Skip to content

Commit cdc9838

Browse files
committed
refs swagger-api#2312 - rename scanAllResources to readAllResources
1 parent ff1fc9f commit cdc9838

File tree

6 files changed

+14
-14
lines changed

6 files changed

+14
-14
lines changed

modules/swagger-integration/src/main/java/io/swagger/oas/integration/GenericOpenApiContext.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -329,8 +329,8 @@ private OpenAPIConfiguration mergeParentConfiguration (OpenAPIConfiguration conf
329329
if (merged.isPrettyPrint() == null) {
330330
merged.setPrettyPrint(parentConfig.isPrettyPrint());
331331
}
332-
if (merged.isScanAllResources() == null) {
333-
merged.setScanAllResources(parentConfig.isScanAllResources());
332+
if (merged.isReadAllResources() == null) {
333+
merged.setReadAllResources(parentConfig.isReadAllResources());
334334
}
335335
return merged;
336336
}

modules/swagger-integration/src/main/java/io/swagger/oas/integration/SwaggerConfiguration.java

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@ public class SwaggerConfiguration implements OpenAPIConfiguration {
2020
private String scannerClass;
2121

2222
private Boolean prettyPrint;
23-
private Boolean scanAllResources;
23+
private Boolean readAllResources;
2424
private Collection<String> ignoredRoutes;
2525
private Long cacheTTL = -1L;
2626

@@ -37,16 +37,16 @@ public SwaggerConfiguration cacheTTL(Long cacheTTL) {
3737
return this;
3838
}
3939

40-
public Boolean isScanAllResources() {
41-
return scanAllResources;
40+
public Boolean isReadAllResources() {
41+
return readAllResources;
4242
}
4343

44-
public void setScanAllResources(Boolean scanAllResources) {
45-
this.scanAllResources = scanAllResources;
44+
public void setReadAllResources(Boolean readAllResources) {
45+
this.readAllResources = readAllResources;
4646
}
4747

48-
public SwaggerConfiguration scanAllResources(Boolean scanAllResources) {
49-
this.scanAllResources = scanAllResources;
48+
public SwaggerConfiguration readAllResources(Boolean readAllResources) {
49+
this.readAllResources = readAllResources;
5050
return this;
5151
}
5252

modules/swagger-integration/src/main/java/io/swagger/oas/integration/api/OpenAPIConfiguration.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@ public interface OpenAPIConfiguration {
2323

2424
Map<String, Object> getUserDefinedOptions();
2525

26-
Boolean isScanAllResources();
26+
Boolean isReadAllResources();
2727

2828
Boolean isPrettyPrint();
2929

modules/swagger-integration/src/main/resources/META-INF/MANIFEST.MF

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
Manifest-Version: 1.0
2-
Bnd-LastModified: 1501658827414
2+
Bnd-LastModified: 1501660651909
33
Build-Jdk: 1.8.0_72
44
Built-By: frantuma
55
Bundle-Description: Sonatype helps open source projects to set up Maven

modules/swagger-jaxrs2/src/main/java/io/swagger/jaxrs2/integration/ServletConfigContextUtils.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ public class ServletConfigContextUtils {
1919
public static final String OPENAPI_CONFIGURATION_SCANNER_KEY = "openApi.configuration.scannerClass";
2020
public static final String OPENAPI_CONFIGURATION_BUILDER_KEY = "openApi.configuration.builderClass";
2121
public static final String OPENAPI_CONFIGURATION_PRETTYPRINT_KEY = "openApi.configuration.prettyPrint";
22-
public static final String OPENAPI_CONFIGURATION_SCANALLRESOURCES_KEY = "openApi.configuration.scanAllResources";
22+
public static final String OPENAPI_CONFIGURATION_READALLRESOURCES_KEY = "openApi.configuration.readAllResources";
2323
public static final String OPENAPI_CONFIGURATION_RESOURCECLASSES_KEY = "openApi.configuration.resourceClasses";
2424
public static final String OPENAPI_CONFIGURATION_FILTER_KEY = "openApi.configuration.filterClass";
2525
public static final String OPENAPI_CONFIGURATION_CACHE_TTL_KEY = "openApi.configuration.filterClass";

modules/swagger-jaxrs2/src/main/java/io/swagger/jaxrs2/integration/ServletOpenApiConfigurationLoader.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@
1717
import static io.swagger.jaxrs2.integration.ServletConfigContextUtils.OPENAPI_CONFIGURATION_FILTER_KEY;
1818
import static io.swagger.jaxrs2.integration.ServletConfigContextUtils.OPENAPI_CONFIGURATION_PRETTYPRINT_KEY;
1919
import static io.swagger.jaxrs2.integration.ServletConfigContextUtils.OPENAPI_CONFIGURATION_READER_KEY;
20-
import static io.swagger.jaxrs2.integration.ServletConfigContextUtils.OPENAPI_CONFIGURATION_SCANALLRESOURCES_KEY;
20+
import static io.swagger.jaxrs2.integration.ServletConfigContextUtils.OPENAPI_CONFIGURATION_READALLRESOURCES_KEY;
2121
import static io.swagger.jaxrs2.integration.ServletConfigContextUtils.OPENAPI_CONFIGURATION_SCANNER_KEY;
2222
import static io.swagger.jaxrs2.integration.ServletConfigContextUtils.OPENAPI_CONFIGURATION_BUILDER_KEY;
2323
import static io.swagger.jaxrs2.integration.ServletConfigContextUtils.getBooleanInitParam;
@@ -49,7 +49,7 @@ public OpenAPIConfiguration load(String path) throws IOException {
4949
.resourcePackages(resolveResourcePackages(servletConfig))
5050
.filterClass(getInitParam(servletConfig, OPENAPI_CONFIGURATION_FILTER_KEY))
5151
.resourceClasses(resolveResourceClasses(servletConfig))
52-
.scanAllResources(getBooleanInitParam(servletConfig, OPENAPI_CONFIGURATION_SCANALLRESOURCES_KEY))
52+
.readAllResources(getBooleanInitParam(servletConfig, OPENAPI_CONFIGURATION_READALLRESOURCES_KEY))
5353
.prettyPrint(getBooleanInitParam(servletConfig, OPENAPI_CONFIGURATION_PRETTYPRINT_KEY))
5454
.readerClass(getInitParam(servletConfig, OPENAPI_CONFIGURATION_READER_KEY))
5555
.cacheTTL(getLongInitParam(servletConfig, OPENAPI_CONFIGURATION_CACHE_TTL_KEY))

0 commit comments

Comments
 (0)