Removed unused code, and some refactoring in connection with reflecti…

…on rewrite
aaberg · Sep 20, 2024 · 657d89c · 657d89c
1 parent 597ef8b
commit 657d89c
Show file tree

Hide file tree

Showing 36 changed files with 6 additions and 1,391 deletions.
diff --git a/core/src/main/java/org/sql2o/Query.java b/core/src/main/java/org/sql2o/Query.java
@@ -9,7 +9,7 @@
 import org.sql2o.logging.LocalLoggerFactory;
 import org.sql2o.logging.Logger;
 import org.sql2o.quirks.Quirks;
-import org.sql2o.reflection.PojoIntrospector;
+import org.sql2o.reflection2.PojoIntrospector;
 
 import java.io.InputStream;
 import java.lang.reflect.InvocationTargetException;

diff --git a/core/src/main/java/org/sql2o/data/Row.java b/core/src/main/java/org/sql2o/data/Row.java
@@ -143,13 +143,11 @@ public String getString(String columnName){
      * View row as a simple map.
      */
     public Map<String, Object> asMap() {
-        Map map = new HashMap();
+        final var map = new HashMap<String, Object>();
         Set<String> keys = columnNameToIdxMap.keySet();
-        Iterator iterator = keys.iterator();
-        while (iterator.hasNext()) {
-            String colum = iterator.next().toString();
-            int index = columnNameToIdxMap.get(colum);
-            map.put(colum, values[index]);
+        for (String key : keys) {
+            int index = columnNameToIdxMap.get(key);
+            map.put(key, values[index]);
         }
         return map;
     }

diff --git a/core/src/main/java/org/sql2o/reflection/FactoryFacade.java b/core/src/main/java/org/sql2o/reflection/FactoryFacade.java
diff --git a/core/src/main/java/org/sql2o/reflection/FieldGetter.java b/core/src/main/java/org/sql2o/reflection/FieldGetter.java
diff --git a/core/src/main/java/org/sql2o/reflection/FieldGetterFactory.java b/core/src/main/java/org/sql2o/reflection/FieldGetterFactory.java
diff --git a/core/src/main/java/org/sql2o/reflection/FieldSetter.java b/core/src/main/java/org/sql2o/reflection/FieldSetter.java
diff --git a/core/src/main/java/org/sql2o/reflection/FieldSetterFactory.java b/core/src/main/java/org/sql2o/reflection/FieldSetterFactory.java
diff --git a/core/src/main/java/org/sql2o/reflection/Getter.java b/core/src/main/java/org/sql2o/reflection/Getter.java
diff --git a/core/src/main/java/org/sql2o/reflection/MethodGetter.java b/core/src/main/java/org/sql2o/reflection/MethodGetter.java
diff --git a/core/src/main/java/org/sql2o/reflection/MethodGetterFactory.java b/core/src/main/java/org/sql2o/reflection/MethodGetterFactory.java
diff --git a/core/src/main/java/org/sql2o/reflection/MethodSetter.java b/core/src/main/java/org/sql2o/reflection/MethodSetter.java
diff --git a/core/src/main/java/org/sql2o/reflection/MethodSetterFactory.java b/core/src/main/java/org/sql2o/reflection/MethodSetterFactory.java
diff --git a/core/src/main/java/org/sql2o/reflection/ObjectConstructor.java b/core/src/main/java/org/sql2o/reflection/ObjectConstructor.java
diff --git a/core/src/main/java/org/sql2o/reflection/ObjectConstructorFactory.java b/core/src/main/java/org/sql2o/reflection/ObjectConstructorFactory.java