sonar critical for Remove this call to 'equals' 95/47195/2
authorSaurabh Kumar26 <sk00552209@techmahindra.com>
Fri, 11 May 2018 11:16:36 +0000 (16:46 +0530)
committerManoop Talasila <talasila@research.att.com>
Fri, 1 Jun 2018 19:49:21 +0000 (19:49 +0000)
 Use compareTo instead equal and change to related types
Sonar Link:
https://sonar.onap.org/project/issues?assignees=SaurabhKumar26&id=org.onap.portal.sdk%3Aepsdk-project&open=AV_om8Hm-08if2a6ufnV&resolved=false&severities=CRITICAL&types=BUG

Location:
src/main/java/org/onap/portalsdk/analytics/controller/WizardProcessor.java

Line No: 1162

Change-Id: Ib5aa5f125b12b9d76606f4dbfbf672ae14ff1492
Issue-ID: PORTAL-280
Signed-off-by: Saurabh Kumar26 <sk00552209@techmahindra.com>
ecomp-sdk/epsdk-analytics/src/main/java/org/onap/portalsdk/analytics/controller/WizardProcessor.java

index 71e6d75..47af1b7 100644 (file)
@@ -43,10 +43,12 @@ import java.util.Calendar;
 import java.util.Collections;
 import java.util.Iterator;
 import java.util.List;
+import java.util.TimeZone;
 
 import javax.servlet.http.HttpServletRequest;
 import javax.xml.datatype.DatatypeConfigurationException;
 import javax.xml.datatype.DatatypeFactory;
+import javax.xml.datatype.XMLGregorianCalendar;
 
 import org.onap.portalsdk.analytics.error.RaptorException;
 import org.onap.portalsdk.analytics.error.ValidationException;
@@ -105,9 +107,19 @@ import org.onap.portalsdk.core.logging.logic.EELFLoggerDelegate;
  */
 
 public class WizardProcessor extends org.onap.portalsdk.analytics.RaptorObject {
-
+       public static Calendar getCalendar(XMLGregorianCalendar xmlCalendar){
+          // log.debug("Zone ID is " + xmlCalendar.getTimezone());
+           TimeZone timeZone = xmlCalendar.getTimeZone(xmlCalendar.getTimezone());
+           Calendar calendar = Calendar.getInstance(timeZone);
+           calendar.set(Calendar.YEAR,xmlCalendar.getYear());
+           calendar.set(Calendar.MONTH,xmlCalendar.getMonth()-1);
+           calendar.set(Calendar.DATE,xmlCalendar.getDay());
+           calendar.set(Calendar.HOUR_OF_DAY,xmlCalendar.getHour());
+           calendar.set(Calendar.MINUTE,xmlCalendar.getMinute());
+           calendar.set(Calendar.SECOND,xmlCalendar.getSecond());
+           return calendar;
+       }
        private static final EELFLoggerDelegate logger = EELFLoggerDelegate.getLogger(WizardProcessor.class);
-
        public WizardProcessor() {
        }
 
@@ -1159,7 +1171,7 @@ public class WizardProcessor extends org.onap.portalsdk.analytics.RaptorObject {
                                                && fieldSQL.equals(nvl(currField.getFieldSQL())) 
                         && fieldDefaultSQL.equals(nvl(currField.getFieldDefaultSQL()))
                         && dependsOn.equals(nvl(currField.getDependsOn(), "N"))
-                        && (start == null || (start != null && currField.getRangeStartDate() == null) || (start.equals(currField.getRangeStartDate())))
+                        && (start == null || (start != null && currField.getRangeStartDate() == null) || (start.compareTo(getCalendar(currField.getRangeStartDate())) )==0)
                         && (end == null || (end != null && currField.getRangeEndDate() == null) || (end.equals(currField.getRangeEndDate())))
                         && rangeStartDateSQL.equals(nvl(currField.getRangeStartDateSQL()))
                         && rangeEndDateSQL.equals(nvl(currField.getRangeEndDateSQL()))