diff options
author | Rupinder <rupinsi1@in.ibm.com> | 2020-04-03 13:53:12 +0530 |
---|---|---|
committer | Rupinder <rupinsi1@in.ibm.com> | 2020-04-03 13:55:16 +0530 |
commit | 61e8fa6d7f81967e9f73c73dc3bd69da8222cd69 (patch) | |
tree | e84eb4ed59999475075dbd46ce0be63ac6608ba5 /ecomp-sdk/epsdk-analytics/src/main/java/org/onap/portalsdk/analytics/model/base | |
parent | 4957ffcc47d239309c798ee4172c5840d7d89e13 (diff) |
removed code smells
Improved code quality by removing code smells
Issue-ID: PORTAL-865
Change-Id: Ic68e75d36672a9b51800853c0ac485e9bb603d3b
Signed-off-by: Rupinder<rupinsi1@in.ibm.com>
Diffstat (limited to 'ecomp-sdk/epsdk-analytics/src/main/java/org/onap/portalsdk/analytics/model/base')
2 files changed, 8 insertions, 3 deletions
diff --git a/ecomp-sdk/epsdk-analytics/src/main/java/org/onap/portalsdk/analytics/model/base/IdNameSql.java b/ecomp-sdk/epsdk-analytics/src/main/java/org/onap/portalsdk/analytics/model/base/IdNameSql.java index d727171a..3091fa96 100644 --- a/ecomp-sdk/epsdk-analytics/src/main/java/org/onap/portalsdk/analytics/model/base/IdNameSql.java +++ b/ecomp-sdk/epsdk-analytics/src/main/java/org/onap/portalsdk/analytics/model/base/IdNameSql.java @@ -255,7 +255,9 @@ public class IdNameSql extends IdNameList { } if(searchString!=null && searchString.length()>0 && !searchString.equals("%")) { - if(pageNo == -2) query.append(" WHERE "); + if(pageNo == -2){ + query.append(" WHERE "); + } else query.append(" and "); query.append("name like '"+ searchString +"'"); } diff --git a/ecomp-sdk/epsdk-analytics/src/main/java/org/onap/portalsdk/analytics/model/base/ReportWrapper.java b/ecomp-sdk/epsdk-analytics/src/main/java/org/onap/portalsdk/analytics/model/base/ReportWrapper.java index 4778d2f2..69837d04 100644 --- a/ecomp-sdk/epsdk-analytics/src/main/java/org/onap/portalsdk/analytics/model/base/ReportWrapper.java +++ b/ecomp-sdk/epsdk-analytics/src/main/java/org/onap/portalsdk/analytics/model/base/ReportWrapper.java @@ -2887,7 +2887,8 @@ public class ReportWrapper extends org.onap.portalsdk.analytics.RaptorObject { posFormField = sql.indexOf(fieldDisplay); int posSelectField = sql.lastIndexOf("SELECT ", posFormField); int andField = 0; - int whereField = 0, whenField = 0; + int whereField = 0; + int whenField = 0; andField = sql.lastIndexOf(" AND ", posFormField); whereField = sql.indexOf(" WHERE", posSelectField); whenField = sql.indexOf(" WHEN", posSelectField); @@ -4242,7 +4243,9 @@ public class ReportWrapper extends org.onap.portalsdk.analytics.RaptorObject { // reportSQL = reportSQL.replaceAll("[\\s]*\\(", "("); colName = colName.replaceAll(",[\\s]*\\(", ",("); StringBuffer colNameBuf = new StringBuffer(colName); - int pos = 0, posFormatStart = 0, posFormatEnd = 0; + int pos = 0; + int posFormatStart = 0; + int posFormatEnd = 0; String format = ""; if (colNameBuf.indexOf("999") == -1 && colNameBuf.indexOf("990") == -1) { logger.debug(EELFLoggerDelegate.debugLogger, (" return colName " + colNameBuf.toString())); |