Refactor

build.gradle

@@ -4,9 +4,9 @@ plugins {
     id 'java-library'
     id 'maven-publish'
     id 'signing'
-    id 'com.diffplug.spotless' version '6.25.0'
-    id 'org.checkerframework' version '0.6.49'
-    id("net.ltgt.errorprone") version "4.1.0"
+    id 'com.diffplug.spotless' version '7.1.0'
+    id 'org.checkerframework' version '0.6.56'
+    id 'net.ltgt.errorprone' version '4.3.0'
     id 'com.adarshr.test-logger' version '4.0.0'
 }
 
@@ -22,26 +22,28 @@ application {
 
 dependencies {
 
-    implementation 'com.github.javaparser:javaparser-symbol-solver-core:3.26.1'
+    implementation 'com.github.javaparser:javaparser-symbol-solver-core:3.27.0'
 
     implementation 'net.sf.jopt-simple:jopt-simple:5.0.4'
 
-    implementation "org.vineflower:vineflower:1.11.0"
+    implementation "org.vineflower:vineflower:1.11.1"
 
-    implementation 'commons-io:commons-io:2.18.0'
+    implementation 'commons-io:commons-io:2.19.0'
 
     // Use JUnit test framework.
     testImplementation 'junit:junit:4.13.2'
 
-    errorprone("com.google.errorprone:error_prone_core:2.35.1")
+    errorprone("com.google.errorprone:error_prone_core:2.40.0")
+
+    implementation 'com.google.googlejavaformat:google-java-format:1.28.0'
 }
 
 // Use require-javadoc. From https://github.com/plume-lib/require-javadoc.
 configurations {
     requireJavadoc
 }
 dependencies {
-    requireJavadoc "org.plumelib:require-javadoc:1.0.9"
+    requireJavadoc "org.plumelib:require-javadoc:2.0.0"
 }
 task requireJavadoc(type: JavaExec) {
     group = 'Documentation'
@@ -73,14 +75,40 @@ task checkExpectedOutputCompilesFor(type: Exec) {
     }
 }
 
+// needed for google-java-format: see https://github.com/google/google-java-format?tab=readme-ov-file#as-a-library
+tasks.withType(JavaExec).configureEach {
+    jvmArgs += [
+        '--add-exports=jdk.compiler/com.sun.tools.javac.api=ALL-UNNAMED',
+        '--add-exports=jdk.compiler/com.sun.tools.javac.code=ALL-UNNAMED',
+        '--add-exports=jdk.compiler/com.sun.tools.javac.file=ALL-UNNAMED',
+        '--add-exports=jdk.compiler/com.sun.tools.javac.parser=ALL-UNNAMED',
+        '--add-exports=jdk.compiler/com.sun.tools.javac.tree=ALL-UNNAMED',
+        '--add-exports=jdk.compiler/com.sun.tools.javac.util=ALL-UNNAMED'
+    ]
+}
+
+tasks.withType(Test).configureEach {
+    jvmArgs += [
+        '--add-exports=jdk.compiler/com.sun.tools.javac.api=ALL-UNNAMED',
+        '--add-exports=jdk.compiler/com.sun.tools.javac.code=ALL-UNNAMED',
+        '--add-exports=jdk.compiler/com.sun.tools.javac.file=ALL-UNNAMED',
+        '--add-exports=jdk.compiler/com.sun.tools.javac.parser=ALL-UNNAMED',
+        '--add-exports=jdk.compiler/com.sun.tools.javac.tree=ALL-UNNAMED',
+        '--add-exports=jdk.compiler/com.sun.tools.javac.util=ALL-UNNAMED'
+    ]
+}
+
 tasks.compileJava {
     // uncomment for testing
     // options.errorprone.enabled = false
     options.errorprone.disable(
             // JavaParser's visitor design requires us to regularly violate this rule
             "VoidUsed",
             // Specimin should compile with Java 11, but this suggestion assumes Java 17
-            "PatternMatchingInstanceof")
+            "PatternMatchingInstanceof",
+            // Remove after refactor
+            "UnusedMethod",
+            "UnusedVariable")
 }
 
 tasks.compileTestJava {
@@ -113,7 +141,7 @@ spotless {
 
         // define the steps to apply to those files
         trimTrailingWhitespace()
-        indentWithSpaces()
+        leadingTabsToSpaces()
         endWithNewline()
     }
     java {

check_differences/check_differences.bat

@@ -45,9 +45,6 @@ cd /D "%CURRENT_DIRECTORY%"
 cd /D "%2" || exit /b 1
 set "DIRECTORY_2=%cd%"
 
-echo %DIRECTORY_1%
-echo %DIRECTORY_2%
-
 cd /D "%DIRECTORY_1%"
 set DIR_1_STRUCTURE=
 for /r %%i in (*) do (

gradle/wrapper/gradle-wrapper.properties

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

settings.gradle

@@ -8,4 +8,3 @@
  */
 
 rootProject.name = 'specimin'
-include('lib')

src/main/java/org/checkerframework/specimin/AmbiguityResolutionPolicy.java

@@ -0,0 +1,21 @@
+package org.checkerframework.specimin;
+
+import com.google.common.base.Ascii;
+
+public enum AmbiguityResolutionPolicy {
+  All,
+  BestEffort,
+  InputCondition;
+
+  public static AmbiguityResolutionPolicy parse(String input) {
+    return switch (Ascii.toLowerCase(input)) {
+      case "all" -> AmbiguityResolutionPolicy.All;
+      case "best-effort" -> AmbiguityResolutionPolicy.BestEffort;
+      case "input-condition" -> AmbiguityResolutionPolicy.InputCondition;
+      default ->
+          throw new RuntimeException(
+              "Unsupported ambiguity resolution policy. Options are: \"all\", \"best-effort\","
+                  + " \"input-condition\"");
+    };
+  }
+}