summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorManoop Talasila <talasila@research.att.com>2019-08-05 18:40:10 +0000
committerGerrit Code Review <gerrit@onap.org>2019-08-05 18:40:10 +0000
commit6f39686fa0654ed81d77d6d46ae49a5c2a8fcf3d (patch)
tree6f4e093be21a33314ce6b85e0a511df622ee19cc
parentc50a2d9fb306b7190f1fe4fada258d75807faf70 (diff)
parentb5abb9ffb393d0ce78ce5799576935a8f5820022 (diff)
Merge "Sonar Fix- ReportFormFields.java"
-rw-r--r--ecomp-sdk/epsdk-analytics/src/main/java/org/onap/portalsdk/analytics/model/runtime/ReportFormFields.java14
1 files changed, 7 insertions, 7 deletions
diff --git a/ecomp-sdk/epsdk-analytics/src/main/java/org/onap/portalsdk/analytics/model/runtime/ReportFormFields.java b/ecomp-sdk/epsdk-analytics/src/main/java/org/onap/portalsdk/analytics/model/runtime/ReportFormFields.java
index 02a3de4e..7bacd229 100644
--- a/ecomp-sdk/epsdk-analytics/src/main/java/org/onap/portalsdk/analytics/model/runtime/ReportFormFields.java
+++ b/ecomp-sdk/epsdk-analytics/src/main/java/org/onap/portalsdk/analytics/model/runtime/ReportFormFields.java
@@ -90,7 +90,7 @@ public class ReportFormFields extends Vector {
//Calendar rangeEndDate = fft.getRangeEndDate().toGregorianCalendar();
String rangeStartDateSQL = fft.getRangeStartDateSQL();
String rangeEndDateSQL = fft.getRangeEndDateSQL();
- String user_id = AppUtils.getUserID(request);
+ String userId = AppUtils.getUserID(request);
String multiSelectListSize = fft.getMultiSelectListSize();
//s_logger.debug("ranges are : " + fft.getRangeStartDate() + fft.getRangeEndDate());
@@ -122,9 +122,9 @@ public class ReportFormFields extends Vector {
}
// }
}
- fieldSQL = Utils.replaceInString(fieldSQL, "[USERID]", user_id);
- fieldSQL = Utils.replaceInString(fieldSQL, "[USER_ID]", user_id);
- fieldSQL = Utils.replaceInString(fieldSQL, "[LOGGED_USERID]", user_id);
+ fieldSQL = Utils.replaceInString(fieldSQL, "[USERID]", userId);
+ fieldSQL = Utils.replaceInString(fieldSQL, "[USER_ID]", userId);
+ fieldSQL = Utils.replaceInString(fieldSQL, "[LOGGED_USERID]", userId);
}
@@ -152,9 +152,9 @@ public class ReportFormFields extends Vector {
fieldDefaultSQL = Utils.replaceInString(fieldDefaultSQL, "[" + sessionParameters[i].toUpperCase()+"]", (String)session.getAttribute(sessionParameters[i]) );
}
- fieldDefaultSQL = Utils.replaceInString(fieldDefaultSQL, "[USERID]", user_id);
- fieldDefaultSQL = Utils.replaceInString(fieldDefaultSQL, "[USER_ID]", user_id);
- fieldDefaultSQL = Utils.replaceInString(fieldDefaultSQL, "[LOGGED_USERID]", user_id);
+ fieldDefaultSQL = Utils.replaceInString(fieldDefaultSQL, "[USERID]", userId);
+ fieldDefaultSQL = Utils.replaceInString(fieldDefaultSQL, "[USER_ID]", userId);
+ fieldDefaultSQL = Utils.replaceInString(fieldDefaultSQL, "[LOGGED_USERID]", userId);
}
//s_logger.debug("fieldSQL After" + fieldSQL);
if(rangeStartDateSQL!=null) {