Merge pull request iluwatar#611 from mookkiah/issue_587_dao

iluwatar · web-flow · commit 68d094a84712 · 2017-08-17T22:24:52.000+03:00
Issue 587 SonarQube reports bugs - Module DAO
diff --git a/dao/src/main/java/com/iluwatar/dao/DbCustomerDao.java b/dao/src/main/java/com/iluwatar/dao/DbCustomerDao.java
@@ -65,8 +65,8 @@ public Stream<Customer> getAll() throws Exception {
     Connection connection;
     try {
       connection = getConnection();
-      PreparedStatement statement = connection.prepareStatement("SELECT * FROM CUSTOMERS");
-      ResultSet resultSet = statement.executeQuery();
+      PreparedStatement statement = connection.prepareStatement("SELECT * FROM CUSTOMERS");  //NOSONAR
+      ResultSet resultSet = statement.executeQuery(); //NOSONAR
       return StreamSupport.stream(new Spliterators.AbstractSpliterator<Customer>(Long.MAX_VALUE, 
           Spliterator.ORDERED) {
 
@@ -82,7 +82,7 @@ public boolean tryAdvance(Consumer<? super Customer> action) {
             throw new RuntimeException(e);
           }
         }
-      }, false).onClose(() -> mutedClose(connection));
+      }, false).onClose(() -> mutedClose(connection, statement, resultSet));
     } catch (SQLException e) {
       throw new Exception(e.getMessage(), e);
     }
@@ -92,8 +92,10 @@ private Connection getConnection() throws SQLException {
     return dataSource.getConnection();
   }
 
-  private void mutedClose(Connection connection) {
+  private void mutedClose(Connection connection, PreparedStatement statement, ResultSet resultSet) {
     try {
+      resultSet.close();
+      statement.close();
       connection.close();
     } catch (SQLException e) {
       e.printStackTrace();
