Cleaning some warnings up, very slowly (#933)

* Cleaning some warnings up, very slowly

* Updating to Gradle 9

* Updating to Gradle 9.2

Author: cram-cfa

build.gradle

@@ -26,9 +26,6 @@ jacoco {
     toolVersion = '0.8.10'
 }
 
-targetCompatibility = JavaVersion.VERSION_21
-sourceCompatibility = JavaVersion.VERSION_21
-
 group = "org.codeforamerica.platform"
 version = "1.6.43-SNAPSHOT"
 ext.admin = System.getenv("SONATYPE_USERNAME")
@@ -129,6 +126,8 @@ jacocoTestReport {
 }
 
 java {
+    sourceCompatibility = JavaVersion.VERSION_21
+    targetCompatibility = JavaVersion.VERSION_21
     withJavadocJar()
     withSourcesJar()
 }

gradle/wrapper/gradle-wrapper.jar

@@ -1,6 +1,7 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-8.11-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-9.2.0-bin.zip
 networkTimeout=10000
+validateDistributionUrl=true
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists

gradle/wrapper/gradle-wrapper.properties

@@ -8,11 +8,9 @@
  */
 
 rootProject.name = "formflow-library"
-include("lib")
 
 buildCache {
     local {
         directory = new File(rootDir, 'build-cache')
-        removeUnusedEntriesAfterDays = 30
     }
 }

gradlew

@@ -66,10 +66,15 @@
 @RequestMapping(ScreenController.FLOW)
 public class ScreenController extends FormFlowController {
 
+    /**
+     * Base path for all FFL flows
+     */
     public static final String FLOW = "/flow";
-    public static final String FLOW_SCREEN_PATH = "{flow}/{screen}";
 
-    private static final String SUBFLOW_UUID = "uuid";
+    /**
+     * Default path pattern for all FFL flows
+     */
+    public static final String FLOW_SCREEN_PATH = "{flow}/{screen}";
 
     private static final String REPEAT_FOR_UUID = "repeatForIterationUuid";
     private final ValidationService validationService;
@@ -81,6 +86,22 @@ public class ScreenController extends FormFlowController {
     private final ShortCodeConfig shortCodeConfig;
     private final SubflowManager subflowManager;
 
+    /**
+     * A controller to render any screen in flows, including subflows.
+     *
+     * @param flowConfigurations              flow configurations
+     * @param userFileRepositoryService       UserFileRepositoryService
+     * @param submissionRepositoryService     SubmissionRepositoryService
+     * @param validationService               ValidationService
+     * @param addressValidationService        AddressValidationService
+     * @param formFlowConfigurationProperties FormFlowConfigurationProperties
+     * @param conditionManager                ConditionManager
+     * @param actionManager                   ActionManager
+     * @param fileValidationService           FileValidationService
+     * @param messageSource                   MessageSource
+     * @param shortCodeConfig                 ShortCodeConfig
+     * @param subflowManager                  SubflowManager
+     */
     public ScreenController(
             List<FlowConfiguration> flowConfigurations,
             UserFileRepositoryService userFileRepositoryService,

gradlew.bat

@@ -160,27 +160,22 @@ public synchronized void generateAndSetUniqueShortCode(Submission submission) {
                 // set this submission's shortcode, and persist it
                 submission.setShortCode(newCode);
                 save(submission);
+                log.info("Created short code {} for submission {}", newCode, submission.getId());
             } else {
                 log.warn("Confirmation code {} already exists", newCode);
             }
         } while (submission.getShortCode() == null);
     }
 
     private static String generateRandomCode(int length, ShortCodeType type) {
-        RandomStringGenerator.Builder builder = new RandomStringGenerator.Builder().withinRange('0', 'z');
-
-        switch (type) {
-            case alphanumeric:
-                builder.filteredBy(Character::isLetterOrDigit);
-                break;
-            case alpha:
-                builder.filteredBy(Character::isLetter);
-                break;
-            case numeric:
-                builder.filteredBy(Character::isDigit);
-                break;
-        }
+        RandomStringGenerator.Builder builder = RandomStringGenerator.builder().withinRange('0', 'z');
+
+        builder = switch (type) {
+            case alphanumeric -> builder.filteredBy(Character::isLetterOrDigit);
+            case alpha -> builder.filteredBy(Character::isLetter);
+            case numeric -> builder.filteredBy(Character::isDigit);
+        };
 
-        return builder.build().generate(length);
+        return builder.get().generate(length);
     }
 }