Sort members

apache · Nov 23, 2023 · a6cdeab · a6cdeab
1 parent c3a913f
commit a6cdeab
Show file tree

Hide file tree

Showing 4 changed files with 47 additions and 47 deletions.
diff --git a/src/test/java/org/apache/commons/dbutils/BaseTestCase.java b/src/test/java/org/apache/commons/dbutils/BaseTestCase.java
@@ -79,6 +79,18 @@ protected ResultSet createMockResultSet() {
         return MockResultSet.create(metaData, rows);
     }
 
+    public ResultSet getEmptyResultSet() {
+        return this.emptyResultSet;
+    }
+
+    public ResultSet getResultSet() {
+        return this.rs;
+    }
+
+    public void setResultSet(ResultSet resultSet) {
+        this.rs = resultSet;
+    }
+
     /**
      * This is called before each test method so ResultSet will be fresh each time.
      *
@@ -92,18 +104,6 @@ protected void setUp() throws Exception {
         emptyResultSet = MockResultSet.create(metaData, null);
     }
 
-    public ResultSet getResultSet() {
-        return this.rs;
-    }
-
-    public ResultSet getEmptyResultSet() {
-        return this.emptyResultSet;
-    }
-
-    public void setResultSet(ResultSet resultSet) {
-        this.rs = resultSet;
-    }
-
     // Test which allows Eclipse to be run on full project (avoids no tests found)
     // check that the rows are valid for the column definition
     public void testCheckDataSizes() {

diff --git a/src/test/java/org/apache/commons/dbutils/MockResultSet.java b/src/test/java/org/apache/commons/dbutils/MockResultSet.java
@@ -32,6 +32,8 @@
  */
 public class MockResultSet implements InvocationHandler {
 
+    private static final Set<String> METHOD_NAMES = Set.of("isLast", "hashCode", "toString", "equals");
+
     /**
      * Create a {@code MockResultSet} proxy object. This is equivalent to:
      *
@@ -54,8 +56,6 @@ public static ResultSet create(final ResultSetMetaData metaData, final Object[][
 
     private Boolean wasNull = Boolean.FALSE;
 
-    private static final Set<String> METHOD_NAMES = Set.of("isLast", "hashCode", "toString", "equals");
-
     /**
      * MockResultSet constructor.
      *
@@ -267,33 +267,6 @@ protected String getString(final int columnIndex) throws SQLException {
         return obj == null ? null : obj.toString();
     }
 
-    @Override
-    public Object invoke(final Object proxy, final Method method, final Object[] args)
-        throws Throwable {
-
-        final String methodName = method.getName();
-        if (methodName.equals("getMetaData")) {
-            return this.getMetaData();
-        }
-        if (methodName.equals("next")) {
-            return this.next();
-        }
-        if (methodName.equals("previous")) {
-            // Handle previous method
-        } else if (methodName.equals("close")) {
-            // Handle close method
-        } else if (isColumnMethod(methodName)) {
-            return handleColumnMethod(methodName, args);
-        } else if (METHOD_NAMES.contains(methodName)) {
-            return handleNonColumnMethod(methodName, proxy, args);
-        }
-        throw new UnsupportedOperationException("Unsupported method: " + methodName);
-    }
-
-    private boolean isColumnMethod(String methodName) {
-        return methodName.startsWith("get") || methodName.equals("wasNull");
-    }
-
     private Object handleColumnMethod(String methodName, final Object[] args) throws SQLException {
         switch (methodName) {
             case "getBoolean":
@@ -336,6 +309,33 @@ private Object handleNonColumnMethod(String methodName, Object proxy, Object[] a
         }
     }
 
+    @Override
+    public Object invoke(final Object proxy, final Method method, final Object[] args)
+        throws Throwable {
+
+        final String methodName = method.getName();
+        if (methodName.equals("getMetaData")) {
+            return this.getMetaData();
+        }
+        if (methodName.equals("next")) {
+            return this.next();
+        }
+        if (methodName.equals("previous")) {
+            // Handle previous method
+        } else if (methodName.equals("close")) {
+            // Handle close method
+        } else if (isColumnMethod(methodName)) {
+            return handleColumnMethod(methodName, args);
+        } else if (METHOD_NAMES.contains(methodName)) {
+            return handleNonColumnMethod(methodName, proxy, args);
+        }
+        throw new UnsupportedOperationException("Unsupported method: " + methodName);
+    }
+
+    private boolean isColumnMethod(String methodName) {
+        return methodName.startsWith("get") || methodName.equals("wasNull");
+    }
+
     /**
      * @throws SQLException
      */

diff --git a/src/test/java/org/apache/commons/dbutils/handlers/columns/AbstractTestColumnHandler.java b/src/test/java/org/apache/commons/dbutils/handlers/columns/AbstractTestColumnHandler.java
@@ -37,10 +37,6 @@ public AbstractTestColumnHandler(final ColumnHandler<T> handler, final Class<?>
         this.matchingType = matchingType;
     }
 
-    public ResultSet getResultSet() {
-        return this.rs;
-    }
-
     public ColumnHandler<T> getColumnHandler() {
         return this.handler;
     }
@@ -49,6 +45,10 @@ public Class<?> getMatchingType() {
         return this.matchingType;
     }
 
+    public ResultSet getResultSet() {
+        return this.rs;
+    }
+
     @Test
     public abstract void testApplyType() throws Exception;
 

diff --git a/src/test/java/org/apache/commons/dbutils/wrappers/SqlNullCheckedResultSetTest.java b/src/test/java/org/apache/commons/dbutils/wrappers/SqlNullCheckedResultSetTest.java
@@ -214,6 +214,8 @@ public void setObject(final Object value) throws SQLException {
  */
 public class SqlNullCheckedResultSetTest extends BaseTestCase {
 
+    private static ResultSet rs;
+
     private static void assertArrayEquals(final byte[] expected, final byte[] actual) {
         if (expected == actual) {
             return;
@@ -227,9 +229,7 @@ private static void assertArrayEquals(final byte[] expected, final byte[] actual
             assertEquals("Array not equal at index " + i, expectedItem, actualItem);
         }
     }
-
     private SqlNullCheckedResultSet rs2;
-    private static ResultSet rs;
 
     /**
      * Sets up instance variables required by this test case.