Merge pull request #157 from jeffgbutler/master

General Code Cleanup

Author: jeffgbutler

pom.xml

@@ -42,7 +42,7 @@
     <kotlin.compiler.jvmTarget>1.8</kotlin.compiler.jvmTarget>
     <sonar.sources>pom.xml,src/main/java,src/main/kotlin</sonar.sources>
     <sonar.tests>src/test/java,src/test/kotlin</sonar.tests>
-    <jacoco.version>0.8.4</jacoco.version>
+    <jacoco.version>0.8.5</jacoco.version>
     <kotlin.code.style>official</kotlin.code.style>
   </properties>
 

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

@@ -263,25 +263,21 @@ static StringConstant stringConstant(String constant) {
     }
 
     // functions
-    @SafeVarargs
     static <T extends Number> Add<T> add(BindableColumn<T> firstColumn, BasicColumn secondColumn,
             BasicColumn... subsequentColumns) {
         return Add.of(firstColumn, secondColumn, Arrays.asList(subsequentColumns));
     }
 
-    @SafeVarargs
     static <T extends Number> Divide<T> divide(BindableColumn<T> firstColumn, BasicColumn secondColumn,
             BasicColumn... subsequentColumns) {
         return Divide.of(firstColumn, secondColumn, Arrays.asList(subsequentColumns));
     }
 
-    @SafeVarargs
     static <T extends Number> Multiply<T> multiply(BindableColumn<T> firstColumn, BasicColumn secondColumn,
             BasicColumn... subsequentColumns) {
         return Multiply.of(firstColumn, secondColumn, Arrays.asList(subsequentColumns));
     }
 
-    @SafeVarargs
     static <T extends Number> Subtract<T> subtract(BindableColumn<T> firstColumn, BasicColumn secondColumn,
             BasicColumn... subsequentColumns) {
         return Subtract.of(firstColumn, secondColumn, Arrays.asList(subsequentColumns));

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

@@ -168,7 +168,7 @@ public UpdateDSL<R> equalToWhenPresent(Supplier<T> valueSupplier) {
 
     public class UpdateWhereBuilder extends AbstractWhereDSL<UpdateWhereBuilder> implements Buildable<R> {
 
-        public <T> UpdateWhereBuilder() {
+        public UpdateWhereBuilder() {
             super();
         }
 

src/main/java/org/mybatis/dynamic/sql/util/InsertMapping.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.
@@ -15,12 +15,7 @@
  */
 package org.mybatis.dynamic.sql.util;
 
-import java.util.function.Function;
-
-import org.mybatis.dynamic.sql.SqlColumn;
-
+@FunctionalInterface
 public interface InsertMapping {
-    <R> R mapColumn(Function<SqlColumn<?>, R> mapper);
-
     <R> R accept(InsertMappingVisitor<R> visitor);
 }

src/main/java/org/mybatis/dynamic/sql/util/UpdateMapping.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.
@@ -15,12 +15,7 @@
  */
 package org.mybatis.dynamic.sql.util;
 
-import java.util.function.Function;
-
-import org.mybatis.dynamic.sql.SqlColumn;
-
+@FunctionalInterface
 public interface UpdateMapping {
-    <R> R mapColumn(Function<SqlColumn<?>, R> mapper);
-
     <R> R accept(UpdateMappingVisitor<R> visitor);
 }

src/main/java/org/mybatis/dynamic/sql/where/AbstractWhereDSL.java

@@ -26,7 +26,7 @@
 public abstract class AbstractWhereDSL<T extends AbstractWhereDSL<T>> {
     private List<SqlCriterion<?>> criteria = new ArrayList<>();
 
-    protected <S> AbstractWhereDSL() {
+    protected AbstractWhereDSL() {
         super();
     }
 
@@ -45,9 +45,9 @@ public <S> T where(BindableColumn<S> column, VisitableCondition<S> condition, Li
         return getThis();
     }
 
-    @SuppressWarnings("unchecked")
     public T applyWhere(WhereApplier whereApplier) {
-        return (T) whereApplier.apply(this);
+        whereApplier.accept(this);
+        return getThis();
     }
 
     public <S> T and(BindableColumn<S> column, VisitableCondition<S> condition) {

src/main/java/org/mybatis/dynamic/sql/where/WhereApplier.java

@@ -15,7 +15,7 @@
  */
 package org.mybatis.dynamic.sql.where;
 
-import java.util.function.UnaryOperator;
+import java.util.function.Consumer;
 
 @FunctionalInterface
-public interface WhereApplier extends UnaryOperator<AbstractWhereDSL<?>> {}
+public interface WhereApplier extends Consumer<AbstractWhereDSL<?>> {}

src/main/kotlin/org/mybatis/dynamic/sql/util/kotlin/AbstractWhereDSLExtensions.kt

@@ -19,7 +19,7 @@ import org.mybatis.dynamic.sql.BindableColumn
 import org.mybatis.dynamic.sql.VisitableCondition
 import org.mybatis.dynamic.sql.where.AbstractWhereDSL
 
-typealias WhereApplier = AbstractWhereDSL<*>.() -> AbstractWhereDSL<*>
+typealias WhereApplier = AbstractWhereDSL<*>.() -> Unit
 
 fun <T, M : AbstractWhereDSL<M>> AbstractWhereDSL<M>.where(column: BindableColumn<T>, condition: VisitableCondition<T>, collect: CriteriaReceiver): M {
     val collector = CriteriaCollector()

src/main/kotlin/org/mybatis/dynamic/sql/util/kotlin/JoinCollector.kt

@@ -22,12 +22,13 @@ import org.mybatis.dynamic.sql.select.join.JoinCriterion
 typealias JoinReceiver = JoinCollector.() -> JoinCollector
 
 class JoinCollector {
-    lateinit var onJoinCriterion: JoinCriterion
+    val onJoinCriterion: JoinCriterion by lazy { internalOnCriterion }
     val andJoinCriteria = mutableListOf<JoinCriterion>()
+    private lateinit var internalOnCriterion: JoinCriterion
 
     fun on(column: BasicColumn, condition: JoinCondition) =
         apply {
-            onJoinCriterion = JoinCriterion.Builder()
+            internalOnCriterion = JoinCriterion.Builder()
                 .withConnector("on")
                 .withJoinColumn(column)
                 .withJoinCondition(condition)