Repository: cxf Updated Branches: refs/heads/2.7.x-fixes 9132cb69d -> 9b5b62e1d
[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/9b5b62e1 Tree: http://git-wip-us.apache.org/repos/asf/cxf/tree/9b5b62e1 Diff: http://git-wip-us.apache.org/repos/asf/cxf/diff/9b5b62e1 Branch: refs/heads/2.7.x-fixes Commit: 9b5b62e1dc8048cfd36c3d8621de80da55df562f Parents: 9132cb6 Author: Sergey Beryozkin <[email protected]> Authored: Wed May 21 13:26:13 2014 +0100 Committer: Sergey Beryozkin <[email protected]> Committed: Wed May 21 13:31:38 2014 +0100 ---------------------------------------------------------------------- .../java/org/apache/cxf/jaxrs/model/wadl/WadlGenerator.java | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cxf/blob/9b5b62e1/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/model/wadl/WadlGenerator.java ---------------------------------------------------------------------- diff --git a/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/model/wadl/WadlGenerator.java b/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/model/wadl/WadlGenerator.java index 216cf11..fff8bf9 100644 --- a/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/model/wadl/WadlGenerator.java +++ b/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/model/wadl/WadlGenerator.java @@ -134,7 +134,6 @@ public class WadlGenerator implements RequestHandler { private boolean ignoreForwardSlash; private boolean addResourceAndMethodIds; private boolean ignoreRequests; - private boolean linkJsonToXmlSchema; private boolean linkAnyMediaTypeToXmlSchema; private boolean useJaxbContextForQnames = true; private boolean supportCollections = true; @@ -171,7 +170,7 @@ public class WadlGenerator implements RequestHandler { this.ignoreMessageWriters = other.ignoreMessageWriters; this.ignoreForwardSlash = other.ignoreForwardSlash; this.ignoreRequests = other.ignoreRequests; - this.linkJsonToXmlSchema = other.linkJsonToXmlSchema; + this.linkAnyMediaTypeToXmlSchema = other.linkAnyMediaTypeToXmlSchema; this.privateAddresses = other.privateAddresses; this.resolver = other.resolver; this.addResourceAndMethodIds = other.addResourceAndMethodIds; @@ -800,8 +799,7 @@ public class WadlGenerator implements RequestHandler { 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)); @@ -1416,7 +1414,7 @@ public class WadlGenerator implements RequestHandler { } public void setLinkJsonToXmlSchema(boolean link) { - linkJsonToXmlSchema = link; + setLinkAnyMediaTypeToXmlSchema(link); } public void setLinkAnyMediaTypeToXmlSchema(boolean link) {
