Remove critical code smells Bean classes

Change-Id: Ia39f58c8b4dd6c0fd15e022aee126f6524aec175
Issue-ID: DMAAP-1195
Signed-off-by: econwar <conor.ward@est.tech>

diff --git a/datarouter-prov/src/main/java/org/onap/dmaap/datarouter/provisioning/beans/EgressRoute.java b/datarouter-prov/src/main/java/org/onap/dmaap/datarouter/provisioning/beans/EgressRoute.java
index 1213596..e766e70 100644 (file)
--- a/datarouter-prov/src/main/java/org/onap/dmaap/datarouter/provisioning/beans/EgressRoute.java
+++ b/datarouter-prov/src/main/java/org/onap/dmaap/datarouter/provisioning/beans/EgressRoute.java
@@ -47,6 +47,7 @@ import org.onap.dmaap.datarouter.provisioning.utils.DB;
 public class EgressRoute extends NodeClass implements Comparable<EgressRoute> {\r
 \r
     private static EELFLogger intlogger = EELFManager.getInstance().getLogger("InternalLog");\r
+    private static final String SQLEXCEPTION = "SQLException: ";\r
     private final int subid;\r
     private final int nodeid;\r
 \r
@@ -57,7 +58,7 @@ public class EgressRoute extends NodeClass implements Comparable<EgressRoute> {
      * @return the sorted set\r
      */\r
     public static SortedSet<EgressRoute> getAllEgressRoutes() {\r
-        SortedSet<EgressRoute> set = new TreeSet<EgressRoute>();\r
+        SortedSet<EgressRoute> set = new TreeSet<>();\r
         try {\r
             DB db = new DB();\r
             @SuppressWarnings("resource")\r
@@ -74,7 +75,7 @@ public class EgressRoute extends NodeClass implements Comparable<EgressRoute> {
 \r
             db.release(conn);\r
         } catch (SQLException e) {\r
-            intlogger.error("SQLException " + e.getMessage());\r
+            intlogger.error("PROV0008 EgressRoute.getAllEgressRoutes: " + e.getMessage(), e);\r
         }\r
         return set;\r
     }\r
@@ -104,20 +105,20 @@ public class EgressRoute extends NodeClass implements Comparable<EgressRoute> {
             ps.close();\r
             db.release(conn);\r
         } catch (SQLException e) {\r
-            intlogger.error("SQLException " + e.getMessage());\r
+            intlogger.error("PROV0009 EgressRoute.getEgressRoute: " + 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 v;\r
     }\r
 \r
-    public EgressRoute(int subid, int nodeid) throws IllegalArgumentException {\r
+    public EgressRoute(int subid, int nodeid) {\r
         this.subid = subid;\r
         this.nodeid = nodeid;\r
 // Note: unlike for Feeds, it subscriptions can be removed from the tables, so it is\r
@@ -126,7 +127,7 @@ public class EgressRoute extends NodeClass implements Comparable<EgressRoute> {
 //            throw new IllegalArgumentException("No such subscription: "+subid);\r
     }\r
 \r
-    public EgressRoute(int subid, String node) throws IllegalArgumentException {\r
+    public EgressRoute(int subid, String node) {\r
         this(subid, lookupNodeName(node));\r
     }\r
 \r
@@ -141,15 +142,14 @@ public class EgressRoute extends NodeClass implements Comparable<EgressRoute> {
             ps.execute();\r
         } catch (SQLException e) {\r
             rv = false;\r
-            intlogger.warn("PROV0007 doDelete: " + e.getMessage());\r
-            intlogger.error("SQLException " + e.getMessage());\r
+            intlogger.error("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
@@ -169,14 +169,14 @@ public class EgressRoute extends NodeClass implements Comparable<EgressRoute> {
             ps.close();\r
             rv = true;\r
         } catch (SQLException e) {\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
@@ -194,14 +194,14 @@ public class EgressRoute extends NodeClass implements Comparable<EgressRoute> {
             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

diff --git a/datarouter-prov/src/main/java/org/onap/dmaap/datarouter/provisioning/beans/Feed.java b/datarouter-prov/src/main/java/org/onap/dmaap/datarouter/provisioning/beans/Feed.java
index 506821e..cab4d3d 100644 (file)
--- a/datarouter-prov/src/main/java/org/onap/dmaap/datarouter/provisioning/beans/Feed.java
+++ b/datarouter-prov/src/main/java/org/onap/dmaap/datarouter/provisioning/beans/Feed.java
@@ -47,6 +47,7 @@ import java.util.*;
 public class Feed extends Syncable {\r
     private static EELFLogger intlogger = EELFManager.getInstance().getLogger("InternalLog");\r
     private static int next_feedid = getMaxFeedID() + 1;\r
+    private static final String SQLEXCEPTION = "SQLException: ";\r
 \r
     private int feedid;\r
     private int groupid; //New field is added - Groups feature Rally:US708115 - 1610\r
@@ -85,7 +86,7 @@ public class Feed extends Syncable {
             }\r
             db.release(conn);\r
         } catch (SQLException e) {\r
-            intlogger.warn("PROV0024 Feed.isFeedValid: ", e.getMessage());\r
+            intlogger.warn("PROV0024 Feed.isFeedValid: " + e.getMessage(), e);\r
         }\r
         return count != 0;\r
     }\r
@@ -135,7 +136,7 @@ public class Feed extends Syncable {
             }\r
             db.release(conn);\r
         } catch (SQLException e) {\r
-            intlogger.warn("PROV0025 Feed.countActiveFeeds: ", e.getMessage());\r
+            intlogger.warn("PROV0025 Feed.countActiveFeeds: " + e.getMessage(), e);\r
         }\r
         return count;\r
     }\r
@@ -155,7 +156,7 @@ public class Feed extends Syncable {
             }\r
             db.release(conn);\r
         } catch (SQLException e) {\r
-            intlogger.warn("PROV0026 Feed.getMaxFeedID: ", e.getMessage());\r
+            intlogger.warn("PROV0026 Feed.getMaxFeedID: " + e.getMessage(), e);\r
         }\r
         return max;\r
     }\r
@@ -201,7 +202,7 @@ public class Feed extends Syncable {
             }\r
             db.release(conn);\r
         } catch (SQLException e) {\r
-            intlogger.warn("PROV0027 Feed.getAllFeeds: ", e.getMessage());\r
+            intlogger.warn("PROV0027 Feed.getAllFeeds: " + e.getMessage(), e);\r
         }\r
         return map.values();\r
     }\r
@@ -235,7 +236,7 @@ public class Feed extends Syncable {
             }\r
             db.release(conn);\r
         } catch (SQLException e) {\r
-            intlogger.warn("PROV0028 Feed.getFilteredFeedUrlList: ", e.getMessage());\r
+            intlogger.warn("PROV0028 Feed.getFilteredFeedUrlList: " + e.getMessage(), e);\r
         }\r
         return list;\r
     }\r
@@ -272,7 +273,7 @@ public class Feed extends Syncable {
             }\r
             db.release(conn);\r
         } catch (SQLException e) {\r
-            intlogger.warn("PROV0029 Feed.getFeedBySQL: ", e.getMessage());\r
+            intlogger.warn("PROV0029 Feed.getFeedBySQL: " + e.getMessage(), e);\r
         }\r
         return feed;\r
     }\r
