X-Git-Url: https://gerrit.onap.org/r/gitweb?a=blobdiff_plain;f=datarouter-prov%2Fsrc%2Fmain%2Fjava%2Forg%2Fonap%2Fdmaap%2Fdatarouter%2Fprovisioning%2Fbeans%2FParameters.java;h=79fc91b112c69303ef1cc23aa26bbbd39ccd6dda;hb=adb2ad2d16e851fbf8dcc71af68949a74463204d;hp=9e7071bb6ac9a85bfebaebe93c85bb83ae4b9d64;hpb=534c164c124950a2019acf71d253ac96be12c78c;p=dmaap%2Fdatarouter.git 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 9e7071bb..79fc91b1 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 @@ -23,17 +23,19 @@ package org.onap.dmaap.datarouter.provisioning.beans; +import com.att.eelf.configuration.EELFLogger; +import com.att.eelf.configuration.EELFManager; import java.sql.Connection; import java.sql.PreparedStatement; import java.sql.ResultSet; import java.sql.SQLException; -import java.sql.Statement; -import java.util.*; - -import com.att.eelf.configuration.EELFLogger; -import com.att.eelf.configuration.EELFManager; +import java.util.ArrayList; +import java.util.Collection; +import java.util.HashMap; +import java.util.Map; +import java.util.Objects; import org.json.JSONObject; -import org.onap.dmaap.datarouter.provisioning.utils.DB; +import org.onap.dmaap.datarouter.provisioning.utils.ProvDbUtils; /** * Methods to provide access to Provisioning parameters in the DB. This class also provides constants of the standard @@ -42,6 +44,7 @@ import org.onap.dmaap.datarouter.provisioning.utils.DB; * @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"; @@ -50,7 +53,7 @@ public class Parameters extends Syncable { public static final String PROV_AUTH_SUBJECTS = "PROV_AUTH_SUBJECTS"; public static final String PROV_NAME = "PROV_NAME"; public static final String PROV_ACTIVE_NAME = "PROV_ACTIVE_NAME"; - public static final String PROV_DOMAIN = "PROV_DOMAIN"; + static final String PROV_DOMAIN = "PROV_DOMAIN"; public static final String PROV_MAXFEED_COUNT = "PROV_MAXFEED_COUNT"; public static final String PROV_MAXSUB_COUNT = "PROV_MAXSUB_COUNT"; public static final String PROV_POKETIMER1 = "PROV_POKETIMER1"; @@ -67,7 +70,7 @@ public class Parameters extends Syncable { public static final String DELIVERY_RETRY_RATIO = "DELIVERY_RETRY_RATIO"; public static final String DELIVERY_MAX_AGE = "DELIVERY_MAX_AGE"; 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 + public static final String STATIC_ROUTING_NODES = "STATIC_ROUTING_NODES"; private static EELFLogger intlogger = EELFManager.getInstance().getLogger("InternalLog"); private static final String SQLEXCEPTION = "SQLException: "; @@ -75,37 +78,44 @@ public class Parameters extends Syncable { private String keyname; private String value; + public Parameters(String key, String val) { + this.keyname = key; + this.value = val; + } + + public Parameters(ResultSet rs) throws SQLException { + this.keyname = rs.getString("KEYNAME"); + this.value = rs.getString("VALUE"); + } + /** * Get all parameters in the DB as a Map. * * @return the Map of keynames/values from the DB. */ public static Map getParameters() { - Map props = new HashMap(); + Map props = new HashMap<>(); for (Parameters p : getParameterCollection()) { props.put(p.getKeyname(), p.getValue()); } return props; } + /** + * Method to get parameters. + * @return collection of parameters + */ public static Collection getParameterCollection() { - Collection coll = new ArrayList(); - try { - DB db = new DB(); - @SuppressWarnings("resource") - Connection conn = db.getConnection(); - try (Statement stmt = conn.createStatement()) { - String sql = "select * from PARAMETERS"; - try (ResultSet rs = stmt.executeQuery(sql)) { - while (rs.next()) { - Parameters p = new Parameters(rs); - coll.add(p); - } - } + Collection coll = new ArrayList<>(); + try (Connection conn = ProvDbUtils.getInstance().getConnection(); + PreparedStatement ps = conn.prepareStatement("select * from PARAMETERS"); + ResultSet rs = ps.executeQuery()) { + while (rs.next()) { + Parameters param = new Parameters(rs); + coll.add(param); } - db.release(conn); } catch (SQLException e) { - intlogger.error(SQLEXCEPTION + e.getMessage()); + intlogger.error(SQLEXCEPTION + e.getMessage(), e); } return coll; } @@ -113,43 +123,24 @@ public class Parameters extends Syncable { /** * Get a specific parameter value from the DB. * - * @param k the key to lookup + * @param key the key to lookup * @return the value, or null if non-existant */ - public static Parameters getParameter(String k) { - Parameters v = null; - try { - DB db = new DB(); - @SuppressWarnings("resource") - Connection conn = db.getConnection(); - try (PreparedStatement stmt = conn - .prepareStatement("select KEYNAME, VALUE from PARAMETERS where KEYNAME = ?")) { - stmt.setString(1, k); - try (ResultSet rs = stmt.executeQuery()) { - if (rs.next()) { - v = new Parameters(rs); - } + public static Parameters getParameter(String key) { + Parameters val = null; + try (Connection conn = ProvDbUtils.getInstance().getConnection(); + PreparedStatement stmt = conn.prepareStatement( + "select KEYNAME, VALUE from PARAMETERS where KEYNAME = ?")) { + stmt.setString(1, key); + try (ResultSet rs = stmt.executeQuery()) { + if (rs.next()) { + val = new Parameters(rs); } } - db.release(conn); } catch (SQLException e) { - intlogger.error(SQLEXCEPTION + e.getMessage()); + intlogger.error(SQLEXCEPTION + e.getMessage(), e); } - return v; - } - - public Parameters() { - this("", ""); - } - - public Parameters(String k, String v) { - this.keyname = k; - this.value = v; - } - - public Parameters(ResultSet rs) throws SQLException { - this.keyname = rs.getString("KEYNAME"); - this.value = rs.getString("VALUE"); + return val; } public String getKeyname() { @@ -173,78 +164,42 @@ public class Parameters extends Syncable { } @Override - public boolean doInsert(Connection c) { + public boolean doInsert(Connection conn) { boolean rv = true; - PreparedStatement ps = null; - try { - // Create the SUBSCRIPTIONS row - String sql = "insert into PARAMETERS values (?, ?)"; - ps = c.prepareStatement(sql); + try (PreparedStatement ps = conn.prepareStatement("insert into PARAMETERS values (?, ?)")) { ps.setString(1, getKeyname()); ps.setString(2, getValue()); ps.execute(); } catch (SQLException e) { rv = false; intlogger.warn("PROV0005 doInsert: " + e.getMessage(), e); - } finally { - try { - if (ps != null) { - ps.close(); - } - } catch (SQLException e) { - intlogger.error(SQLEXCEPTION + e.getMessage()); - } } return rv; } @Override - public boolean doUpdate(Connection c) { + public boolean doUpdate(Connection conn) { boolean rv = true; - PreparedStatement ps = null; - try { - // Update the PARAMETERS row - String sql = "update PARAMETERS set VALUE = ? where KEYNAME = ?"; - ps = c.prepareStatement(sql); + try (PreparedStatement ps = conn.prepareStatement("update PARAMETERS set VALUE = ? where KEYNAME = ?")) { ps.setString(1, getValue()); ps.setString(2, getKeyname()); ps.executeUpdate(); } catch (SQLException e) { rv = false; intlogger.warn("PROV0006 doUpdate: " + e.getMessage(),e); - } finally { - try { - if (ps != null) { - ps.close(); - } - } catch (SQLException e) { - intlogger.error(SQLEXCEPTION + e.getMessage(), e); - } } return rv; } @Override - public boolean doDelete(Connection c) { + public boolean doDelete(Connection conn) { boolean rv = true; - PreparedStatement ps = null; - try { - // Create the SUBSCRIPTIONS row - String sql = "delete from PARAMETERS where KEYNAME = ?"; - ps = c.prepareStatement(sql); + try (PreparedStatement ps = conn.prepareStatement("delete from PARAMETERS where KEYNAME = ?")) { ps.setString(1, getKeyname()); ps.execute(); } catch (SQLException e) { rv = false; intlogger.warn("PROV0007 doDelete: " + e.getMessage(), e); - } finally { - try { - if (ps != null) { - ps.close(); - } - } catch (SQLException e) { - intlogger.error(SQLEXCEPTION + e.getMessage(), e); - } } return rv; } @@ -260,13 +215,7 @@ public class Parameters extends Syncable { return false; } Parameters of = (Parameters) obj; - if (!keyname.equals(of.keyname)) { - return false; - } - if (!value.equals(of.value)) { - return false; - } - return true; + return (!value.equals(of.value)) && (!keyname.equals(of.keyname)); } @Override