From f9f214d530f5d18ca1e36d5c0e12e6f048bdd24d Mon Sep 17 00:00:00 2001 From: Jakub Dudycz Date: Thu, 22 Feb 2018 15:28:55 +0100 Subject: DbServiceUtil sonar fixes Change-Id: Iaeca67ccb70134ba2bac0fe04e045592d8d9efcc Issue-ID: APPC-661 Signed-off-by: Jakub Dudycz --- .../appc/encryptiontool/wrapper/DbServiceUtil.java | 48 ++++++-------- .../appc/encryptiontool/TestEncryptionTool.java | 75 +++++++++++----------- 2 files changed, 58 insertions(+), 65 deletions(-) (limited to 'appc-config/appc-encryption-tool') 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 87d1c97c0..2849641b5 100644 --- 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 @@ -22,52 +22,46 @@ 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 -{ - private static final Logger log = LoggerFactory - .getLogger(DbServiceUtil.class); +public class DbServiceUtil { - 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 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 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 DBResourceManager initDbLibService() throws Exception - { - props = new Properties(); + + 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; } - } diff --git a/appc-config/appc-encryption-tool/provider/src/test/java/org/onap/appc/encryptiontool/TestEncryptionTool.java b/appc-config/appc-encryption-tool/provider/src/test/java/org/onap/appc/encryptiontool/TestEncryptionTool.java index 16ff38e00..fceefa6e7 100644 --- a/appc-config/appc-encryption-tool/provider/src/test/java/org/onap/appc/encryptiontool/TestEncryptionTool.java +++ b/appc-config/appc-encryption-tool/provider/src/test/java/org/onap/appc/encryptiontool/TestEncryptionTool.java @@ -24,8 +24,10 @@ package org.onap.appc.encryptiontool; +import java.sql.SQLException; import java.util.ArrayList; import java.util.HashMap; +import java.util.List; import java.util.Map; import org.junit.Test; import org.onap.appc.encryptiontool.wrapper.DbServiceUtil; @@ -37,59 +39,58 @@ import org.onap.ccsdk.sli.core.sli.SvcLogicContext; public class TestEncryptionTool { //@Test - public void testEncryptionTool() throws Exception{ - String [] input = new String[] {"testVnf_Type","testUser","testPassword11", "testAction1", "8080", "http://localhost:8080/restconf/healthcheck"}; + public void testEncryptionTool() throws Exception { + String[] input = new String[]{"testVnf_Type", "testUser", "testPassword11", "testAction1", "8080", + "http://localhost:8080/restconf/healthcheck"}; WrapperEncryptionTool.main(input); } - @Test(expected=Exception.class) - public void testgetPropertyDG() throws Exception{ + + @Test(expected = Exception.class) + public void testgetPropertyDG() throws Exception { EncryptionToolDGWrapper et = new EncryptionToolDGWrapper(); SvcLogicContext ctx = new SvcLogicContext(); - Map inParams = new HashMap(); + Map inParams = new HashMap<>(); inParams.put("prefix", "test"); inParams.put("propertyName", "testVnf_Type.testAction1.url"); et.getProperty(inParams, ctx); } - @Test(expected=Exception.class) - public void testgetData() throws Exception - { - DbServiceUtil d = new DbServiceUtil(); - ArrayList argList = null; - String schema ="sdnctl"; - String tableName ="dual"; - String getselectData ="123"; - String getDataClasue="123='123'"; - d.getData(tableName, argList, schema, getselectData, getDataClasue); + + @Test(expected = Exception.class) + public void testgetData() throws Exception { + List argList = null; + String schema = "sdnctl"; + String tableName = "dual"; + String getselectData = "123"; + String getDataClasue = "123='123'"; + DbServiceUtil.getData(tableName, argList, schema, getselectData, getDataClasue); } - @Test(expected=Exception.class) - public void testupdateDB() throws Exception - { - DbServiceUtil d = new DbServiceUtil(); - String setCluase = null; - String schema ="sdnctl"; - String tableName ="dual"; - ArrayList inputArgs = null; - String whereClause="123='123'"; - d.updateDB(tableName, inputArgs, schema, whereClause, setCluase); + + @Test(expected = Exception.class) + public void testupdateDB() throws Exception { + String setClause = null; + String tableName = "dual"; + List inputArgs = null; + String whereClause = "123='123'"; + DbServiceUtil.updateDB(tableName, inputArgs, whereClause, setClause); } + @Test - public void decrypt() throws Exception{ + public void decrypt() throws Exception { EncryptionTool et = EncryptionTool.getInstance(); - System.out.println(et.decrypt("enc:Ai8KLw==").toString()); + System.out.println(et.decrypt("enc:Ai8KLw==")); } - - + //@Test(expected=Exception.class) - public void testupdateProperties() throws Exception{ - WrapperEncryptionTool.updateProperties("testuser2", "", "abc3", "", "22", "testhost1", "Ansible"); - + public void testupdateProperties() throws Exception { + WrapperEncryptionTool.updateProperties( + "testuser2", "", "abc3", "", "22", "testhost1", "Ansible"); } - + //@Test(expected=Exception.class) - public void testgetProperties() throws Exception{ - EncryptionToolDGWrapper et = new EncryptionToolDGWrapper(); - Map inParams = new HashMap(); + public void testgetProperties() throws Exception { + EncryptionToolDGWrapper et = new EncryptionToolDGWrapper(); + Map inParams = new HashMap<>(); SvcLogicContext ctx = new SvcLogicContext(); ctx.setAttribute("vnf-type", "test2"); ctx.setAttribute("input.action", "Configure"); @@ -97,7 +98,5 @@ public class TestEncryptionTool { inParams.put("propertyName", "user"); inParams.put("prefix", "user"); et.getProperty(inParams, ctx); - } - } -- cgit 1.2.3-korg