X-Git-Url: https://gerrit.onap.org/r/gitweb?a=blobdiff_plain;f=datarouter-prov%2Fsrc%2Fmain%2Fjava%2Forg%2Fonap%2Fdmaap%2Fdatarouter%2Fprovisioning%2Fbeans%2FFeed.java;h=3462e2347bbe57bd11c6292afcfecf2ec38bc488;hb=refs%2Fchanges%2F22%2F92022%2F2;hp=506821e2d5e38b0ceb9932291442c88e03db673e;hpb=b60213dc26540543f500b3442b061565907c3cf8;p=dmaap%2Fdatarouter.git

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 506821e2..3462e234 100644
--- 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 {
     private static EELFLogger intlogger = EELFManager.getInstance().getLogger("InternalLog");
     private static int next_feedid = getMaxFeedID() + 1;
+    private static final String SQLEXCEPTION = "SQLException: ";
 
     private int feedid;
     private int groupid; //New field is added - Groups feature Rally:US708115 - 1610
@@ -85,7 +86,7 @@ public class Feed extends Syncable {
             }
             db.release(conn);
         } catch (SQLException e) {
-            intlogger.warn("PROV0024 Feed.isFeedValid: ", e.getMessage());
+            intlogger.warn("PROV0024 Feed.isFeedValid: " + e.getMessage(), e);
         }
         return count != 0;
     }
@@ -135,7 +136,7 @@ public class Feed extends Syncable {
             }
             db.release(conn);
         } catch (SQLException e) {
-            intlogger.warn("PROV0025 Feed.countActiveFeeds: ", e.getMessage());
+            intlogger.warn("PROV0025 Feed.countActiveFeeds: " + e.getMessage(), e);
         }
         return count;
     }
@@ -155,13 +156,13 @@ public class Feed extends Syncable {
             }
             db.release(conn);
         } catch (SQLException e) {
-            intlogger.warn("PROV0026 Feed.getMaxFeedID: ", e.getMessage());
+            intlogger.warn("PROV0026 Feed.getMaxFeedID: " + e.getMessage(), e);
         }
         return max;
     }
 
     public static Collection<Feed> getAllFeeds() {
-        Map<Integer, Feed> map = new HashMap<Integer, Feed>();
+        Map<Integer, Feed> map = new HashMap<>();
         try {
             DB db = new DB();
             @SuppressWarnings("resource")
@@ -201,13 +202,13 @@ public class Feed extends Syncable {
             }
             db.release(conn);
         } catch (SQLException e) {
-            intlogger.warn("PROV0027 Feed.getAllFeeds: ", e.getMessage());
+            intlogger.warn("PROV0027 Feed.getAllFeeds: " + e.getMessage(), e);
         }
         return map.values();
     }
 
     public static List<String> getFilteredFeedUrlList(final String name, final String val) {
-        List<String> list = new ArrayList<String>();
+        List<String> list = new ArrayList<>();
         String sql = "select SELF_LINK from FEEDS where DELETED = 0";
         if (name.equals("name")) {
             sql += " and NAME = ?";
@@ -235,7 +236,7 @@ public class Feed extends Syncable {
             }
             db.release(conn);
         } catch (SQLException e) {
-            intlogger.warn("PROV0028 Feed.getFilteredFeedUrlList: ", e.getMessage());
+            intlogger.warn("PROV0028 Feed.getFilteredFeedUrlList: " + e.getMessage(), e);
         }
         return list;
     }
@@ -272,7 +273,7 @@ public class Feed extends Syncable {
             }
             db.release(conn);
         } catch (SQLException e) {
-            intlogger.warn("PROV0029 Feed.getFeedBySQL: ", e.getMessage());
+            intlogger.warn("PROV0029 Feed.getFeedBySQL: " + e.getMessage(), e);
         }
         return feed;
     }
