Pass CodeUpdater a Supplier, not a CodeDatabase

Some operations (specifically `downloadIndividual` [^1]) don't
need the CodeDatabase. However, the SQL data source is always
created, so you need valid env vars for a SQL database, even
if not used.

This patch changes it so that isn't the case; if the operation
you're trying to run manually doesn't use a SQL database, the
variables are not required.

[^1]: `downloadInidivdual` gets individual XML files from
courts (necessary for `repcap`, an undocumented table which
breaks things), and doesn't directly interact with any
of the SQL tables themselves.

Author: BryceStevenWilley

proxyserver/src/main/java/edu/suffolk/litlab/efsp/ecfcodes/CodeUpdater.java

@@ -23,7 +23,6 @@
 import java.io.InputStream;
 import java.net.HttpURLConnection;
 import java.net.URL;
-import java.sql.Connection;
 import java.sql.SQLException;
 import java.sql.Savepoint;
 import java.time.Clock;
@@ -37,6 +36,7 @@
 import java.util.Set;
 import java.util.concurrent.ConcurrentHashMap;
 import java.util.function.Function;
+import java.util.function.Supplier;
 import java.util.stream.Collectors;
 import java.util.stream.Stream;
 import java.util.zip.ZipInputStream;
@@ -413,6 +413,7 @@ private boolean downloadCourtTables(
   /** Returns true if successful, false if not successful */
   public boolean updateAll(String baseUrl, FilingReviewMDEPort filingPort, CodeDatabase cd)
       throws SQLException, IOException, JAXBException {
+    cd.setAutoCommit(false);
     HeaderSigner signer = new HeaderSigner(this.pathToKeystore, this.x509Password);
     if (!downloadSystemTables(baseUrl, cd, signer)) {
       log.warn(
@@ -496,6 +497,7 @@ public boolean replaceAll(String baseUrl, FilingReviewMDEPort filingPort, CodeDa
   public boolean replaceSome(
       String baseUrl, FilingReviewMDEPort filingPort, CodeDatabase cd, List<String> locs)
       throws SQLException, IOException, JAXBException {
+    cd.setAutoCommit(false);
     HeaderSigner signer = new HeaderSigner(this.pathToKeystore, this.x509Password);
     log.info("Downloading system tables for {}", cd.getDomain());
     boolean success = downloadSystemTables(baseUrl, cd, signer);
@@ -598,11 +600,14 @@ public boolean downloadIndiv(List<String> args, String jurisdiction, TylerEnv en
   }
 
   public static boolean executeCommand(
-      CodeDatabase cd, String jurisdiction, TylerEnv env, List<String> args, String x509Password) {
+      Supplier<CodeDatabase> cdSupplier,
+      String jurisdiction,
+      TylerEnv env,
+      List<String> args,
+      String x509Password) {
     SoapX509CallbackHandler.setX509Password(x509Password);
     String command = args.get(0);
     try {
-      cd.setAutoCommit(false);
       String codesSite = TylerClients.getTylerServerRootUrl(jurisdiction, env);
       FilingReviewMDEPort filingPort =
           loginWithTyler(
@@ -612,11 +617,12 @@ public static boolean executeCommand(
               System.getenv("TYLER_USER_PASSWORD"));
       CodeUpdater cu = new CodeUpdater(System.getenv("PATH_TO_KEYSTORE"), x509Password);
       if (command.equalsIgnoreCase("replaceall")) {
-        return cu.replaceAll(codesSite, filingPort, cd);
+        return cu.replaceAll(codesSite, filingPort, cdSupplier.get());
       } else if (command.equalsIgnoreCase("replacesome")) {
-        return cu.replaceSome(codesSite, filingPort, cd, args.subList(1, args.size()));
+        return cu.replaceSome(
+            codesSite, filingPort, cdSupplier.get(), args.subList(1, args.size()));
       } else if (command.equalsIgnoreCase("refresh")) {
-        return cu.updateAll(codesSite, filingPort, cd);
+        return cu.updateAll(codesSite, filingPort, cdSupplier.get());
       } else if (command.equalsIgnoreCase("downloadIndiv")) {
         return cu.downloadIndiv(args, jurisdiction, env);
       } else {
@@ -629,6 +635,25 @@ public static boolean executeCommand(
     }
   }
 
+  /** Should just be called from main. */
+  private static CodeDatabase makeCodeDatabase(String jurisdiction, TylerEnv env) {
+    try {
+      DataSource ds =
+          DatabaseCreator.makeDataSource(
+              System.getenv("POSTGRES_URL"),
+              Integer.parseInt(System.getenv("POSTGRES_PORT")),
+              System.getenv("POSTGRES_CODES_DB"),
+              System.getenv("POSTGRES_USER"),
+              System.getenv("POSTGRES_PASSWORD"),
+              5,
+              100);
+
+      return CodeDatabase.fromDS(jurisdiction, env, ds);
+    } catch (Exception ex) {
+      throw new RuntimeException(ex);
+    }
+  }
+
   /**
    * Run with:
    *
@@ -645,30 +670,19 @@ public static void main(String[] args) throws Exception {
       log.error("Need to pass in a subprogram: downloadIndiv, or refresh");
       System.exit(1);
     }
-    DataSource ds =
-        DatabaseCreator.makeDataSource(
-            System.getenv("POSTGRES_URL"),
-            Integer.parseInt(System.getenv("POSTGRES_PORT")),
-            System.getenv("POSTGRES_CODES_DB"),
-            System.getenv("POSTGRES_USER"),
-            System.getenv("POSTGRES_PASSWORD"),
-            5,
-            100);
 
     List<String> jurisdictions = List.of(System.getenv("TYLER_JURISDICTIONS").split(" "));
     var env = TylerEnv.parse(System.getenv("TYLER_ENV"));
     for (String jurisdiction : jurisdictions) {
       // Reusing USER for Jurisdiction, SESSION for the court / location, and REQUEST for the table
       // name.
       MDC.put(MDCWrappers.USER_ID, jurisdiction);
-      try (Connection conn = ds.getConnection()) {
-        executeCommand(
-            new CodeDatabase(jurisdiction, env, conn),
-            jurisdiction,
-            env,
-            List.of(args),
-            System.getenv("X509_PASSWORD"));
-      }
+      executeCommand(
+          () -> makeCodeDatabase(jurisdiction, env),
+          jurisdiction,
+          env,
+          List.of(args),
+          System.getenv("X509_PASSWORD"));
     }
   }
 }

proxyserver/src/main/java/edu/suffolk/litlab/efsp/server/setup/tyler/TylerModuleSetup.java

@@ -184,15 +184,15 @@ public void preSetup() {
                   + tylerJurisdiction
                   + ": please wait a bit");
           CodeUpdater.executeCommand(
-              cd,
+              () -> cd,
               tylerJurisdiction,
               tylerEnv,
               List.of("replacesome", testOnlyLocation),
               this.x509Password);
         } else {
           log.info("Downloading all codes for {}: please wait a bit", tylerJurisdiction);
           CodeUpdater.executeCommand(
-              cd, tylerJurisdiction, tylerEnv, List.of("replaceall"), this.x509Password);
+              () -> cd, tylerJurisdiction, tylerEnv, List.of("replaceall"), this.x509Password);
         }
       }
     } catch (SQLException e) {

proxyserver/src/main/java/edu/suffolk/litlab/efsp/server/utils/UpdateCodeVersions.java

@@ -53,7 +53,8 @@ public void execute(JobExecutionContext context) throws JobExecutionException {
     try (Connection conn =
             DatabaseCreator.makeSingleConnection(pgDb, pgFullUrl, pgUser, pgPassword);
         CodeDatabase cd = new CodeDatabase(jurisdiction, env, conn)) {
-      success = CodeUpdater.executeCommand(cd, jurisdiction, env, List.of("refresh"), x509Password);
+      success =
+          CodeUpdater.executeCommand(() -> cd, jurisdiction, env, List.of("refresh"), x509Password);
     } catch (SQLException e) {
       log.error("Couldn't connect to Codes db from Job Executor: ", e);
       success = false;