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%2FParameters.java;h=9e7071bb6ac9a85bfebaebe93c85bb83ae4b9d64;hp=b2378218b26f47dcfc18de00b7907d1af28cbf63;hb=534c164c124950a2019acf71d253ac96be12c78c;hpb=e7045aa2c572410e4ab4143fc4c570a8826157e3

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