You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cxf.apache.org by il...@apache.org on 2015/12/02 17:10:44 UTC
[3/3] cxf git commit: Introducing activateOnlyIfJaxrsSupported for
explicit activation control
Introducing activateOnlyIfJaxrsSupported for explicit activation control
Project: http://git-wip-us.apache.org/repos/asf/cxf/repo
Commit: http://git-wip-us.apache.org/repos/asf/cxf/commit/3d15737a
Tree: http://git-wip-us.apache.org/repos/asf/cxf/tree/3d15737a
Diff: http://git-wip-us.apache.org/repos/asf/cxf/diff/3d15737a
Branch: refs/heads/master
Commit: 3d15737a94be91f7d21a6523e886a234f36865f5
Parents: e915cfd
Author: Francesco Chicchiriccò <il...@apache.org>
Authored: Wed Dec 2 17:09:06 2015 +0100
Committer: Francesco Chicchiriccò <il...@apache.org>
Committed: Wed Dec 2 17:10:21 2015 +0100
----------------------------------------------------------------------
.../cxf/jaxrs/swagger/AbstractSwaggerFeature.java | 12 +++++++++++-
1 file changed, 11 insertions(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cxf/blob/3d15737a/rt/rs/description/src/main/java/org/apache/cxf/jaxrs/swagger/AbstractSwaggerFeature.java
----------------------------------------------------------------------
diff --git a/rt/rs/description/src/main/java/org/apache/cxf/jaxrs/swagger/AbstractSwaggerFeature.java b/rt/rs/description/src/main/java/org/apache/cxf/jaxrs/swagger/AbstractSwaggerFeature.java
index 08d2e16..386855d 100644
--- a/rt/rs/description/src/main/java/org/apache/cxf/jaxrs/swagger/AbstractSwaggerFeature.java
+++ b/rt/rs/description/src/main/java/org/apache/cxf/jaxrs/swagger/AbstractSwaggerFeature.java
@@ -34,6 +34,7 @@ public abstract class AbstractSwaggerFeature extends AbstractFeature {
protected boolean scan = true;
protected boolean runAsFilter;
+ private boolean activateOnlyIfJaxrsSupported;
private String resourcePackage;
private String version = "1.0.0";
// depending on swagger version basePath is set differently
@@ -57,7 +58,7 @@ public abstract class AbstractSwaggerFeature extends AbstractFeature {
@Override
public void initialize(Server server, Bus bus) {
- if (SWAGGER_JAXRS_AVAILABLE) {
+ if (!activateOnlyIfJaxrsSupported || SWAGGER_JAXRS_AVAILABLE) {
calculateDefaultResourcePackage(server);
calculateDefaultBasePath(server);
addSwaggerResource(server);
@@ -161,4 +162,13 @@ public abstract class AbstractSwaggerFeature extends AbstractFeature {
public void setRunAsFilter(boolean runAsFilter) {
this.runAsFilter = runAsFilter;
}
+
+ public boolean isActivateOnlyIfJaxrsSupported() {
+ return activateOnlyIfJaxrsSupported;
+ }
+
+ public void setActivateOnlyIfJaxrsSupported(boolean activateOnlyIfJaxrsSupported) {
+ this.activateOnlyIfJaxrsSupported = activateOnlyIfJaxrsSupported;
+ }
+
}