X-Git-Url: https://gerrit.onap.org/r/gitweb?p=dmaap%2Fdatarouter.git;a=blobdiff_plain;f=datarouter-prov%2Fsrc%2Fmain%2Fjava%2Forg%2Fonap%2Fdmaap%2Fdatarouter%2Fprovisioning%2Fbeans%2FNetworkRoute.java;h=6ac05445e0468899d116aff5ff1c73b46c3f116c;hp=bad6f53795daec1df388f9ee8a8174529a191e4d;hb=534c164c124950a2019acf71d253ac96be12c78c;hpb=478e29d6504d776e139468b381548ecfa58c7518

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 bad6f537..6ac05445 100644
--- 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
@@ -33,7 +33,8 @@ import java.util.Objects;
 import java.util.SortedSet;
 import java.util.TreeSet;
 
-import org.apache.log4j.Logger;
+import com.att.eelf.configuration.EELFLogger;
+import com.att.eelf.configuration.EELFManager;
 import org.json.JSONObject;
 import org.onap.dmaap.datarouter.provisioning.utils.DB;
 
@@ -44,25 +45,27 @@ import org.onap.dmaap.datarouter.provisioning.utils.DB;
  * @version $Id: NetworkRoute.java,v 1.2 2013/12/16 20:30:23 eby Exp $
  */
 public class NetworkRoute extends NodeClass implements Comparable<NetworkRoute> {
-    private static Logger intlogger = Logger.getLogger("org.onap.dmaap.datarouter.provisioning.internal");
+
+    private static EELFLogger intlogger = EELFManager.getInstance().getLogger("InternalLog");
+    private static final String SQLEXCEPTION = "SQLException: ";
     private final int fromnode;
     private final int tonode;
     private final int vianode;
 
     /**
-     * Get a set of all Network Routes in the DB.  The set is sorted according to the natural sorting order
-     * of the routes (based on the from and to node names in each route).
+     * Get a set of all Network Routes in the DB.  The set is sorted according to the natural sorting order of the
+     * routes (based on the from and to node names in each route).
      *
      * @return the sorted set
      */
     public static SortedSet<NetworkRoute> getAllNetworkRoutes() {
-        SortedSet<NetworkRoute> set = new TreeSet<NetworkRoute>();
+        SortedSet<NetworkRoute> set = new TreeSet<>();
         try {
             DB db = new DB();
             @SuppressWarnings("resource")
             Connection conn = db.getConnection();
-            try(Statement stmt = conn.createStatement()) {
-                try(ResultSet rs = stmt.executeQuery("select FROMNODE, TONODE, VIANODE from NETWORK_ROUTES")) {
+            try (Statement stmt = conn.createStatement()) {
+                try (ResultSet rs = stmt.executeQuery("select FROMNODE, TONODE, VIANODE from NETWORK_ROUTES")) {
                     while (rs.next()) {
                         int fromnode = rs.getInt("FROMNODE");
                         int tonode = rs.getInt("TONODE");
@@ -73,30 +76,30 @@ public class NetworkRoute extends NodeClass implements Comparable<NetworkRoute>
             }
             db.release(conn);
         } catch (SQLException e) {
-            intlogger.error("SQLException " + e.getMessage());
+            intlogger.error(SQLEXCEPTION + e.getMessage(), e);
         }
         return set;
     }
 
-    public NetworkRoute(String fromnode, String tonode) throws IllegalArgumentException {
+    public NetworkRoute(String fromnode, String tonode) {
         this.fromnode = lookupNodeName(fromnode);
         this.tonode = lookupNodeName(tonode);
         this.vianode = -1;
     }
 
-    public NetworkRoute(String fromnode, String tonode, String vianode) throws IllegalArgumentException {
+    public NetworkRoute(String fromnode, String tonode, String vianode) {
         this.fromnode = lookupNodeName(fromnode);
         this.tonode = lookupNodeName(tonode);
         this.vianode = lookupNodeName(vianode);
     }
 
-    public NetworkRoute(JSONObject jo) throws IllegalArgumentException {
+    public NetworkRoute(JSONObject jo) {
         this.fromnode = lookupNodeName(jo.getString("from"));
         this.tonode = lookupNodeName(jo.getString("to"));
         this.vianode = lookupNodeName(jo.getString("via"));
     }
 
-    public NetworkRoute(int fromnode, int tonode, int vianode) throws IllegalArgumentException {
+    public NetworkRoute(int fromnode, int tonode, int vianode) {
         this.fromnode = fromnode;
         this.tonode = tonode;
         this.vianode = vianode;
@@ -110,10 +113,6 @@ public class NetworkRoute extends NodeClass implements Comparable<NetworkRoute>
         return tonode;
     }
 
-    public int getVianode() {
-        return vianode;
-    }
-
     @Override
     public boolean doDelete(Connection c) {
         boolean rv = true;
@@ -126,15 +125,14 @@ public class NetworkRoute extends NodeClass implements Comparable<NetworkRoute>
             ps.execute();
         } catch (SQLException e) {
             rv = false;
-            intlogger.warn("PROV0007 doDelete: " + e.getMessage());
-            intlogger.error("SQLException " + e.getMessage());
+            intlogger.warn("PROV0007 doDelete: " + e.getMessage(), e);
         } finally {
             try {
-                if(ps!=null) {
+                if (ps != null) {
                     ps.close();
                 }
             } catch (SQLException e) {
-                intlogger.error("SQLException " + e.getMessage());
+                intlogger.error(SQLEXCEPTION + e.getMessage(), e);
             }
         }
         return rv;
@@ -156,15 +154,14 @@ public class NetworkRoute extends NodeClass implements Comparable<NetworkRoute>
                 ps.close();
                 rv = true;
             } catch (SQLException e) {
-                intlogger.warn("PROV0005 doInsert: " + e.getMessage());
-                intlogger.error("SQLException " + e.getMessage());
+                intlogger.warn("PROV0005 doInsert: " + e.getMessage(), e);
             } finally {
                 try {
-                    if(ps!=null) {
+                    if (ps != null) {
                         ps.close();
                     }
                 } catch (SQLException e) {
-                    intlogger.error("SQLException " + e.getMessage());
+                    intlogger.error(SQLEXCEPTION + e.getMessage(), e);
                 }
             }
         }
@@ -184,15 +181,14 @@ public class NetworkRoute extends NodeClass implements Comparable<NetworkRoute>
             ps.executeUpdate();
         } catch (SQLException e) {
             rv = false;
-            intlogger.warn("PROV0006 doUpdate: " + e.getMessage());
-            intlogger.error("SQLException " + e.getMessage());
+            intlogger.warn("PROV0006 doUpdate: " + e.getMessage(), e);
         } finally {
             try {
-                if(ps!=null) {
+                if (ps != null) {
                     ps.close();
                 }
             } catch (SQLException e) {
-                intlogger.error("SQLException " + e.getMessage());
+                intlogger.error(SQLEXCEPTION + e.getMessage(), e);
             }
         }
         return rv;
@@ -214,8 +210,9 @@ public class NetworkRoute extends NodeClass implements Comparable<NetworkRoute>
 
     @Override
     public boolean equals(Object obj) {
-        if (!(obj instanceof NetworkRoute))
+        if (!(obj instanceof NetworkRoute)) {
             return false;
+        }
         NetworkRoute on = (NetworkRoute) obj;
         return (fromnode == on.fromnode) && (tonode == on.tonode) && (vianode == on.vianode);
     }
@@ -228,8 +225,9 @@ public class NetworkRoute extends NodeClass implements Comparable<NetworkRoute>
     @Override
     public int compareTo(NetworkRoute o) {
         if (this.fromnode == o.fromnode) {
-            if (this.tonode == o.tonode)
+            if (this.tonode == o.tonode) {
                 return this.vianode - o.vianode;
+            }
             return this.tonode - o.tonode;
         }
         return this.fromnode - o.fromnode;