Code style cleanup for prov authz and beans

[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 78ed96d..e89cfd4 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
@@ -45,6 +45,7 @@ import org.onap.dmaap.datarouter.provisioning.utils.DB;
  * @author Robert Eby\r
  * @version $Id: Parameters.java,v 1.11 2014/03/12 19:45:41 eby Exp $\r
  */\r
+\r
 public class Parameters extends Syncable {\r
 \r
     public static final String PROV_REQUIRE_SECURE = "PROV_REQUIRE_SECURE";\r
@@ -78,9 +79,9 @@ public class Parameters extends Syncable {
     private String keyname;\r
     private String value;\r
 \r
-    public Parameters(String k, String v) {\r
-        this.keyname = k;\r
-        this.value = v;\r
+    public Parameters(String key, String val) {\r
+        this.keyname = key;\r
+        this.value = val;\r
     }\r
 \r
     public Parameters(ResultSet rs) throws SQLException {\r
@@ -101,6 +102,10 @@ public class Parameters extends Syncable {
         return props;\r
     }\r
 \r
+    /**\r
+     * Method to get parameters.\r
+     * @return collection of parameters\r
+     */\r
     public static Collection<Parameters> getParameterCollection() {\r
         Collection<Parameters> coll = new ArrayList<>();\r
         DB db = new DB();\r
@@ -109,8 +114,8 @@ public class Parameters extends Syncable {
                 Statement stmt = conn.createStatement()) {\r
             try (ResultSet rs = stmt.executeQuery(sql)) {\r
                 while (rs.next()) {\r
-                    Parameters p = new Parameters(rs);\r
-                    coll.add(p);\r
+                    Parameters param = new Parameters(rs);\r
+                    coll.add(param);\r
                 }\r
             }\r
             db.release(conn);\r
@@ -123,26 +128,26 @@ public class Parameters extends Syncable {
     /**\r
      * Get a specific parameter value from the DB.\r
      *\r
-     * @param k the key to lookup\r
+     * @param key the key to lookup\r
      * @return the value, or null if non-existant\r
      */\r
-    public static Parameters getParameter(String k) {\r
-        Parameters v = null;\r
+    public static Parameters getParameter(String key) {\r
+        Parameters val = null;\r
         DB db = new DB();\r
         String sql = "select KEYNAME, VALUE from PARAMETERS where KEYNAME = ?";\r
         try (Connection conn = db.getConnection();\r
                 PreparedStatement stmt = conn.prepareStatement(sql)) {\r
-            stmt.setString(1, k);\r
+            stmt.setString(1, key);\r
             try (ResultSet rs = stmt.executeQuery()) {\r
                 if (rs.next()) {\r
-                    v = new Parameters(rs);\r
+                    val = new Parameters(rs);\r
                 }\r
             }\r
             db.release(conn);\r
         } catch (SQLException e) {\r
             intlogger.error(SQLEXCEPTION + e.getMessage(), e);\r
         }\r
-        return v;\r
+        return val;\r
     }\r
 \r
     public String getKeyname() {\r
@@ -166,10 +171,10 @@ public class Parameters extends Syncable {
     }\r
 \r
     @Override\r
-    public boolean doInsert(Connection c) {\r
+    public boolean doInsert(Connection conn) {\r
         boolean rv = true;\r
         String sql = "insert into PARAMETERS values (?, ?)";\r
-        try (PreparedStatement ps = c.prepareStatement(sql)) {\r
+        try (PreparedStatement ps = conn.prepareStatement(sql)) {\r
             ps.setString(1, getKeyname());\r
             ps.setString(2, getValue());\r
             ps.execute();\r
@@ -181,10 +186,10 @@ public class Parameters extends Syncable {
     }\r
 \r
     @Override\r
-    public boolean doUpdate(Connection c) {\r
+    public boolean doUpdate(Connection conn) {\r
         boolean rv = true;\r
         String sql = "update PARAMETERS set VALUE = ? where KEYNAME = ?";\r
-        try (PreparedStatement ps = c.prepareStatement(sql)) {\r
+        try (PreparedStatement ps = conn.prepareStatement(sql)) {\r
             ps.setString(1, getValue());\r
             ps.setString(2, getKeyname());\r
             ps.executeUpdate();\r
@@ -196,10 +201,10 @@ public class Parameters extends Syncable {
     }\r
 \r
     @Override\r
-    public boolean doDelete(Connection c) {\r
+    public boolean doDelete(Connection conn) {\r
         boolean rv = true;\r
         String sql = "delete from PARAMETERS where KEYNAME = ?";\r
-        try (PreparedStatement ps = c.prepareStatement(sql)) {\r
+        try (PreparedStatement ps = conn.prepareStatement(sql)) {\r
             ps.setString(1, getKeyname());\r
             ps.execute();\r
         } catch (SQLException e) {\r