Code polishing

Author: jeffgbutler

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

@@ -66,9 +66,7 @@ public Optional<FieldAndValue> visit(PropertyMapping mapping) {
     @Override
     public Optional<FieldAndValue> visit(PropertyWhenPresentMapping mapping) {
         if (mapping.shouldRender()) {
-            return FieldAndValue.withFieldName(mapping.mapColumn(SqlColumn::name))
-                    .withValuePhrase(mapping.mapColumn(toJdbcPlaceholder(mapping.property())))
-                    .buildOptional();
+            return visit((PropertyMapping) mapping);
         } else {
             return Optional.empty();
         }

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

@@ -1,5 +1,5 @@
 /**
- *    Copyright 2016-2019 the original author or authors.
+ *    Copyright 2016-2020 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.
@@ -15,13 +15,16 @@
  */
 package org.mybatis.dynamic.sql.util;
 
+import java.util.Objects;
+
 import org.mybatis.dynamic.sql.SqlColumn;
 
 public class PropertyMapping extends AbstractColumnMapping {
     private String property;
 
-    private PropertyMapping(SqlColumn<?> column) {
+    protected PropertyMapping(SqlColumn<?> column, String property) {
         super(column);
+        this.property = Objects.requireNonNull(property);
     }
 
     public String property() {
@@ -34,8 +37,6 @@ public <R> R accept(ColumnMappingVisitor<R> visitor) {
     }
 
     public static PropertyMapping of(SqlColumn<?> column, String property) {
-        PropertyMapping mapping = new PropertyMapping(column);
-        mapping.property = property;
-        return mapping;
+        return new PropertyMapping(column, property);
     }
 }

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

@@ -20,20 +20,14 @@
 
 import org.mybatis.dynamic.sql.SqlColumn;
 
-public class PropertyWhenPresentMapping extends AbstractColumnMapping {
-    private String property;
+public class PropertyWhenPresentMapping extends PropertyMapping {
     private Supplier<?> valueSupplier;
 
     private PropertyWhenPresentMapping(SqlColumn<?> column, String property, Supplier<?> valueSupplier) {
-        super(column);
-        this.property = Objects.requireNonNull(property);
+        super(column, property);
         this.valueSupplier = Objects.requireNonNull(valueSupplier);
     }
 
-    public String property() {
-        return property;
-    }
-    
     public boolean shouldRender() {
         return valueSupplier.get() != null;
     }

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

@@ -1,5 +1,5 @@
 /**
- *    Copyright 2016-2018 the original author or authors.
+ *    Copyright 2016-2020 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.
@@ -22,7 +22,7 @@
 public interface StringUtilities {
 
     static String spaceAfter(Optional<String> in) {
-        return in.map(s -> s + " ") //$NON-NLS-1$
+        return in.map(StringUtilities::spaceAfter)
                 .orElse(""); //$NON-NLS-1$
     }
 
@@ -31,7 +31,7 @@ static String spaceAfter(String in) {
     }
 
     static String spaceBefore(Optional<String> in) {
-        return in.map(s -> " " + s) //$NON-NLS-1$
+        return in.map(StringUtilities::spaceBefore)
                 .orElse(""); //$NON-NLS-1$
     }
 

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

@@ -1,5 +1,5 @@
 /**
- *    Copyright 2016-2019 the original author or authors.
+ *    Copyright 2016-2020 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.
@@ -15,6 +15,7 @@
  */
 package org.mybatis.dynamic.sql.util;
 
+import java.util.Objects;
 import java.util.function.Supplier;
 
 import org.mybatis.dynamic.sql.SqlColumn;
@@ -25,7 +26,7 @@ public class ValueMapping<T> extends AbstractColumnMapping {
 
     private ValueMapping(SqlColumn<T> column, Supplier<T> valueSupplier) {
         super(column);
-        this.valueSupplier = valueSupplier;
+        this.valueSupplier = Objects.requireNonNull(valueSupplier);
     }
 
     public T value() {