appc-config-generator-provider sonar fixes part 1

Initial code reformat and import rearrangement

Change-Id: I0a808bc3043d8558d96f15e0b695fddf5333bab1
Issue-ID: APPC-671
Signed-off-by: Jakub Dudycz <jakub.dudycz@nokia.com>

4 files changed, 32 insertions, 29 deletions

diff --git a/appc-config/appc-config-generator/provider/src/main/java/org/onap/sdnc/config/generator/tool/Constants.java b/appc-config/appc-config-generator/provider/src/main/java/org/onap/sdnc/config/generator/tool/Constants.java
index 322e1a6c5..00fda9fb7 100644
--- a/appc-config/appc-config-generator/provider/src/main/java/org/onap/sdnc/config/generator/tool/Constants.java
+++ b/appc-config/appc-config-generator/provider/src/main/java/org/onap/sdnc/config/generator/tool/Constants.java
@@ -27,7 +27,7 @@ package org.onap.sdnc.config.generator.tool;
 public class Constants {
 
     public static final String DBLIB_SERVICE =
-            "org.onap.ccsdk.sli.core.dblib.DBResourceManager";
+        "org.onap.ccsdk.sli.core.dblib.DBResourceManager";
     public static final String DEVICE_AUTHENTICATION = "DEVICE_AUTHENTICATION";
     public static final String SCHEMA_SDNCTL = "SDNCTL";
 
diff --git a/appc-config/appc-config-generator/provider/src/main/java/org/onap/sdnc/config/generator/tool/DbServiceUtil.java b/appc-config/appc-config-generator/provider/src/main/java/org/onap/sdnc/config/generator/tool/DbServiceUtil.java
index a39f0d2e4..c98429c02 100644
--- a/appc-config/appc-config-generator/provider/src/main/java/org/onap/sdnc/config/generator/tool/DbServiceUtil.java
+++ b/appc-config/appc-config-generator/provider/src/main/java/org/onap/sdnc/config/generator/tool/DbServiceUtil.java
@@ -35,6 +35,7 @@ import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
 public class DbServiceUtil {
+
     private static final Logger log = LoggerFactory.getLogger(DbServiceUtil.class);
 
     private static Properties props;
@@ -42,19 +43,19 @@ public class DbServiceUtil {
 
 
     public static boolean updateDB(String tableName, ArrayList inputArgs, String scema,
-            String whereClause, String setCluase) throws SQLException {
+        String whereClause, String setCluase) throws SQLException {
         String updatePasswordString =
-                "update " + tableName + " set " + setCluase + " where " + whereClause;
+            "update " + tableName + " set " + setCluase + " where " + whereClause;
         boolean result =
-                jdbcDataSource.writeData(updatePasswordString, inputArgs, Constants.SCHEMA_SDNCTL);
+            jdbcDataSource.writeData(updatePasswordString, inputArgs, Constants.SCHEMA_SDNCTL);
         return result;
     }
 
 
     public static CachedRowSet getData(String tableName, ArrayList argList, String schema,
-            String getselectData, String getDataClasue) throws SQLException {
+        String getselectData, String getDataClasue) throws SQLException {
         String selectQuery =
-                "select " + getselectData + "from " + tableName + " where " + getDataClasue;
+            "select " + getselectData + "from " + tableName + " where " + getDataClasue;
         CachedRowSet data = jdbcDataSource.getData(selectQuery, argList, schema);
         return data;
     }
@@ -66,7 +67,7 @@ public class DbServiceUtil {
         URL propURL = file.toURI().toURL();
         props.load(propURL.openStream());
 
-                // this is an expected difference in CCSDK
+        // this is an expected difference in CCSDK
         jdbcDataSource = new DBResourceManager(props);
 
         return jdbcDataSource;
@@ -74,5 +75,4 @@ public class DbServiceUtil {
     }
 
 
-
 }
diff --git a/appc-config/appc-config-generator/provider/src/main/java/org/onap/sdnc/config/generator/tool/LogParserTool.java b/appc-config/appc-config-generator/provider/src/main/java/org/onap/sdnc/config/generator/tool/LogParserTool.java
index 0c228b8eb..ebd58b01c 100644
--- a/appc-config/appc-config-generator/provider/src/main/java/org/onap/sdnc/config/generator/tool/LogParserTool.java
+++ b/appc-config/appc-config-generator/provider/src/main/java/org/onap/sdnc/config/generator/tool/LogParserTool.java
@@ -24,19 +24,21 @@
 
 package org.onap.sdnc.config.generator.tool;
 
+import com.att.eelf.configuration.EELFLogger;
+import com.att.eelf.configuration.EELFManager;
 import java.text.ParseException;
 import java.text.SimpleDateFormat;
 import java.util.ArrayList;
 import java.util.Date;
 import java.util.List;
-import com.att.eelf.configuration.EELFLogger;
-import com.att.eelf.configuration.EELFManager;
 
 public class LogParserTool {
+
     private static final EELFLogger log = EELFManager.getInstance().getLogger(JSONTool.class);
 
     private String[] singleLines;
-    private List<String> recentErrors = new ArrayList<String>();;
+    private List<String> recentErrors = new ArrayList<String>();
+    ;
     private Date todaysDate = new Date();
     private SimpleDateFormat dFormat = new SimpleDateFormat("yyyy-MM-dd'T'HH:mm:ss");
     private final int minMilli = 60000;
@@ -62,7 +64,7 @@ public class LogParserTool {
             String error = recentErrors.get(0);
             recentErrors.clear();
             return "Error: "
-                    + error.substring(error.indexOf("Error parsing orchestration file:") + 34);
+                + error.substring(error.indexOf("Error parsing orchestration file:") + 34);
         }
     }
 
@@ -70,11 +72,11 @@ public class LogParserTool {
         int result;
         for (int i = singleLines.length - 1; i >= 0; i--) {
             if (singleLines[i].contains("Starting orchestration of file backed up to")
-                    || singleLines[i].contains("Error parsing orchestration file:")) {
+                || singleLines[i].contains("Error parsing orchestration file:")) {
                 result = checkDateTime(singleLines[i]);
-                if (result == IN_TIME)
+                if (result == IN_TIME) {
                     recentErrors.add(singleLines[i]);
-                else if (result == NOT_IN_TIME) {
+                } else if (result == NOT_IN_TIME) {
                     return;
                 }
             }
@@ -87,8 +89,9 @@ public class LogParserTool {
             newDate = dFormat.parse(line.substring(0, 19));
             if ((todaysDate.getTime() - newDate.getTime()) <= 5 * minMilli) {
                 return IN_TIME;
-            } else
+            } else {
                 return NOT_IN_TIME;
+            }
         } catch (ParseException e) {
             e.printStackTrace();
             return NO_DATE;
diff --git a/appc-config/appc-config-generator/provider/src/main/java/org/onap/sdnc/config/generator/tool/MergeTool.java b/appc-config/appc-config-generator/provider/src/main/java/org/onap/sdnc/config/generator/tool/MergeTool.java
index a7f0b9d32..1126c2adb 100644
--- a/appc-config/appc-config-generator/provider/src/main/java/org/onap/sdnc/config/generator/tool/MergeTool.java
+++ b/appc-config/appc-config-generator/provider/src/main/java/org/onap/sdnc/config/generator/tool/MergeTool.java
@@ -24,6 +24,12 @@
 
 package org.onap.sdnc.config.generator.tool;
 
+import com.att.eelf.configuration.EELFLogger;
+import com.att.eelf.configuration.EELFManager;
+import com.fasterxml.jackson.core.JsonParseException;
+import com.fasterxml.jackson.databind.JsonMappingException;
+import com.fasterxml.jackson.databind.JsonNode;
+import com.fasterxml.jackson.databind.ObjectMapper;
 import java.io.IOException;
 import java.io.StringWriter;
 import java.util.Iterator;
@@ -37,12 +43,6 @@ import org.apache.velocity.runtime.RuntimeConstants;
 import org.apache.velocity.runtime.resource.loader.StringResourceLoader;
 import org.apache.velocity.runtime.resource.util.StringResourceRepository;
 import org.onap.sdnc.config.generator.ConfigGeneratorConstant;
-import com.att.eelf.configuration.EELFLogger;
-import com.att.eelf.configuration.EELFManager;
-import com.fasterxml.jackson.core.JsonParseException;
-import com.fasterxml.jackson.databind.JsonMappingException;
-import com.fasterxml.jackson.databind.JsonNode;
-import com.fasterxml.jackson.databind.ObjectMapper;
 
 
 public class MergeTool {
@@ -59,7 +59,7 @@ public class MergeTool {
         ve.init();
 
         StringResourceRepository repo = (StringResourceRepository) ve
-                .getApplicationAttribute(StringResourceLoader.REPOSITORY_NAME_DEFAULT);
+            .getApplicationAttribute(StringResourceLoader.REPOSITORY_NAME_DEFAULT);
         repo.putStringResource("TemplateResource", template);
 
         Template t = ve.getTemplate("TemplateResource");
@@ -75,8 +75,8 @@ public class MergeTool {
 
 
     public static String mergeJson2TemplateData(String template, String jsonData,
-            String templateType, String doPrettyOutput)
-            throws JsonParseException, JsonMappingException, IOException {
+        String templateType, String doPrettyOutput)
+        throws JsonParseException, JsonMappingException, IOException {
         String mergedData = template;
         if (StringUtils.isNotBlank(template) && StringUtils.isNotBlank(jsonData)) {
             Velocity.init();
@@ -100,10 +100,10 @@ public class MergeTool {
             mergedData = writer.toString();
 
             if (StringUtils.isNotBlank(templateType) && StringUtils.isNotBlank(doPrettyOutput)
-                    && ConfigGeneratorConstant.Y.equalsIgnoreCase(doPrettyOutput)
-                    && (ConfigGeneratorConstant.DATA_TYPE_JSON.equalsIgnoreCase(templateType)
-                            || ConfigGeneratorConstant.DATA_TYPE_XML
-                                    .equalsIgnoreCase(templateType))) {
+                && ConfigGeneratorConstant.Y.equalsIgnoreCase(doPrettyOutput)
+                && (ConfigGeneratorConstant.DATA_TYPE_JSON.equalsIgnoreCase(templateType)
+                || ConfigGeneratorConstant.DATA_TYPE_XML
+                .equalsIgnoreCase(templateType))) {
                 // Perform Prettying
 
             }