Removing unused code

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

diff --git a/datarouter-prov/src/main/java/org/onap/dmaap/datarouter/provisioning/beans/Group.java b/datarouter-prov/src/main/java/org/onap/dmaap/datarouter/provisioning/beans/Group.java
index 8904765..da682d7 100644 (file)
--- a/datarouter-prov/src/main/java/org/onap/dmaap/datarouter/provisioning/beans/Group.java
+++ b/datarouter-prov/src/main/java/org/onap/dmaap/datarouter/provisioning/beans/Group.java
@@ -46,6 +46,7 @@ public class Group extends Syncable {
 \r
     private static EELFLogger intlogger = EELFManager.getInstance().getLogger("InternalLog");\r
     private static int next_groupid = getMaxGroupID() + 1;\r
+    private static final String SQLEXCEPTION = "SQLException: ";\r
 \r
     private int groupid;\r
     private String authid;\r
@@ -107,7 +108,7 @@ public class Group extends Syncable {
             }\r
             db.release(conn);\r
         } catch (SQLException e) {\r
-            intlogger.error("SQLException " + e.getMessage());\r
+            intlogger.error("PROV0009 getGroupsForSQL: " + e.getMessage(), e);\r
         }\r
         return list;\r
     }\r
@@ -127,59 +128,11 @@ public class Group extends Syncable {
             }\r
             db.release(conn);\r
         } catch (SQLException e) {\r
-            intlogger.info("getMaxSubID: " + e.getMessage());\r
+            intlogger.info("PROV0001 getMaxSubID: " + e.getMessage(), e);\r
         }\r
         return max;\r
     }\r
 \r
-    public static Collection<String> getGroupsByClassfication(String classfication) {\r
-        List<String> list = new ArrayList<>();\r
-        String sql = "select * from GROUPS where classification = ?";\r
-        try {\r
-            DB db = new DB();\r
-            @SuppressWarnings("resource")\r
-            Connection conn = db.getConnection();\r
-            try (PreparedStatement stmt = conn.prepareStatement(sql)) {\r
-                stmt.setString(1, classfication);\r
-                try (ResultSet rs = stmt.executeQuery()) {\r
-                    while (rs.next()) {\r
-                        int groupid = rs.getInt("groupid");\r
-\r
-                    }\r
-                }\r
-            }\r
-            db.release(conn);\r
-        } catch (SQLException e) {\r
-            intlogger.error("SQLException " + e.getMessage());\r
-        }\r
-        return list;\r
-    }\r
-\r
-    /**\r
-     * Return a count of the number of active subscriptions in the DB.\r
-     *\r
-     * @return the count\r
-     */\r
-    public static int countActiveSubscriptions() {\r
-        int count = 0;\r
-        try {\r
-            DB db = new DB();\r
-            @SuppressWarnings("resource")\r
-            Connection conn = db.getConnection();\r
-            try (Statement stmt = conn.createStatement()) {\r
-                try (ResultSet rs = stmt.executeQuery("select count(*) from SUBSCRIPTIONS")) {\r
-                    if (rs.next()) {\r
-                        count = rs.getInt(1);\r
-                    }\r
-                }\r
-            }\r
-            db.release(conn);\r
-        } catch (SQLException e) {\r
-            intlogger.warn("PROV0008 countActiveSubscriptions: " + e.getMessage());\r
-        }\r
-        return count;\r
-    }\r
-\r
     public Group() {\r
         this("", "", "");\r
     }\r
@@ -229,7 +182,8 @@ public class Group extends Syncable {
         } catch (InvalidObjectException e) {\r
             throw e;\r
         } catch (Exception e) {\r
-            throw new InvalidObjectException("invalid JSON: " + e.getMessage());\r
+            intlogger.warn("Invalid JSON: " + e.getMessage(), e);\r
+            throw new InvalidObjectException("Invalid JSON: " + e.getMessage());\r
         }\r
     }\r
 \r
@@ -249,14 +203,6 @@ public class Group extends Syncable {
         Group.intlogger = intlogger;\r
     }\r
 \r
-    public static int getNext_groupid() {\r
-        return next_groupid;\r
-    }\r
-\r
-    public static void setNext_groupid(int next_groupid) {\r
-        Group.next_groupid = next_groupid;\r
-    }\r
-\r
     public String getAuthid() {\r
         return authid;\r
     }\r
@@ -293,19 +239,6 @@ public class Group extends Syncable {
         return members;\r
     }\r
 \r
-    public void setMembers(String members) {\r
-        this.members = members;\r
-    }\r
-\r
-    public Date getLast_mod() {\r
-        return last_mod;\r
-    }\r
-\r
-    public void setLast_mod(Date last_mod) {\r
-        this.last_mod = last_mod;\r
-    }\r
-\r
-\r
     @Override\r
     public JSONObject asJSONObject() {\r
         JSONObject jo = new JSONObject();\r
@@ -346,14 +279,14 @@ public class Group extends Syncable {
             ps.close();\r
         } catch (SQLException e) {\r
             rv = false;\r
-            intlogger.warn("PROV0005 doInsert: " + e.getMessage());\r
+            intlogger.warn("PROV0005 doInsert: " + e.getMessage(), e);\r
         } finally {\r
             try {\r
                 if (ps != null) {\r
                     ps.close();\r
                 }\r
             } catch (SQLException e) {\r
-                intlogger.error("SQLException " + e.getMessage());\r
+                intlogger.error(SQLEXCEPTION + e.getMessage(), e);\r
             }\r
         }\r
         return rv;\r
@@ -375,14 +308,14 @@ public class Group extends Syncable {
             ps.executeUpdate();\r
         } catch (SQLException e) {\r
             rv = false;\r
-            intlogger.warn("PROV0006 doUpdate: " + e.getMessage());\r
+            intlogger.warn("PROV0006 doUpdate: " + e.getMessage(), e);\r
         } finally {\r
             try {\r
                 if (ps != null) {\r
                     ps.close();\r
                 }\r
             } catch (SQLException e) {\r
-                intlogger.error("SQLException " + e.getMessage());\r
+                intlogger.error(SQLEXCEPTION + e.getMessage(), e);\r
             }\r
         }\r
         return rv;\r
@@ -399,14 +332,14 @@ public class Group extends Syncable {
             ps.execute();\r
         } catch (SQLException e) {\r
             rv = false;\r
-            intlogger.warn("PROV0007 doDelete: " + e.getMessage());\r
+            intlogger.warn("PROV0007 doDelete: " + e.getMessage(), e);\r
         } finally {\r
             try {\r
                 if (ps != null) {\r
                     ps.close();\r
                 }\r
             } catch (SQLException e) {\r
-                intlogger.error("SQLException " + e.getMessage());\r
+                intlogger.error(SQLEXCEPTION + e.getMessage(), e);\r
             }\r
         }\r
         return rv;\r