reduced code smells

Improved some code stucture

Issue-ID: PORTAL-865
Change-Id: I9651ed6f592f83daf3c270749938e7ebc7a38619
Signed-off-by: Rupinder<rupinsi1@in.ibm.com>

1 files changed, 18 insertions, 9 deletions

diff --git a/ecomp-sdk/epsdk-analytics/src/main/java/org/onap/portalsdk/analytics/system/Globals.java b/ecomp-sdk/epsdk-analytics/src/main/java/org/onap/portalsdk/analytics/system/Globals.java
index 6718e427..6f55037b 100644
--- a/ecomp-sdk/epsdk-analytics/src/main/java/org/onap/portalsdk/analytics/system/Globals.java
+++ b/ecomp-sdk/epsdk-analytics/src/main/java/org/onap/portalsdk/analytics/system/Globals.java
@@ -1140,7 +1140,8 @@ return sheetName;
                         StringTokenizer st = new StringTokenizer(vals, "|");
                         if(st.countTokens()>0) {
 	                        while(st.hasMoreTokens()) {
-	                        	if(isMultiValue) value.append("'");
+	                        	if(isMultiValue)
+									value.append("'");
 	                        	String token = st.nextToken();
 								try {
 		                        	if(token !=null && token.length() > 0)
@@ -1149,7 +1150,8 @@ return sheetName;
 								catch (IllegalArgumentException ex1){} 
 								catch (Exception ex2){}
 								value.append(token);
-								if(isMultiValue) value.append("'"); 
+								if(isMultiValue)
+									value.append("'"); 
 								if(st.hasMoreTokens()) {
 									value.append(",");
 								}
@@ -1163,7 +1165,8 @@ return sheetName;
          		    		valuesMap.put(fieldNameMap.get(formField), valueStr);
          		    		valueStr = "";
                         }
-                        if(isMultiValue) value.append(")");
+                        if(isMultiValue)
+							value.append(")");
 					 
 					 valuesMap.put(fieldNameMap.get(formField), value.toString());
 					 if(ff.getValidationType().equals(FormField.VT_TIMESTAMP_HR) || ff.getValidationType().equals(FormField.VT_TIMESTAMP_MIN) || ff.getValidationType().equals(FormField.VT_TIMESTAMP_SEC)) {
@@ -1209,7 +1212,8 @@ return sheetName;
                         StringTokenizer st = new StringTokenizer(vals, "|");
                         if(st.countTokens()>0) {
 	                        while(st.hasMoreTokens()) {
-	                        	if(isMultiValue) value.append("'");
+	                        	if(isMultiValue)
+									value.append("'");
 	                        	String token = st.nextToken();
 								try {
 		                        	if(token !=null && token.length() > 0)
@@ -1218,7 +1222,8 @@ return sheetName;
 								catch (IllegalArgumentException ex1){} 
 								catch (Exception ex2){}
 								value.append(token);
-								if(isMultiValue) value.append("'"); 
+								if(isMultiValue)
+									value.append("'"); 
 								if(st.hasMoreTokens()) {
 									value.append(",");
 								}
@@ -1231,7 +1236,8 @@ return sheetName;
          		    		valuesMap.put(fieldNameMap.get(formField), valueStr);
          		    		valueStr = "";
                         }
-                        if(isMultiValue) value.append(")");
+                        if(isMultiValue)
+							value.append(")");
 					 
 					 valuesMap.put(fieldNameMap.get(formField), value.toString());
 					 
@@ -1405,7 +1411,8 @@ return sheetName;
 							value.append("(");
 						}
 						for(int j = 0 ; j < vals.length; j++) {
-							if(isMultiValue) value.append("'");
+							if(isMultiValue)
+								value.append("'");
 							try {
 								if(vals[j] !=null && vals[j].length() > 0) {
 									vals[j] = Utils.oracleSafe(vals[j]);
@@ -1420,7 +1427,8 @@ return sheetName;
 							}
 		
 		
-							if(isMultiValue) value.append("'"); 
+							if(isMultiValue)
+								value.append("'"); 
 							
 							if(j != vals.length -1) {
 								value.append(",");
@@ -1542,7 +1550,8 @@ return sheetName;
 
     public static int getMemoryThreshold() {
 			int threshold =  Integer.parseInt(nvls(raptorProperties.getProperty("memory_threshold_percentage"),"0").trim());
-			if(threshold <= 0) threshold = 0;
+			if(threshold <= 0)
+				threshold = 0;
 			return threshold;
     }