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 <[email protected]> Authored: Wed May 21 13:26:13 2014 +0100 Committer: Sergey Beryozkin <[email protected]> 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;
