Skip to content

Commit 9146659

Browse files
author
bnasslahsen
committed
PR#450 review
1 parent 5a675e9 commit 9146659

File tree

21 files changed

+48
-48
lines changed

21 files changed

+48
-48
lines changed

Diff for: ‎springdoc-openapi-kotlin/src/test/java/test/org/springdoc/api/app1/SpringDocTestApp.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@
2828
import org.springframework.context.annotation.ComponentScan;
2929

3030
@SpringBootApplication
31-
@ComponentScan(basePackages = { "org.springdoc.core", "test.org.springdoc.api.app1" })
31+
@ComponentScan(basePackages = { "org.springdoc", "test.org.springdoc.api.app1" })
3232
public class SpringDocTestApp {
3333
public static void main(String[] args) {
3434
SpringApplication.run(SpringDocTestApp.class, args);

Diff for: ‎springdoc-openapi-kotlin/src/test/kotlin/test/org/springdoc/api/app2/SpringDocApp2Test.kt

+2-2
Original file line numberDiff line numberDiff line change
@@ -22,10 +22,10 @@ import org.springframework.boot.autoconfigure.SpringBootApplication
2222
import org.springframework.context.annotation.ComponentScan
2323
import test.org.springdoc.api.AbstractKotlinSpringDocTest
2424

25-
@ComponentScan(basePackages = ["org.springdoc.core", "test.org.springdoc.api.app2"])
25+
@ComponentScan(basePackages = ["org.springdoc", "test.org.springdoc.api.app2"])
2626
class SpringDocApp2Test : AbstractKotlinSpringDocTest() {
2727

2828
@SpringBootApplication
2929
open class DemoApplication
3030

31-
}
31+
}

Diff for: ‎springdoc-openapi-kotlin/src/test/kotlin/test/org/springdoc/api/app3/SpringDocApp3Test.kt

+2-2
Original file line numberDiff line numberDiff line change
@@ -22,10 +22,10 @@ import org.springframework.boot.autoconfigure.SpringBootApplication
2222
import org.springframework.context.annotation.ComponentScan
2323
import test.org.springdoc.api.AbstractKotlinSpringDocTest
2424

25-
@ComponentScan(basePackages = ["org.springdoc.core", "test.org.springdoc.api.app3"])
25+
@ComponentScan(basePackages = ["org.springdoc", "test.org.springdoc.api.app3"])
2626
class SpringDocApp3Test : AbstractKotlinSpringDocTest() {
2727

2828
@SpringBootApplication
2929
open class DemoApplication
3030

31-
}
31+
}

Diff for: ‎springdoc-openapi-kotlin/src/test/kotlin/test/org/springdoc/api/app4/SpringDocApp4Test.kt

+2-2
Original file line numberDiff line numberDiff line change
@@ -22,10 +22,10 @@ import org.springframework.boot.autoconfigure.SpringBootApplication
2222
import org.springframework.context.annotation.ComponentScan
2323
import test.org.springdoc.api.AbstractKotlinSpringDocTest
2424

25-
@ComponentScan(basePackages = ["org.springdoc.core", "test.org.springdoc.api.app4"])
25+
@ComponentScan(basePackages = ["org.springdoc", "test.org.springdoc.api.app4"])
2626
class SpringDocApp4Test : AbstractKotlinSpringDocTest() {
2727

2828
@SpringBootApplication
2929
open class DemoApplication
3030

31-
}
31+
}

Diff for: ‎springdoc-openapi-webflux-core/src/main/java/org/springdoc/api/OpenApiResource.java

+2
Original file line numberDiff line numberDiff line change
@@ -39,6 +39,7 @@
3939
import reactor.core.publisher.Mono;
4040

4141
import org.springframework.beans.factory.annotation.Value;
42+
import org.springframework.boot.autoconfigure.condition.ConditionalOnMissingBean;
4243
import org.springframework.http.MediaType;
4344
import org.springframework.http.server.reactive.ServerHttpRequest;
4445
import org.springframework.web.bind.annotation.GetMapping;
@@ -56,6 +57,7 @@
5657
import static org.springframework.util.AntPathMatcher.DEFAULT_PATH_SEPARATOR;
5758

