From 3a7b7eaa6fe3b9b973be7260d1216109e73d6219 Mon Sep 17 00:00:00 2001 From: Jeff Butler Date: Thu, 23 Oct 2025 17:40:40 -0400 Subject: [PATCH] Checkstyle Updates --- .../org/mybatis/dynamic/sql/SqlColumn.java | 13 ++++++------- .../IsGreaterThanOrEqualToWhenPresent.java | 18 +++++++++--------- .../IsLikeCaseInsensitiveWhenPresent.java | 18 +++++++++--------- .../IsNotLikeCaseInsensitiveWhenPresent.java | 18 +++++++++--------- 4 files changed, 33 insertions(+), 34 deletions(-) diff --git a/src/main/java/org/mybatis/dynamic/sql/SqlColumn.java b/src/main/java/org/mybatis/dynamic/sql/SqlColumn.java index ee372794b..b3dcf9513 100644 --- a/src/main/java/org/mybatis/dynamic/sql/SqlColumn.java +++ b/src/main/java/org/mybatis/dynamic/sql/SqlColumn.java @@ -79,7 +79,6 @@ * method and cast the result properly. We provide a {@link SqlColumn#cast(SqlColumn)} method to aid with this * process. For example, overriding the {@code descending} method could look like this: * - *

*

  * {@code
  * @Override
@@ -237,8 +236,8 @@ public Optional renderingStrategy() {
      * and method chaining would not work. This is a workaround for Java's lack of reification.
      *
      * @param typeHandler the type handler to set
-     * @return a new column instance with the specified type handler
      * @param  the type of the new column (will be the same as T)
+     * @return a new column instance with the specified type handler
      */
     public  SqlColumn withTypeHandler(String typeHandler) {
         return cast(copyBuilder().withTypeHandler(typeHandler).build());
@@ -253,8 +252,8 @@ public  SqlColumn withTypeHandler(String typeHandler) {
      * and method chaining would not work. This is a workaround for Java's lack of reification.
      *
      * @param renderingStrategy the rendering strategy to set
-     * @return a new column instance with the specified type handler
      * @param  the type of the new column (will be the same as T)
+     * @return a new column instance with the specified type handler
      */
     public  SqlColumn withRenderingStrategy(RenderingStrategy renderingStrategy) {
         return cast(copyBuilder().withRenderingStrategy(renderingStrategy).build());
@@ -271,8 +270,8 @@ public  SqlColumn withRenderingStrategy(RenderingStrategy renderingStrateg
      * and method chaining would not work. This is a workaround for Java's lack of reification.
      *
      * @param parameterTypeConverter the parameter type converter to set
-     * @return a new column instance with the specified type handler
      * @param  the type of the new column (will be the same as T)
+     * @return a new column instance with the specified type handler
      */
     @SuppressWarnings("unchecked")
     public  SqlColumn withParameterTypeConverter(ParameterTypeConverter parameterTypeConverter) {
@@ -292,8 +291,8 @@ public  SqlColumn withParameterTypeConverter(ParameterTypeConverter
      * and method chaining would not work. This is a workaround for Java's lack of reification.
      *
      * @param javaType the Java type to set
-     * @return a new column instance with the specified type handler
      * @param  the type of the new column (will be the same as T)
+     * @return a new column instance with the specified type handler
      */
     @SuppressWarnings("unchecked")
     public  SqlColumn withJavaType(Class javaType) {
@@ -312,8 +311,8 @@ public  SqlColumn withJavaType(Class javaType) {
      * and method chaining would not work. This is a workaround for Java's lack of reification.
      *
      * @param javaProperty the Java property to set
-     * @return a new column instance with the specified type handler
      * @param  the type of the new column (will be the same as T)
+     * @return a new column instance with the specified type handler
      */
     public  SqlColumn withJavaProperty(String javaProperty) {
         return cast(copyBuilder().withJavaProperty(javaProperty).build());
@@ -366,7 +365,7 @@ public static  SqlColumn of(String name, SqlTable table, JDBCType jdbcType
                 .build();
     }
 
-    public static abstract class AbstractBuilder, B extends AbstractBuilder> {
+    public abstract static class AbstractBuilder, B extends AbstractBuilder> {
         protected @Nullable String name;
         protected @Nullable SqlTable table;
         protected @Nullable JDBCType jdbcType;
diff --git a/src/main/java/org/mybatis/dynamic/sql/where/condition/IsGreaterThanOrEqualToWhenPresent.java b/src/main/java/org/mybatis/dynamic/sql/where/condition/IsGreaterThanOrEqualToWhenPresent.java
index ccb868c94..970ef0775 100644
--- a/src/main/java/org/mybatis/dynamic/sql/where/condition/IsGreaterThanOrEqualToWhenPresent.java
+++ b/src/main/java/org/mybatis/dynamic/sql/where/condition/IsGreaterThanOrEqualToWhenPresent.java
@@ -26,16 +26,16 @@ public class IsGreaterThanOrEqualToWhenPresent extends AbstractSingleValueCon
         implements AbstractSingleValueCondition.Filterable, AbstractSingleValueCondition.Mappable {
     private static final IsGreaterThanOrEqualToWhenPresent EMPTY =
             new IsGreaterThanOrEqualToWhenPresent(-1) {
-        @Override
-        public Object value() {
-            throw new NoSuchElementException("No value present"); //$NON-NLS-1$
-        }
+                @Override
+                public Object value() {
+                    throw new NoSuchElementException("No value present"); //$NON-NLS-1$
+                }
 
-        @Override
-        public boolean isEmpty() {
-            return true;
-        }
-    };
+                @Override
+                public boolean isEmpty() {
+                    return true;
+                }
+            };
 
     public static  IsGreaterThanOrEqualToWhenPresent empty() {
         @SuppressWarnings("unchecked")
diff --git a/src/main/java/org/mybatis/dynamic/sql/where/condition/IsLikeCaseInsensitiveWhenPresent.java b/src/main/java/org/mybatis/dynamic/sql/where/condition/IsLikeCaseInsensitiveWhenPresent.java
index ae8398aef..0f06e3311 100644
--- a/src/main/java/org/mybatis/dynamic/sql/where/condition/IsLikeCaseInsensitiveWhenPresent.java
+++ b/src/main/java/org/mybatis/dynamic/sql/where/condition/IsLikeCaseInsensitiveWhenPresent.java
@@ -28,16 +28,16 @@ public class IsLikeCaseInsensitiveWhenPresent extends AbstractSingleValueCond
         AbstractSingleValueCondition.Mappable {
     private static final IsLikeCaseInsensitiveWhenPresent EMPTY =
             new IsLikeCaseInsensitiveWhenPresent<>("") { //$NON-NLS-1$
-        @Override
-        public String value() {
-            throw new NoSuchElementException("No value present"); //$NON-NLS-1$
-        }
+                @Override
+                public String value() {
+                    throw new NoSuchElementException("No value present"); //$NON-NLS-1$
+                }
 
-        @Override
-        public boolean isEmpty() {
-            return true;
-        }
-    };
+                @Override
+                public boolean isEmpty() {
+                    return true;
+                }
+            };
 
     public static  IsLikeCaseInsensitiveWhenPresent empty() {
         @SuppressWarnings("unchecked")
diff --git a/src/main/java/org/mybatis/dynamic/sql/where/condition/IsNotLikeCaseInsensitiveWhenPresent.java b/src/main/java/org/mybatis/dynamic/sql/where/condition/IsNotLikeCaseInsensitiveWhenPresent.java
index df07202f9..880b20ab8 100644
--- a/src/main/java/org/mybatis/dynamic/sql/where/condition/IsNotLikeCaseInsensitiveWhenPresent.java
+++ b/src/main/java/org/mybatis/dynamic/sql/where/condition/IsNotLikeCaseInsensitiveWhenPresent.java
@@ -28,16 +28,16 @@ public class IsNotLikeCaseInsensitiveWhenPresent extends AbstractSingleValueC
         AbstractSingleValueCondition.Mappable {
     private static final IsNotLikeCaseInsensitiveWhenPresent EMPTY =
             new IsNotLikeCaseInsensitiveWhenPresent<>("") { //$NON-NLS-1$
-        @Override
-        public String value() {
-            throw new NoSuchElementException("No value present"); //$NON-NLS-1$
-        }
+                @Override
+                public String value() {
+                    throw new NoSuchElementException("No value present"); //$NON-NLS-1$
+                }
 
-        @Override
-        public boolean isEmpty() {
-            return true;
-        }
-    };
+                @Override
+                public boolean isEmpty() {
+                    return true;
+                }
+            };
 
     public static  IsNotLikeCaseInsensitiveWhenPresent empty() {
         @SuppressWarnings("unchecked")