Repository: cxf Updated Branches: refs/heads/master 905f61906 -> 93738e5b1
Deprecating Swagger2 isScan property as it has no effect Project: http://git-wip-us.apache.org/repos/asf/cxf/repo Commit: http://git-wip-us.apache.org/repos/asf/cxf/commit/93738e5b Tree: http://git-wip-us.apache.org/repos/asf/cxf/tree/93738e5b Diff: http://git-wip-us.apache.org/repos/asf/cxf/diff/93738e5b Branch: refs/heads/master Commit: 93738e5b11e641fb8b5eecc58a5e3819cc6c47e6 Parents: 905f619 Author: Sergey Beryozkin <[email protected]> Authored: Wed Aug 23 12:38:21 2017 +0100 Committer: Sergey Beryozkin <[email protected]> Committed: Wed Aug 23 12:38:21 2017 +0100 ---------------------------------------------------------------------- .../org/apache/cxf/jaxrs/swagger/AbstractSwaggerFeature.java | 6 ++++-- .../java/org/apache/cxf/jaxrs/swagger/Swagger2Feature.java | 2 ++ 2 files changed, 6 insertions(+), 2 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cxf/blob/93738e5b/rt/rs/description-swagger/src/main/java/org/apache/cxf/jaxrs/swagger/AbstractSwaggerFeature.java ---------------------------------------------------------------------- diff --git a/rt/rs/description-swagger/src/main/java/org/apache/cxf/jaxrs/swagger/AbstractSwaggerFeature.java b/rt/rs/description-swagger/src/main/java/org/apache/cxf/jaxrs/swagger/AbstractSwaggerFeature.java index 11ba731..74b3e90 100644 --- a/rt/rs/description-swagger/src/main/java/org/apache/cxf/jaxrs/swagger/AbstractSwaggerFeature.java +++ b/rt/rs/description-swagger/src/main/java/org/apache/cxf/jaxrs/swagger/AbstractSwaggerFeature.java @@ -37,8 +37,8 @@ public abstract class AbstractSwaggerFeature extends AbstractFeature { SWAGGER_JAXRS_AVAILABLE = isSwaggerJaxRsAvailable(); } - protected boolean scan = true; - protected boolean runAsFilter; + private boolean scan = true; + private boolean runAsFilter; private boolean activateOnlyIfJaxrsSupported; private String resourcePackage; private String version; @@ -160,9 +160,11 @@ public abstract class AbstractSwaggerFeature extends AbstractFeature { public void setTermsOfServiceUrl(String termsOfServiceUrl) { this.termsOfServiceUrl = termsOfServiceUrl; } + @Deprecated public boolean isScan() { return scan; } + @Deprecated public void setScan(boolean scan) { this.scan = scan; } http://git-wip-us.apache.org/repos/asf/cxf/blob/93738e5b/rt/rs/description-swagger/src/main/java/org/apache/cxf/jaxrs/swagger/Swagger2Feature.java ---------------------------------------------------------------------- diff --git a/rt/rs/description-swagger/src/main/java/org/apache/cxf/jaxrs/swagger/Swagger2Feature.java b/rt/rs/description-swagger/src/main/java/org/apache/cxf/jaxrs/swagger/Swagger2Feature.java index 78bc676..8419729 100644 --- a/rt/rs/description-swagger/src/main/java/org/apache/cxf/jaxrs/swagger/Swagger2Feature.java +++ b/rt/rs/description-swagger/src/main/java/org/apache/cxf/jaxrs/swagger/Swagger2Feature.java @@ -130,6 +130,7 @@ public class Swagger2Feature extends AbstractSwaggerFeature { super.calculateDefaultBasePath(server); } + @SuppressWarnings("deprecation") @Override protected void addSwaggerResource(Server server, Bus bus) { JAXRSServiceFactoryBean sfb = @@ -214,6 +215,7 @@ public class Swagger2Feature extends AbstractSwaggerFeature { ServerProviderFactory.class.getName())).setUserProviders(providers); } + @SuppressWarnings("deprecation") protected void initBeanConfig(Bus bus, BeanConfig beanConfig) { InputStream is = ResourceUtils.getClasspathResourceStream(propertiesLocation, AbstractSwaggerFeature.class,
