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/definition/ReportSchedule.java | |
| 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/definition/ReportSchedule.java')
| -rw-r--r-- | ecomp-sdk/epsdk-analytics/src/main/java/org/onap/portalsdk/analytics/model/definition/ReportSchedule.java | 19 |
1 files changed, 13 insertions, 6 deletions
diff --git a/ecomp-sdk/epsdk-analytics/src/main/java/org/onap/portalsdk/analytics/model/definition/ReportSchedule.java b/ecomp-sdk/epsdk-analytics/src/main/java/org/onap/portalsdk/analytics/model/definition/ReportSchedule.java index d56391ef..5db298b8 100644 --- a/ecomp-sdk/epsdk-analytics/src/main/java/org/onap/portalsdk/analytics/model/definition/ReportSchedule.java +++ b/ecomp-sdk/epsdk-analytics/src/main/java/org/onap/portalsdk/analytics/model/definition/ReportSchedule.java @@ -666,7 +666,9 @@ public class ReportSchedule extends RaptorObject implements Serializable{ paramValue = Utils.replaceInString(paramValue, "''", "'"); ds = ConnectionUtils.getDataSet(paramValue, dbInfo); - if (ds.getRowCount() > 0) paramValue = ds.getString(0, 0); + if (ds.getRowCount() > 0){ + paramValue = ds.getString(0, 0); + } } logger.debug(EELFLoggerDelegate.debugLogger, ("SQLSQLBASED B4^^^^^^^^^ " + sql + " " + fft.getValidationType() + " " + fft.getFieldName() + " " + fft.getFieldId())); if(fft!=null && (fft.getValidationType()!=null && (fft.getValidationType().equals(FormField.VT_TIMESTAMP_HR) || fft.getValidationType().equals(FormField.VT_TIMESTAMP_MIN) ||fft.getValidationType().equals(FormField.VT_TIMESTAMP_SEC) ||fft.getValidationType().equals(FormField.VT_DATE) ))) { @@ -741,8 +743,10 @@ public class ReportSchedule extends RaptorObject implements Serializable{ re1 = Pattern.compile("(^[\r\n]|[\\s]|[^0-9a-zA-Z])AND(.*?[^\r\n]*)"+ "\\["+fft.getFieldName()+ "\\](.*?)\\s", Pattern.DOTALL); posFormField = sql.indexOf(fieldDisplay); posAnd = sql.lastIndexOf(" AND ", posFormField); - if(posAnd < 0) posAnd = 0; - else if (posAnd > 2) posAnd = posAnd - 2; + if(posAnd < 0) + posAnd = 0; + else if (posAnd > 2) + posAnd = posAnd - 2; matcher = re1.matcher(sql); if (matcher.find(posAnd)) { sql = sql.replace(matcher.group(), ""); @@ -763,8 +767,10 @@ public class ReportSchedule extends RaptorObject implements Serializable{ re1 = Pattern.compile("(^[\r\n]|[\\s]|[^0-9a-zA-Z])AND(.*?[^\r\n]*)"+ "\\["+fft.getFieldName()+ "\\](.*?)\\s", Pattern.DOTALL); //+[\'\\)|\'|\\s] posFormField = sql.indexOf(fieldDisplay); posAnd = sql.lastIndexOf(" AND ", posFormField); - if(posAnd < 0) posAnd = 0; - else if (posAnd > 2) posAnd = posAnd - 2; + if(posAnd < 0) + posAnd = 0; + else if (posAnd > 2) + posAnd = posAnd - 2; matcher = re1.matcher(sql); if (matcher.find(posAnd)) { sql = sql.replace(matcher.group(), " "); @@ -1190,7 +1196,8 @@ public class ReportSchedule extends RaptorObject implements Serializable{ }catch(NumberFormatException ex){ numInt = 0; } - if(numInt < 10) return "0"+numInt; + if(numInt < 10) + return "0"+numInt; else return ""+numInt; } |