Merge branch 'release/0.1.0'

Update version to 0.1.0 - Fix some minor bugs.
SMontiel · Apr 1, 2018 · b534d35 · b534d35
2 parents 9f44c90 + 78ecca4
commit b534d35
Show file tree

Hide file tree

Showing 16 changed files with 26 additions and 51 deletions.
diff --git a/.gradle/4.5.1/fileHashes/fileHashes.bin b/.gradle/4.5.1/fileHashes/fileHashes.bin
diff --git a/.gradle/4.5.1/fileHashes/fileHashes.lock b/.gradle/4.5.1/fileHashes/fileHashes.lock
diff --git a/.gradle/4.5.1/taskHistory/taskHistory.bin b/.gradle/4.5.1/taskHistory/taskHistory.bin
diff --git a/.gradle/4.5.1/taskHistory/taskHistory.lock b/.gradle/4.5.1/taskHistory/taskHistory.lock
diff --git a/.gradle/buildOutputCleanup/buildOutputCleanup.lock b/.gradle/buildOutputCleanup/buildOutputCleanup.lock
diff --git a/.gradle/buildOutputCleanup/outputFiles.bin b/.gradle/buildOutputCleanup/outputFiles.bin
diff --git a/README.md b/README.md
@@ -27,7 +27,7 @@ allprojects {
 
 ```groovy
 dependencies {
-  compile 'com.github.SMontiel:SimpleJDBC:0.0.3'
+  compile 'com.github.SMontiel:SimpleJDBC:0.1.0'
 }
 ```
 

diff --git a/build.gradle b/build.gradle
@@ -9,7 +9,7 @@ repositories {
 
 jar {
     baseName = 'SimpleJDBC'
-    version =  '0.0.3'
+    version =  '0.1.0'
 }
 
 sourceCompatibility = 1.7

diff --git a/src/main/java/com/smontiel/simple_jdbc/SimpleJDBC.java b/src/main/java/com/smontiel/simple_jdbc/SimpleJDBC.java
@@ -64,7 +64,7 @@ private <S> S execute(Strategy<S> s) {
         try {
             return s.execute(dataSource.getConnection());
         } catch (SQLException e) {
-            Utils.printSQLException((SQLException) e);
+            Utils.printSQLException(e);
             throw new RuntimeException(e);
         }
     }

diff --git a/src/main/java/com/smontiel/simple_jdbc/Utils.java b/src/main/java/com/smontiel/simple_jdbc/Utils.java
@@ -10,9 +10,11 @@
  */
 public class Utils {
 
-    public static void printSQLException(SQLException ex) {
+    public static void printSQLException(Exception exception) {
+        if (exception == null || !(exception instanceof SQLException)) return;
 
-        for (Throwable e : ex) {
+        SQLException sqlException = (SQLException) exception;
+        for (Throwable e : sqlException) {
             if (e instanceof SQLException) {
                 if (!ignoreSQLException(
                         ((SQLException) e).
@@ -27,7 +29,7 @@ public static void printSQLException(SQLException ex) {
 
                     System.err.println("Message: " + e.getMessage());
 
-                    Throwable t = ex.getCause();
+                    Throwable t = sqlException.getCause();
                     while(t != null) {
                         System.out.println("Cause: " + t);
                         t = t.getCause();

diff --git a/src/main/java/com/smontiel/simple_jdbc/internal/strategies/ManyOrNoneStrategy.java b/src/main/java/com/smontiel/simple_jdbc/internal/strategies/ManyOrNoneStrategy.java
@@ -9,7 +9,6 @@
 import java.sql.Connection;
 import java.sql.PreparedStatement;
 import java.sql.ResultSet;
-import java.sql.SQLException;
 import java.util.ArrayList;
 import java.util.List;
 
@@ -51,7 +50,7 @@ public List<T> execute(Connection connection) {
             }
             return list;
         } catch (Exception e) {
-            Utils.printSQLException((SQLException) e);
+            Utils.printSQLException(e);
             throw new RuntimeException(e);
         }
     }

diff --git a/src/main/java/com/smontiel/simple_jdbc/internal/strategies/ManyStrategy.java b/src/main/java/com/smontiel/simple_jdbc/internal/strategies/ManyStrategy.java
@@ -9,7 +9,6 @@
 import java.sql.Connection;
 import java.sql.PreparedStatement;
 import java.sql.ResultSet;
-import java.sql.SQLException;
 import java.util.ArrayList;
 import java.util.List;
 
@@ -53,7 +52,7 @@ public List<T> execute(Connection connection) {
                 throw new IllegalStateException("No data returned from the query.");
             } else return list;
         } catch (Exception e) {
-            Utils.printSQLException((SQLException) e);
+            Utils.printSQLException(e);
             throw new RuntimeException(e);
         }
     }

diff --git a/src/main/java/com/smontiel/simple_jdbc/internal/strategies/NoneStrategy.java b/src/main/java/com/smontiel/simple_jdbc/internal/strategies/NoneStrategy.java
@@ -7,7 +7,6 @@
 import java.sql.Connection;
 import java.sql.PreparedStatement;
 import java.sql.ResultSet;
-import java.sql.SQLException;
 
 /**
  * Created by Salvador Montiel on 08/mar/2018.
@@ -39,8 +38,8 @@ public Integer execute(Connection connection) {
 
             Integer instance = stmt.getUpdateCount();
             return instance;
-        } catch (SQLException e) {
-            Utils.printSQLException((SQLException) e);
+        } catch (Exception e) {
+            Utils.printSQLException(e);
             throw new RuntimeException(e);
         }
     }

diff --git a/src/main/java/com/smontiel/simple_jdbc/internal/strategies/OneOrNoneStrategy.java b/src/main/java/com/smontiel/simple_jdbc/internal/strategies/OneOrNoneStrategy.java
@@ -9,7 +9,6 @@
 import java.sql.Connection;
 import java.sql.PreparedStatement;
 import java.sql.ResultSet;
-import java.sql.SQLException;
 
 /**
  * Created by Salvador Montiel on 08/mar/2018.
@@ -51,7 +50,7 @@ public T execute(Connection connection) {
             }
             return instance;
         } catch (Exception e) {
-            Utils.printSQLException((SQLException) e);
+            Utils.printSQLException(e);
             throw new RuntimeException(e);
         }
     }

diff --git a/src/main/java/com/smontiel/simple_jdbc/internal/strategies/OneStrategy.java b/src/main/java/com/smontiel/simple_jdbc/internal/strategies/OneStrategy.java
@@ -9,7 +9,6 @@
 import java.sql.Connection;
 import java.sql.PreparedStatement;
 import java.sql.ResultSet;
-import java.sql.SQLException;
 
 /**
  * Created by Salvador Montiel on 08/mar/2018.
@@ -53,7 +52,7 @@ public T execute(Connection connection) {
             }
             return instance;
         } catch (Exception e) {
-            Utils.printSQLException((SQLException) e);
+            Utils.printSQLException(e);
             throw new RuntimeException(e);
         }
     }

diff --git a/src/main/java/com/smontiel/simple_jdbc/internal/strategies/TransactionStrategy.java b/src/main/java/com/smontiel/simple_jdbc/internal/strategies/TransactionStrategy.java
@@ -8,7 +8,6 @@
 
 import java.sql.Connection;
 import java.sql.ResultSet;
-import java.sql.SQLException;
 import java.util.List;
 
 /**
@@ -39,12 +38,12 @@ public R execute(Connection connection) {
             instance = handler.apply(new TransactionExecutor(noCloseConnection));
             noCloseConnection.commit();
         } catch (Exception e ) {
-            Utils.printSQLException((SQLException) e);
+            Utils.printSQLException(e);
             if (noCloseConnection != null) {
                 try {
                     System.err.print("Transaction is being rolled back");
                     noCloseConnection.rollback();
-                } catch(SQLException excep) {
+                } catch(Exception excep) {
                     Utils.printSQLException(excep);
                     throw new RuntimeException(excep);
                 }
@@ -57,7 +56,7 @@ public R execute(Connection connection) {
                 if (connection != null) {
                     connection.close();
                 }
-            } catch (SQLException e) {
+            } catch (Exception e) {
                 Utils.printSQLException(e);
                 throw new RuntimeException(e);
             }
@@ -81,55 +80,34 @@ public <T> List<T> any(String sqlQuery, ThrowingFunction<ResultSet, T> handler)
 
         @Override
         public <T> List<T> many(String sqlQuery, ThrowingFunction<ResultSet, T> handler) {
-            try {
-                Strategy<List<T>> s = StrategyFactory.many(sqlQuery, handler);
-                return s.execute(connection);
-            } catch (Exception e) {
-                Utils.printSQLException((SQLException) e);
-                throw new RuntimeException(e);
-            }
+            return execute(StrategyFactory.many(sqlQuery, handler));
         }
 
         @Override
         public <T> List<T> manyOrNone(String sqlQuery, ThrowingFunction<ResultSet, T> handler) {
-            try {
-                Strategy<List<T>> s = StrategyFactory.manyOrNone(sqlQuery, handler);
-                return s.execute(connection);
-            } catch (Exception e) {
-                Utils.printSQLException((SQLException) e);
-                throw new RuntimeException(e);
-            }
+            return execute(StrategyFactory.manyOrNone(sqlQuery, handler));
         }
 
         @Override
         public Integer none(String sqlQuery) {
-            try {
-                Strategy<Integer> s = StrategyFactory.none(sqlQuery);
-                return s.execute(connection);
-            } catch (Exception e) {
-                Utils.printSQLException((SQLException) e);
-                throw new RuntimeException(e);
-            }
+            return execute(StrategyFactory.none(sqlQuery));
         }
 
         @Override
         public <T> T one(String sqlQuery, ThrowingFunction<ResultSet, T> handler) {
-            try {
-                Strategy<T> s = StrategyFactory.one(sqlQuery, handler);
-                return s.execute(connection);
-            } catch (Exception e) {
-                Utils.printSQLException((SQLException) e);
-                throw new RuntimeException(e);
-            }
+            return execute(StrategyFactory.one(sqlQuery, handler));
         }
 
         @Override
         public <T> T oneOrNone(String sqlQuery, ThrowingFunction<ResultSet, T> handler) {
+            return execute(StrategyFactory.oneOrNone(sqlQuery, handler));
+        }
+
+        private <S> S execute(Strategy<S> s) {
             try {
-                Strategy<T> s = StrategyFactory.oneOrNone(sqlQuery, handler);
                 return s.execute(connection);
             } catch (Exception e) {
-                Utils.printSQLException((SQLException) e);
+                Utils.printSQLException(e);
                 throw new RuntimeException(e);
             }
         }