diff --git a/edexOsgi/com.raytheon.uf.common.dataquery/META-INF/MANIFEST.MF b/edexOsgi/com.raytheon.uf.common.dataquery/META-INF/MANIFEST.MF index cd31e1b808..79eaf9cae7 100644 --- a/edexOsgi/com.raytheon.uf.common.dataquery/META-INF/MANIFEST.MF +++ b/edexOsgi/com.raytheon.uf.common.dataquery/META-INF/MANIFEST.MF @@ -12,4 +12,5 @@ Export-Package: com.raytheon.uf.common.dataquery, com.raytheon.uf.common.dataquery.responses Require-Bundle: com.raytheon.uf.common.serialization;bundle-version="1.12.1173", com.raytheon.uf.common.serialization.comm;bundle-version="1.12.1173" -Import-Package: com.raytheon.uf.common.time +Import-Package: com.raytheon.uf.common.time, + com.raytheon.uf.common.time.util diff --git a/edexOsgi/com.raytheon.uf.common.dataquery/src/com/raytheon/uf/common/dataquery/requests/RequestConstraint.java b/edexOsgi/com.raytheon.uf.common.dataquery/src/com/raytheon/uf/common/dataquery/requests/RequestConstraint.java index 2f5edfa66d..6bd330e742 100644 --- a/edexOsgi/com.raytheon.uf.common.dataquery/src/com/raytheon/uf/common/dataquery/requests/RequestConstraint.java +++ b/edexOsgi/com.raytheon.uf.common.dataquery/src/com/raytheon/uf/common/dataquery/requests/RequestConstraint.java @@ -25,6 +25,7 @@ import java.text.ParseException; import java.text.SimpleDateFormat; import java.util.ArrayList; import java.util.Arrays; +import java.util.Calendar; import java.util.Collection; import java.util.Date; import java.util.EnumSet; @@ -42,6 +43,7 @@ import javax.xml.bind.annotation.XmlType; import com.raytheon.uf.common.serialization.ISerializableObject; import com.raytheon.uf.common.serialization.annotations.DynamicSerialize; import com.raytheon.uf.common.serialization.annotations.DynamicSerializeElement; +import com.raytheon.uf.common.time.util.TimeUtil; /** * RequestConstraint - Constraints on a uEngine request @@ -55,9 +57,12 @@ import com.raytheon.uf.common.serialization.annotations.DynamicSerializeElement; * Date Ticket# Engineer Description * ------------ ---------- ----------- -------------------------- * Aug 21, 2007 chammack Initial Creation. - * May 27, 2009 2408 jsanchez Cast value to String. - * Sep 28, 2009 3099 bsteffen Fixed constraintCompare to convert all non-numeric objects to String - * Nov 05, 2009 3553 rjpeter Added isNull capability. + * May 27, 2009 2408 jsanchez Cast value to String. + * Sep 28, 2009 3099 bsteffen Fixed constraintCompare to convert + * all non-numeric objects to String + * Nov 05, 2009 3553 rjpeter Added isNull capability. + * Jul 09, 2013 1869 bsteffen Format Calendar when making + * Constraint Mapping. * * * @@ -524,6 +529,8 @@ public class RequestConstraint implements ISerializableObject, Cloneable { String constraintValue = null; if (value == null) { constraintType = ConstraintType.ISNULL; + } else if (value instanceof Calendar) { + constraintValue = TimeUtil.formatCalendar((Calendar) value); } else { constraintValue = value.toString(); if (value.getClass().isArray() || value instanceof Collection) {