Duplicate code elimination

Author: jeffgbutler

src/main/java/org/mybatis/dynamic/sql/common/CommonBuilder.java

@@ -0,0 +1,79 @@
+/*
+ *    Copyright 2016-2022 the original author or authors.
+ *
+ *    Licensed under the Apache License, Version 2.0 (the "License");
+ *    you may not use this file except in compliance with the License.
+ *    You may obtain a copy of the License at
+ *
+ *       https://www.apache.org/licenses/LICENSE-2.0
+ *
+ *    Unless required by applicable law or agreed to in writing, software
+ *    distributed under the License is distributed on an "AS IS" BASIS,
+ *    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *    See the License for the specific language governing permissions and
+ *    limitations under the License.
+ */
+package org.mybatis.dynamic.sql.common;
+
+import org.mybatis.dynamic.sql.SqlTable;
+import org.mybatis.dynamic.sql.where.WhereModel;
+
+/**
+ * Builder class shared between the delete and update model builders.
+ *
+ * @param <T> type of the implementing builder
+ */
+public abstract class CommonBuilder<T extends CommonBuilder<T>> {
+    private SqlTable table;
+    private String tableAlias;
+    private WhereModel whereModel;
+    private Long limit;
+    private OrderByModel orderByModel;
+
+    public SqlTable table() {
+        return table;
+    }
+
+    public String tableAlias() {
+        return tableAlias;
+    }
+
+    public WhereModel whereModel() {
+        return whereModel;
+    }
+
+    public Long limit() {
+        return limit;
+    }
+
+    public OrderByModel orderByModel() {
+        return orderByModel;
+    }
+
+    public T withTable(SqlTable table) {
+        this.table = table;
+        return getThis();
+    }
+
+    public T withTableAlias(String tableAlias) {
+        this.tableAlias = tableAlias;
+        return getThis();
+    }
+
+    public T withWhereModel(WhereModel whereModel) {
+        this.whereModel = whereModel;
+        return getThis();
+    }
+
+    public T withLimit(Long limit) {
+        this.limit = limit;
+        return getThis();
+    }
+
+    public T withOrderByModel(OrderByModel orderByModel) {
+        this.orderByModel = orderByModel;
+        return getThis();
+    }
+
+    protected abstract T getThis();
+}

src/main/java/org/mybatis/dynamic/sql/delete/DeleteModel.java

@@ -20,6 +20,7 @@
 
 import org.jetbrains.annotations.NotNull;
 import org.mybatis.dynamic.sql.SqlTable;
+import org.mybatis.dynamic.sql.common.CommonBuilder;
 import org.mybatis.dynamic.sql.common.OrderByModel;
 import org.mybatis.dynamic.sql.delete.render.DeleteRenderer;
 import org.mybatis.dynamic.sql.delete.render.DeleteStatementProvider;
@@ -34,11 +35,11 @@ public class DeleteModel {
     private final OrderByModel orderByModel;
 
     private DeleteModel(Builder builder) {
-        table = Objects.requireNonNull(builder.table);
-        whereModel = builder.whereModel;
-        tableAlias = builder.tableAlias;
-        limit = builder.limit;
-        orderByModel = builder.orderByModel;
+        table = Objects.requireNonNull(builder.table());
+        whereModel = builder.whereModel();
+        tableAlias = builder.tableAlias();
+        limit = builder.limit();
+        orderByModel = builder.orderByModel();
     }
 
     public SqlTable table() {
@@ -73,35 +74,9 @@ public static Builder withTable(SqlTable table) {
         return new Builder().withTable(table);
     }
 
-    public static class Builder {
-        private SqlTable table;
-        private String tableAlias;
-        private WhereModel whereModel;
-        private Long limit;
-        private OrderByModel orderByModel;
-
-        public Builder withTable(SqlTable table) {
-            this.table = table;
-            return this;
-        }
-
-        public Builder withTableAlias(String tableAlias) {
-            this.tableAlias = tableAlias;
-            return this;
-        }
-
-        public Builder withWhereModel(WhereModel whereModel) {
-            this.whereModel = whereModel;
-            return this;
-        }
-
-        public Builder withLimit(Long limit) {
-            this.limit = limit;
-            return this;
-        }
-
-        public Builder withOrderByModel(OrderByModel orderByModel) {
-            this.orderByModel = orderByModel;
+    public static class Builder extends CommonBuilder<Builder> {
+        @Override
+        protected Builder getThis() {
             return this;
         }
 

src/main/java/org/mybatis/dynamic/sql/update/UpdateModel.java

@@ -24,6 +24,7 @@
 
 import org.jetbrains.annotations.NotNull;
 import org.mybatis.dynamic.sql.SqlTable;
+import org.mybatis.dynamic.sql.common.CommonBuilder;
 import org.mybatis.dynamic.sql.common.OrderByModel;
 import org.mybatis.dynamic.sql.exception.InvalidSqlException;
 import org.mybatis.dynamic.sql.render.RenderingStrategy;
@@ -42,12 +43,12 @@ public class UpdateModel {
     private final OrderByModel orderByModel;
 
     private UpdateModel(Builder builder) {
-        table = Objects.requireNonNull(builder.table);
-        whereModel = builder.whereModel;
+        table = Objects.requireNonNull(builder.table());
+        whereModel = builder.whereModel();
         columnMappings = Objects.requireNonNull(builder.columnMappings);
-        tableAlias = builder.tableAlias;
-        limit = builder.limit;
-        orderByModel = builder.orderByModel;
+        tableAlias = builder.tableAlias();
+        limit = builder.limit();
+        orderByModel = builder.orderByModel();
 
         if (columnMappings.isEmpty()) {
             throw new InvalidSqlException(Messages.getString("ERROR.17")); //$NON-NLS-1$
@@ -90,41 +91,16 @@ public static Builder withTable(SqlTable table) {
         return new Builder().withTable(table);
     }
 
-    public static class Builder {
-        private SqlTable table;
-        private String tableAlias;
-        private WhereModel whereModel;
+    public static class Builder extends CommonBuilder<Builder> {
         private final List<AbstractColumnMapping> columnMappings = new ArrayList<>();
-        private Long limit;
-        private OrderByModel orderByModel;
-
-        public Builder withTable(SqlTable table) {
-            this.table = table;
-            return this;
-        }
-
-        public Builder withTableAlias(String tableAlias) {
-            this.tableAlias = tableAlias;
-            return this;
-        }
 
         public Builder withColumnMappings(List<AbstractColumnMapping> columnMappings) {
             this.columnMappings.addAll(columnMappings);
             return this;
         }
 
-        public Builder withWhereModel(WhereModel whereModel) {
-            this.whereModel = whereModel;
-            return this;
-        }
-
-        public Builder withLimit(Long limit) {
-            this.limit = limit;
-            return this;
-        }
-
-        public Builder withOrderByModel(OrderByModel orderByModel) {
-            this.orderByModel = orderByModel;
+        @Override
+        protected Builder getThis() {
             return this;
         }