@@ -338,6 +339,7 @@ public class Feed extends Syncable {
             try {\r
                 this.version = jo.getString("version");\r
             } catch (JSONException e) {\r
+                intlogger.warn("PROV0023 Feed.Feed: " + e.getMessage(), e);\r
                 this.version = null;\r
             }\r
             if(version != null && version.length() > 20)\r
@@ -379,11 +381,10 @@ public class Feed extends Syncable {
             JSONObject jol = jo.optJSONObject("links");\r
             this.links = (jol == null) ? (new FeedLinks()) : (new FeedLinks(jol));\r
         } catch (InvalidObjectException e) {\r
-            intlogger.warn("PROV0030 Feed.Feed: ", e.getMessage());\r
             throw e;\r
         } catch (Exception e) {\r
-            intlogger.error("PROV0031 Feed.Feed: invalid JSON: "+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
@@ -555,15 +556,14 @@ public class Feed extends Syncable {
             ps.execute();\r
         } catch (SQLException e) {\r
             rv = false;\r
-            intlogger.warn("PROV0007 doDelete: " + e.getMessage());\r
-            intlogger.error("SQLException " + e.getMessage());\r
+            intlogger.error("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
@@ -624,8 +624,7 @@ public class Feed extends Syncable {
             }\r
         } catch (SQLException e) {\r
             rv = false;\r
-            intlogger.warn("PROV0005 doInsert: " + e.getMessage());\r
-            intlogger.error("SQLException " + e.getMessage());\r
+            intlogger.error("PROV0005 doInsert: " + e.getMessage(), e);\r
         }\r
         return rv;\r
     }\r
@@ -705,13 +704,13 @@ public class Feed extends Syncable {
             ps.close();\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
             } catch (SQLException e) {\r
-                intlogger.error("SQLException " + e.getMessage());\r
+                intlogger.error(SQLEXCEPTION + e.getMessage(), e);\r
             }\r
         }\r
         return rv;\r
@@ -737,14 +736,14 @@ public class Feed extends Syncable {
             ps.close();\r
         } catch (SQLException e) {\r
             rv = false;\r
-            intlogger.warn("PROV0006 doUpdate: " + e.getMessage());\r
+            intlogger.warn("PROV0008 changeOwnerShip: " + 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

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..be4c640 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,7 +128,7 @@ 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
@@ -150,7 +151,7 @@ public class Group extends Syncable {
             }\r
             db.release(conn);\r
         } catch (SQLException e) {\r
-            intlogger.error("SQLException " + e.getMessage());\r
+            intlogger.error("PROV0002 getGroupsByClassfication: " + e.getMessage(), e);\r
         }\r
         return list;\r
     }\r
@@ -175,7 +176,7 @@ public class Group extends Syncable {
             }\r
             db.release(conn);\r
         } catch (SQLException e) {\r
-            intlogger.warn("PROV0008 countActiveSubscriptions: " + e.getMessage());\r
+            intlogger.warn("PROV0008 countActiveSubscriptions: " + e.getMessage(), e);\r
         }\r
         return count;\r
     }\r
