import java.util.SortedSet;\r
import java.util.TreeSet;\r
\r
-import org.apache.log4j.Logger;\r
+import com.att.eelf.configuration.EELFLogger;\r
+import com.att.eelf.configuration.EELFManager;\r
import org.json.JSONObject;\r
import org.onap.dmaap.datarouter.provisioning.utils.DB;\r
\r
*/\r
public class NetworkRoute extends NodeClass implements Comparable<NetworkRoute> {\r
\r
- private static Logger intlogger = Logger.getLogger("org.onap.dmaap.datarouter.provisioning.internal");\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
* @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
}\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
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
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
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