reduced code smells

Improved some code stucture

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

2 files changed, 12 insertions, 6 deletions

diff --git a/ecomp-sdk/epsdk-analytics/src/main/java/org/onap/portalsdk/analytics/model/runtime/ReportParamValues.java b/ecomp-sdk/epsdk-analytics/src/main/java/org/onap/portalsdk/analytics/model/runtime/ReportParamValues.java
index 2d46326b..2cff3e63 100644
--- a/ecomp-sdk/epsdk-analytics/src/main/java/org/onap/portalsdk/analytics/model/runtime/ReportParamValues.java
+++ b/ecomp-sdk/epsdk-analytics/src/main/java/org/onap/portalsdk/analytics/model/runtime/ReportParamValues.java
@@ -132,7 +132,8 @@ public class ReportParamValues extends Hashtable {
 		long currentTime = System.currentTimeMillis();
 		//System.out.println("ReportParamValues setParamValues called " + refresh);
 		boolean paramUpdated = false;
-       if(refresh) clearValues();
+       if(refresh)
+           clearValues();
 		for (Enumeration enKeys = keys(); enKeys.hasMoreElements();) {
 			String key = (String) enKeys.nextElement();
 			String oldValue = XSSFilter.filterRequestOnlyScript(getParamValue(key));
diff --git a/ecomp-sdk/epsdk-analytics/src/main/java/org/onap/portalsdk/analytics/model/runtime/ReportParamValuesForPDFExcel.java b/ecomp-sdk/epsdk-analytics/src/main/java/org/onap/portalsdk/analytics/model/runtime/ReportParamValuesForPDFExcel.java
index 98718686..483e9fe4 100644
--- a/ecomp-sdk/epsdk-analytics/src/main/java/org/onap/portalsdk/analytics/model/runtime/ReportParamValuesForPDFExcel.java
+++ b/ecomp-sdk/epsdk-analytics/src/main/java/org/onap/portalsdk/analytics/model/runtime/ReportParamValuesForPDFExcel.java
@@ -111,7 +111,8 @@ public class ReportParamValuesForPDFExcel extends Hashtable {
 		//debugLogger.debug("ReportParamValues for PDF Excel setParamValues called " + refresh);
 	   long currentTime = System.currentTimeMillis();
 		boolean paramUpdated = false;
-       if(refresh) clearValues();
+       if(refresh)
+           clearValues();
 	       String name = null;
 	       String value = null; 
 	       String value1 = "";
@@ -193,7 +194,8 @@ public class ReportParamValuesForPDFExcel extends Hashtable {
 						}
 					 if(sql!=null && sql.trim().length()>0){
 						 name = "";
-						 if(name.length()<=0) name = ff.getFieldName();
+						 if(name.length()<=0)
+							 name = ff.getFieldName();
 						 value = rr.getParamValue(name);
 						 //debugLogger.debug("Name "+ name+ " value:" + value);
 						 String paramValue = ESAPI.encoder().encodeForSQL( SecurityCodecUtil.getCodec(), getParamValueForSQL(name, value));
@@ -280,7 +282,8 @@ public class ReportParamValuesForPDFExcel extends Hashtable {
 										put(ff.getFieldName(), nvl(value1));
 									} else { 
 		 						  
-		 						  if(ds!=null && ds.getRowCount()>0) put(ff.getFieldName(), nvl(ds.getString(0,1)));
+		 						  if(ds!=null && ds.getRowCount()>0)
+									  put(ff.getFieldName(), nvl(ds.getString(0,1)));
 		 						  else put(ff.getFieldName(), nvl(value));
 									}
 		 					  }
@@ -315,7 +318,8 @@ public class ReportParamValuesForPDFExcel extends Hashtable {
 									//debugLogger.debug("77777777777777 " + value1);
 								} else 
 								     value1 = nvl(rr.getParamValue(ff.getFieldName()));
-								     if(value1.length()<=0) value1 = nvl(ff.getDefaultValue());
+								     if(value1.length()<=0)
+										 value1 = nvl(ff.getDefaultValue());
 									 put(ff.getFieldName(), nvl(value1));
 
 						 }
@@ -431,7 +435,8 @@ public class ReportParamValuesForPDFExcel extends Hashtable {
     	}catch(NumberFormatException ex){
     		numInt = 0;
     	}
-    	if(numInt < 10) return "0"+numInt;
+    	if(numInt < 10)
+			return "0"+numInt;
     	else return ""+numInt;
     }