Return-Path: X-Original-To: archive-asf-public-internal@cust-asf2.ponee.io Delivered-To: archive-asf-public-internal@cust-asf2.ponee.io Received: from cust-asf.ponee.io (cust-asf.ponee.io [163.172.22.183]) by cust-asf2.ponee.io (Postfix) with ESMTP id 9D32D2009E8 for ; Mon, 30 May 2016 11:53:38 +0200 (CEST) Received: by cust-asf.ponee.io (Postfix) id 9BC8F160A19; Mon, 30 May 2016 09:53:38 +0000 (UTC) Delivered-To: archive-asf-public@cust-asf.ponee.io Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by cust-asf.ponee.io (Postfix) with SMTP id E548D160A16 for ; Mon, 30 May 2016 11:53:37 +0200 (CEST) Received: (qmail 47292 invoked by uid 500); 30 May 2016 09:53:37 -0000 Mailing-List: contact commits-help@cxf.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@cxf.apache.org Delivered-To: mailing list commits@cxf.apache.org Received: (qmail 47283 invoked by uid 99); 30 May 2016 09:53:37 -0000 Received: from git1-us-west.apache.org (HELO git1-us-west.apache.org) (140.211.11.23) by apache.org (qpsmtpd/0.29) with ESMTP; Mon, 30 May 2016 09:53:37 +0000 Received: by git1-us-west.apache.org (ASF Mail Server at git1-us-west.apache.org, from userid 33) id ADCA2DFABB; Mon, 30 May 2016 09:53:36 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: sergeyb@apache.org To: commits@cxf.apache.org Message-Id: X-Mailer: ASF-Git Admin Mailer Subject: cxf git commit: Updating WADLGenerator to block the recursion for XMLGregorianCalendar Date: Mon, 30 May 2016 09:53:36 +0000 (UTC) archived-at: Mon, 30 May 2016 09:53:38 -0000 Repository: cxf Updated Branches: refs/heads/master 5f0410688 -> fc8b74975 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 Commit: fc8b749755eb22ca4bc2e552c08832a10af7810d Parents: 5f04106 Author: Sergey Beryozkin Authored: Mon May 30 10:53:21 2016 +0100 Committer: Sergey Beryozkin 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)) {