You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cxf.apache.org by se...@apache.org on 2014/10/08 11:38:48 UTC
git commit: [CXF-6037] Support for java.sql.Time
Repository: cxf
Updated Branches:
refs/heads/master 74b552206 -> 625bc46f5
[CXF-6037] Support for java.sql.Time
Project: http://git-wip-us.apache.org/repos/asf/cxf/repo
Commit: http://git-wip-us.apache.org/repos/asf/cxf/commit/625bc46f
Tree: http://git-wip-us.apache.org/repos/asf/cxf/tree/625bc46f
Diff: http://git-wip-us.apache.org/repos/asf/cxf/diff/625bc46f
Branch: refs/heads/master
Commit: 625bc46f5f9a0cef6fc9d5975cd5c2b8697d2bce
Parents: 74b5522
Author: Sergey Beryozkin <sb...@talend.com>
Authored: Wed Oct 8 10:38:29 2014 +0100
Committer: Sergey Beryozkin <sb...@talend.com>
Committed: Wed Oct 8 10:38:29 2014 +0100
----------------------------------------------------------------------
.../cxf/jaxrs/ext/search/AbstractSearchConditionParser.java | 8 ++++++++
1 file changed, 8 insertions(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cxf/blob/625bc46f/rt/rs/extensions/search/src/main/java/org/apache/cxf/jaxrs/ext/search/AbstractSearchConditionParser.java
----------------------------------------------------------------------
diff --git a/rt/rs/extensions/search/src/main/java/org/apache/cxf/jaxrs/ext/search/AbstractSearchConditionParser.java b/rt/rs/extensions/search/src/main/java/org/apache/cxf/jaxrs/ext/search/AbstractSearchConditionParser.java
index 2ad62bc..2eda542 100644
--- a/rt/rs/extensions/search/src/main/java/org/apache/cxf/jaxrs/ext/search/AbstractSearchConditionParser.java
+++ b/rt/rs/extensions/search/src/main/java/org/apache/cxf/jaxrs/ext/search/AbstractSearchConditionParser.java
@@ -21,6 +21,7 @@ package org.apache.cxf.jaxrs.ext.search;
import java.lang.annotation.Annotation;
import java.lang.reflect.Method;
import java.lang.reflect.Proxy;
+import java.sql.Time;
import java.sql.Timestamp;
import java.text.DateFormat;
import java.text.ParseException;
@@ -270,6 +271,8 @@ public abstract class AbstractSearchConditionParser<T> implements SearchConditio
try {
if (Timestamp.class.isAssignableFrom(valueType)) {
return convertToTimestamp(value);
+ } else if (Time.class.isAssignableFrom(valueType)) {
+ return convertToTime(value);
} else {
return convertToDefaultDate(value);
}
@@ -292,6 +295,11 @@ public abstract class AbstractSearchConditionParser<T> implements SearchConditio
return new Timestamp(date.getTime());
}
+ private Time convertToTime(String value) throws ParseException {
+ Date date = convertToDefaultDate(value);
+ return new Time(date.getTime());
+ }
+
private Date convertToDefaultDate(String value) throws ParseException {
DateFormat df = SearchUtils.getDateFormat(contextProperties);
String dateValue = value;