[v1] Refactor AstNode getChildren() method

partiql · Dec 9, 2024 · c1db6ff · c1db6ff
1 parent 7b818d6
commit c1db6ff
Show file tree

Hide file tree

Showing 99 changed files with 284 additions and 355 deletions.
diff --git a/partiql-ast/api/partiql-ast.api b/partiql-ast/api/partiql-ast.api
diff --git a/partiql-ast/src/main/java/org/partiql/ast/AstNode.java b/partiql-ast/src/main/java/org/partiql/ast/AstNode.java
@@ -2,7 +2,7 @@
 
 import org.jetbrains.annotations.NotNull;
 
-import java.util.Collection;
+import java.util.List;
 import java.util.Random;
 
 /**
@@ -14,7 +14,7 @@ public abstract class AstNode {
     public String tag = "Ast-" + String.format("%06x", new Random().nextInt());
 
     @NotNull
-    public abstract Collection<AstNode> children();
+    public abstract List<AstNode> getChildren();
 
     public abstract <R, C> R accept(@NotNull AstVisitor<R, C> visitor, C ctx);
 }
diff --git a/partiql-ast/src/main/java/org/partiql/ast/AstVisitor.java b/partiql-ast/src/main/java/org/partiql/ast/AstVisitor.java
@@ -66,7 +66,7 @@
 //  Also include docs on how a library user could create a new variant for sum types and which methods to override
 public abstract class AstVisitor<R, C> {
     public R defaultVisit(AstNode node, C ctx) {
-        for (AstNode child : node.children()) {
+        for (AstNode child : node.getChildren()) {
             child.accept(this, ctx);
         }
         return defaultReturn(node, ctx);

diff --git a/partiql-ast/src/main/java/org/partiql/ast/DataType.java b/partiql-ast/src/main/java/org/partiql/ast/DataType.java
@@ -6,7 +6,6 @@
 import org.partiql.ast.ddl.AttributeConstraint;
 
 import java.util.ArrayList;
-import java.util.Collection;
 import java.util.List;
 
 @EqualsAndHashCode(callSuper = false)
@@ -56,7 +55,7 @@ public StructField(
 
         @NotNull
         @Override
-        public Collection<AstNode> children() {
+        public List<AstNode> getChildren() {
             ArrayList<AstNode> kids = new ArrayList<>();
             kids.add(name);
             kids.add(type);
@@ -722,7 +721,7 @@ public List<StructField> getFields() {
 
     @NotNull
     @Override
-    public Collection<AstNode> children() {
+    public List<AstNode> getChildren() {
         List<AstNode> kids = new ArrayList<>();
         if (name != null) {
             kids.add(name);

diff --git a/partiql-ast/src/main/java/org/partiql/ast/DatetimeField.java b/partiql-ast/src/main/java/org/partiql/ast/DatetimeField.java
@@ -3,8 +3,8 @@
 import lombok.EqualsAndHashCode;
 import org.jetbrains.annotations.NotNull;
 
-import java.util.Collection;
 import java.util.Collections;
+import java.util.List;
 
 /**
  * TODO docs, equals, hashcode
@@ -118,7 +118,7 @@ public static int[] codes() {
 
     @NotNull
     @Override
-    public Collection<AstNode> children() {
+    public List<AstNode> getChildren() {
         return Collections.emptyList();
     }
 

diff --git a/partiql-ast/src/main/java/org/partiql/ast/Exclude.java b/partiql-ast/src/main/java/org/partiql/ast/Exclude.java
@@ -5,7 +5,6 @@
 import org.jetbrains.annotations.NotNull;
 
 import java.util.ArrayList;
-import java.util.Collection;
 import java.util.List;
 
 /**
@@ -23,7 +22,7 @@ public Exclude(@NotNull List<ExcludePath> excludePaths) {
 
     @NotNull
     @Override
-    public Collection<AstNode> children() {
+    public List<AstNode> getChildren() {
         return new ArrayList<>(excludePaths);
     }
 

diff --git a/partiql-ast/src/main/java/org/partiql/ast/ExcludePath.java b/partiql-ast/src/main/java/org/partiql/ast/ExcludePath.java
@@ -6,7 +6,6 @@
 import org.partiql.ast.expr.ExprVarRef;
 
 import java.util.ArrayList;
-import java.util.Collection;
 import java.util.List;
 
 /**
@@ -28,7 +27,7 @@ public ExcludePath(@NotNull ExprVarRef root, @NotNull List<ExcludeStep> excludeS
 
     @NotNull
     @Override
-    public Collection<AstNode> children() {
+    public List<AstNode> getChildren() {
         List<AstNode> kids = new ArrayList<>();
         kids.add(root);
         kids.addAll(excludeSteps);

diff --git a/partiql-ast/src/main/java/org/partiql/ast/ExcludeStep.java b/partiql-ast/src/main/java/org/partiql/ast/ExcludeStep.java
@@ -5,7 +5,6 @@
 import org.jetbrains.annotations.NotNull;
 
 import java.util.ArrayList;
-import java.util.Collection;
 import java.util.List;
 
 /**
@@ -27,7 +26,7 @@ public StructField(@NotNull Identifier symbol) {
 
         @NotNull
         @Override
-        public Collection<AstNode> children() {
+        public List<AstNode> getChildren() {
             List<AstNode> kids = new ArrayList<>();
             kids.add(symbol);
             return kids;
@@ -53,7 +52,7 @@ public CollIndex(int index) {
 
         @NotNull
         @Override
-        public Collection<AstNode> children() {
+        public List<AstNode> getChildren() {
             return new ArrayList<>();
         }
 
@@ -73,7 +72,7 @@ public StructWildcard() {}
 
         @NotNull
         @Override
-        public Collection<AstNode> children() {
+        public List<AstNode> getChildren() {
             return new ArrayList<>();
         }
 
@@ -93,7 +92,7 @@ public CollWildcard() {}
 
         @NotNull
         @Override
-        public Collection<AstNode> children() {
+        public List<AstNode> getChildren() {
             return new ArrayList<>();
         }
 

diff --git a/partiql-ast/src/main/java/org/partiql/ast/Explain.java b/partiql-ast/src/main/java/org/partiql/ast/Explain.java
@@ -5,7 +5,6 @@
 import org.jetbrains.annotations.NotNull;
 
 import java.util.ArrayList;
-import java.util.Collection;
 import java.util.List;
 import java.util.Map;
 
@@ -28,7 +27,7 @@ public Explain(@NotNull Map<String, Literal> options, @NotNull Statement stateme
 
     @NotNull
     @Override
-    public Collection<AstNode> children() {
+    public List<AstNode> getChildren() {
         List<AstNode> kids = new ArrayList<>();
         kids.add(statement);
         return kids;

diff --git a/partiql-ast/src/main/java/org/partiql/ast/From.java b/partiql-ast/src/main/java/org/partiql/ast/From.java
@@ -5,7 +5,6 @@
 import org.jetbrains.annotations.NotNull;
 
 import java.util.ArrayList;
-import java.util.Collection;
 import java.util.List;
 
 /**
@@ -23,7 +22,7 @@ public From(@NotNull List<FromTableRef> tableRefs) {
 
     @NotNull
     @Override
-    public Collection<AstNode> children() {
+    public List<AstNode> getChildren() {
         return new ArrayList<>(tableRefs);
     }
 

diff --git a/partiql-ast/src/main/java/org/partiql/ast/FromExpr.java b/partiql-ast/src/main/java/org/partiql/ast/FromExpr.java
@@ -7,7 +7,6 @@
 import org.partiql.ast.expr.Expr;
 
 import java.util.ArrayList;
-import java.util.Collection;
 import java.util.List;
 
 /**
@@ -38,7 +37,7 @@ public FromExpr(@NotNull Expr expr, @NotNull FromType fromType, @Nullable Identi
 
     @NotNull
     @Override
-    public Collection<AstNode> children() {
+    public List<AstNode> getChildren() {
         List<AstNode> kids = new ArrayList<>();
         kids.add(expr);
         if (asAlias != null) kids.add(asAlias);

diff --git a/partiql-ast/src/main/java/org/partiql/ast/FromJoin.java b/partiql-ast/src/main/java/org/partiql/ast/FromJoin.java
@@ -7,7 +7,6 @@
 import org.partiql.ast.expr.Expr;
 
 import java.util.ArrayList;
-import java.util.Collection;
 import java.util.List;
 
 /**
@@ -37,7 +36,7 @@ public FromJoin(@NotNull FromTableRef lhs, @NotNull FromTableRef rhs, @Nullable
 
     @NotNull
     @Override
-    public Collection<AstNode> children() {
+    public List<AstNode> getChildren() {
         List<AstNode> kids = new ArrayList<>();
         kids.add(lhs);
         kids.add(rhs);

diff --git a/partiql-ast/src/main/java/org/partiql/ast/FromType.java b/partiql-ast/src/main/java/org/partiql/ast/FromType.java
@@ -3,8 +3,8 @@
 import lombok.EqualsAndHashCode;
 import org.jetbrains.annotations.NotNull;
 
-import java.util.Collection;
 import java.util.Collections;
+import java.util.List;
 
 /**
  * TODO docs, equals, hashcode
@@ -70,7 +70,7 @@ public static int[] codes() {
 
     @NotNull
     @Override
-    public Collection<AstNode> children() {
+    public List<AstNode> getChildren() {
         return Collections.emptyList();
     }
 

diff --git a/partiql-ast/src/main/java/org/partiql/ast/GroupBy.java b/partiql-ast/src/main/java/org/partiql/ast/GroupBy.java
@@ -7,7 +7,6 @@
 import org.partiql.ast.expr.Expr;
 
 import java.util.ArrayList;
-import java.util.Collection;
 import java.util.List;
 
 /**
@@ -33,7 +32,7 @@ public GroupBy(@NotNull GroupByStrategy strategy, @NotNull List<Key> keys, @Null
 
     @NotNull
     @Override
-    public Collection<AstNode> children() {
+    public List<AstNode> getChildren() {
         List<AstNode> kids = new ArrayList<>(keys);
         if (asAlias != null) {
             kids.add(asAlias);
@@ -64,7 +63,7 @@ public Key(@NotNull Expr expr, @Nullable Identifier asAlias) {
 
         @NotNull
         @Override
-        public Collection<AstNode> children() {
+        public List<AstNode> getChildren() {
             List<AstNode> kids = new ArrayList<>();
             kids.add(expr);
             if (asAlias != null) {

diff --git a/partiql-ast/src/main/java/org/partiql/ast/GroupByStrategy.java b/partiql-ast/src/main/java/org/partiql/ast/GroupByStrategy.java
@@ -3,8 +3,8 @@
 import lombok.EqualsAndHashCode;
 import org.jetbrains.annotations.NotNull;
 
-import java.util.Collection;
 import java.util.Collections;
+import java.util.List;
 
 /**
  * TODO docs, equals, hashcode
@@ -70,7 +70,7 @@ public static int[] codes() {
 
     @NotNull
     @Override
-    public Collection<AstNode> children() {
+    public List<AstNode> getChildren() {
         return Collections.emptyList();
     }
 

diff --git a/partiql-ast/src/main/java/org/partiql/ast/Identifier.java b/partiql-ast/src/main/java/org/partiql/ast/Identifier.java
@@ -5,7 +5,7 @@
 import org.jetbrains.annotations.NotNull;
 
 import java.util.ArrayList;
-import java.util.Collection;
+import java.util.List;
 
 /**
  * TODO docs, equals, hashcode
@@ -25,7 +25,7 @@ public Identifier(@NotNull String symbol, boolean isDelimited) {
 
     @NotNull
     @Override
-    public Collection<AstNode> children() {
+    public List<AstNode> getChildren() {
         return new ArrayList<>();
     }
 

diff --git a/partiql-ast/src/main/java/org/partiql/ast/IdentifierChain.java b/partiql-ast/src/main/java/org/partiql/ast/IdentifierChain.java
@@ -6,7 +6,6 @@
 import org.jetbrains.annotations.Nullable;
 
 import java.util.ArrayList;
-import java.util.Collection;
 import java.util.List;
 
 /**
@@ -28,7 +27,7 @@ public IdentifierChain(@NotNull Identifier root, @Nullable IdentifierChain next)
 
     @NotNull
     @Override
-    public Collection<AstNode> children() {
+    public List<AstNode> getChildren() {
         List<AstNode> kids = new ArrayList<>();
         kids.add(root);
         if (next != null) {

diff --git a/partiql-ast/src/main/java/org/partiql/ast/JoinType.java b/partiql-ast/src/main/java/org/partiql/ast/JoinType.java
@@ -3,8 +3,8 @@
 import lombok.EqualsAndHashCode;
 import org.jetbrains.annotations.NotNull;
 
-import java.util.Collection;
 import java.util.Collections;
+import java.util.List;
 
 /**
  * TODO docs, equals, hashcode
@@ -126,7 +126,7 @@ public static int[] codes() {
 
     @NotNull
     @Override
-    public Collection<AstNode> children() {
+    public List<AstNode> getChildren() {
         return Collections.emptyList();
     }
 

diff --git a/partiql-ast/src/main/java/org/partiql/ast/Let.java b/partiql-ast/src/main/java/org/partiql/ast/Let.java
@@ -6,7 +6,6 @@
 import org.partiql.ast.expr.Expr;
 
 import java.util.ArrayList;
-import java.util.Collection;
 import java.util.List;
 
 /**
@@ -24,7 +23,7 @@ public Let(@NotNull List<Binding> bindings) {
 
     @NotNull
     @Override
-    public Collection<AstNode> children() {
+    public List<AstNode> getChildren() {
         return new ArrayList<>(bindings);
     }
 
@@ -51,7 +50,7 @@ public Binding(@NotNull Expr expr, @NotNull Identifier asAlias) {
 
         @NotNull
         @Override
-        public Collection<AstNode> children() {
+        public List<AstNode> getChildren() {
             List<AstNode> kids = new ArrayList<>();
             kids.add(expr);
             kids.add(asAlias);

diff --git a/partiql-ast/src/main/java/org/partiql/ast/Literal.java b/partiql-ast/src/main/java/org/partiql/ast/Literal.java
@@ -5,8 +5,8 @@
 
 import java.math.BigDecimal;
 import java.math.BigInteger;
-import java.util.Collection;
 import java.util.Collections;
+import java.util.List;
 
 import static java.util.Objects.requireNonNull;
 
@@ -103,7 +103,7 @@ public String name() {
 
     @Override
     @NotNull
-    public Collection<AstNode> children() {
+    public List<AstNode> getChildren() {
         return Collections.emptyList();
     }
 

diff --git a/partiql-ast/src/main/java/org/partiql/ast/Nulls.java b/partiql-ast/src/main/java/org/partiql/ast/Nulls.java
@@ -3,8 +3,8 @@
 import lombok.EqualsAndHashCode;
 import org.jetbrains.annotations.NotNull;
 
-import java.util.Collection;
 import java.util.Collections;
+import java.util.List;
 
 /**
  * TODO docs, equals, hashcode
@@ -71,7 +71,7 @@ public static int[] codes() {
 
     @NotNull
     @Override
-    public Collection<AstNode> children() {
+    public List<AstNode> getChildren() {
         return Collections.emptyList();
     }