@@ -229,7 +230,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
@@ -346,14 +348,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 +377,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 +401,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

diff --git a/datarouter-prov/src/main/java/org/onap/dmaap/datarouter/provisioning/beans/IngressRoute.java b/datarouter-prov/src/main/java/org/onap/dmaap/datarouter/provisioning/beans/IngressRoute.java
index bbed37a..4332d7d 100644 (file)
--- a/datarouter-prov/src/main/java/org/onap/dmaap/datarouter/provisioning/beans/IngressRoute.java
+++ b/datarouter-prov/src/main/java/org/onap/dmaap/datarouter/provisioning/beans/IngressRoute.java
@@ -55,6 +55,7 @@ import org.onap.dmaap.datarouter.provisioning.utils.DB;
 public class IngressRoute extends NodeClass implements Comparable<IngressRoute> {\r
 \r
     private static EELFLogger intlogger = EELFManager.getInstance().getLogger("InternalLog");\r
+    private static final String SQLEXCEPTION = "SQLException: ";\r
     private final int seq;\r
     private final int feedid;\r
     private final String userid;\r
@@ -102,7 +103,7 @@ public class IngressRoute extends NodeClass implements Comparable<IngressRoute>
             }\r
             db.release(conn);\r
         } catch (SQLException e) {\r
-            intlogger.error("SQLException " + e.getMessage());\r
+            intlogger.error("PROV0001 getAllIngressRoutesForSQL: " + e.getMessage(), e);\r
         }\r
         return set;\r
     }\r
@@ -140,7 +141,7 @@ public class IngressRoute extends NodeClass implements Comparable<IngressRoute>
             }\r
             db.release(conn);\r
         } catch (SQLException e) {\r
-            intlogger.error("SQLException " + e.getMessage());\r
+            intlogger.error("PROV0002 getMax: " + e.getMessage(), e);\r
         }\r
         return rv;\r
     }\r
