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 b237821..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,18 +30,20 @@ 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
 /**\r
- * Methods to provide access to Provisioning parameters in the DB.\r
- * This class also provides constants of the standard parameters used by the Data Router.\r
+ * Methods to provide access to Provisioning parameters in the DB. This class also provides constants of the standard\r
+ * parameters used by the Data Router.\r
  *\r
  * @author Robert Eby\r
  * @version $Id: Parameters.java,v 1.11 2014/03/12 19:45:41 eby Exp $\r
  */\r
 public class Parameters extends Syncable {\r
+\r
     public static final String PROV_REQUIRE_SECURE = "PROV_REQUIRE_SECURE";\r
     public static final String PROV_REQUIRE_CERT = "PROV_REQUIRE_CERT";\r
     public static final String PROV_AUTH_ADDRESSES = "PROV_AUTH_ADDRESSES";\r
@@ -55,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
@@ -66,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
@@ -90,9 +94,9 @@ public class Parameters extends Syncable {
             DB db = new DB();\r
             @SuppressWarnings("resource")\r
             Connection conn = db.getConnection();\r
-            try(Statement stmt = conn.createStatement()) {\r
+            try (Statement stmt = conn.createStatement()) {\r
                 String sql = "select * from PARAMETERS";\r
-                try(ResultSet rs = stmt.executeQuery(sql)) {\r
+                try (ResultSet rs = stmt.executeQuery(sql)) {\r
                     while (rs.next()) {\r
                         Parameters p = new Parameters(rs);\r
                         coll.add(p);\r
@@ -101,7 +105,7 @@ public class Parameters extends Syncable {
             }\r
             db.release(conn);\r
         } catch (SQLException e) {\r
-            e.printStackTrace();\r
+            intlogger.error(SQLEXCEPTION + e.getMessage());\r
         }\r
         return coll;\r
     }\r
@@ -118,9 +122,10 @@ public class Parameters extends Syncable {
             DB db = new DB();\r
             @SuppressWarnings("resource")\r
             Connection conn = db.getConnection();\r
-            try(PreparedStatement stmt = conn.prepareStatement("select KEYNAME, VALUE from PARAMETERS where KEYNAME = ?")) {\r
+            try (PreparedStatement stmt = conn\r
+                    .prepareStatement("select KEYNAME, VALUE from PARAMETERS where KEYNAME = ?")) {\r
                 stmt.setString(1, k);\r
-                try(ResultSet rs = stmt.executeQuery()) {\r
+                try (ResultSet rs = stmt.executeQuery()) {\r
                     if (rs.next()) {\r
                         v = new Parameters(rs);\r
                     }\r
@@ -128,7 +133,7 @@ public class Parameters extends Syncable {
             }\r
             db.release(conn);\r
         } catch (SQLException e) {\r
-            e.printStackTrace();\r
+            intlogger.error(SQLEXCEPTION + e.getMessage());\r
         }\r
         return v;\r
     }\r
@@ -151,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
@@ -184,15 +185,14 @@ public class Parameters extends Syncable {
             ps.execute();\r
         } catch (SQLException e) {\r
             rv = false;\r
-            intlogger.warn("PROV0005 doInsert: " + e.getMessage());\r
-            e.printStackTrace();\r
+            intlogger.warn("PROV0005 doInsert: " + e.getMessage(), e);\r
         } finally {\r
             try {\r
-                if(ps!=null) {\r
+                if (ps != null) {\r
                     ps.close();\r
                 }\r
             } catch (SQLException e) {\r
-                e.printStackTrace();\r
+                intlogger.error(SQLEXCEPTION + e.getMessage());\r
             }\r
         }\r
         return rv;\r
@@ -211,15 +211,14 @@ public class Parameters extends Syncable {
             ps.executeUpdate();\r
         } catch (SQLException e) {\r
             rv = false;\r
-            intlogger.warn("PROV0006 doUpdate: " + e.getMessage());\r
-            e.printStackTrace();\r
+            intlogger.warn("PROV0006 doUpdate: " + e.getMessage(),e);\r
         } finally {\r
             try {\r
-                if(ps!=null) {\r
+                if (ps != null) {\r
                     ps.close();\r
                 }\r
             } catch (SQLException e) {\r
-                e.printStackTrace();\r
+                intlogger.error(SQLEXCEPTION + e.getMessage(), e);\r
             }\r
         }\r
         return rv;\r
@@ -237,15 +236,14 @@ public class Parameters extends Syncable {
             ps.execute();\r
         } catch (SQLException e) {\r
             rv = false;\r
-            intlogger.warn("PROV0007 doDelete: " + e.getMessage());\r
-            e.printStackTrace();\r
+            intlogger.warn("PROV0007 doDelete: " + e.getMessage(), e);\r
         } finally {\r
             try {\r
-                if(ps!=null) {\r
+                if (ps != null) {\r
                     ps.close();\r
                 }\r
             } catch (SQLException e) {\r
-                e.printStackTrace();\r
+                intlogger.error(SQLEXCEPTION + e.getMessage(), e);\r
             }\r
         }\r
         return rv;\r
@@ -258,13 +256,16 @@ public class Parameters extends Syncable {
 \r
     @Override\r
     public boolean equals(Object obj) {\r
-        if (!(obj instanceof Parameters))\r
+        if (!(obj instanceof Parameters)) {\r
             return false;\r
+        }\r
         Parameters of = (Parameters) obj;\r
-        if (!keyname.equals(of.keyname))\r
+        if (!keyname.equals(of.keyname)) {\r
             return false;\r
-        if (!value.equals(of.value))\r
+        }\r
+        if (!value.equals(of.value)) {\r
             return false;\r
+        }\r
         return true;\r
     }\r
 \r