Merge pull request #261 from jeffgbutler/update-parent

Update Parent and Fix Resulting Issues

Author: jeffgbutler

checkstyle-override.xml

@@ -1,7 +1,7 @@
 <?xml version="1.0"?>
 <!--
 
-       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.
@@ -44,6 +44,11 @@
             <property name="eachLine" value="true"/>
         </module>
 
+    <module name="LineLength">
+        <property name="max" value="120"/>
+        <property name="ignorePattern" value="^package.*|^import.*|a href|href|http://|https://|ftp://"/>
+    </module>
+
     <module name="TreeWalker">
         <module name="OuterTypeFilename"/>
         <module name="IllegalTokenText">
@@ -56,10 +61,6 @@
             <property name="allowByTailComment" value="true"/>
             <property name="allowNonPrintableEscapes" value="true"/>
         </module>
-        <module name="LineLength">
-            <property name="max" value="120"/>
-            <property name="ignorePattern" value="^package.*|^import.*|a href|href|http://|https://|ftp://"/>
-        </module>
         <module name="AvoidStarImport"/>
         <module name="OneTopLevelClass"/>
         <module name="NoLineWrap"/>
@@ -75,7 +76,7 @@
         </module>
         <module name="RightCurly">
             <property name="id" value="RightCurlyAlone"/>
-            <property name="option" value="alone"/>
+            <property name="option" value="alone_or_singleline"/>
             <property name="tokens" value="CLASS_DEF, METHOD_DEF, CTOR_DEF, LITERAL_FOR, LITERAL_WHILE, STATIC_INIT, INSTANCE_INIT"/>
         </module>
         <module name="WhitespaceAround">
@@ -187,7 +188,7 @@
         <module name="CustomImportOrder">
             <property name="sortImportsInGroupAlphabetically" value="true"/>
             <property name="separateLineBetweenGroups" value="true"/>
-            <property name="customImportOrderRules" value="STATIC###THIRD_PARTY_PACKAGE"/>
+            <property name="customImportOrderRules" value="STATIC###STANDARD_JAVA_PACKAGE###THIRD_PARTY_PACKAGE"/>
         </module>
         <module name="MethodParamPad"/>
         <module name="ParenPad"/>
@@ -217,12 +218,8 @@
         <module name="JavadocMethod">
             <property name="scope" value="public"/>
             <property name="allowMissingParamTags" value="true"/>
-            <property name="allowMissingThrowsTags" value="true"/>
             <property name="allowMissingReturnTag" value="true"/>
-            <property name="allowMissingJavadoc" value="true"/>
-            <property name="minLineCount" value="2"/>
             <property name="allowedAnnotations" value="Override, Test"/>
-            <property name="allowThrowsTagsForSubclasses" value="true"/>
         </module>
         <module name="MethodName">
             <property name="format" value="^[a-z][a-z0-9][a-zA-Z0-9_]*$"/>

pom.xml

@@ -20,7 +20,7 @@
   <parent>
     <groupId>org.mybatis</groupId>
     <artifactId>mybatis-parent</artifactId>
-    <version>31</version>
+    <version>32</version>
   </parent>
   <groupId>org.mybatis.dynamic-sql</groupId>
   <artifactId>mybatis-dynamic-sql</artifactId>
@@ -42,7 +42,6 @@
     <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.5</jacoco.version>
     <kotlin.code.style>official</kotlin.code.style>
     <test.containers.version>1.14.3</test.containers.version>
     <osgi.export>org.mybatis.dynamic.sql.*;version=${project.version};-noimport:=true</osgi.export>

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