5859
@RestController
60+
@ConditionalOnMissingBean(name = "openApiResource")
5961
public class OpenApiResource extends AbstractOpenApiResource {
6062

6163
private final RequestMappingInfoHandlerMapping requestMappingHandlerMapping;

Diff for: ‎springdoc-openapi-webflux-core/src/main/java/org/springdoc/core/MultipleOpenApiWebFluxConfiguration.java

+4-3
Original file line numberDiff line numberDiff line change
@@ -36,11 +36,12 @@
3636

3737
@Configuration
3838
@ConditionalOnWebApplication(type = ConditionalOnWebApplication.Type.REACTIVE)
39+
@ConditionalOnBean(GroupedOpenApi.class)
3940
@ConditionalOnProperty(name = SPRINGDOC_ENABLED, matchIfMissing = true)
4041
public class MultipleOpenApiWebFluxConfiguration {
4142

42-
@Bean(name = "multipleWebfluxOpenApiResource")
43-
@ConditionalOnMissingBean(name = "multipleWebfluxOpenApiResource")
43+
@Bean
44+
@ConditionalOnMissingBean
4445
public MultipleOpenApiResource multipleOpenApiResource(List<GroupedOpenApi> groupedOpenApis,
4546
ObjectFactory<OpenAPIBuilder> defaultOpenAPIBuilder, AbstractRequestBuilder requestBuilder,
4647
GenericResponseBuilder responseBuilder, OperationBuilder operationParser,
@@ -50,4 +51,4 @@ public MultipleOpenApiResource multipleOpenApiResource(List<GroupedOpenApi> grou
5051
responseBuilder, operationParser,
5152
requestMappingHandlerMapping,springDocConfigProperties);
5253
}
53-
}
54+
}

Diff for: ‎springdoc-openapi-webflux-core/src/main/java/org/springdoc/core/SpringDocWebFluxConfiguration.java