@@ -175,14 +176,14 @@ public class IngressRoute extends NodeClass implements Comparable<IngressRoute>
             ps.close();\r
             db.release(conn);\r
         } catch (SQLException e) {\r
-            intlogger.error("SQLException " + e.getMessage());\r
+            intlogger.error("PROV0003 getIngressRoute: " + 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 v;\r
@@ -215,7 +216,7 @@ public class IngressRoute extends NodeClass implements Comparable<IngressRoute>
             }\r
             db.release(conn);\r
         } catch (SQLException e) {\r
-            intlogger.error("SQLException " + e.getMessage());\r
+            intlogger.error("PROV0004 getIngressRoute: " + e.getMessage(), e);\r
         }\r
         return rv;\r
     }\r
@@ -307,6 +308,7 @@ public class IngressRoute extends NodeClass implements Comparable<IngressRoute>
                 SubnetMatcher sm = new SubnetMatcher(subnet);\r
                 return sm.matches(inet.getAddress());\r
             } catch (UnknownHostException e) {\r
+                intlogger.error("PROV0008 matches: " + e.getMessage(), e);\r
                 return false;\r
             }\r
         }\r
@@ -337,6 +339,7 @@ public class IngressRoute extends NodeClass implements Comparable<IngressRoute>
                     len = sn.length;\r
                     valid = true;\r
                 } catch (UnknownHostException e) {\r
+                    intlogger.error("PROV0008 SubnetMatcher: " + e.getMessage(), e);\r
                     len = 0;\r
                     valid = false;\r
                 }\r
@@ -347,6 +350,7 @@ public class IngressRoute extends NodeClass implements Comparable<IngressRoute>
                     sn = InetAddress.getByName(subnet.substring(0, i)).getAddress();\r
                     valid = true;\r
                 } catch (UnknownHostException e) {\r
+                    intlogger.error("PROV0008 SubnetMatcher: " + e.getMessage(), e);\r
                     valid = false;\r
                 }\r
                 len = n / 8;\r
@@ -390,7 +394,7 @@ public class IngressRoute extends NodeClass implements Comparable<IngressRoute>
     }\r
 \r
     private Collection<String> readNodes() {\r
-        Collection<String> set = new TreeSet<String>();\r
+        Collection<String> set = new TreeSet<>();\r
         try {\r
             DB db = new DB();\r
             @SuppressWarnings("resource")\r
@@ -407,7 +411,7 @@ public class IngressRoute extends NodeClass implements Comparable<IngressRoute>
             }\r
             db.release(conn);\r
         } catch (SQLException e) {\r
-            intlogger.error("SQLException " + e.getMessage());\r
+            intlogger.error(SQLEXCEPTION + e.getMessage(), e);\r
         }\r
         return set;\r
     }\r
@@ -434,14 +438,14 @@ public class IngressRoute extends NodeClass implements Comparable<IngressRoute>
             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
@@ -477,14 +481,14 @@ public class IngressRoute extends NodeClass implements Comparable<IngressRoute>
             ps.close();\r
             rv = true;\r
         } catch (SQLException e) {\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
@@ -524,14 +528,10 @@ public class IngressRoute extends NodeClass implements Comparable<IngressRoute>
 \r
     @Override\r
     public boolean equals(Object obj) {\r
-        try {\r
-            if (!(obj instanceof IngressRoute)) {\r
-                return false;\r
-            }\r
-            return this.compareTo((IngressRoute) obj) == 0;\r
-        } catch (NullPointerException e) {\r
+        if (!(obj instanceof IngressRoute)) {\r
             return false;\r
         }\r
+        return this.compareTo((IngressRoute) obj) == 0;\r
     }\r
 \r
     @Override\r

diff --git a/datarouter-prov/src/main/java/org/onap/dmaap/datarouter/provisioning/beans/LogRecord.java b/datarouter-prov/src/main/java/org/onap/dmaap/datarouter/provisioning/beans/LogRecord.java
index 86d1fae..cbddbf4 100644 (file)
--- a/datarouter-prov/src/main/java/org/onap/dmaap/datarouter/provisioning/beans/LogRecord.java
+++ b/datarouter-prov/src/main/java/org/onap/dmaap/datarouter/provisioning/beans/LogRecord.java
@@ -77,7 +77,7 @@ public class LogRecord extends BaseLogRecord {
                 }\r
             }\r
         } catch (SQLException e) {\r
-            intlogger.error("SQLException: " + e.getMessage());\r
+            intlogger.error("PROV0001 printLogRecords: " + e.getMessage(), e);\r
         }\r
     }\r
 \r

