Merge "Added fix for string comparison reported in sonar"

[dmaap/datarouter.git] / datarouter-prov / src / main / java / org / onap / dmaap / datarouter / provisioning / StatisticsServlet.java

diff --git a/datarouter-prov/src/main/java/org/onap/dmaap/datarouter/provisioning/StatisticsServlet.java b/datarouter-prov/src/main/java/org/onap/dmaap/datarouter/provisioning/StatisticsServlet.java
index 134a595..4917402 100755 (executable)
--- a/datarouter-prov/src/main/java/org/onap/dmaap/datarouter/provisioning/StatisticsServlet.java
+++ b/datarouter-prov/src/main/java/org/onap/dmaap/datarouter/provisioning/StatisticsServlet.java
@@ -180,39 +180,8 @@ public class StatisticsServlet extends BaseServlet {
       outputType = req.getParameter("output_type");\r
     }\r
 \r
-    try {\r
-\r
-      String filterQuery = this.queryGeneretor(map);\r
-      eventlogger.debug("SQL Query for Statistics resultset. " + filterQuery);\r
+    this.getRecordsForSQL(map, outputType, out, resp);\r
 \r
-      ResultSet rs = this.getRecordsForSQL(filterQuery);\r
-\r
-      if (outputType.equals("csv")) {\r
-        resp.setContentType("application/octet-stream");\r
-        Date date = new Date();\r
-        SimpleDateFormat dateFormat = new SimpleDateFormat("dd-MM-YYYY HH:mm:ss");\r
-        resp.setHeader("Content-Disposition",\r
-            "attachment; filename=\"result:" + dateFormat.format(date) + ".csv\"");\r
-        eventlogger.info("Generating CSV file from Statistics resultset");\r
-\r
-        rsToCSV(rs, out);\r
-      } else {\r
-        eventlogger.info("Generating JSON for Statistics resultset");\r
-        this.rsToJson(rs, out);\r
-      }\r
-    } catch (IOException e) {\r
-      eventlogger.error("IOException - Generating JSON/CSV:" + e);\r
-      e.printStackTrace();\r
-    } catch (JSONException e) {\r
-      eventlogger.error("JSONException - executing SQL query:" + e);\r
-      e.printStackTrace();\r
-    } catch (SQLException e) {\r
-      eventlogger.error("SQLException - executing SQL query:" + e);\r
-      e.printStackTrace();\r
-    } catch (ParseException e) {\r
-      eventlogger.error("ParseException - executing SQL query:" + e);\r
-      e.printStackTrace();\r
-    }\r
   }\r
 \r
 \r
