More consistent Optional handling

Author: jeffgbutler

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

@@ -1,5 +1,5 @@
 /**
- *    Copyright 2016-2018 the original author or authors.
+ *    Copyright 2016-2019 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.
@@ -18,7 +18,6 @@
 import java.util.Arrays;
 import java.util.List;
 import java.util.Objects;
-import java.util.Optional;
 
 import org.mybatis.dynamic.sql.SqlColumn;
 import org.mybatis.dynamic.sql.SqlTable;
@@ -43,7 +42,7 @@ private InsertSelectDSL(SqlTable table, SelectModel selectModel) {
 
     public InsertSelectModel build() {
         return InsertSelectModel.withTable(table)
-                .withColumnList(Optional.ofNullable(columnList))
+                .withColumnList(columnList)
                 .withSelectModel(selectModel)
                 .build();
     }

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

@@ -1,5 +1,5 @@
 /**
- *    Copyright 2016-2017 the original author or authors.
+ *    Copyright 2016-2019 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,12 +26,12 @@
 
 public class InsertSelectModel {
     private SqlTable table;
-    private Optional<InsertColumnListModel> columnList;
+    private InsertColumnListModel columnList;
     private SelectModel selectModel;
 
     private InsertSelectModel(Builder builder) {
         table = Objects.requireNonNull(builder.table);
-        columnList = Objects.requireNonNull(builder.columnList);
+        columnList = builder.columnList;
         selectModel = Objects.requireNonNull(builder.selectModel);
     }
 
@@ -44,7 +44,7 @@ public SelectModel selectModel() {
     }
 
     public Optional<InsertColumnListModel> columnList() {
-        return columnList;
+        return Optional.ofNullable(columnList);
     }
 
     public InsertSelectStatementProvider render(RenderingStrategy renderingStrategy) {
@@ -60,15 +60,15 @@ public static Builder withTable(SqlTable table) {
 
     public static class Builder {
         private SqlTable table;
-        private Optional<InsertColumnListModel> columnList = Optional.empty();
+        private InsertColumnListModel columnList;
         private SelectModel selectModel;
 
         public Builder withTable(SqlTable table) {
             this.table = table;
             return this;
         }
 
-        public Builder withColumnList(Optional<InsertColumnListModel> columnList) {
+        public Builder withColumnList(InsertColumnListModel columnList) {
             this.columnList = columnList;
             return this;
         }

src/main/java/org/mybatis/dynamic/sql/select/render/SelectRenderer.java

@@ -42,7 +42,7 @@ public class SelectRenderer {
     private SelectRenderer(Builder builder) {
         selectModel = Objects.requireNonNull(builder.selectModel);
         renderingStrategy = Objects.requireNonNull(builder.renderingStrategy);
-        sequence = builder.sequence.orElse(new AtomicInteger(1));
+        sequence = builder.sequence().orElse(new AtomicInteger(1));
     }
 
     public SelectStatementProvider render() {
@@ -117,7 +117,7 @@ public static Builder withSelectModel(SelectModel selectModel) {
     public static class Builder {
         private SelectModel selectModel;
         private RenderingStrategy renderingStrategy;
-        private Optional<AtomicInteger> sequence = Optional.empty();
+        private AtomicInteger sequence;
 
         public Builder withSelectModel(SelectModel selectModel) {
             this.selectModel = selectModel;
@@ -130,10 +130,14 @@ public Builder withRenderingStrategy(RenderingStrategy renderingStrategy) {
         }
 
         public Builder withSequence(AtomicInteger sequence) {
-            this.sequence = Optional.of(sequence);
+            this.sequence = sequence;
             return this;
         }
 
+        private Optional<AtomicInteger> sequence() {
+            return Optional.ofNullable(sequence);
+        }
+        
         public SelectRenderer build() {
             return new SelectRenderer(this);
         }

src/main/java/org/mybatis/dynamic/sql/where/render/RenderedCriterion.java

@@ -81,7 +81,7 @@ private String calculateFragment(FragmentCollector collector) {
     }
 
     public static class Builder {
-        private Optional<String> connector;
+        private Optional<String> connector = Optional.empty();
         private Optional<FragmentAndParameters> initialCondition = Optional.empty();
         private List<RenderedCriterion> subCriteria = new ArrayList<>();