+2-2
Original file line numberDiff line numberDiff line change
@@ -42,8 +42,8 @@
4242
@ConditionalOnProperty(name = SPRINGDOC_ENABLED, matchIfMissing = true)
4343
public class SpringDocWebFluxConfiguration {
4444

45-
@Bean(name = "webfluxOpenApiResource")
46-
@ConditionalOnMissingBean(name = "webfluxOpenApiResource")
45+
@Bean
46+
@ConditionalOnMissingBean
4747
public OpenApiResource openApiResource(OpenAPIBuilder openAPIBuilder, AbstractRequestBuilder requestBuilder,
4848
GenericResponseBuilder responseBuilder, OperationBuilder operationParser,
4949
RequestMappingInfoHandlerMapping requestMappingHandlerMapping,

Diff for: ‎springdoc-openapi-webflux-core/src/test/java/test/org/springdoc/api/app3/SpringDocTestApp.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@
3030
import org.springframework.context.annotation.ComponentScan;
3131

3232
@SpringBootApplication
33-
@ComponentScan(basePackages = { "org.springdoc.core", "test.org.springdoc.api.app3" })
33+
@ComponentScan(basePackages = { "org.springdoc", "test.org.springdoc.api.app3" })
3434
public class SpringDocTestApp {
3535
public static void main(String[] args) {
3636
SpringApplication.run(SpringDocTestApp.class, args);

Diff for: ‎springdoc-openapi-webflux-core/src/test/java/test/org/springdoc/api/app39/SpringDocTestApp.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@
3030
import org.springframework.context.annotation.ComponentScan;
3131

3232
@SpringBootApplication
33-
@ComponentScan(basePackages = { "org.springdoc.core", "test.org.springdoc.api.app39" })
33+
@ComponentScan(basePackages = { "org.springdoc", "test.org.springdoc.api.app39" })
3434
public class SpringDocTestApp {
3535

3636
public static void main(String[] args) {

Diff for: ‎springdoc-openapi-webflux-core/src/test/java/test/org/springdoc/api/app4/SpringDocTestApp.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@
3030
import org.springframework.context.annotation.ComponentScan;
3131

3232
@SpringBootApplication
33-
@ComponentScan(basePackages = { "org.springdoc.core", "test.org.springdoc.api.app4" })
33+
@ComponentScan(basePackages = { "org.springdoc", "test.org.springdoc.api.app4" })
3434
public class SpringDocTestApp {
3535
public static void main(String[] args) {
3636
SpringApplication.run(SpringDocTestApp.class, args);

Diff for: ‎springdoc-openapi-webflux-core/src/test/java/test/org/springdoc/api/app5/SpringDocTestApp.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@
3030
import org.springframework.context.annotation.ComponentScan;
3131

3232
@SpringBootApplication
33-
@ComponentScan(basePackages = { "org.springdoc.core", "test.org.springdoc.api.app5" })
33+
@ComponentScan(basePackages = { "org.springdoc", "test.org.springdoc.api.app5" })
3434
public class SpringDocTestApp {
3535
public static void main(String[] args) {
3636
SpringApplication.run(SpringDocTestApp.class, args);

Diff for: ‎springdoc-openapi-webflux-core/src/test/java/test/org/springdoc/api/app63/SpringDocApp63Test.java

+2-2
Original file line numberDiff line numberDiff line change
@@ -38,6 +38,6 @@ public static void afterClass() {
3838
}
3939

4040
@SpringBootApplication
41-
@ComponentScan(basePackages = { "org.springdoc.core", "test.org.springdoc.api.app63" })
41+
@ComponentScan(basePackages = { "org.springdoc", "test.org.springdoc.api.app63" })
4242
static class SpringDocTestApp {}
43-
}
43+
}

Diff for: ‎springdoc-openapi-webflux-core/src/test/java/test/org/springdoc/api/app64/SpringDocApp64Test.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -38,6 +38,6 @@ public static void afterClass() {
3838
}
3939

4040
@SpringBootApplication
41-
@ComponentScan(basePackages = { "org.springdoc.core", "test.org.springdoc.api.app64" })
41+
@ComponentScan(basePackages = { "org.springdoc", "test.org.springdoc.api.app64" })
4242
static class SpringDocTestApp {}
4343
}

Diff for: ‎springdoc-openapi-webflux-core/src/test/java/test/org/springdoc/api/app65/SpringDocApp65Test.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -26,6 +26,6 @@
2626
public class SpringDocApp65Test extends AbstractSpringDocTest {
2727

2828
@SpringBootApplication
29-
@ComponentScan(basePackages = { "org.springdoc.core", "test.org.springdoc.api.app65" })
29+
@ComponentScan(basePackages = { "org.springdoc", "test.org.springdoc.api.app65" })
3030
static class SpringDocTestApp {}
3131
}

Diff for: ‎springdoc-openapi-webflux-core/src/test/java/test/org/springdoc/api/app66/SpringDocTestApp.java

+1-6
Original file line numberDiff line numberDiff line change
@@ -25,17 +25,13 @@
2525
import io.swagger.v3.oas.models.security.SecurityScheme;
2626
import org.springdoc.core.GroupedOpenApi;
2727

28-
import org.springdoc.core.MultipleOpenApiWebFluxConfiguration;
2928
import org.springframework.boot.SpringApplication;
30-
import org.springframework.boot.autoconfigure.AutoConfigureBefore;
3129
import org.springframework.boot.autoconfigure.SpringBootApplication;
3230
import org.springframework.context.annotation.Bean;
3331
import org.springframework.context.annotation.ComponentScan;
34-
import org.springframework.core.Ordered;
35-
import org.springframework.core.annotation.Order;
3632

3733
@SpringBootApplication
38-
@ComponentScan(basePackages = { "org.springdoc.core", "test.org.springdoc.api.app66" })
34+
@ComponentScan(basePackages = { "org.springdoc", "test.org.springdoc.api.app66" })
3935
public class SpringDocTestApp {
4036
public static void main(String[] args) {
4137
SpringApplication.run(SpringDocTestApp.class, args);
@@ -51,7 +47,6 @@ public OpenAPI customOpenAPI() {
5147
}
5248

5349
@Bean
54-
@Order(Ordered.HIGHEST_PRECEDENCE)
5550
public GroupedOpenApi streamOpenApi() {
5651
String[] paths = { "/stream/**" };
5752
String[] packagedToMatch = { "test.org.springdoc.api.app66" };

Diff for: ‎springdoc-openapi-webflux-core/src/test/java/test/org/springdoc/api/app67/SpringDocApp67Test.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@
2828
public class SpringDocApp67Test extends AbstractSpringDocTest {
2929

3030
@SpringBootApplication
31-
@ComponentScan(basePackages = { "org.springdoc.core", "test.org.springdoc.api.app67" })
31+
@ComponentScan(basePackages = { "org.springdoc", "test.org.springdoc.api.app67" })
3232
static class SpringDocTestApp {}
3333

3434
@Test

Diff for: ‎springdoc-openapi-webflux-core/src/test/java/test/org/springdoc/api/core/ReactiveAutoConfigurationTest.java

+5-5
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,7 @@ public void configurations_successfully_loaded() {
3737
contextRunner
3838
.run(context -> assertThat(context)
3939
.hasNotFailed()
40-
.hasBean("webfluxOpenApiResource"));
40+
.hasBean("openApiResource"));
4141
}
4242

4343
@Test
@@ -46,7 +46,7 @@ public void configurations_not_loaded_when_application_is_not_web() {
4646
.withUserConfiguration(TestApp.class)
4747
.run(context -> assertThat(context)
4848
.hasNotFailed()
49-
.doesNotHaveBean("webfluxOpenApiResource"));
49+
.doesNotHaveBean("openApiResource"));
5050
}
5151

5252
@Test
@@ -55,7 +55,7 @@ public void configurations_not_loaded_when_disabled() {
5555
.withPropertyValues("springdoc.api-docs.enabled=false")
5656
.run(context -> assertThat(context)
5757
.hasNotFailed()
58-
.doesNotHaveBean("webfluxOpenApiResource"));
58+
.doesNotHaveBean("openApiResource"));
5959
}
6060

6161
@Test
@@ -64,11 +64,11 @@ public void configurations_not_loaded_when_reactor_is_not_on_class_path() {
6464
.withClassLoader(new FilteredClassLoader("org.springframework.web.reactive.HandlerResult"))
6565
.run(context -> assertThat(context)
6666
.hasNotFailed()
67-
.doesNotHaveBean("webfluxOpenApiResource"));
67+
.doesNotHaveBean("openApiResource"));
6868

6969
}
7070

7171
@SpringBootApplication
7272
static class TestApp {
7373
}
74-
}
74+
}

Diff for: ‎springdoc-openapi-webmvc-core/src/main/java/org/springdoc/api/OpenApiResource.java

+2
Original file line numberDiff line numberDiff line change
@@ -42,6 +42,7 @@
4242
import org.springdoc.core.customizers.OpenApiCustomiser;
4343

4444
import org.springframework.beans.factory.annotation.Value;
45+
import org.springframework.boot.autoconfigure.condition.ConditionalOnMissingBean;
4546
import org.springframework.core.annotation.AnnotationUtils;
4647
import org.springframework.http.MediaType;
4748
import org.springframework.web.bind.annotation.GetMapping;
@@ -60,6 +61,7 @@
6061
import static org.springframework.util.AntPathMatcher.DEFAULT_PATH_SEPARATOR;
6162

6263
@RestController
64+
@ConditionalOnMissingBean(name = "openApiResource")
6365
public class OpenApiResource extends AbstractOpenApiResource {
6466

6567
private final RequestMappingInfoHandlerMapping requestMappingHandlerMapping;

Diff for: ‎springdoc-openapi-webmvc-core/src/main/java/org/springdoc/core/MultipleOpenApiSupportConfiguration.java

+3-3
Original file line numberDiff line numberDiff line change
@@ -42,8 +42,8 @@
4242
@ConditionalOnProperty(name = SPRINGDOC_ENABLED, matchIfMissing = true)
4343
public class MultipleOpenApiSupportConfiguration {
4444

45-
@Bean(name = "multipleMvcOpenApiResource")
46-
@ConditionalOnMissingBean(name = "multipleMvcOpenApiResource")
45+
@Bean
46+
@ConditionalOnMissingBean
4747
public MultipleOpenApiResource multipleOpenApiResource(List<GroupedOpenApi> groupedOpenApis,
4848
ObjectFactory<OpenAPIBuilder> defaultOpenAPIBuilder, AbstractRequestBuilder requestBuilder,
4949
GenericResponseBuilder responseBuilder, OperationBuilder operationParser,
@@ -54,4 +54,4 @@ public MultipleOpenApiResource multipleOpenApiResource(List<GroupedOpenApi> grou
5454
responseBuilder, operationParser,
5555
requestMappingHandlerMapping, servletContextProvider,springDocConfigProperties);
5656
}
57-
}
57+
}

Diff for: ‎springdoc-openapi-webmvc-core/src/main/java/org/springdoc/core/SpringDocWebMvcConfiguration.java

+2-2
Original file line numberDiff line numberDiff line change
@@ -47,8 +47,8 @@
4747
@ConditionalOnProperty(name = SPRINGDOC_ENABLED, matchIfMissing = true)
4848
public class SpringDocWebMvcConfiguration {
4949

50-
@Bean(name = "mvcOpenApiResource")
51-
@ConditionalOnMissingBean(name = "mvcOpenApiResource")
50+
@Bean
51+
@ConditionalOnMissingBean
5252
public OpenApiResource openApiResource(OpenAPIBuilder openAPIBuilder, AbstractRequestBuilder requestBuilder,
5353
GenericResponseBuilder responseBuilder, OperationBuilder operationParser,
5454
RequestMappingInfoHandlerMapping requestMappingHandlerMapping, Optional<ActuatorProvider> servletContextProvider,

Diff for: ‎springdoc-openapi-webmvc-core/src/test/java/test/org/springdoc/api/app72/BlockingAutoConfigurationTest.java

+11-11
Original file line numberDiff line numberDiff line change
@@ -40,9 +40,9 @@ public void configurations_successfully_loaded() {
4040
.withPropertyValues("springdoc.show-actuator=true")
4141
.run(context -> assertThat(context)
4242
.hasNotFailed()
43-
.hasBean("mvcOpenApiResource")
43+
.hasBean("openApiResource")
4444
.hasBean("actuatorProvider")
45-
.hasBean("multipleMvcOpenApiResource")
45+
.hasBean("multipleOpenApiResource")
4646
);
4747
}
4848

@@ -52,9 +52,9 @@ public void configurations_not_loaded_when_application_is_not_web() {
5252
.withUserConfiguration(TestApp.class)
5353
.run(context -> assertThat(context)
5454
.hasNotFailed()
55-
.doesNotHaveBean("mvcOpenApiResource")
55+
.doesNotHaveBean("openApiResource")
5656
.doesNotHaveBean("actuatorProvider")
57-
.doesNotHaveBean("multipleMvcOpenApiResource")
57+
.doesNotHaveBean("multipleOpenApiResource")
5858
);
5959
}
6060

@@ -63,9 +63,9 @@ public void actuator_configuration_not_loaded_when_not_enabled_explicitly() {
6363
contextRunner
6464
.run(context -> assertThat(context)
6565
.hasNotFailed()
66-
.hasBean("mvcOpenApiResource")
66+
.hasBean("openApiResource")
6767
.doesNotHaveBean("actuatorPprrovider")
68-
.hasBean("multipleMvcOpenApiResource")
68+
.hasBean("multipleOpenApiResource")
6969
);
7070
}
7171

@@ -75,9 +75,9 @@ public void configurations_not_loaded_when_disabled() {
7575
.withPropertyValues("springdoc.api-docs.enabled=false")
7676
.run(context -> assertThat(context)
7777
.hasNotFailed()
78-
.doesNotHaveBean("mvcOpenApiResource")
78+
.doesNotHaveBean("openApiResource")
7979
.doesNotHaveBean("actuatorProvider")
80-
.doesNotHaveBean("multipleMvcOpenApiResource")
80+
.doesNotHaveBean("multipleOpenApiResource")
8181
);
8282
}
8383

@@ -87,9 +87,9 @@ public void configurations_not_loaded_when_mvc_is_not_on_class_path() {
8787
.withClassLoader(new FilteredClassLoader("org.springframework.web.context.support.GenericWebApplicationContext"))
8888
.run(context -> assertThat(context)
8989
.hasNotFailed()
90-
.doesNotHaveBean("mvcOpenApiResource")
90+
.doesNotHaveBean("openApiResource")
9191
.doesNotHaveBean("actuatorProvider")
92-
.doesNotHaveBean("multipleMvcOpenApiResource")
92+
.doesNotHaveBean("multipleOpenApiResource")
9393
);
9494

9595
}
@@ -104,4 +104,4 @@ GroupedOpenApi testGroupedOpenApi() {
104104
.build();
105105
}
106106
}
107-
}
107+
}

0 commit comments

Comments
 (0)