@@ -293,13 +262,13 @@ public class StatisticsServlet extends BaseServlet {
   /**\r
    * getFeedIdsByGroupId - Getting FEEDID's by GROUP ID.\r
    *\r
-   * @throws SQL Query SQLException.\r
+   * @throws SQLException Query SQLException.\r
    */\r
   public StringBuffer getFeedIdsByGroupId(int groupIds) throws SQLException {\r
 \r
     DB db = null;\r
     Connection conn = null;\r
-    PreparedStatement prepareStatement = null;\r
+    //PreparedStatement prepareStatement = null;\r
     ResultSet resultSet = null;\r
     String sqlGoupid = null;\r
     StringBuffer feedIds = new StringBuffer();\r
@@ -308,16 +277,16 @@ public class StatisticsServlet extends BaseServlet {
       db = new DB();\r
       conn = db.getConnection();\r
       sqlGoupid = " SELECT FEEDID from FEEDS  WHERE GROUPID = ?";\r
-      prepareStatement = conn.prepareStatement(sqlGoupid);\r
-      prepareStatement.setInt(1, groupIds);\r
-      resultSet = prepareStatement.executeQuery();\r
-      while (resultSet.next()) {\r
-        feedIds.append(resultSet.getInt("FEEDID"));\r
-        feedIds.append(",");\r
+      try(PreparedStatement prepareStatement = conn.prepareStatement(sqlGoupid)) {\r
+          prepareStatement.setInt(1, groupIds);\r
+          resultSet = prepareStatement.executeQuery();\r
+          while (resultSet.next()) {\r
+              feedIds.append(resultSet.getInt("FEEDID"));\r
+              feedIds.append(",");\r
+          }\r
+          feedIds.deleteCharAt(feedIds.length() - 1);\r
+          System.out.println("feedIds" + feedIds.toString());\r
       }\r
-      feedIds.deleteCharAt(feedIds.length() - 1);\r
-      System.out.println("feedIds" + feedIds.toString());\r
-\r
     } catch (SQLException e) {\r
       e.printStackTrace();\r
     } finally {\r
@@ -326,13 +295,7 @@ public class StatisticsServlet extends BaseServlet {
           resultSet.close();\r
           resultSet = null;\r
         }\r
-\r
-        if (prepareStatement != null) {\r
-          prepareStatement.close();\r
-          prepareStatement = null;\r
-        }\r
-\r
-        if (conn != null) {\r
+          if (conn != null) {\r
           db.release(conn);\r
         }\r
       } catch (Exception e) {\r
@@ -572,32 +535,46 @@ public class StatisticsServlet extends BaseServlet {
     return -1;\r
   }\r
 \r
-\r
-  private ResultSet getRecordsForSQL(String sql) {\r
-    intlogger.debug(sql);\r
-    long start = System.currentTimeMillis();\r
-    DB db = new DB();\r
-    Connection conn = null;\r
-    ResultSet rs = null;\r
-\r
+  private void getRecordsForSQL(Map<String, String> map, String outputType, ServletOutputStream out, HttpServletResponse resp) {\r
     try {\r
-      conn = db.getConnection();\r
-      Statement stmt = conn.createStatement();\r
-      PreparedStatement pst = conn.prepareStatement(sql);\r
-      rs = pst.executeQuery();\r
-      //this.rsToJson(rs)\r
-      //rs.close();\r
-      stmt.close();\r
-    } catch (SQLException e) {\r
-      e.printStackTrace();\r
-    } finally {\r
-      if (conn != null) {\r
-        db.release(conn);\r
+\r
+      String filterQuery = this.queryGeneretor(map);\r
+      eventlogger.debug("SQL Query for Statistics resultset. " + filterQuery);\r
+      intlogger.debug(filterQuery);\r
+      long start = System.currentTimeMillis();\r
+      DB db = new DB();\r
+      ResultSet rs = null;\r
+      try (Connection conn = db.getConnection()) {\r
+        try (PreparedStatement pst = conn.prepareStatement(filterQuery)) {\r
+          rs = pst.executeQuery();\r
+          if (outputType.equals("csv")) {\r
+            resp.setContentType("application/octet-stream");\r
+            Date date = new Date();\r
+            SimpleDateFormat dateFormat = new SimpleDateFormat("dd-MM-YYYY HH:mm:ss");\r
+            resp.setHeader("Content-Disposition",\r
+                    "attachment; filename=\"result:" + dateFormat.format(date) + ".csv\"");\r
+            eventlogger.info("Generating CSV file from Statistics resultset");\r
+\r
+            rsToCSV(rs, out);\r
+          } else {\r
+            eventlogger.info("Generating JSON for Statistics resultset");\r
+            this.rsToJson(rs, out);\r
+          }\r
+        }\r
+      } catch (SQLException e) {\r
+        e.printStackTrace();\r
       }\r
+      intlogger.debug("Time: " + (System.currentTimeMillis() - start) + " ms");\r
+    } catch (IOException e) {\r
+      eventlogger.error("IOException - Generating JSON/CSV:" + e);\r
+      e.printStackTrace();\r
+    } catch (JSONException e) {\r
+      eventlogger.error("JSONException - executing SQL query:" + e);\r
+      e.printStackTrace();\r
+    } catch (ParseException e) {\r
+      eventlogger.error("ParseException - executing SQL query:" + e);\r
+      e.printStackTrace();\r
     }\r
-\r
-    intlogger.debug("Time: " + (System.currentTimeMillis() - start) + " ms");\r
-\r
-    return rs;\r
   }\r
 }\r
+\r