X-Git-Url: https://gerrit.onap.org/r/gitweb?a=blobdiff_plain;f=datarouter-prov%2Fsrc%2Fmain%2Fjava%2Forg%2Fonap%2Fdmaap%2Fdatarouter%2Fprovisioning%2FStatisticsServlet.java;h=4917402ca9fa308be5b4ef377ce01c74e6286816;hb=dffdd1d82c6aa0adfb7a24703af48870f182ccfa;hp=134a595b0ed8106464f8fc37980fa8131953bd90;hpb=9d8f44daae28d5a9c8113be7f280090b950b859e;p=dmaap%2Fdatarouter.git

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