@@ -328,16 +329,15 @@ public class Feed extends Syncable {
             this.groupid = jo.optInt("groupid");
             this.name = jo.getString("name");
             this.aaf_instance = jo.optString("aaf_instance", "legacy");
-            if(!(aaf_instance.equalsIgnoreCase("legacy"))){
-                if (aaf_instance.length() > 255){
+            if(!(aaf_instance.equalsIgnoreCase("legacy")) && aaf_instance.length() > 255){
                     throw new InvalidObjectException("aaf_instance field is too long");
-                }
             }
             if (name.length() > 255)
                 throw new InvalidObjectException("name field is too long");
             try {
                 this.version = jo.getString("version");
             } catch (JSONException e) {
+                intlogger.warn("PROV0023 Feed.Feed: " + e.getMessage(), e);
                 this.version = null;
             }
             if(version != null && version.length() > 20)
@@ -363,7 +363,7 @@ public class Feed extends Syncable {
                     throw new InvalidObjectException("password field is too long ("+ fid.getPassword()+")");  //Fortify scan fixes - Privacy Violation
                 this.authorization.getEndpoint_ids().add(fid);
             }
-            if (this.authorization.getEndpoint_ids().size() < 1)
+            if (this.authorization.getEndpoint_ids().isEmpty())
                 throw new InvalidObjectException("need to specify at least one endpoint_id");
             endPointIds = jauth.getJSONArray("endpoint_addrs");
             for (int i = 0; i < endPointIds.length(); i++) {
@@ -379,11 +379,10 @@ public class Feed extends Syncable {
             JSONObject jol = jo.optJSONObject("links");
             this.links = (jol == null) ? (new FeedLinks()) : (new FeedLinks(jol));
         } catch (InvalidObjectException e) {
-            intlogger.warn("PROV0030 Feed.Feed: ", e.getMessage());
             throw e;
         } catch (Exception e) {
-            intlogger.error("PROV0031 Feed.Feed: invalid JSON: "+e);
-            throw new InvalidObjectException("invalid JSON: " + e.getMessage());
+            intlogger.warn("Invalid JSON: " + e.getMessage(), e);
+            throw new InvalidObjectException("Invalid JSON: " + e.getMessage());
         }
     }
 
@@ -496,14 +495,6 @@ public class Feed extends Syncable {
         this.suspended = suspended;
     }
 
-    public Date getLast_mod() {
-        return last_mod;
-    }
-
-    public Date getCreated_date() {
-        return created_date;
-    }
-
     @Override
     public JSONObject asJSONObject() {
         JSONObject jo = new JSONObject();
@@ -555,15 +546,14 @@ public class Feed extends Syncable {
             ps.execute();
         } catch (SQLException e) {
             rv = false;
-            intlogger.warn("PROV0007 doDelete: " + e.getMessage());
-            intlogger.error("SQLException " + e.getMessage());
+            intlogger.error("PROV0007 doDelete: " + e.getMessage(), e);
         } finally {
             try {
                 if(ps!=null) {
                     ps.close();
                 }
             } catch (SQLException e) {
-                intlogger.error("SQLException " + e.getMessage());
+                intlogger.error(SQLEXCEPTION + e.getMessage(), e);
             }
         }
         return rv;
@@ -624,8 +614,7 @@ public class Feed extends Syncable {
             }
         } catch (SQLException e) {
             rv = false;
-            intlogger.warn("PROV0005 doInsert: " + e.getMessage());
-            intlogger.error("SQLException " + e.getMessage());
+            intlogger.error("PROV0005 doInsert: " + e.getMessage(), e);
         }
         return rv;
     }
@@ -705,13 +694,13 @@ public class Feed extends Syncable {
             ps.close();
         } catch (SQLException e) {
             rv = false;
-            intlogger.warn("PROV0006 doUpdate: " + e.getMessage());
+            intlogger.warn("PROV0006 doUpdate: " + e.getMessage(), e);
         } finally {
             try {
                 if (ps != null)
                     ps.close();
             } catch (SQLException e) {
-                intlogger.error("SQLException " + e.getMessage());
+                intlogger.error(SQLEXCEPTION + e.getMessage(), e);
             }
         }
         return rv;
@@ -737,14 +726,14 @@ public class Feed extends Syncable {
             ps.close();
         } catch (SQLException e) {
             rv = false;
-            intlogger.warn("PROV0006 doUpdate: " + e.getMessage());
+            intlogger.warn("PROV0008 changeOwnerShip: " + e.getMessage(), e);
         } finally {
             try {
                 if(ps!=null) {
                     ps.close();
                 }
             } catch (SQLException e) {
-                intlogger.error("SQLException " + e.getMessage());
+                intlogger.error(SQLEXCEPTION + e.getMessage(), e);
             }
         }
         return rv;