Add remaining public fields

partiql · Dec 26, 2024 · 73e25c5 · 73e25c5
1 parent 12cdf50
commit 73e25c5
Show file tree

Hide file tree

Showing 5 changed files with 27 additions and 23 deletions.
diff --git a/partiql-ast/api/partiql-ast.api b/partiql-ast/api/partiql-ast.api
@@ -2807,8 +2807,6 @@ public abstract class org/partiql/ast/graph/GraphLabel : org/partiql/ast/AstNode
 }
 
 public class org/partiql/ast/graph/GraphLabel$Conj : org/partiql/ast/graph/GraphLabel {
-	public final field lhs Lorg/partiql/ast/graph/GraphLabel;
-	public final field rhs Lorg/partiql/ast/graph/GraphLabel;
 	public fun <init> (Lorg/partiql/ast/graph/GraphLabel;Lorg/partiql/ast/graph/GraphLabel;)V
 	public fun accept (Lorg/partiql/ast/AstVisitor;Ljava/lang/Object;)Ljava/lang/Object;
 	public static fun builder ()Lorg/partiql/ast/graph/GraphLabel$Conj$Builder;
@@ -2828,8 +2826,6 @@ public class org/partiql/ast/graph/GraphLabel$Conj$Builder {
 }
 
 public class org/partiql/ast/graph/GraphLabel$Disj : org/partiql/ast/graph/GraphLabel {
-	public final field lhs Lorg/partiql/ast/graph/GraphLabel;
-	public final field rhs Lorg/partiql/ast/graph/GraphLabel;
 	public fun <init> (Lorg/partiql/ast/graph/GraphLabel;Lorg/partiql/ast/graph/GraphLabel;)V
 	public fun accept (Lorg/partiql/ast/AstVisitor;Ljava/lang/Object;)Ljava/lang/Object;
 	public static fun builder ()Lorg/partiql/ast/graph/GraphLabel$Disj$Builder;
@@ -2983,16 +2979,16 @@ public class org/partiql/ast/graph/GraphPart$Pattern$Builder {
 }
 
 public final class org/partiql/ast/graph/GraphPattern : org/partiql/ast/AstNode {
-	public final field parts Ljava/util/List;
-	public final field prefilter Lorg/partiql/ast/expr/Expr;
-	public final field quantifier Lorg/partiql/ast/graph/GraphQuantifier;
-	public final field restrictor Lorg/partiql/ast/graph/GraphRestrictor;
-	public final field variable Ljava/lang/String;
 	public fun <init> (Lorg/partiql/ast/graph/GraphRestrictor;Lorg/partiql/ast/expr/Expr;Ljava/lang/String;Lorg/partiql/ast/graph/GraphQuantifier;Ljava/util/List;)V
 	public fun accept (Lorg/partiql/ast/AstVisitor;Ljava/lang/Object;)Ljava/lang/Object;
 	public static fun builder ()Lorg/partiql/ast/graph/GraphPattern$Builder;
 	public fun equals (Ljava/lang/Object;)Z
 	public fun getChildren ()Ljava/util/List;
+	public fun getParts ()Ljava/util/List;
+	public fun getPrefilter ()Lorg/partiql/ast/expr/Expr;
+	public fun getQuantifier ()Lorg/partiql/ast/graph/GraphQuantifier;
+	public fun getRestrictor ()Lorg/partiql/ast/graph/GraphRestrictor;
+	public fun getVariable ()Ljava/lang/String;
 	public fun hashCode ()I
 }
 
@@ -3108,13 +3104,13 @@ public class org/partiql/ast/graph/GraphSelector$AnyShortest$Builder {
 }
 
 public class org/partiql/ast/graph/GraphSelector$ShortestK : org/partiql/ast/graph/GraphSelector {
-	public final field k J
 	public fun <init> (J)V
 	public fun accept (Lorg/partiql/ast/AstVisitor;Ljava/lang/Object;)Ljava/lang/Object;
 	public static fun builder ()Lorg/partiql/ast/graph/GraphSelector$ShortestK$Builder;
 	protected fun canEqual (Ljava/lang/Object;)Z
 	public fun equals (Ljava/lang/Object;)Z
 	public fun getChildren ()Ljava/util/List;
+	public fun getK ()J
 	public fun hashCode ()I
 }
 
@@ -3125,13 +3121,13 @@ public class org/partiql/ast/graph/GraphSelector$ShortestK$Builder {
 }
 
 public class org/partiql/ast/graph/GraphSelector$ShortestKGroup : org/partiql/ast/graph/GraphSelector {
-	public final field k J
 	public fun <init> (J)V
 	public fun accept (Lorg/partiql/ast/AstVisitor;Ljava/lang/Object;)Ljava/lang/Object;
 	public static fun builder ()Lorg/partiql/ast/graph/GraphSelector$ShortestKGroup$Builder;
 	protected fun canEqual (Ljava/lang/Object;)Z
 	public fun equals (Ljava/lang/Object;)Z
 	public fun getChildren ()Ljava/util/List;
+	public fun getK ()J
 	public fun hashCode ()I
 }
 

diff --git a/partiql-ast/build.gradle.kts b/partiql-ast/build.gradle.kts
@@ -16,7 +16,7 @@
 plugins {
     id(Plugins.conventions)
     id(Plugins.publish)
-    // To allow for Kotlin code in partiql-ast to understand Java Lombok annotations, need the following plugin.
+    // Need the Kotlin lombok plugin to allow for Kotlin code in partiql-ast to understand Java Lombok annotations.
     // https://kotlinlang.org/docs/lombok.html
     id(Plugins.kotlinLombok) version Versions.kotlinLombok
 }

diff --git a/partiql-ast/src/main/java/org/partiql/ast/graph/GraphLabel.java b/partiql-ast/src/main/java/org/partiql/ast/graph/GraphLabel.java
@@ -96,11 +96,11 @@ public <R, C> R accept(@NotNull AstVisitor<R, C> visitor, C ctx) {
     public static class Conj extends GraphLabel {
         @NotNull
         @Getter
-        public final GraphLabel lhs;
+        private final GraphLabel lhs;
 
         @NotNull
         @Getter
-        public final GraphLabel rhs;
+        private final GraphLabel rhs;
 
         public Conj(@NotNull GraphLabel lhs, @NotNull GraphLabel rhs) {
             this.lhs = lhs;
@@ -130,11 +130,11 @@ public <R, C> R accept(@NotNull AstVisitor<R, C> visitor, C ctx) {
     public static class Disj extends GraphLabel {
         @NotNull
         @Getter
-        public final GraphLabel lhs;
+        private final GraphLabel lhs;
 
         @NotNull
         @Getter
-        public final GraphLabel rhs;
+        private final GraphLabel rhs;
 
         public Disj(@NotNull GraphLabel lhs, @NotNull GraphLabel rhs) {
             this.lhs = lhs;

diff --git a/partiql-ast/src/main/java/org/partiql/ast/graph/GraphPattern.java b/partiql-ast/src/main/java/org/partiql/ast/graph/GraphPattern.java
@@ -2,6 +2,7 @@
 
 import lombok.Builder;
 import lombok.EqualsAndHashCode;
+import lombok.Getter;
 import org.jetbrains.annotations.NotNull;
 import org.jetbrains.annotations.Nullable;
 import org.partiql.ast.AstNode;
@@ -18,19 +19,24 @@
 @EqualsAndHashCode(callSuper = false)
 public final class GraphPattern extends AstNode {
     @Nullable
-    public final GraphRestrictor restrictor;
+    @Getter
+    private final GraphRestrictor restrictor;
 
     @Nullable
-    public final Expr prefilter;
+    @Getter
+    private final Expr prefilter;
 
     @Nullable
-    public final String variable;
+    @Getter
+    private final String variable;
 
     @Nullable
-    public final GraphQuantifier quantifier;
+    @Getter
+    private final GraphQuantifier quantifier;
 
     @NotNull
-    public final List<GraphPart> parts;
+    @Getter
+    private final List<GraphPart> parts;
 
     public GraphPattern(@Nullable GraphRestrictor restrictor, @Nullable Expr prefilter,
                         @Nullable String variable, @Nullable GraphQuantifier quantifier,

diff --git a/partiql-ast/src/main/java/org/partiql/ast/graph/GraphSelector.java b/partiql-ast/src/main/java/org/partiql/ast/graph/GraphSelector.java
@@ -105,7 +105,8 @@ public <R, C> R accept(@NotNull AstVisitor<R, C> visitor, C ctx) {
     @Builder(builderClassName = "Builder")
     @EqualsAndHashCode(callSuper = false)
     public static class ShortestK extends GraphSelector {
-        public final long k;
+        @Getter
+        private final long k;
 
         public ShortestK(long k) {
             this.k = k;
@@ -129,7 +130,8 @@ public <R, C> R accept(@NotNull AstVisitor<R, C> visitor, C ctx) {
     @Builder(builderClassName = "Builder")
     @EqualsAndHashCode(callSuper = false)
     public static class ShortestKGroup extends GraphSelector {
-        public final long k;
+        @Getter
+        private final long k;
 
         public ShortestKGroup(long k) {
             this.k = k;