Merge pull request #359 from jeffgbutler/master

jeffgbutler · web-flow · commit 82c4fdf96915 · 2021-05-06T17:28:42.000-04:00
Checkstyle and Spotbugs Updates
diff --git a/src/main/java/org/mybatis/dynamic/sql/util/SqlProviderAdapter.java b/src/main/java/org/mybatis/dynamic/sql/util/SqlProviderAdapter.java
@@ -80,8 +80,8 @@ public String insertMultipleWithGeneratedKeys(Map<String, Object> parameterMap)
         if (entries.size() == 1) {
             return entries.get(0);
         } else {
-            throw new IllegalArgumentException("The parameters for insertMultipleWithGeneratedKeys" + //$NON-NLS-1$
-                    " must contain exactly one parameter of type String"); //$NON-NLS-1$
+            throw new IllegalArgumentException("The parameters for insertMultipleWithGeneratedKeys" //$NON-NLS-1$
+                    + " must contain exactly one parameter of type String"); //$NON-NLS-1$
         }
     }
 
diff --git a/src/main/java/org/mybatis/dynamic/sql/where/condition/IsInCaseInsensitive.java b/src/main/java/org/mybatis/dynamic/sql/where/condition/IsInCaseInsensitive.java
@@ -44,8 +44,9 @@ protected  IsInCaseInsensitive(Collection<String> values, Callback emptyCallback
 
     @Override
     public String renderCondition(String columnName, Stream<String> placeholders) {
-        return "upper(" + columnName + ") " + //$NON-NLS-1$ //$NON-NLS-2$
-                placeholders.collect(Collectors.joining(",", "in (", ")")); //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
+        return "upper(" + columnName + ") " //$NON-NLS-1$ //$NON-NLS-2$
+                + placeholders.collect(
+                        Collectors.joining(",", "in (", ")")); //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
     }
 
     @Override
diff --git a/src/main/java/org/mybatis/dynamic/sql/where/condition/IsNotInCaseInsensitive.java b/src/main/java/org/mybatis/dynamic/sql/where/condition/IsNotInCaseInsensitive.java
@@ -44,8 +44,8 @@ protected IsNotInCaseInsensitive(Collection<String> values, Callback emptyCallba
 
     @Override
     public String renderCondition(String columnName, Stream<String> placeholders) {
-        return "upper(" + columnName + ") " + //$NON-NLS-1$ //$NON-NLS-2$
-                placeholders.collect(
+        return "upper(" + columnName + ") " //$NON-NLS-1$ //$NON-NLS-2$
+                + placeholders.collect(
                         Collectors.joining(",", "not in (", ")")); //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
     }
 
diff --git a/src/main/kotlin/org/mybatis/dynamic/sql/util/kotlin/KotlinBaseBuilders.kt b/src/main/kotlin/org/mybatis/dynamic/sql/util/kotlin/KotlinBaseBuilders.kt
@@ -105,18 +105,18 @@ abstract class KotlinBaseBuilder<D : AbstractWhereSupport<*>, B : KotlinBaseBuil
 
     fun allRows(): B = self()
 
-    private fun applyToWhere(block: AbstractWhereDSL<*>.() -> Unit): B =
-        self().also {
-            getDsl().where().apply(block)
-        }
+    private fun applyToWhere(block: AbstractWhereDSL<*>.() -> Unit): B {
+        getDsl().where().apply(block)
+        return self()
+    }
 
     private fun applyToWhere(
         subCriteria: CriteriaReceiver,
         block: AbstractWhereDSL<*>.(List<SqlCriterion>) -> Unit
-    ): B =
-        self().also {
-            getDsl().where().block(CriteriaCollector().apply(subCriteria).criteria)
-        }
+    ): B {
+        getDsl().where().block(CriteriaCollector().apply(subCriteria).criteria)
+        return self()
+    }
 
     protected abstract fun self(): B
 
@@ -199,17 +199,17 @@ abstract class KotlinBaseJoiningBuilder<D : AbstractQueryExpressionDSL<*, *>, B
             rightJoin(sq, sq.correlationName, jc.onJoinCriterion, jc.andJoinCriteria)
         }
 
-    private fun applyToDsl(joinCriteria: JoinReceiver, applyJoin: D.(JoinCollector) -> Unit): B =
-        self().also {
-            getDsl().applyJoin(JoinCollector().apply(joinCriteria))
-        }
+    private fun applyToDsl(joinCriteria: JoinReceiver, applyJoin: D.(JoinCollector) -> Unit): B {
+        getDsl().applyJoin(JoinCollector().apply(joinCriteria))
+        return self()
+    }
 
     private fun applyToDsl(
         subQuery: KotlinQualifiedSubQueryBuilder.() -> Unit,
         joinCriteria: JoinReceiver,
         applyJoin: D.(KotlinQualifiedSubQueryBuilder, JoinCollector) -> Unit
-    ): B =
-        self().also {
-            getDsl().applyJoin(KotlinQualifiedSubQueryBuilder().apply(subQuery), JoinCollector().apply(joinCriteria))
-        }
+    ): B {
+        getDsl().applyJoin(KotlinQualifiedSubQueryBuilder().apply(subQuery), JoinCollector().apply(joinCriteria))
+        return self()
+    }
 }

Original file line number	Diff line number	Diff line change
`@@ -80,8 +80,8 @@ public String insertMultipleWithGeneratedKeys(Map<String, Object> parameterMap)`
`80`	`80`	`if (entries.size() == 1) {`
`81`	`81`	`return entries.get(0);`
`82`	`82`	`} else {`
`83`		`- throw new IllegalArgumentException("The parameters for insertMultipleWithGeneratedKeys" + //$NON-NLS-1$`
`84`		`- " must contain exactly one parameter of type String"); //$NON-NLS-1$`
	`83`	`+ throw new IllegalArgumentException("The parameters for insertMultipleWithGeneratedKeys" //$NON-NLS-1$`
	`84`	`+ + " must contain exactly one parameter of type String"); //$NON-NLS-1$`
`85`	`85`	`}`
`86`	`86`	`}`
`87`	`87`
Original file line number	Diff line number	Diff line change
`@@ -44,8 +44,8 @@ protected IsNotInCaseInsensitive(Collection<String> values, Callback emptyCallba`
`44`	`44`
`45`	`45`	`@Override`
`46`	`46`	`public String renderCondition(String columnName, Stream<String> placeholders) {`
`47`		`- return "upper(" + columnName + ") " + //$NON-NLS-1$ //$NON-NLS-2$`
`48`		`- placeholders.collect(`
	`47`	`+ return "upper(" + columnName + ") " //$NON-NLS-1$ //$NON-NLS-2$`
	`48`	`+ + placeholders.collect(`
`49`	`49`	`Collectors.joining(",", "not in (", ")")); //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$`
`50`	`50`	`}`
`51`	`51`