Merge pull request #8 from jeffgbutler/master

General Cleanup and Maintenance

Author: jeffgbutler

pom.xml

@@ -108,12 +108,6 @@
       <version>${junit.platform.version}</version>
       <scope>test</scope>
     </dependency>
-    <dependency>
-      <groupId>org.junit.jupiter</groupId>
-      <artifactId>junit-jupiter-engine</artifactId>
-      <version>${junit.jupiter.version}</version>
-      <scope>test</scope>
-    </dependency>
     <!-- added to support running JUnit5 tests with JUnit4.  Remove when Infinitest catches up. -->
     <!-- Note: DO NOT make this the org.junit.vintage support.  All the tests are written with JUnit5.
          Once Infinitest is ready we can remove this dependency and the corresponding @RunWith annotations

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

@@ -1,5 +1,5 @@
 /**
- *    Copyright 2016-2017 the original author or authors.
+ *    Copyright 2016-2018 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.
@@ -26,18 +26,18 @@ public class SqlCriterion<T> {
 
     private BindableColumn<T> column;
     private VisitableCondition<T> condition;
-    private Optional<String> connector;
+    private String connector;
     private List<SqlCriterion<?>> subCriteria;
 
     private SqlCriterion(Builder<T> builder) {
-        connector = Optional.ofNullable(builder.connector);
+        connector = builder.connector;
         column = Objects.requireNonNull(builder.column);
         condition = Objects.requireNonNull(builder.condition);
         subCriteria = Objects.requireNonNull(builder.subCriteria);
     }
 
     public Optional<String> connector() {
-        return connector;
+        return Optional.ofNullable(connector);
     }
 
     public BindableColumn<T> column() {

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

@@ -1,5 +1,5 @@
 /**
- *    Copyright 2016-2017 the original author or authors.
+ *    Copyright 2016-2018 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.
@@ -26,19 +26,19 @@
 
 public class DeleteModel {
     private SqlTable table;
-    private Optional<WhereModel> whereModel;
+    private WhereModel whereModel;
 
     private DeleteModel(Builder builder) {
         table = Objects.requireNonNull(builder.table);
-        whereModel = Optional.ofNullable(builder.whereModel);
+        whereModel = builder.whereModel;
     }
 
     public SqlTable table() {
         return table;
     }
 
     public Optional<WhereModel> whereModel() {
-        return whereModel;
+        return Optional.ofNullable(whereModel);
     }
 
     public DeleteStatementProvider render(RenderingStrategy renderingStrategy) {

src/main/java/org/mybatis/dynamic/sql/delete/render/DeleteStatementProvider.java

@@ -1,5 +1,5 @@
 /**
- *    Copyright 2016-2017 the original author or authors.
+ *    Copyright 2016-2018 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.
@@ -17,7 +17,7 @@
 
 import static org.mybatis.dynamic.sql.util.StringUtilities.spaceBefore;
 
-import java.util.Collections;
+import java.util.HashMap;
 import java.util.Map;
 import java.util.Objects;
 import java.util.Optional;
@@ -26,22 +26,23 @@
 
 public class DeleteStatementProvider {
     private String tableName;
-    private Optional<WhereClauseProvider> whereClauseProvider;
+    private Optional<String> whereClause;
+    private Map<String, Object> parameters;
 
     private DeleteStatementProvider(Builder builder) {
         tableName = Objects.requireNonNull(builder.tableName);
-        whereClauseProvider = Objects.requireNonNull(builder.whereClauseProvider);
+        whereClause = Optional.ofNullable(builder.whereClause);
+        parameters = Objects.requireNonNull(builder.parameters);
     }
 
     public Map<String, Object> getParameters() {
-        return whereClauseProvider.map(WhereClauseProvider::getParameters)
-                .orElse(Collections.emptyMap());
+        return parameters;
     }
 
     public String getDeleteStatement() {
         return "delete from" //$NON-NLS-1$
                 + spaceBefore(tableName)
-                + spaceBefore(whereClauseProvider.map(WhereClauseProvider::getWhereClause));
+                + spaceBefore(whereClause);
     }
 
     public static Builder withTableName(String tableName) {
@@ -50,15 +51,19 @@ public static Builder withTableName(String tableName) {
 
     public static class Builder {
         private String tableName;
-        private Optional<WhereClauseProvider> whereClauseProvider = Optional.empty();
+        private String whereClause;
+        private Map<String, Object> parameters = new HashMap<>();
 
         public Builder withTableName(String tableName) {
             this.tableName = tableName;
             return this;
         }
 
         public Builder withWhereClause(Optional<WhereClauseProvider> whereClauseProvider) {
-            this.whereClauseProvider = whereClauseProvider;
+            whereClauseProvider.ifPresent(wcp -> {
+                whereClause = wcp.getWhereClause();
+                parameters.putAll(wcp.getParameters());
+            });
             return this;
         }
 

src/main/java/org/mybatis/dynamic/sql/insert/InsertSelectDSL.java

@@ -1,5 +1,5 @@
 /**
- *    Copyright 2016-2017 the original author or authors.
+ *    Copyright 2016-2018 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.
@@ -17,6 +17,7 @@
 
 import java.util.Arrays;
 import java.util.List;
+import java.util.Objects;
 import java.util.Optional;
 
 import org.mybatis.dynamic.sql.SqlColumn;
@@ -27,24 +28,22 @@
 public class InsertSelectDSL {
 
     private SqlTable table;
-    private Optional<InsertColumnListModel> columnList;
+    private InsertColumnListModel columnList;
     private SelectModel selectModel;
 
     private InsertSelectDSL(SqlTable table, InsertColumnListModel columnList, SelectModel selectModel) {
-        this.table = table;
-        this.columnList = Optional.of(columnList);
-        this.selectModel = selectModel;
+        this(table, selectModel);
+        this.columnList = columnList;
     }
 
     private InsertSelectDSL(SqlTable table, SelectModel selectModel) {
-        this.table = table;
-        this.columnList = Optional.empty();
-        this.selectModel = selectModel;
+        this.table = Objects.requireNonNull(table);
+        this.selectModel = Objects.requireNonNull(selectModel);
     }
 
     public InsertSelectModel build() {
         return InsertSelectModel.withTable(table)
-                .withColumnList(columnList)
+                .withColumnList(Optional.ofNullable(columnList))
                 .withSelectModel(selectModel)
                 .build();
     }

src/main/java/org/mybatis/dynamic/sql/select/QueryExpressionModel.java

@@ -1,5 +1,5 @@
 /**
- *    Copyright 2016-2017 the original author or authors.
+ *    Copyright 2016-2018 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.
@@ -34,29 +34,29 @@
 import org.mybatis.dynamic.sql.where.WhereModel;
 
 public class QueryExpressionModel {
-    private Optional<String> connector;
+    private String connector;
     private boolean isDistinct;
     private List<BasicColumn> selectList;
     private SqlTable table;
-    private Optional<JoinModel> joinModel;
+    private JoinModel joinModel;
     private TableAliasCalculator tableAliasCalculator;
-    private Optional<WhereModel> whereModel;
-    private Optional<GroupByModel> groupByModel;
+    private WhereModel whereModel;
+    private GroupByModel groupByModel;
 
     private QueryExpressionModel(Builder builder) {
-        connector = Optional.ofNullable(builder.connector);
+        connector = builder.connector;
         isDistinct = builder.isDistinct;
         selectList = Objects.requireNonNull(builder.selectList);
         table = Objects.requireNonNull(builder.table);
-        joinModel = Optional.ofNullable(builder.joinModel);
-        tableAliasCalculator = joinModel.map(jm -> GuaranteedTableAliasCalculator.of(builder.tableAliases))
+        joinModel = builder.joinModel;
+        tableAliasCalculator = joinModel().map(jm -> GuaranteedTableAliasCalculator.of(builder.tableAliases))
                 .orElse(TableAliasCalculator.of(builder.tableAliases));
-        whereModel = Optional.ofNullable(builder.whereModel);
-        groupByModel = Optional.ofNullable(builder.groupByModel);
+        whereModel = builder.whereModel;
+        groupByModel = builder.groupByModel;
     }
 
     public Optional<String> connector() {
-        return connector;
+        return Optional.ofNullable(connector);
     }
 
     public boolean isDistinct() {
@@ -76,15 +76,15 @@ public TableAliasCalculator tableAliasCalculator() {
     }
 
     public Optional<WhereModel> whereModel() {
-        return whereModel;
+        return Optional.ofNullable(whereModel);
     }
 
     public Optional<JoinModel> joinModel() {
-        return joinModel;
+        return Optional.ofNullable(joinModel);
     }
 
     public Optional<GroupByModel> groupByModel() {
-        return groupByModel;
+        return Optional.ofNullable(groupByModel);
     }
 
     public String calculateTableNameIncludingAlias(SqlTable table) {

src/main/java/org/mybatis/dynamic/sql/select/SelectModel.java

@@ -1,5 +1,5 @@
 /**
- *    Copyright 2016-2017 the original author or authors.
+ *    Copyright 2016-2018 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.
@@ -28,19 +28,19 @@
 
 public class SelectModel {
     private List<QueryExpressionModel> queryExpressions;
-    private Optional<OrderByModel> orderByModel;
+    private OrderByModel orderByModel;
 
     private SelectModel(Builder builder) {
         queryExpressions = Objects.requireNonNull(builder.queryExpressions);
-        orderByModel = Optional.ofNullable(builder.orderByModel);
+        orderByModel = builder.orderByModel;
     }
 
     public <R> Stream<R> mapQueryExpressions(Function<QueryExpressionModel, R> mapper) {
         return queryExpressions.stream().map(mapper);
     }
 
     public Optional<OrderByModel> orderByModel() {
-        return orderByModel;
+        return Optional.ofNullable(orderByModel);
     }
 
     public SelectStatementProvider render(RenderingStrategy renderingStrategy) {

src/main/java/org/mybatis/dynamic/sql/select/aggregate/CountAll.java

@@ -1,5 +1,5 @@
 /**
- *    Copyright 2016-2017 the original author or authors.
+ *    Copyright 2016-2018 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.
@@ -29,7 +29,7 @@
  */
 public class CountAll implements BasicColumn {
 
-    private Optional<String> alias = Optional.empty();
+    private String alias;
 
     public CountAll() {
         super();
@@ -42,13 +42,13 @@ public String renderWithTableAlias(TableAliasCalculator tableAliasCalculator) {
 
     @Override
     public Optional<String> alias() {
-        return alias;
+        return Optional.ofNullable(alias);
     }
 
     @Override
     public CountAll as(String alias) {
         CountAll copy = new CountAll();
-        copy.alias = Optional.of(alias);
+        copy.alias = alias;
         return copy;
     }
 }

src/main/java/org/mybatis/dynamic/sql/select/function/Add.java

@@ -1,5 +1,5 @@
 /**
- *    Copyright 2016-2017 the original author or authors.
+ *    Copyright 2016-2018 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.
@@ -24,7 +24,7 @@
 
 public class Add<T extends Number> implements BindableColumn<T> {
 
-    private Optional<String> alias = Optional.empty();
+    private String alias;
     private BindableColumn<T> column1;
     private BindableColumn<T> column2;
 
@@ -35,7 +35,7 @@ private Add(BindableColumn<T> column1, BindableColumn<T> column2) {
 
     @Override
     public Optional<String> alias() {
-        return alias;
+        return Optional.ofNullable(alias);
     }
 
     @Override
@@ -48,7 +48,7 @@ public String renderWithTableAlias(TableAliasCalculator tableAliasCalculator) {
     @Override
     public BindableColumn<T> as(String alias) {
         Add<T> newColumn = new Add<>(column1, column2);
-        newColumn.alias = Optional.of(alias);
+        newColumn.alias = alias;
         return newColumn;
     }
 

src/main/java/org/mybatis/dynamic/sql/select/join/JoinType.java

@@ -1,5 +1,5 @@
 /**
- *    Copyright 2016-2017 the original author or authors.
+ *    Copyright 2016-2018 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.
@@ -23,17 +23,16 @@ public enum JoinType {
     RIGHT("right"), //$NON-NLS-1$
     FULL("full"); //$NON-NLS-1$
 
-    private Optional<String> shortType;
+    private String shortType;
 
     private JoinType() {
-        this.shortType = Optional.empty();
     }
 
     private JoinType(String shortType) {
-        this.shortType = Optional.of(shortType);
+        this.shortType = shortType;
     }
 
     public Optional<String> shortType() {
-        return shortType;
+        return Optional.ofNullable(shortType);
     }
 }