removed code smells

Reduced the code smells

Issue-ID: CCSDK-2232
Change-Id: I30eec021ba50f28dc1df2fd554c4e349c4a76dd6
Signed-off-by: Rupinder<rupinsi1@in.ibm.com>

diff --git a/resource-assignment/provider/src/main/java/org/onap/ccsdk/sli/adaptors/rm/dao/jdbc/Resource.java b/resource-assignment/provider/src/main/java/org/onap/ccsdk/sli/adaptors/rm/dao/jdbc/Resource.java
index 4b0c82f..6b764a7 100644 (file)
--- a/resource-assignment/provider/src/main/java/org/onap/ccsdk/sli/adaptors/rm/dao/jdbc/Resource.java
+++ b/resource-assignment/provider/src/main/java/org/onap/ccsdk/sli/adaptors/rm/dao/jdbc/Resource.java
@@ -24,7 +24,9 @@ package org.onap.ccsdk.sli.adaptors.rm.dao.jdbc;
 public class Resource {
 
     public long id;
-    public String assetId, name, type;
+    public String assetId;
+    public String name;
+    public String type;
     public long ltUsed;
     public String llLabel;
     public int llReferenceCount;

diff --git a/resource-assignment/provider/src/main/java/org/onap/ccsdk/sli/adaptors/util/expr/ExpressionEvaluator.java b/resource-assignment/provider/src/main/java/org/onap/ccsdk/sli/adaptors/util/expr/ExpressionEvaluator.java
index 8ba454b..8092a75 100644 (file)
--- a/resource-assignment/provider/src/main/java/org/onap/ccsdk/sli/adaptors/util/expr/ExpressionEvaluator.java
+++ b/resource-assignment/provider/src/main/java/org/onap/ccsdk/sli/adaptors/util/expr/ExpressionEvaluator.java
@@ -193,7 +193,8 @@ public class ExpressionEvaluator {
         int opl = op.length();
         int sl = s.length();
         String delimiters = " \0\t\r\n()";
-        int pcount = 0, qcount = 0;
+        int pcount = 0;
+        int qcount = 0;
         for (int i = 0; i < sl; i++) {
             char c = s.charAt(i);
             if (c == '(' && qcount == 0) {

diff --git a/resource-assignment/provider/src/main/java/org/onap/ccsdk/sli/adaptors/util/str/StrUtil.java b/resource-assignment/provider/src/main/java/org/onap/ccsdk/sli/adaptors/util/str/StrUtil.java
index ef889f0..126ec94 100644 (file)
--- a/resource-assignment/provider/src/main/java/org/onap/ccsdk/sli/adaptors/util/str/StrUtil.java
+++ b/resource-assignment/provider/src/main/java/org/onap/ccsdk/sli/adaptors/util/str/StrUtil.java
@@ -215,7 +215,8 @@ public class StrUtil {
         for (String s : str) {
             try {
                 int i1 = s.indexOf('-');
-                int start, end;
+                int start;
+                int end;
                 if (i1 > 0) {
                     String s1 = s.substring(0, i1);
                     String s2 = s.substring(i1 + 1);

diff --git a/saltstack-adapter/saltstack-adapter-provider/src/main/java/org/onap/ccsdk/sli/adaptors/saltstack/model/SaltstackMessageParser.java b/saltstack-adapter/saltstack-adapter-provider/src/main/java/org/onap/ccsdk/sli/adaptors/saltstack/model/SaltstackMessageParser.java
index 50d08e2..3bb401a 100644 (file)
--- a/saltstack-adapter/saltstack-adapter-provider/src/main/java/org/onap/ccsdk/sli/adaptors/saltstack/model/SaltstackMessageParser.java
+++ b/saltstack-adapter/saltstack-adapter-provider/src/main/java/org/onap/ccsdk/sli/adaptors/saltstack/model/SaltstackMessageParser.java
@@ -307,7 +307,8 @@ public class SaltstackMessageParser {
     public SaltstackResult parseResponse(SvcLogicContext ctx, String pfx,
                                          SaltstackResult saltstackResult, boolean slsExec) throws IOException {
         int code = saltstackResult.getStatusCode();
-        boolean executionStatus = true, retCodeFound = false;
+        boolean executionStatus = true;
+        boolean retCodeFound = false;
         if (code != SaltstackResultCodes.SUCCESS.getValue()) {
             return saltstackResult;
         }