Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Original file line number Diff line number Diff line change
Expand Up @@ -25,6 +25,8 @@ public static boolean areEqual(Object object1, Object object2) {
return areEqualLists((List<Object>) object1, (List<Object>) object2);
} else if (object1 instanceof Map && object2 instanceof Map) {
return areEqualMaps((Map<Object, Object>) object1, (Map<Object, Object>) object2);
} else if (object1 instanceof String || object2 instanceof String) {
return object1.toString().equals(object2.toString());
} else if (!object1.getClass().isAssignableFrom(object2.getClass())) {
return false;
} else {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -29,6 +29,7 @@
import org.kie.dmn.feel.lang.Type;
import org.kie.dmn.feel.lang.types.BuiltInType;
import org.kie.dmn.feel.lang.types.impl.ComparablePeriod;
import org.kie.dmn.feel.runtime.custom.FormattedZonedDateTime;
import org.kie.dmn.model.api.Definitions;
import org.kie.internal.io.ResourceFactory;
import org.omg.dmn.tck.marshaller._20160719.TestCaseType;
Expand Down Expand Up @@ -56,7 +57,6 @@
import java.time.LocalDateTime;
import java.time.LocalTime;
import java.time.OffsetTime;
import java.time.ZonedDateTime;
import java.time.format.DateTimeParseException;
import java.util.ArrayList;
import java.util.Collection;
Expand Down Expand Up @@ -331,7 +331,7 @@ private Object parseType(ValueType value, DMNType dmnType) {
} else {
XMLGregorianCalendar xmlCal = (XMLGregorianCalendar) dateTimeOrDurationValue;
if (xmlCal.getTimezone() != DatatypeConstants.FIELD_UNDEFINED && xmlCal.getXMLSchemaType() == DatatypeConstants.DATETIME) {
return ZonedDateTime.parse(xmlCal.toXMLFormat());
return FormattedZonedDateTime.parse(xmlCal.toXMLFormat());
} else if (xmlCal.getTimezone() != DatatypeConstants.FIELD_UNDEFINED && xmlCal.getXMLSchemaType() == DatatypeConstants.TIME) {
return OffsetTime.parse(xmlCal.toXMLFormat());
} else if (xmlCal.getXMLSchemaType() == DatatypeConstants.DATETIME) {
Expand Down
Loading