You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cxf.apache.org by se...@apache.org on 2015/05/11 22:05:36 UTC
cxf git commit: Updating WadlGenerator to support mulltiple doc
providers
Repository: cxf
Updated Branches:
refs/heads/master 7b31a2afc -> aecaf0106
Updating WadlGenerator to support mulltiple doc providers
Project: http://git-wip-us.apache.org/repos/asf/cxf/repo
Commit: http://git-wip-us.apache.org/repos/asf/cxf/commit/aecaf010
Tree: http://git-wip-us.apache.org/repos/asf/cxf/tree/aecaf010
Diff: http://git-wip-us.apache.org/repos/asf/cxf/diff/aecaf010
Branch: refs/heads/master
Commit: aecaf0106fa98028d2f40585c3e835882da4bb34
Parents: 7b31a2a
Author: Sergey Beryozkin <sb...@talend.com>
Authored: Mon May 11 21:05:15 2015 +0100
Committer: Sergey Beryozkin <sb...@talend.com>
Committed: Mon May 11 21:05:15 2015 +0100
----------------------------------------------------------------------
.../cxf/jaxrs/model/wadl/WadlGenerator.java | 20 +++++++++++---------
1 file changed, 11 insertions(+), 9 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cxf/blob/aecaf010/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 8974f1e..24de86b 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
@@ -180,7 +180,7 @@ public class WadlGenerator implements ContainerRequestFilter {
private String stylesheetReference;
private boolean applyStylesheetLocally;
private Bus bus;
- private DocumentationProvider docProvider;
+ private List<DocumentationProvider> docProviders = new LinkedList<DocumentationProvider>();
private ResourceIdGenerator idGenerator;
public WadlGenerator() {
@@ -941,7 +941,7 @@ public class WadlGenerator implements ContainerRequestFilter {
boolean isJson) {
//CHECKSTYLE:ON
boolean docAnnAvailable = isDocAvailable(anns);
- if (docAnnAvailable || (ori != null && docProvider != null)) {
+ if (docAnnAvailable || (ori != null && !docProviders.isEmpty())) {
sb.append(">");
if (docAnnAvailable) {
handleDocs(anns, sb, category, allowDefault, isJson);
@@ -1650,19 +1650,19 @@ public class WadlGenerator implements ContainerRequestFilter {
}
protected void handleClassJavaDocs(ClassResourceInfo cri, StringBuilder sb) {
- if (docProvider != null) {
+ for (DocumentationProvider docProvider : docProviders) {
addProvidedDocs(sb, docProvider.getClassDoc(cri));
}
}
protected void handleOperJavaDocs(OperationResourceInfo ori, StringBuilder sb) {
- if (docProvider != null) {
+ for (DocumentationProvider docProvider : docProviders) {
addProvidedDocs(sb, docProvider.getMethodDoc(ori));
}
}
protected void handleOperResponseJavaDocs(OperationResourceInfo ori, StringBuilder sb) {
- if (docProvider != null) {
+ for (DocumentationProvider docProvider : docProviders) {
addProvidedDocs(sb, docProvider.getMethodResponseDoc(ori));
}
}
@@ -1670,7 +1670,7 @@ public class WadlGenerator implements ContainerRequestFilter {
protected void handleOperParamJavaDocs(OperationResourceInfo ori,
int paramIndex,
StringBuilder sb) {
- if (docProvider != null) {
+ for (DocumentationProvider docProvider : docProviders) {
addProvidedDocs(sb, docProvider.getMethodParameterDoc(ori, paramIndex));
}
}
@@ -2128,13 +2128,15 @@ public class WadlGenerator implements ContainerRequestFilter {
}
public void setJavaDocPath(String path) throws Exception {
- docProvider = new JavaDocProvider(bus == null ? BusFactory.getDefaultBus() : bus, path);
+ setDocumentationProvider(new JavaDocProvider(bus == null ? BusFactory.getDefaultBus() : bus, path));
}
public void setDocumentationProvider(DocumentationProvider p) {
- docProvider = p;
+ docProviders.add(p);
+ }
+ public void setDocumentationProvider(List<DocumentationProvider> ps) {
+ docProviders.addAll(ps);
}
-
public void setStylesheetReference(String stylesheetReference) {
this.stylesheetReference = stylesheetReference;
}