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/12/05 18:18:52 UTC
cxf git commit: [CXF-6137] Treating Date as simple type
Repository: cxf
Updated Branches:
refs/heads/master 5f7bb5a03 -> 0304dcbf5
[CXF-6137] Treating Date as simple type
Project: http://git-wip-us.apache.org/repos/asf/cxf/repo
Commit: http://git-wip-us.apache.org/repos/asf/cxf/commit/0304dcbf
Tree: http://git-wip-us.apache.org/repos/asf/cxf/tree/0304dcbf
Diff: http://git-wip-us.apache.org/repos/asf/cxf/diff/0304dcbf
Branch: refs/heads/master
Commit: 0304dcbf5668082d98196d9346e7d10c0bf48387
Parents: 5f7bb5a
Author: Sergey Beryozkin <sb...@talend.com>
Authored: Fri Dec 5 17:18:31 2014 +0000
Committer: Sergey Beryozkin <sb...@talend.com>
Committed: Fri Dec 5 17:18:31 2014 +0000
----------------------------------------------------------------------
.../main/java/org/apache/cxf/jaxrs/model/wadl/WadlGenerator.java | 4 +++-
1 file changed, 3 insertions(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cxf/blob/0304dcbf/rt/rs/description/src/main/java/org/apache/cxf/jaxrs/model/wadl/WadlGenerator.java
----------------------------------------------------------------------
diff --git a/rt/rs/description/src/main/java/org/apache/cxf/jaxrs/model/wadl/WadlGenerator.java b/rt/rs/description/src/main/java/org/apache/cxf/jaxrs/model/wadl/WadlGenerator.java
index c5c3f8b..a1cdcf4 100644
--- a/rt/rs/description/src/main/java/org/apache/cxf/jaxrs/model/wadl/WadlGenerator.java
+++ b/rt/rs/description/src/main/java/org/apache/cxf/jaxrs/model/wadl/WadlGenerator.java
@@ -35,6 +35,7 @@ import java.util.Arrays;
import java.util.Collection;
import java.util.Collections;
import java.util.Comparator;
+import java.util.Date;
import java.util.HashMap;
import java.util.HashSet;
import java.util.IdentityHashMap;
@@ -805,7 +806,8 @@ public class WadlGenerator implements ContainerRequestFilter {
}
Class<?> paramCls = entry.getValue();
boolean isPrimitive = InjectionUtils.isPrimitive(paramCls) || paramCls.isEnum();
- if (isPrimitive || InjectionUtils.isSupportedCollectionOrArray(paramCls)) {
+ if (isPrimitive || Date.class.isAssignableFrom(paramCls)
+ || InjectionUtils.isSupportedCollectionOrArray(paramCls)) {
doWriteParam(ori, sb, entry.getKey(), paramCls, paramCls, name, new Annotation[] {}, isJson);
} else if (!parentBeanClasses.contains(paramCls)) {
parentBeanClasses.add(paramCls);