Copy/paste reduction

Author: jeffgbutler

src/main/java/org/mybatis/dynamic/sql/CriteriaGroup.java

@@ -28,7 +28,7 @@
 public class CriteriaGroup extends SqlCriterion {
     private final SqlCriterion initialCriterion;
 
-    private CriteriaGroup(Builder builder) {
+    protected CriteriaGroup(AbstractGroupBuilder<?> builder) {
         super(builder);
         initialCriterion = Objects.requireNonNull(builder.initialCriterion);
     }
@@ -42,14 +42,16 @@ public <R> R accept(SqlCriterionVisitor<R> visitor) {
         return visitor.visit(this);
     }
 
-    public static class Builder extends AbstractBuilder<Builder> {
+    public abstract static class AbstractGroupBuilder<T extends AbstractGroupBuilder<T>> extends AbstractBuilder<T> {
         private SqlCriterion initialCriterion;
 
-        public Builder withInitialCriterion(SqlCriterion initialCriterion) {
+        public T withInitialCriterion(SqlCriterion initialCriterion) {
             this.initialCriterion = initialCriterion;
-            return this;
+            return getThis();
         }
+    }
 
+    public static class Builder extends AbstractGroupBuilder<Builder> {
         public CriteriaGroup build() {
             return new CriteriaGroup(this);
         }

src/main/java/org/mybatis/dynamic/sql/NotCriterion.java

@@ -15,39 +15,23 @@
  */
 package org.mybatis.dynamic.sql;
 
-import java.util.Objects;
-
 /**
  * This class represents a criteria group with a NOT.
  *
  * @author Jeff Butler
  * @since 1.4.0
  */
-public class NotCriterion extends SqlCriterion {
-    private final SqlCriterion initialCriterion;
-
+public class NotCriterion extends CriteriaGroup {
     private NotCriterion(Builder builder) {
         super(builder);
-        initialCriterion = Objects.requireNonNull(builder.initialCriterion);
-    }
-
-    public SqlCriterion initialCriterion() {
-        return initialCriterion;
     }
 
     @Override
     public <R> R accept(SqlCriterionVisitor<R> visitor) {
         return visitor.visit(this);
     }
 
-    public static class Builder extends AbstractBuilder<Builder> {
-        private SqlCriterion initialCriterion;
-
-        public Builder withInitialCriterion(SqlCriterion initialCriterion) {
-            this.initialCriterion = initialCriterion;
-            return this;
-        }
-
+    public static class Builder extends AbstractGroupBuilder<Builder> {
         public NotCriterion build() {
             return new NotCriterion(this);
         }