You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cxf.apache.org by re...@apache.org on 2016/05/31 00:36:57 UTC
[07/17] cxf git commit: Updating WADLGenerator to block the recursion
for XMLGregorianCalendar
Updating WADLGenerator to block the recursion for XMLGregorianCalendar
Project: http://git-wip-us.apache.org/repos/asf/cxf/repo
Commit: http://git-wip-us.apache.org/repos/asf/cxf/commit/fc8b7497
Tree: http://git-wip-us.apache.org/repos/asf/cxf/tree/fc8b7497
Diff: http://git-wip-us.apache.org/repos/asf/cxf/diff/fc8b7497
Branch: refs/heads/master-jaxrs-2.1
Commit: fc8b749755eb22ca4bc2e552c08832a10af7810d
Parents: 5f04106
Author: Sergey Beryozkin <sb...@gmail.com>
Authored: Mon May 30 10:53:21 2016 +0100
Committer: Sergey Beryozkin <sb...@gmail.com>
Committed: Mon May 30 10:53:21 2016 +0100
----------------------------------------------------------------------
.../java/org/apache/cxf/jaxrs/model/wadl/WadlGenerator.java | 5 ++++-
1 file changed, 4 insertions(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cxf/blob/fc8b7497/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 3a37814..02f03b2 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
@@ -69,6 +69,7 @@ import javax.xml.bind.JAXBContext;
import javax.xml.bind.annotation.XmlRootElement;
import javax.xml.bind.annotation.XmlSeeAlso;
import javax.xml.bind.annotation.XmlType;
+import javax.xml.datatype.XMLGregorianCalendar;
import javax.xml.namespace.QName;
import javax.xml.parsers.ParserConfigurationException;
import javax.xml.stream.XMLStreamException;
@@ -874,7 +875,9 @@ public class WadlGenerator implements ContainerRequestFilter {
}
Class<?> paramCls = entry.getValue();
boolean isPrimitive = InjectionUtils.isPrimitive(paramCls) || paramCls.isEnum();
- if (isPrimitive || Date.class.isAssignableFrom(paramCls)
+ if (isPrimitive
+ || Date.class.isAssignableFrom(paramCls)
+ || XMLGregorianCalendar.class.isAssignableFrom(paramCls)
|| InjectionUtils.isSupportedCollectionOrArray(paramCls)) {
doWriteParam(ori, sb, entry.getKey(), paramCls, paramCls, name, new Annotation[] {}, isJson);
} else if (!parentBeanClasses.contains(paramCls)) {