Removed debug mode, added logger

Author: JanHolger

src/main/java/org/javawebstack/orm/ORM.java

@@ -8,9 +8,12 @@
 import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
+import java.util.logging.Logger;
 
 public class ORM {
 
+    public static final Logger LOGGER = Logger.getLogger("ORM");
+
     private static final Map<Class<? extends Model>, Repo<?>> repositories = new HashMap<>();
 
     public static <T extends Model> Repo<T> repo(Class<T> model){

src/main/java/org/javawebstack/orm/ORMConfig.java

@@ -11,8 +11,7 @@ public class ORMConfig {
     private boolean camelToSnakeCase = true;
     private int defaultSize = 0;
     private boolean idPrimaryKey = true;
-    private List<TypeMapper> typeMappers = new ArrayList<>();
-    private boolean debugMode = false;
+    private final List<TypeMapper> typeMappers = new ArrayList<>();
     public ORMConfig(){
         typeMappers.add(new DefaultMapper());
     }
@@ -51,12 +50,4 @@ public List<TypeMapper> getTypeMappers(){
     public boolean isIdPrimaryKey() {
         return idPrimaryKey;
     }
-
-    public void setDebugMode(boolean debugMode) {
-        this.debugMode = debugMode;
-    }
-
-    public boolean isDebugMode() {
-        return debugMode;
-    }
 }

src/main/java/org/javawebstack/orm/migration/AutoMigrator.java

@@ -19,9 +19,7 @@ public static void migrate(Repo<?>... repos){
         Map<SQL, List<String>> tables = new HashMap<>();
         for(Repo<?> repo : repos){
             if(!tables.containsKey(repo.getConnection())){
-                repo.getConnection().setDebugMode(repo.getInfo().getConfig().isDebugMode());
                 tables.put(repo.getConnection(), getTables(repo.getConnection()));
-                repo.getConnection().setDebugMode(false);
             }
             migrateTable(repo.getConnection(), repo.getInfo(), tables.get(repo.getConnection()).contains(repo.getInfo().getTableName()));
         }

src/main/java/org/javawebstack/orm/wrapper/BaseSQL.java

@@ -1,24 +1,22 @@
 package org.javawebstack.orm.wrapper;
 
+import org.javawebstack.orm.ORM;
+import org.javawebstack.orm.exception.ORMQueryException;
+
 import java.sql.*;
 import java.util.HashMap;
 import java.util.Locale;
 import java.util.Map;
+import java.util.logging.Level;
 
 public abstract class BaseSQL implements SQL {
 
     private final Map<ResultSet,Statement> statementMap = new HashMap<>();
-    private boolean debugMode = false;
-
-    public void setDebugMode(boolean debugMode) {
-        this.debugMode = debugMode;
-    }
 
     public abstract Connection getConnection();
 
     public int write(String queryString,Object... parameters) throws SQLException {
-        if(debugMode)
-            System.out.println(queryString);
+        ORM.LOGGER.log(Level.ALL, queryString);
         if(queryString.toLowerCase(Locale.ROOT).startsWith("insert")){
             PreparedStatement ps = setParams(getConnection().prepareStatement(queryString, Statement.RETURN_GENERATED_KEYS), parameters);
             ps.executeUpdate();
@@ -39,8 +37,7 @@ public int write(String queryString,Object... parameters) throws SQLException {
     }
 
     public ResultSet read(String queryString, Object... parameters) throws SQLException {
-        if(debugMode)
-            System.out.println(queryString);
+        ORM.LOGGER.log(Level.ALL, queryString);
         PreparedStatement ps = setParams(getConnection().prepareStatement(queryString), parameters);
         ResultSet rs = ps.executeQuery();
         statementMap.put(rs,ps);
@@ -77,7 +74,7 @@ else if(type.equals(Date.class))
             else if(type.equals(Time.class))
                 st.setTime(i,(Time)object);
             else
-                System.out.println("[SQL] Could not set type: "+object.getClass().getName());
+                throw new ORMQueryException("Can't set parameter of type: "+object.getClass().getName());
             i++;
         }
         return st;
@@ -95,7 +92,7 @@ public void close(ResultSet rs){
         try {
             rs.close();
         } catch (SQLException e) {
-            e.printStackTrace();
+            throw new ORMQueryException(e);
         }
     }
 

src/main/java/org/javawebstack/orm/wrapper/SQL.java

@@ -10,6 +10,5 @@ public interface SQL {
     ResultSet read(String queryString, Object... parameters) throws SQLException;
     int write(String queryString, Object... parameters) throws SQLException;
     void close(ResultSet resultSet);
-    void setDebugMode(boolean debugMode);
 
 }