Return-Path: X-Original-To: apmail-cxf-commits-archive@www.apache.org Delivered-To: apmail-cxf-commits-archive@www.apache.org Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by minotaur.apache.org (Postfix) with SMTP id C055011166 for ; Wed, 21 May 2014 12:26:36 +0000 (UTC) Received: (qmail 88548 invoked by uid 500); 21 May 2014 12:26:35 -0000 Delivered-To: apmail-cxf-commits-archive@cxf.apache.org Received: (qmail 88485 invoked by uid 500); 21 May 2014 12:26:35 -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 88478 invoked by uid 99); 21 May 2014 12:26:35 -0000 Received: from tyr.zones.apache.org (HELO tyr.zones.apache.org) (140.211.11.114) by apache.org (qpsmtpd/0.29) with ESMTP; Wed, 21 May 2014 12:26:35 +0000 Received: by tyr.zones.apache.org (Postfix, from userid 65534) id 5967D999D89; Wed, 21 May 2014 12:26:35 +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: <5fd3a30803624e9aab7ca6566a5732e5@git.apache.org> X-Mailer: ASF-Git Admin Mailer Subject: git commit: [CXF-5757] Minor update Date: Wed, 21 May 2014 12:26:35 +0000 (UTC) Repository: cxf Updated Branches: refs/heads/master ffc3fb9a8 -> 8050c2664 [CXF-5757] Minor update Project: http://git-wip-us.apache.org/repos/asf/cxf/repo Commit: http://git-wip-us.apache.org/repos/asf/cxf/commit/8050c266 Tree: http://git-wip-us.apache.org/repos/asf/cxf/tree/8050c266 Diff: http://git-wip-us.apache.org/repos/asf/cxf/diff/8050c266 Branch: refs/heads/master Commit: 8050c266472478118c71f0259e08d0df2cf691ee Parents: ffc3fb9 Author: Sergey Beryozkin Authored: Wed May 21 13:26:13 2014 +0100 Committer: Sergey Beryozkin Committed: Wed May 21 13:26:13 2014 +0100 ---------------------------------------------------------------------- .../java/org/apache/cxf/jaxrs/model/wadl/WadlGenerator.java | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cxf/blob/8050c266/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 af12984..e9ec2ba 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 @@ -134,7 +134,6 @@ public class WadlGenerator implements ContainerRequestFilter { private boolean ignoreForwardSlash; private boolean addResourceAndMethodIds; private boolean ignoreRequests; - private boolean linkJsonToXmlSchema; private boolean linkAnyMediaTypeToXmlSchema; private boolean useJaxbContextForQnames = true; private boolean supportCollections = true; @@ -862,8 +861,7 @@ public class WadlGenerator implements ContainerRequestFilter { if (isJson) { sb.append(" element=\"").append(theActualType.getSimpleName()).append("\""); } else if (qnameResolver != null - && (mt.getSubtype().contains("xml") || linkAnyMediaTypeToXmlSchema - || linkJsonToXmlSchema && mt.getSubtype().contains("json")) + && (linkAnyMediaTypeToXmlSchema || mt.getSubtype().contains("xml")) && jaxbTypes.contains(theActualType)) { generateQName(sb, qnameResolver, clsMap, theActualType, isCollection, getBodyAnnotations(ori, inbound)); @@ -1537,7 +1535,7 @@ public class WadlGenerator implements ContainerRequestFilter { @Deprecated public void setLinkJsonToXmlSchema(boolean link) { - linkJsonToXmlSchema = link; + setLinkAnyMediaTypeToXmlSchema(link); } public void setLinkAnyMediaTypeToXmlSchema(boolean link) { linkAnyMediaTypeToXmlSchema = link;