diff --git a/datarouter-prov/src/main/java/org/onap/dmaap/datarouter/provisioning/beans/NetworkRoute.java b/datarouter-prov/src/main/java/org/onap/dmaap/datarouter/provisioning/beans/NetworkRoute.java
index 94eeec4..eeca090 100644 (file)
--- a/datarouter-prov/src/main/java/org/onap/dmaap/datarouter/provisioning/beans/NetworkRoute.java
+++ b/datarouter-prov/src/main/java/org/onap/dmaap/datarouter/provisioning/beans/NetworkRoute.java
@@ -47,6 +47,7 @@ import org.onap.dmaap.datarouter.provisioning.utils.DB;
 public class NetworkRoute extends NodeClass implements Comparable<NetworkRoute> {\r
 \r
     private static EELFLogger intlogger = EELFManager.getInstance().getLogger("InternalLog");\r
+    private static final String SQLEXCEPTION = "SQLException: ";\r
     private final int fromnode;\r
     private final int tonode;\r
     private final int vianode;\r
@@ -58,7 +59,7 @@ public class NetworkRoute extends NodeClass implements Comparable<NetworkRoute>
      * @return the sorted set\r
      */\r
     public static SortedSet<NetworkRoute> getAllNetworkRoutes() {\r
-        SortedSet<NetworkRoute> set = new TreeSet<NetworkRoute>();\r
+        SortedSet<NetworkRoute> set = new TreeSet<>();\r
         try {\r
             DB db = new DB();\r
             @SuppressWarnings("resource")\r
@@ -75,30 +76,30 @@ public class NetworkRoute extends NodeClass implements Comparable<NetworkRoute>
             }\r
             db.release(conn);\r
         } catch (SQLException e) {\r
-            intlogger.error("SQLException " + e.getMessage());\r
+            intlogger.error(SQLEXCEPTION + e.getMessage(), e);\r
         }\r
         return set;\r
     }\r
 \r
-    public NetworkRoute(String fromnode, String tonode) throws IllegalArgumentException {\r
+    public NetworkRoute(String fromnode, String tonode) {\r
         this.fromnode = lookupNodeName(fromnode);\r
         this.tonode = lookupNodeName(tonode);\r
         this.vianode = -1;\r
     }\r
 \r
-    public NetworkRoute(String fromnode, String tonode, String vianode) throws IllegalArgumentException {\r
+    public NetworkRoute(String fromnode, String tonode, String vianode) {\r
         this.fromnode = lookupNodeName(fromnode);\r
         this.tonode = lookupNodeName(tonode);\r
         this.vianode = lookupNodeName(vianode);\r
     }\r
 \r
-    public NetworkRoute(JSONObject jo) throws IllegalArgumentException {\r
+    public NetworkRoute(JSONObject jo) {\r
         this.fromnode = lookupNodeName(jo.getString("from"));\r
         this.tonode = lookupNodeName(jo.getString("to"));\r
         this.vianode = lookupNodeName(jo.getString("via"));\r
     }\r
 \r
-    public NetworkRoute(int fromnode, int tonode, int vianode) throws IllegalArgumentException {\r
+    public NetworkRoute(int fromnode, int tonode, int vianode) {\r
         this.fromnode = fromnode;\r
         this.tonode = tonode;\r
         this.vianode = vianode;\r
@@ -128,14 +129,14 @@ public class NetworkRoute extends NodeClass implements Comparable<NetworkRoute>
             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
@@ -157,14 +158,14 @@ public class NetworkRoute extends NodeClass implements Comparable<NetworkRoute>
                 ps.close();\r
                 rv = true;\r
             } catch (SQLException e) {\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
         }\r
@@ -184,14 +185,14 @@ public class NetworkRoute extends NodeClass implements Comparable<NetworkRoute>
             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

diff --git a/datarouter-prov/src/main/java/org/onap/dmaap/datarouter/provisioning/beans/Parameters.java b/datarouter-prov/src/main/java/org/onap/dmaap/datarouter/provisioning/beans/Parameters.java
index 0891486..fff10ac 100644 (file)
--- a/datarouter-prov/src/main/java/org/onap/dmaap/datarouter/provisioning/beans/Parameters.java
+++ b/datarouter-prov/src/main/java/org/onap/dmaap/datarouter/provisioning/beans/Parameters.java
@@ -69,6 +69,7 @@ public class Parameters extends Syncable {
     public static final String STATIC_ROUTING_NODES = "STATIC_ROUTING_NODES"; //Adding new param for static Routing - Rally:US664862-1610\r
 \r
     private static EELFLogger intlogger = EELFManager.getInstance().getLogger("InternalLog");\r
+    private static final String SQLEXCEPTION = "SQLException: ";\r
 \r
     private String keyname;\r
     private String value;\r
@@ -103,7 +104,7 @@ public class Parameters extends Syncable {
             }\r
             db.release(conn);\r
         } catch (SQLException e) {\r
-            intlogger.error("SQLException " + e.getMessage());\r
+            intlogger.error(SQLEXCEPTION + e.getMessage());\r
         }\r
         return coll;\r
     }\r
@@ -131,7 +132,7 @@ public class Parameters extends Syncable {
             }\r
             db.release(conn);\r
         } catch (SQLException e) {\r
-            intlogger.error("SQLException " + e.getMessage());\r
+            intlogger.error(SQLEXCEPTION + e.getMessage());\r
         }\r
         return v;\r
     }\r
@@ -187,14 +188,14 @@ public class Parameters extends Syncable {
             ps.execute();\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());\r
             }\r
         }\r
         return rv;\r
