WIP Switch scraper over to selenium

src/main/java/api/v1/ListTermsEndpoint.java

@@ -7,7 +7,6 @@
 import api.*;
 import io.javalin.http.Context;
 import io.javalin.openapi.*;
-import java.util.*;
 
 public final class ListTermsEndpoint extends App.Endpoint {
   public String getPath() {

src/main/java/database/SelectTerms.java

@@ -1,10 +1,7 @@
 package database;
 
-import static utils.Nyu.*;
-
 import java.sql.*;
 import java.util.*;
-import org.slf4j.*;
 
 public final class SelectTerms {
   static final String SELECT_TERMS = "SELECT DISTINCT term from schools ORDER BY term";

src/main/java/utils/ArrayJS.java

@@ -1,7 +1,6 @@
 package utils;
 
 import java.util.*;
-import java.util.function.*;
 
 public final class ArrayJS {
   public interface ArrayFunc<T> {

src/main/java/utils/Utils.java

@@ -1,5 +1,7 @@
 package utils;
 
+import static utils.Try.*;
+
 import java.io.*;
 import java.net.*;
 import java.nio.charset.StandardCharsets;
@@ -10,8 +12,7 @@
 import java.util.stream.*;
 
 public final class Utils {
-  private static final BufferedReader inReader =
-      new BufferedReader(new InputStreamReader(System.in));
+  private static final BufferedReader inReader = new BufferedReader(new InputStreamReader(System.in));
 
   public static final class Ref<T> {
     public T value;
@@ -29,17 +30,21 @@ public static void profileWait() {
     // The profile doesn't actually start automatically, you have to attach
     // a different program to this. The goal is simply to prevent the program
     // from making progress until the profiler is attached correctly.
-    //                              - Albert Liu, Feb 04, 2022 Fri 00:58 EST
-    Scanner scanner = new Scanner(inReader);
-    scanner.nextLine();
+    // - Albert Liu, Feb 04, 2022 Fri 00:58 EST
+    try (Scanner scanner = new Scanner(inReader)) {
+      scanner.nextLine();
+    }
   }
 
   public static String readResource(String path) {
     InputStream resource = Utils.class.getResourceAsStream(path);
 
-    if (resource == null) throw new IllegalArgumentException("Resource doesn't exist: " + path);
+    if (resource == null)
+      throw new IllegalArgumentException("Resource doesn't exist: " + path);
 
-    return new Scanner(resource, StandardCharsets.UTF_8).useDelimiter("\\A").next();
+    try (var scanner = new Scanner(resource, StandardCharsets.UTF_8).useDelimiter("\\A")) {
+      return scanner.next();
+    }
   }
 
   // Read entire file and then get it as a list of lines
@@ -74,8 +79,7 @@ public static void writeToFileOrStdout(String file, Object value) {
     if (file == null) {
       System.out.println(value);
     } else {
-      try {
-        BufferedWriter writer = new BufferedWriter(new FileWriter(file));
+      try (BufferedWriter writer = new BufferedWriter(new FileWriter(file))) {
         writer.write(value.toString() + "\n");
         writer.flush();
       } catch (IOException e) {
@@ -85,14 +89,10 @@ public static void writeToFileOrStdout(String file, Object value) {
   }
 
   public static String readFromFileOrStdin(String file) {
-    if (file != null) {
-      try {
-        return new Scanner(new FileReader(file)).useDelimiter("\\A").next();
-      } catch (FileNotFoundException e) {
-        throw new RuntimeException(e);
-      }
+    var reader = file != null ? tcPass(() -> new BufferedReader(new FileReader(file))) : inReader;
+    try (var scanner = new Scanner(reader).useDelimiter("\\A")) {
+      return scanner.next();
     }
-    return new Scanner(inReader).useDelimiter("\\A").next();
   }
 
   public static DayOfWeek parseDayOfWeek(String dayOfWeek) {
@@ -126,21 +126,21 @@ public static void setObject(PreparedStatement stmt, int index, Object obj) thro
   }
 
   public static String getEnvDefault(String name, String defaultValue) {
-    String value = System.getenv(name);
+    var value = System.getenv(name);
     if (value == null) {
       return defaultValue;
     }
     return value;
   }
 
   public static int getEnvDefault(String name, int defaultValue) {
-    var value = Try.tcIgnore(() -> Integer.parseInt(System.getenv(name)));
+    var value = tcIgnore(() -> Integer.parseInt(System.getenv(name)));
     return value.orElse(defaultValue);
   }
 
   static class NullWrapper {
-    int type;
-    Object value;
+    final int type;
+    final Object value;
 
     NullWrapper(int type, Object value) {
       this.type = type;
@@ -153,20 +153,16 @@ public static NullWrapper nullable(int type, Object value) {
   }
 
   public static void setArray(PreparedStatement stmt, Object... objs) {
-    int i = 0;
-    try {
-      for (i = 0; i < objs.length; i++) {
+    tcPass(() -> {
+      for (int i = 0; i < objs.length; i++) {
         setObject(stmt, i + 1, objs[i]);
       }
-    } catch (Exception e) {
-      // System.err.println("at index " + i);
-      throw new RuntimeException(e);
-    }
+    });
   }
 
   public static String stackTrace(Throwable t) {
-    StringWriter sw = new StringWriter();
-    PrintWriter pw = new PrintWriter(sw);
+    var sw = new StringWriter();
+    var pw = new PrintWriter(sw);
     t.printStackTrace(pw);
     return sw.toString();
   }

src/test/java/test/CoursesTest.java

@@ -1,6 +1,5 @@
 package test;
 
-import static actions.CopyTermFromProduction.*;
 import static utils.JsonMapper.*;
 import static utils.Nyu.*;
 
@@ -11,7 +10,7 @@
 public class CoursesTest {
   @Test
   public void testFeature182() {
-    var subjects = new String[] {"CSCI-UA", "SCA-UA_1", "MATH-UA"};
+    var subjects = new String[] { "CSCI-UA", "SCA-UA_1", "MATH-UA" };
 
     var testUrl = "/api/courses/sp2021/";
     var app = App.makeApp();
@@ -35,7 +34,7 @@ public void testFeature182() {
 
   @Test
   public void testCoursesInvalidSubject() {
-    var subjects = new String[] {"CSCI-UAd", "CSCI-d", "mEdew"};
+    var subjects = new String[] { "CSCI-UAd", "CSCI-d", "mEdew" };
 
     var testUrl = "/api/courses/sp2021/";
     var app = App.makeApp();
@@ -49,10 +48,9 @@ public void testCoursesInvalidSubject() {
               Assert.assertEquals(resp.code(), 400);
 
               var body = respBody.string();
-              var expected =
-                  "{\"status\":400,\"message\":\"the subject \\\""
-                      + subject
-                      + "\\\" is invalid for the term Term[semester=sp, year=2021]\"}";
+              var expected = "{\"status\":400,\"message\":\"the subject \\\""
+                  + subject
+                  + "\\\" is invalid for the term Term[semester=sp, year=2021]\"}";
 
               Assert.assertEquals(body.toLowerCase(), expected.toLowerCase());
             }