Change default Builder naming; remove Kotlin lombok plugin

partiql · Oct 16, 2024 · c581678 · c581678
1 parent c6dd299
commit c581678
Show file tree

Hide file tree

Showing 61 changed files with 399 additions and 402 deletions.
diff --git a/buildSrc/src/main/kotlin/partiql.versions.kt b/buildSrc/src/main/kotlin/partiql.versions.kt
@@ -39,7 +39,6 @@ object Versions {
     const val kotlinxCollections = "0.3.5"
     const val picoCli = "4.7.0"
     const val kasechange = "1.3.0"
-    const val kotlinLombok = "1.9.20"
     const val kotlinxCoroutines = "1.8.1"
     const val kotlinxCoroutinesJdk8 = "1.8.1"
     const val ktlint = "0.42.1" // we're on an old version of ktlint. TODO upgrade https://github.com/partiql/partiql-lang-kotlin/issues/1418
@@ -110,6 +109,5 @@ object Plugins {
     const val detekt = "io.gitlab.arturbosch.detekt"
     const val dokka = "org.jetbrains.dokka"
     const val library = "org.gradle.java-library"
-    const val kotlinLombok = "org.jetbrains.kotlin.plugin.lombok"
     const val testFixtures = "org.gradle.java-test-fixtures"
 }
diff --git a/partiql-ast/api/partiql-ast.api b/partiql-ast/api/partiql-ast.api
diff --git a/partiql-ast/build.gradle.kts b/partiql-ast/build.gradle.kts
@@ -16,7 +16,6 @@
 plugins {
     id(Plugins.conventions)
     id(Plugins.publish)
-    id(Plugins.kotlinLombok) version Versions.kotlinLombok
 }
 
 dependencies {

diff --git a/partiql-ast/src/main/java/org/partiql/ast/v1/Exclude.java b/partiql-ast/src/main/java/org/partiql/ast/v1/Exclude.java
@@ -10,7 +10,7 @@
 /**
  * TODO docs, equals, hashcode
  */
-@Builder
+@Builder(builderClassName = "Builder")
 public class Exclude extends AstNode {
     @NotNull
     public final List<ExcludePath> excludePaths;

diff --git a/partiql-ast/src/main/java/org/partiql/ast/v1/ExcludePath.java b/partiql-ast/src/main/java/org/partiql/ast/v1/ExcludePath.java
@@ -11,7 +11,7 @@
 /**
  * TODO docs, equals, hashcode
  */
-@Builder
+@Builder(builderClassName = "Builder")
 public class ExcludePath extends AstNode {
     @NotNull
     public final ExprVarRef root;

diff --git a/partiql-ast/src/main/java/org/partiql/ast/v1/ExcludeStep.java b/partiql-ast/src/main/java/org/partiql/ast/v1/ExcludeStep.java
@@ -14,7 +14,7 @@ public abstract class ExcludeStep extends AstNode {
     /**
      * TODO docs, equals, hashcode
      */
-    @Builder
+    @Builder(builderClassName = "Builder")
     public static class StructField extends ExcludeStep {
         @NotNull
         public final Identifier symbol;
@@ -40,7 +40,7 @@ public <R, C> R accept(@NotNull AstVisitor<R, C> visitor, C ctx) {
     /**
      * TODO docs, equals, hashcode
      */
-    @Builder
+    @Builder(builderClassName = "Builder")
     public static class CollIndex extends ExcludeStep {
         public final int index;
 
@@ -63,7 +63,7 @@ public <R, C> R accept(@NotNull AstVisitor<R, C> visitor, C ctx) {
     /**
      * TODO docs, equals, hashcode
      */
-    @Builder
+    @Builder(builderClassName = "Builder")
     public static class StructWildcard extends ExcludeStep {
         @NotNull
         @Override
@@ -80,7 +80,7 @@ public <R, C> R accept(@NotNull AstVisitor<R, C> visitor, C ctx) {
     /**
      * TODO docs, equals, hashcode
      */
-    @Builder
+    @Builder(builderClassName = "Builder")
     public static class CollWildcard extends ExcludeStep {
         @NotNull
         @Override

diff --git a/partiql-ast/src/main/java/org/partiql/ast/v1/Explain.java b/partiql-ast/src/main/java/org/partiql/ast/v1/Explain.java
@@ -12,7 +12,7 @@
 /**
  * TODO docs, equals, hashcode
  */
-@Builder
+@Builder(builderClassName = "Builder")
 public class Explain extends Statement {
     // TODO get rid of PartiQLValue once https://github.com/partiql/partiql-lang-kotlin/issues/1589 is resolved
     @NotNull

diff --git a/partiql-ast/src/main/java/org/partiql/ast/v1/From.java b/partiql-ast/src/main/java/org/partiql/ast/v1/From.java
@@ -10,7 +10,7 @@
 /**
  * TODO docs, equals, hashcode
  */
-@Builder
+@Builder(builderClassName = "Builder")
 public class From extends AstNode {
     @NotNull
     public final List<FromTableRef> tableRefs;

diff --git a/partiql-ast/src/main/java/org/partiql/ast/v1/FromExpr.java b/partiql-ast/src/main/java/org/partiql/ast/v1/FromExpr.java
@@ -12,7 +12,7 @@
 /**
  * TODO docs, equals, hashcode
  */
-@Builder
+@Builder(builderClassName = "Builder")
 public class FromExpr extends FromTableRef {
     @NotNull
     public final Expr expr;

diff --git a/partiql-ast/src/main/java/org/partiql/ast/v1/FromJoin.java b/partiql-ast/src/main/java/org/partiql/ast/v1/FromJoin.java
@@ -12,7 +12,7 @@
 /**
  * TODO docs, equals, hashcode
  */
-@Builder
+@Builder(builderClassName = "Builder")
 public class FromJoin extends FromTableRef {
     @NotNull
     public final From lhs;

diff --git a/partiql-ast/src/main/java/org/partiql/ast/v1/GroupBy.java b/partiql-ast/src/main/java/org/partiql/ast/v1/GroupBy.java
@@ -12,7 +12,7 @@
 /**
  * TODO docs, equals, hashcode
  */
-@Builder
+@Builder(builderClassName = "Builder")
 public class GroupBy extends AstNode {
     @NotNull
     public final GroupByStrategy strategy;
@@ -47,7 +47,7 @@ public <R, C> R accept(@NotNull AstVisitor<R, C> visitor, C ctx) {
     /**
      * TODO docs, equals, hashcode
      */
-    @Builder
+    @lombok.Builder(builderClassName = "Builder")
     public static class Key extends AstNode {
         @NotNull
         public final Expr expr;

diff --git a/partiql-ast/src/main/java/org/partiql/ast/v1/Identifier.java b/partiql-ast/src/main/java/org/partiql/ast/v1/Identifier.java
@@ -9,7 +9,7 @@
 /**
  * TODO docs, equals, hashcode
  */
-@Builder
+@Builder(builderClassName = "Builder")
 public class Identifier extends AstNode {
     @NotNull
     public final String symbol;

diff --git a/partiql-ast/src/main/java/org/partiql/ast/v1/IdentifierChain.java b/partiql-ast/src/main/java/org/partiql/ast/v1/IdentifierChain.java
@@ -11,7 +11,7 @@
 /**
  * TODO docs, equals, hashcode
  */
-@Builder
+@Builder(builderClassName = "Builder")
 public class IdentifierChain extends AstNode {
     @NotNull
     public final Identifier root;

diff --git a/partiql-ast/src/main/java/org/partiql/ast/v1/Let.java b/partiql-ast/src/main/java/org/partiql/ast/v1/Let.java
@@ -11,7 +11,7 @@
 /**
  * TODO docs, equals, hashcode
  */
-@Builder
+@Builder(builderClassName = "Builder")
 public class Let extends AstNode {
     @NotNull
     public final List<Binding> bindings;
@@ -34,7 +34,7 @@ public <R, C> R accept(@NotNull AstVisitor<R, C> visitor, C ctx) {
     /**
      * TODO docs, equals, hashcode
      */
-    @Builder
+    @lombok.Builder(builderClassName = "Builder")
     public static class Binding extends AstNode {
         @NotNull
         public final Expr expr;

diff --git a/partiql-ast/src/main/java/org/partiql/ast/v1/OrderBy.java b/partiql-ast/src/main/java/org/partiql/ast/v1/OrderBy.java
@@ -10,7 +10,7 @@
 /**
  * TODO docs, equals, hashcode
  */
-@Builder
+@Builder(builderClassName = "Builder")
 public class OrderBy extends AstNode {
     @NotNull
     public final List<Sort> sorts;

diff --git a/partiql-ast/src/main/java/org/partiql/ast/v1/Query.java b/partiql-ast/src/main/java/org/partiql/ast/v1/Query.java
@@ -11,7 +11,7 @@
 /**
  * TODO docs, equals, hashcode
  */
-@Builder
+@Builder(builderClassName = "Builder")
 public class Query extends Statement {
     @NotNull
     public final Expr expr;

diff --git a/partiql-ast/src/main/java/org/partiql/ast/v1/QueryBody.java b/partiql-ast/src/main/java/org/partiql/ast/v1/QueryBody.java
@@ -10,7 +10,7 @@
 import java.util.List;
 
 public abstract class QueryBody extends AstNode {
-    @Builder
+    @Builder(builderClassName = "Builder")
     public static class SFW extends QueryBody {
         @NotNull
         public final Select select;
@@ -64,7 +64,7 @@ public <R, C> R accept(@NotNull AstVisitor<R, C> visitor, C ctx) {
         }
     }
 
-    @Builder
+    @Builder(builderClassName = "Builder")
     public static class SetOp extends QueryBody {
         @NotNull
         public final org.partiql.ast.v1.SetOp type;

diff --git a/partiql-ast/src/main/java/org/partiql/ast/v1/SelectItem.java b/partiql-ast/src/main/java/org/partiql/ast/v1/SelectItem.java
@@ -26,7 +26,7 @@ public <R, C> R accept(@NotNull AstVisitor<R, C> visitor, C ctx) {
     /**
      * TODO docs, equals, hashcode
      */
-    @Builder
+    @Builder(builderClassName = "Builder")
     public static class Star extends SelectItem {
         @NotNull
         public final org.partiql.ast.v1.expr.Expr expr;
@@ -52,7 +52,7 @@ public <R, C> R accept(@NotNull AstVisitor<R, C> visitor, C ctx) {
     /**
      * TODO docs, equals, hashcode
      */
-    @Builder
+    @Builder(builderClassName = "Builder")
     public static class Expr extends SelectItem {
         @NotNull
         public final org.partiql.ast.v1.expr.Expr expr;

diff --git a/partiql-ast/src/main/java/org/partiql/ast/v1/SelectList.java b/partiql-ast/src/main/java/org/partiql/ast/v1/SelectList.java
@@ -11,7 +11,7 @@
 /**
  * TODO docs, equals, hashcode
  */
-@Builder
+@Builder(builderClassName = "Builder")
 public class SelectList extends Select {
     @NotNull
     public final List<SelectItem> items;

diff --git a/partiql-ast/src/main/java/org/partiql/ast/v1/SelectPivot.java b/partiql-ast/src/main/java/org/partiql/ast/v1/SelectPivot.java
@@ -11,7 +11,7 @@
 /**
  * TODO docs, equals, hashcode
  */
-@Builder
+@Builder(builderClassName = "Builder")
 public class SelectPivot extends Select {
     @NotNull
     public final Expr key;

diff --git a/partiql-ast/src/main/java/org/partiql/ast/v1/SelectStar.java b/partiql-ast/src/main/java/org/partiql/ast/v1/SelectStar.java
@@ -10,7 +10,7 @@
 /**
  * TODO docs, equals, hashcode
  */
-@Builder
+@Builder(builderClassName = "Builder")
 public class SelectStar extends Select {
     @Nullable
     public final SetQuantifier setq;

diff --git a/partiql-ast/src/main/java/org/partiql/ast/v1/SelectValue.java b/partiql-ast/src/main/java/org/partiql/ast/v1/SelectValue.java
@@ -12,7 +12,7 @@
 /**
  * TODO docs, equals, hashcode
  */
-@Builder
+@Builder(builderClassName = "Builder")
 public class SelectValue extends Select {
     @NotNull
     public final Expr constructor;

diff --git a/partiql-ast/src/main/java/org/partiql/ast/v1/SetOp.java b/partiql-ast/src/main/java/org/partiql/ast/v1/SetOp.java
@@ -10,7 +10,7 @@
 /**
  * TODO docs, equals, hashcode
  */
-@Builder
+@Builder(builderClassName = "Builder")
 public class SetOp extends AstNode {
     @NotNull
     public final SetOpType setOpType;

diff --git a/partiql-ast/src/main/java/org/partiql/ast/v1/Sort.java b/partiql-ast/src/main/java/org/partiql/ast/v1/Sort.java
@@ -12,7 +12,7 @@
 /**
  * TODO docs, equals, hashcode
  */
-@Builder
+@Builder(builderClassName = "Builder")
 public class Sort extends AstNode {
     @NotNull
     public final Expr expr;

diff --git a/partiql-ast/src/main/java/org/partiql/ast/v1/expr/ExprAnd.java b/partiql-ast/src/main/java/org/partiql/ast/v1/expr/ExprAnd.java
@@ -12,7 +12,7 @@
 /**
  * TODO docs, equals, hashcode
  */
-@Builder
+@Builder(builderClassName = "Builder")
 public class ExprAnd extends Expr {
     @NotNull
     public final Expr lhs;

diff --git a/partiql-ast/src/main/java/org/partiql/ast/v1/expr/ExprArray.java b/partiql-ast/src/main/java/org/partiql/ast/v1/expr/ExprArray.java
@@ -12,7 +12,7 @@
 /**
  * TODO docs, equals, hashcode
  */
-@Builder
+@Builder(builderClassName = "Builder")
 public class ExprArray extends Expr {
     @NotNull
     public final List<Expr> values;

diff --git a/partiql-ast/src/main/java/org/partiql/ast/v1/expr/ExprBag.java b/partiql-ast/src/main/java/org/partiql/ast/v1/expr/ExprBag.java
@@ -12,7 +12,7 @@
 /**
  * TODO docs, equals, hashcode
  */
-@Builder
+@Builder(builderClassName = "Builder")
 public class ExprBag extends Expr {
     @NotNull
     public final List<Expr> values;

diff --git a/partiql-ast/src/main/java/org/partiql/ast/v1/expr/ExprBetween.java b/partiql-ast/src/main/java/org/partiql/ast/v1/expr/ExprBetween.java
@@ -12,7 +12,7 @@
 /**
  * TODO docs, equals, hashcode
  */
-@Builder
+@Builder(builderClassName = "Builder")
 public class ExprBetween extends Expr {
     @NotNull
     public final Expr value;

diff --git a/partiql-ast/src/main/java/org/partiql/ast/v1/expr/ExprCall.java b/partiql-ast/src/main/java/org/partiql/ast/v1/expr/ExprCall.java
@@ -15,7 +15,7 @@
 /**
  * TODO docs, equals, hashcode
  */
-@Builder
+@Builder(builderClassName = "Builder")
 public class ExprCall extends Expr {
     @NotNull
     public final IdentifierChain function;

diff --git a/partiql-ast/src/main/java/org/partiql/ast/v1/expr/ExprCase.java b/partiql-ast/src/main/java/org/partiql/ast/v1/expr/ExprCase.java
@@ -13,7 +13,7 @@
 /**
  * TODO docs, equals, hashcode
  */
-@Builder
+@Builder(builderClassName = "Builder")
 public class ExprCase extends Expr {
     @Nullable
     public final Expr expr;
@@ -52,7 +52,7 @@ public <R, C> R accept(@NotNull AstVisitor<R, C> visitor, C ctx) {
     /**
      * TODO docs, equals, hashcode
      */
-    @Builder
+    @lombok.Builder(builderClassName = "Builder")
     public static class Branch extends AstNode {
         @NotNull
         public final Expr condition;

diff --git a/partiql-ast/src/main/java/org/partiql/ast/v1/expr/ExprCast.java b/partiql-ast/src/main/java/org/partiql/ast/v1/expr/ExprCast.java
@@ -13,7 +13,7 @@
 /**
  * TODO docs, equals, hashcode
  */
-@Builder
+@Builder(builderClassName = "Builder")
 public class ExprCast extends Expr {
     @NotNull
     public final Expr value;

diff --git a/partiql-ast/src/main/java/org/partiql/ast/v1/expr/ExprCoalesce.java b/partiql-ast/src/main/java/org/partiql/ast/v1/expr/ExprCoalesce.java
@@ -12,7 +12,7 @@
 /**
  * TODO docs, equals, hashcode
  */
-@Builder
+@Builder(builderClassName = "Builder")
 public class ExprCoalesce extends Expr {
     @NotNull
     public final List<Expr> args;

diff --git a/partiql-ast/src/main/java/org/partiql/ast/v1/expr/ExprExtract.java b/partiql-ast/src/main/java/org/partiql/ast/v1/expr/ExprExtract.java
@@ -13,7 +13,7 @@
 /**
  * TODO docs, equals, hashcode
  */
-@Builder
+@Builder(builderClassName = "Builder")
 public class ExprExtract extends Expr {
     @NotNull
     public final DatetimeField field;

diff --git a/partiql-ast/src/main/java/org/partiql/ast/v1/expr/ExprInCollection.java b/partiql-ast/src/main/java/org/partiql/ast/v1/expr/ExprInCollection.java
@@ -12,7 +12,7 @@
 /**
  * TODO docs, equals, hashcode
  */
-@Builder
+@Builder(builderClassName = "Builder")
 public class ExprInCollection extends Expr {
     @NotNull
     public final Expr lhs;

diff --git a/partiql-ast/src/main/java/org/partiql/ast/v1/expr/ExprIsType.java b/partiql-ast/src/main/java/org/partiql/ast/v1/expr/ExprIsType.java
@@ -13,7 +13,7 @@
 /**
  * TODO docs, equals, hashcode
  */
-@Builder
+@Builder(builderClassName = "Builder")
 public class ExprIsType extends Expr {
     @NotNull
     public final Expr value;

diff --git a/partiql-ast/src/main/java/org/partiql/ast/v1/expr/ExprLike.java b/partiql-ast/src/main/java/org/partiql/ast/v1/expr/ExprLike.java
@@ -13,7 +13,7 @@
 /**
  * TODO docs, equals, hashcode
  */
-@Builder
+@Builder(builderClassName = "Builder")
 public class ExprLike extends Expr {
     @NotNull
     public final Expr value;