Bump Gradle wrapper to 7.3, target Java 17, use sealed types where applicable, clean up code

Author: phantamanta44

README.md

@@ -29,7 +29,7 @@ dependencies {
     implementation("com.googlecode.json-simple:json-simple:1.1.1")
 }
 ```
-SemGuS-Java targets Java 16 and makes extensive use of records to represent SemGuS objects.
+SemGuS-Java targets Java 17 and makes extensive use of sealed types and records to represent SemGuS objects.
 
 ## Usage
 

build.gradle.kts

@@ -13,6 +13,11 @@ repositories {
     }
 }
 
+java {
+    sourceCompatibility = JavaVersion.VERSION_17
+    targetCompatibility = JavaVersion.VERSION_17
+}
+
 dependencies {
     implementation("com.github.phantamanta44:jsr305:1.0.1")
     implementation("com.googlecode.json-simple:json-simple:1.1.1")

gradle/wrapper/gradle-wrapper.properties

@@ -1,5 +1,5 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-7.1-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-7.3-bin.zip
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists

src/main/java/org/semgus/java/Main.java

@@ -1,6 +1,5 @@
 package org.semgus.java;
 
-import org.json.simple.JSONObject;
 import org.json.simple.parser.ParseException;
 import org.semgus.java.event.EventParser;
 import org.semgus.java.event.SpecEvent;
@@ -19,7 +18,14 @@
 /**
  * Entry point class that simply reads a SemGuS JSON document, parses it, and dumps the problem to standard output.
  */
-public class Main {
+public final class Main {
+
+    /**
+     * Empty helper class constructor.
+     */
+    private Main() {
+        // NO-OP
+    }
 
     /**
      * Entry point: reads a JSON document, parses it as a SemGuS JSON specification, and dumps it to standard output.

src/main/java/org/semgus/java/event/MetaSpecEvent.java

@@ -5,7 +5,7 @@
 /**
  * A SemGuS parser event of the "meta" type.
  */
-public interface MetaSpecEvent extends SpecEvent {
+public sealed interface MetaSpecEvent extends SpecEvent {
 
     /**
      * A "set-info" event specifying some problem metadata.

src/main/java/org/semgus/java/event/SemgusSpecEvent.java

@@ -11,7 +11,7 @@
 /**
  * A SemGuS parser event of the "semgus" type.
  */
-public interface SemgusSpecEvent extends SpecEvent {
+public sealed interface SemgusSpecEvent extends SpecEvent {
 
     /**
      * A "check-synth" event indicating that the synthesis problem specification is done.
@@ -43,7 +43,7 @@ record DefineTermTypeEvent(String name, List<Constructor> constructors) implemen
          * @param name     The name of the constructor.
          * @param children The names of child term types for this constructor.
          */
-        public static record Constructor(String name, List<String> children) {
+        public record Constructor(String name, List<String> children) {
             // NO-OP
         }
 
@@ -73,7 +73,7 @@ record HornClauseEvent(
          * @param arguments  The arguments to the constructor.
          * @param returnType The name of the term type constructed by the constructor.
          */
-        public static record Constructor(String name, List<TypedVar> arguments, String returnType) {
+        public record Constructor(String name, List<TypedVar> arguments, String returnType) {
             // NO-OP
         }
 
@@ -104,7 +104,7 @@ record SynthFunEvent(String name, Map<String, NonTerminal> grammar, String termT
          * @param termType    The term type corresponding to this non-terminal.
          * @param productions A set of productions, indexed by production name.
          */
-        public static record NonTerminal(String termType, Map<String, Production> productions) {
+        public record NonTerminal(String termType, Map<String, Production> productions) {
             // NO-OP
         }
 
@@ -114,7 +114,7 @@ public static record NonTerminal(String termType, Map<String, Production> produc
          * @param operator    The name/symbol for this production.
          * @param occurrences The names of non-terminals for child terms.
          */
-        public static record Production(String operator, List<String> occurrences) {
+        public record Production(String operator, List<String> occurrences) {
             // NO-OP
         }
 

src/main/java/org/semgus/java/event/SpecEvent.java

@@ -3,6 +3,6 @@
 /**
  * Parent interface for all SemGuS parser events.
  */
-public interface SpecEvent {
+public sealed interface SpecEvent permits MetaSpecEvent, SemgusSpecEvent {
     // NO-OP
 }

src/main/java/org/semgus/java/object/AttributeValue.java

@@ -10,7 +10,7 @@
 /**
  * Represents the value of an SMT-Lib attribute. Used by SemGuS for various pieces of metadata.
  */
-public interface AttributeValue {
+public sealed interface AttributeValue {
 
     /**
      * Deserializes an attribute value from the SemGuS JSON format.

src/main/java/org/semgus/java/object/Identifier.java

@@ -84,7 +84,7 @@ public String toString() {
     /**
      * An index value for an indexed identifier.
      */
-    public interface Index {
+    public sealed interface Index {
 
         /**
          * Deserializes an index value for an identifier.

src/main/java/org/semgus/java/object/SmtTerm.java

@@ -13,7 +13,7 @@
 /**
  * Represents a term of an SMT formula.
  */
-public interface SmtTerm {
+public sealed interface SmtTerm {
 
     /**
      * Deserializes an SMT formula term in the SemGuS JSON format.
@@ -260,7 +260,7 @@ public String toString() {
          * @param type The argument type.
          * @param term The subterm being passed as an argument.
          */
-        public static record TypedTerm(Identifier type, SmtTerm term) {
+        public record TypedTerm(Identifier type, SmtTerm term) {
 
             @Override
             public String toString() {