Removing unused code

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

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 4d2c9d1..9e7071b 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
@@ -30,7 +30,8 @@ import java.sql.SQLException;
 import java.sql.Statement;\r
 import java.util.*;\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
@@ -56,6 +57,7 @@ public class Parameters extends Syncable {
     public static final String PROV_POKETIMER2 = "PROV_POKETIMER2";\r
     public static final String PROV_SPECIAL_SUBNET = "PROV_SPECIAL_SUBNET";\r
     public static final String PROV_LOG_RETENTION = "PROV_LOG_RETENTION";\r
+    public static final String DEFAULT_LOG_RETENTION = "DEFAULT_LOG_RETENTION";\r
     public static final String NODES = "NODES";\r
     public static final String ACTIVE_POD = "ACTIVE_POD";\r
     public static final String STANDBY_POD = "STANDBY_POD";\r
@@ -67,7 +69,8 @@ public class Parameters extends Syncable {
     public static final String THROTTLE_FILTER = "THROTTLE_FILTER";\r
     public static final String STATIC_ROUTING_NODES = "STATIC_ROUTING_NODES"; //Adding new param for static Routing - Rally:US664862-1610\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
 \r
     private String keyname;\r
     private String value;\r
@@ -102,7 +105,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
@@ -130,7 +133,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
@@ -153,10 +156,6 @@ public class Parameters extends Syncable {
         return keyname;\r
     }\r
 \r
-    public void setKeyname(String keyname) {\r
-        this.keyname = keyname;\r
-    }\r
-\r
     public String getValue() {\r
         return value;\r
     }\r
@@ -186,14 +185,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
@@ -212,14 +211,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
@@ -237,14 +236,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