Fix omitted getters; make protected fields private

partiql · Dec 27, 2024 · 28eb1f1 · 28eb1f1
1 parent 7ca16a7
commit 28eb1f1
Show file tree

Hide file tree

Showing 6 changed files with 20 additions and 19 deletions.
diff --git a/partiql-ast/api/partiql-ast.api b/partiql-ast/api/partiql-ast.api
@@ -728,6 +728,8 @@ public class org/partiql/ast/DataType$StructField : org/partiql/ast/AstNode {
 	protected fun canEqual (Ljava/lang/Object;)Z
 	public fun equals (Ljava/lang/Object;)Z
 	public fun getChildren ()Ljava/util/List;
+	public fun getComment ()Ljava/lang/String;
+	public fun getConstraints ()Ljava/util/List;
 	public fun getName ()Lorg/partiql/ast/Identifier;
 	public fun getType ()Lorg/partiql/ast/DataType;
 	public fun hashCode ()I
@@ -1244,14 +1246,14 @@ public class org/partiql/ast/QueryBody$SFW$Builder {
 }
 
 public class org/partiql/ast/QueryBody$SetOp : org/partiql/ast/QueryBody {
-	public field lhs Lorg/partiql/ast/expr/Expr;
-	public field rhs Lorg/partiql/ast/expr/Expr;
 	public fun <init> (Lorg/partiql/ast/SetOp;ZLorg/partiql/ast/expr/Expr;Lorg/partiql/ast/expr/Expr;)V
 	public fun accept (Lorg/partiql/ast/AstVisitor;Ljava/lang/Object;)Ljava/lang/Object;
 	public static fun builder ()Lorg/partiql/ast/QueryBody$SetOp$Builder;
 	protected fun canEqual (Ljava/lang/Object;)Z
 	public fun equals (Ljava/lang/Object;)Z
 	public fun getChildren ()Ljava/util/List;
+	public fun getLhs ()Lorg/partiql/ast/expr/Expr;
+	public fun getRhs ()Lorg/partiql/ast/expr/Expr;
 	public fun getType ()Lorg/partiql/ast/SetOp;
 	public fun hashCode ()I
 	public fun isOuter ()Z
@@ -1572,7 +1574,6 @@ public class org/partiql/ast/ddl/PartitionBy$Builder {
 }
 
 public abstract class org/partiql/ast/ddl/TableConstraint : org/partiql/ast/AstNode {
-	protected final field name Lorg/partiql/ast/IdentifierChain;
 	protected fun <init> (Lorg/partiql/ast/IdentifierChain;)V
 	public fun getName ()Lorg/partiql/ast/IdentifierChain;
 }
@@ -2648,7 +2649,6 @@ public class org/partiql/ast/expr/ExprWindow$Over$Builder {
 }
 
 public abstract class org/partiql/ast/expr/PathStep : org/partiql/ast/AstNode {
-	protected final field next Lorg/partiql/ast/expr/PathStep;
 	protected fun <init> (Lorg/partiql/ast/expr/PathStep;)V
 	public fun getNext ()Lorg/partiql/ast/expr/PathStep;
 }

diff --git a/partiql-ast/src/main/java/org/partiql/ast/DataType.java b/partiql-ast/src/main/java/org/partiql/ast/DataType.java
@@ -40,8 +40,11 @@ public static class StructField extends AstNode {
         private final boolean optional;
 
         @Nullable
+        @Getter
         private final List<AttributeConstraint> constraints;
+
         @Nullable
+        @Getter
         private final String comment;
 
         public StructField(

diff --git a/partiql-ast/src/main/java/org/partiql/ast/QueryBody.java b/partiql-ast/src/main/java/org/partiql/ast/QueryBody.java
@@ -84,10 +84,12 @@ public static class SetOp extends QueryBody {
         private final boolean outer;
 
         @NotNull
-        public Expr lhs;
+        @Getter
+        private final Expr lhs;
 
         @NotNull
-        public Expr rhs;
+        @Getter
+        private final Expr rhs;
 
         public SetOp(@NotNull org.partiql.ast.SetOp type, boolean outer, @NotNull Expr lhs, @NotNull Expr rhs) {
             this.type = type;

diff --git a/partiql-ast/src/main/java/org/partiql/ast/SelectItem.java b/partiql-ast/src/main/java/org/partiql/ast/SelectItem.java
@@ -48,9 +48,11 @@ public <R, C> R accept(@NotNull AstVisitor<R, C> visitor, C ctx) {
     @EqualsAndHashCode(callSuper = false)
     public static class Expr extends SelectItem {
         @NotNull
+        @Getter
         private final org.partiql.ast.expr.Expr expr;
 
         @Nullable
+        @Getter
         private final Identifier asAlias;
 
         public Expr(@NotNull org.partiql.ast.expr.Expr expr, @Nullable Identifier asAlias) {
@@ -73,15 +75,5 @@ public List<AstNode> getChildren() {
         public <R, C> R accept(@NotNull AstVisitor<R, C> visitor, C ctx) {
             return visitor.visitSelectItemExpr(this, ctx);
         }
-
-        @NotNull
-        public org.partiql.ast.expr.Expr getExpr() {
-            return this.expr;
-        }
-
-        @Nullable
-        public Identifier getAsAlias() {
-            return this.asAlias;
-        }
     }
 }
diff --git a/partiql-ast/src/main/java/org/partiql/ast/ddl/TableConstraint.java b/partiql-ast/src/main/java/org/partiql/ast/ddl/TableConstraint.java
@@ -15,7 +15,7 @@
 public abstract class TableConstraint extends AstNode {
     @Nullable
     @Getter
-    protected final IdentifierChain name;
+    private final IdentifierChain name;
 
     protected TableConstraint(@Nullable IdentifierChain name) {
         this.name = name;
@@ -40,7 +40,7 @@ public Unique(@Nullable IdentifierChain name, @NotNull List<Identifier> column,
         @Override
         public List<AstNode> getChildren() {
             List<AstNode> kids = new ArrayList<>();
-            kids.add(name);
+            kids.add(getName());
             kids.addAll(columns);
             return kids;
         }

diff --git a/partiql-ast/src/main/java/org/partiql/ast/expr/PathStep.java b/partiql-ast/src/main/java/org/partiql/ast/expr/PathStep.java
@@ -17,7 +17,7 @@
 public abstract class PathStep extends AstNode {
     @Nullable
     @Getter
-    protected final PathStep next;
+    private final PathStep next;
 
     protected PathStep(@Nullable PathStep _next) {
         this.next = _next;
@@ -41,6 +41,7 @@ public Field(@NotNull Identifier field, @Nullable PathStep next) {
         @NotNull
         public List<AstNode> getChildren() {
             List<AstNode> kids = new ArrayList<>();
+            PathStep next = getNext();
             if (next != null) {
                 kids.add(next);
             }
@@ -72,6 +73,7 @@ public Element(@NotNull Expr element, @Nullable PathStep next) {
         public List<AstNode> getChildren() {
             List<AstNode> kids = new ArrayList<>();
             kids.add(element);
+            PathStep next = getNext();
             if (next != null) {
                 kids.add(next);
             }
@@ -97,6 +99,7 @@ public AllElements(@Nullable PathStep next) {
         @NotNull
         public List<AstNode> getChildren() {
             List<AstNode> kids = new ArrayList<>();
+            PathStep next = getNext();
             if (next != null) {
                 kids.add(next);
             }
@@ -122,6 +125,7 @@ public AllFields(@Nullable PathStep next) {
         @NotNull
         public List<AstNode> getChildren() {
             List<AstNode> kids = new ArrayList<>();
+            PathStep next = getNext();
             if (next != null) {
                 kids.add(next);
             }