Lowered code smells

[appc.git] / appc-config / appc-encryption-tool / provider / src / main / java / org / onap / appc / encryptiontool / wrapper / DbServiceUtil.java

diff --git a/appc-config/appc-encryption-tool/provider/src/main/java/org/onap/appc/encryptiontool/wrapper/DbServiceUtil.java b/appc-config/appc-encryption-tool/provider/src/main/java/org/onap/appc/encryptiontool/wrapper/DbServiceUtil.java
index 87d1c97..ccfe60a 100644 (file)
--- a/appc-config/appc-encryption-tool/provider/src/main/java/org/onap/appc/encryptiontool/wrapper/DbServiceUtil.java
+++ b/appc-config/appc-encryption-tool/provider/src/main/java/org/onap/appc/encryptiontool/wrapper/DbServiceUtil.java
@@ -1,8 +1,7 @@
-/*-
- * ============LICENSE_START=======================================================
+/*===============LICENSE_START=======================================================
  * ONAP : APPC
  * ================================================================================
- * Copyright (C) 2017 AT&T Intellectual Property. All rights reserved.
+ * Copyright (C) 2017-2018 AT&T Intellectual Property. All rights reserved.
  * =============================================================================
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -16,58 +15,64 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  *
- * ECOMP is a trademark and service mark of AT&T Intellectual Property.
  * ============LICENSE_END=========================================================
  */
 
 package org.onap.appc.encryptiontool.wrapper;
 
+import com.google.common.collect.Lists;
 import java.io.File;
+import java.io.IOException;
 import java.net.URL;
 import java.sql.SQLException;
-import java.util.ArrayList;
+import java.util.List;
 import java.util.Properties;
-
 import javax.sql.rowset.CachedRowSet;
-
+import org.onap.ccsdk.sli.core.dblib.DBResourceManager;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
-import org.onap.ccsdk.sli.core.dblib.DBResourceManager;
+public class DbServiceUtil {
 
-public class DbServiceUtil
-{
-    private static final Logger log = LoggerFactory
-            .getLogger(DbServiceUtil.class);
-
-    private static Properties props;
+    private static final Logger log = LoggerFactory.getLogger(DbServiceUtil.class);
     private static DBResourceManager jdbcDataSource = null;
 
-    public static boolean updateDB(String tableName, ArrayList inputArgs,
-        String scema, String whereClause, String setCluase) throws SQLException
-    {
-            String updatePasswordString = "update " + tableName + " set " +  setCluase +  " where " + whereClause ;
-            boolean result = jdbcDataSource.writeData(updatePasswordString, inputArgs,Constants.SCHEMA_SDNCTL);
-            return result;
+    private DbServiceUtil() {}
+
+    public static boolean updateDB(String tableName, List<String> argList, String whereClause, String setCluase)
+        throws SQLException {
+
+        String updatePasswordString = "update " + tableName + " set " + setCluase + " where " + whereClause;
+        return jdbcDataSource.writeData(updatePasswordString, Lists.newArrayList(argList), Constants.SCHEMA_SDNCTL);
     }
 
-    public static CachedRowSet getData(String tableName, ArrayList argList, String schema,
-        String getselectData, String getDataClasue ) throws SQLException
-     {
-         String selectQuery = "select " + getselectData + "from " + tableName + " where " + getDataClasue ;
-         CachedRowSet data = jdbcDataSource.getData(selectQuery, argList, schema);
-         return data;
+    public static CachedRowSet getData(String tableName, List<String> argList, String schema,
+        String getselectData, String getDataClasue) throws SQLException {
+
+        String selectQuery = "select " + getselectData + "from " + tableName + " where " + getDataClasue;
+        return jdbcDataSource.getData(selectQuery, Lists.newArrayList(argList), schema);
      }
 
+    public static boolean deleteData(String tableName, List<String> argList) throws SQLException {
+        String deleteQuery = "delete from " + tableName;
+        log.info(deleteQuery);
+        return jdbcDataSource.writeData(deleteQuery, Lists.newArrayList(argList), Constants.SCHEMA_SDNCTL);
+    }
+
+     public static boolean insertDB(String tableName, List<String> argList, String setClause,String whereClause)
+        throws SQLException {
 
-    public static DBResourceManager initDbLibService() throws Exception
-    {
-        props = new Properties();
+            String insertPasswordString = "INSERT INTO  " + tableName + " (" + setClause + " )   VALUES (" + whereClause +")";
+            log.info(insertPasswordString + " insert statement " + argList);
+            return jdbcDataSource.writeData(insertPasswordString, Lists.newArrayList(argList), Constants.SCHEMA_SDNCTL);
+     }
+    public static DBResourceManager initDbLibService() throws IOException {
+        Properties props = new Properties();
         File file = new File("/opt/onap/appc/data/properties/dblib.properties");
         URL propURL = file.toURI().toURL();
         props.load(propURL.openStream());
         jdbcDataSource = new DBResourceManager(props);
         return jdbcDataSource;
     }
-
 }
+