@@ -20,7 +20,7 @@
 public abstract class AbstractColumnComparisonCondition<T> implements VisitableCondition<T> {
 
     protected final BasicColumn column;
-    
+
     protected AbstractColumnComparisonCondition(BasicColumn column) {
         this.column = column;
     }
@@ -29,10 +29,10 @@ protected AbstractColumnComparisonCondition(BasicColumn column) {
     public <R> R accept(ConditionVisitor<T,R> visitor) {
         return visitor.visit(this);
     }
-    
+
     public String renderCondition(String columnName, TableAliasCalculator tableAliasCalculator) {
         return renderCondition(columnName, column.renderWithTableAlias(tableAliasCalculator));
     }
-    
+
     protected abstract String renderCondition(String leftColumn, String rightColumn);
 }

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

@@ -43,11 +43,11 @@ protected AbstractListValueCondition(Collection<T> values, UnaryOperator<Stream<
             .collect(Collectors.toList());
         this.emptyCallback = Objects.requireNonNull(emptyCallback);
     }
-    
+
     public final <R> Stream<R> mapValues(Function<T, R> mapper) {
         return values.stream().map(mapper);
     }
-    
+
     @Override
     public boolean shouldRender() {
         if (values.isEmpty()) {

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

@@ -21,24 +21,24 @@
 public abstract class AbstractNoValueCondition<T> implements VisitableCondition<T> {
 
     private final BooleanSupplier booleanSupplier;
-    
+
     protected AbstractNoValueCondition() {
         booleanSupplier = () -> true;
     }
-    
+
     protected AbstractNoValueCondition(BooleanSupplier booleanSupplier) {
         this.booleanSupplier = Objects.requireNonNull(booleanSupplier);
     }
-    
+
     @Override
     public boolean shouldRender() {
         return booleanSupplier.getAsBoolean();
     }
-    
+
     @Override
     public <R> R accept(ConditionVisitor<T,R> visitor) {
         return visitor.visit(this);
     }
-    
+
     public abstract String renderCondition(String columnName);
 }

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

@@ -22,30 +22,30 @@
 public abstract class AbstractSingleValueCondition<T> implements VisitableCondition<T> {
     protected final Supplier<T> valueSupplier;
     private final Predicate<T> predicate;
-    
+
     protected AbstractSingleValueCondition(Supplier<T> valueSupplier) {
         this.valueSupplier = Objects.requireNonNull(valueSupplier);
         predicate = v -> true;
     }
-    
+
     protected AbstractSingleValueCondition(Supplier<T> valueSupplier, Predicate<T> predicate) {
         this.valueSupplier = Objects.requireNonNull(valueSupplier);
         this.predicate = Objects.requireNonNull(predicate);
     }
-    
+
     public T value() {
         return valueSupplier.get();
     }
-    
+
     @Override
     public boolean shouldRender() {
         return predicate.test(value());
     }
-    
+
     @Override
     public <R> R accept(ConditionVisitor<T,R> visitor) {
         return visitor.visit(this);
     }
-    
+
     public abstract String renderCondition(String columnName, String placeholder);
 }

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

@@ -20,11 +20,11 @@
 
 public abstract class AbstractSubselectCondition<T> implements VisitableCondition<T> {
     private final SelectModel selectModel;
-    
+
     protected AbstractSubselectCondition(Buildable<SelectModel> selectModelBuilder) {
         this.selectModel = selectModelBuilder.build();
     }
-    
+
     public SelectModel selectModel() {
         return selectModel;
     }

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

@@ -23,7 +23,7 @@ public abstract class AbstractTwoValueCondition<T> implements VisitableCondition
     protected final Supplier<T> valueSupplier1;
     protected final Supplier<T> valueSupplier2;
     private final BiPredicate<T, T> predicate;
-    
+
     protected AbstractTwoValueCondition(Supplier<T> valueSupplier1, Supplier<T> valueSupplier2) {
         this.valueSupplier1 = Objects.requireNonNull(valueSupplier1);
         this.valueSupplier2 = Objects.requireNonNull(valueSupplier2);
@@ -44,12 +44,12 @@ public T value1() {
     public T value2() {
         return valueSupplier2.get();
     }
-    
+
     @Override
     public boolean shouldRender() {
         return predicate.test(value1(), value2());
     }
-    
+
     @Override
     public <R> R accept(ConditionVisitor<T,R> visitor) {
         return visitor.visit(this);

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

@@ -23,54 +23,54 @@
  * Describes attributes of columns that are necessary for rendering if the column is not expected to
  * be bound as a JDBC parameter.  Columns in select lists, join expressions, and group by expressions
  * are typically not bound.
- * 
+ *
  * @author Jeff Butler
  *
  */
 public interface BasicColumn {
 
     /**
      * Returns the columns alias if one has been specified.
-     * 
+     *
      * @return the column alias
      */
     Optional<String> alias();
-    
+
     /**
      * Returns a new instance of a BasicColumn with the alias set.
-     * 
+     *
      * @param alias the column alias to set
      * @return new instance with alias set
      */
     BasicColumn as(String alias);
-    
+
     /**
      * Returns the name of the item aliased with a table name if appropriate.
      * For example, "a.foo".  This is appropriate for where clauses and order by clauses.
-     * 
+     *
      * @param tableAliasCalculator the table alias calculator for the current renderer
      * @return the item name with the table alias applied
      */
     String renderWithTableAlias(TableAliasCalculator tableAliasCalculator);
-    
+
     /**
      * Returns the name of the item aliased with a table name and column alias if appropriate.
      * For example, "a.foo as bar".  This is appropriate for select list clauses.
-     * 
+     *
      * @param tableAliasCalculator the table alias calculator for the current renderer
      * @return the item name with the table and column aliases applied
      */
     default String renderWithTableAndColumnAlias(TableAliasCalculator tableAliasCalculator) {
         String nameAndTableAlias = renderWithTableAlias(tableAliasCalculator);
-        
+
         return alias().map(a -> nameAndTableAlias + " as " + a) //$NON-NLS-1$
                 .orElse(nameAndTableAlias);
     }
-    
+
     /**
      * Utility method to make it easier to build column lists for methods that require an
      * array rather than the varargs method.
-     * 
+     *
      * @param columns list of BasicColumn
      * @return an array of BasicColumn
      */

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

@@ -23,31 +23,31 @@
 /**
  * Describes additional attributes of columns that are necessary for binding the column as a JDBC parameter.
  * Columns in where clauses are typically bound.
- * 
+ *
  * @author Jeff Butler
  *
  * @param <T> - the Java type that corresponds to this column
 */
 public interface BindableColumn<T> extends BasicColumn {
 
     /**
-     * Override the base method definition to make it more specific to this interface. 
+     * Override the base method definition to make it more specific to this interface.
      */
     @Override
     BindableColumn<T> as(String alias);
 
     default Optional<JDBCType> jdbcType() {
         return Optional.empty();
     }
-    
+
     default Optional<String> typeHandler() {
         return Optional.empty();
     }
-    
+
     default Optional<RenderingStrategy> renderingStrategy() {
         return Optional.empty();
     }
-    
+
     default Object convertParameterType(T value) {
         return value;
     }