Remove code smell of using Optionals as parameters

Author: jeffgbutler

src/main/java/org/mybatis/dynamic/sql/insert/render/InsertSelectRenderer.java

@@ -26,6 +26,7 @@
 import org.mybatis.dynamic.sql.insert.InsertSelectModel;
 import org.mybatis.dynamic.sql.render.RenderingStrategy;
 import org.mybatis.dynamic.sql.select.render.SelectStatementProvider;
+import org.mybatis.dynamic.sql.util.StringUtilities;
 
 public class InsertSelectRenderer {
 
@@ -42,9 +43,11 @@ public InsertSelectStatementProvider render() {
 
         String statementStart = InsertRenderingUtilities.calculateInsertStatementStart(model.table());
         Optional<String> columnsPhrase = calculateColumnsPhrase();
-        String selectStatementS = selectStatement.getSelectStatement();
+        String renderedSelectStatement = selectStatement.getSelectStatement();
 
-        String insertStatement = statementStart + spaceBefore(columnsPhrase) + spaceBefore(selectStatementS);
+        String insertStatement = statementStart
+                + columnsPhrase.map(StringUtilities::spaceBefore).orElse("") //$NON-NLS-1$
+                + spaceBefore(renderedSelectStatement);
 
         return DefaultGeneralInsertStatementProvider.withInsertStatement(insertStatement)
                 .withParameters(selectStatement.getParameters())

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

@@ -15,25 +15,19 @@
  */
 package org.mybatis.dynamic.sql.select.join;
 
-import java.util.Optional;
-
 public enum JoinType {
-    INNER(),
-    LEFT("left"), //$NON-NLS-1$
-    RIGHT("right"), //$NON-NLS-1$
-    FULL("full"); //$NON-NLS-1$
-
-    private final String shortType;
+    INNER("join"), //$NON-NLS-1$
+    LEFT("left join"), //$NON-NLS-1$
+    RIGHT("right join"), //$NON-NLS-1$
+    FULL("full join"); //$NON-NLS-1$
 
-    JoinType() {
-        shortType = null;
-    }
+    private final String type;
 
-    JoinType(String shortType) {
-        this.shortType = shortType;
+    JoinType(String type) {
+        this.type = type;
     }
 
-    public Optional<String> shortType() {
-        return Optional.ofNullable(shortType);
+    public String type() {
+        return type;
     }
 }

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

@@ -15,7 +15,6 @@
  */
 package org.mybatis.dynamic.sql.select.render;
 
-import static org.mybatis.dynamic.sql.util.StringUtilities.spaceAfter;
 import static org.mybatis.dynamic.sql.util.StringUtilities.spaceBefore;
 
 import java.util.Objects;
@@ -52,8 +51,7 @@ public FragmentAndParameters render() {
     private FragmentAndParameters renderJoinSpecification(JoinSpecification joinSpecification) {
         FragmentAndParameters renderedTable = joinSpecification.table().accept(tableExpressionRenderer);
 
-        String fragment = spaceAfter(joinSpecification.joinType().shortType())
-                + "join" //$NON-NLS-1$
+        String fragment = joinSpecification.joinType().type()
                 + spaceBefore(renderedTable.fragment())
                 + spaceBefore(renderConditions(joinSpecification));
 

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

@@ -15,8 +15,6 @@
  */
 package org.mybatis.dynamic.sql.select.render;
 
-import static org.mybatis.dynamic.sql.util.StringUtilities.spaceAfter;
-
 import java.util.Objects;
 import java.util.Optional;
 import java.util.concurrent.atomic.AtomicInteger;
@@ -34,6 +32,7 @@
 import org.mybatis.dynamic.sql.select.join.JoinModel;
 import org.mybatis.dynamic.sql.util.FragmentAndParameters;
 import org.mybatis.dynamic.sql.util.FragmentCollector;
+import org.mybatis.dynamic.sql.util.StringUtilities;
 import org.mybatis.dynamic.sql.where.WhereModel;
 import org.mybatis.dynamic.sql.where.render.WhereRenderer;
 
@@ -135,7 +134,7 @@ private FragmentAndParameters toFragmentAndParameters(FragmentCollector fragment
     }
 
     private FragmentAndParameters calculateQueryExpressionStart() {
-        String start = spaceAfter(queryExpression.connector())
+        String start = queryExpression.connector().map(StringUtilities::spaceAfter).orElse("") //$NON-NLS-1$
                 + "select " //$NON-NLS-1$
                 + (queryExpression.isDistinct() ? "distinct " : "") //$NON-NLS-1$ //$NON-NLS-2$
                 + calculateColumnList()

src/main/java/org/mybatis/dynamic/sql/util/StringUtilities.java

@@ -15,24 +15,12 @@
  */
 package org.mybatis.dynamic.sql.util;
 
-import java.util.Optional;
-
 public interface StringUtilities {
 
-    static String spaceAfter(Optional<String> in) {
-        return in.map(StringUtilities::spaceAfter)
-                .orElse(""); //$NON-NLS-1$
-    }
-
     static String spaceAfter(String in) {
         return in + " "; //$NON-NLS-1$
     }
 
-    static String spaceBefore(Optional<String> in) {
-        return in.map(StringUtilities::spaceBefore)
-                .orElse(""); //$NON-NLS-1$
-    }
-
     static String spaceBefore(String in) {
         return " " + in; //$NON-NLS-1$
     }