@@ -213,14 +214,14 @@ public class Parameters 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
@@ -238,14 +239,14 @@ public class Parameters 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

diff --git a/datarouter-prov/src/main/java/org/onap/dmaap/datarouter/provisioning/beans/Subscription.java b/datarouter-prov/src/main/java/org/onap/dmaap/datarouter/provisioning/beans/Subscription.java
index 442a764..c12d83d 100644 (file)
--- a/datarouter-prov/src/main/java/org/onap/dmaap/datarouter/provisioning/beans/Subscription.java
+++ b/datarouter-prov/src/main/java/org/onap/dmaap/datarouter/provisioning/beans/Subscription.java
@@ -117,7 +117,7 @@ public class Subscription extends Syncable {
             }\r
             db.release(conn);\r
         } catch (SQLException e) {\r
-            intlogger.error(e.toString());\r
+            intlogger.error("PROV0001 getSubscriptionsForSQL: " + e.toString(), e);\r
         }\r
         return list;\r
     }\r
@@ -137,7 +137,7 @@ public class Subscription extends Syncable {
             }\r
             db.release(conn);\r
         } catch (SQLException e) {\r
-            intlogger.info("getMaxSubID: " + e.getMessage());\r
+            intlogger.info("getMaxSubID: " + e.getMessage(), e);\r
         }\r
         return max;\r
     }\r
@@ -161,7 +161,7 @@ public class Subscription extends Syncable {
             }\r
             db.release(conn);\r
         } catch (SQLException e) {\r
-            intlogger.error(SQLEXCEPTION + e.getMessage());\r
+            intlogger.error(SQLEXCEPTION + e.getMessage(), e);\r
         }\r
         return list;\r
     }\r
@@ -186,7 +186,7 @@ public class Subscription extends Syncable {
             }\r
             db.release(conn);\r
         } catch (SQLException e) {\r
-            intlogger.warn("PROV0008 countActiveSubscriptions: " + e.getMessage());\r
+            intlogger.warn("PROV0008 countActiveSubscriptions: " + e.getMessage(), e);\r
         }\r
         return count;\r
     }\r
@@ -274,7 +274,8 @@ public class Subscription 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
@@ -474,14 +475,14 @@ public class Subscription 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
@@ -508,14 +509,14 @@ public class Subscription 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
@@ -541,14 +542,14 @@ public class Subscription extends Syncable {
             ps.close();\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
@@ -566,14 +567,14 @@ public class Subscription 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