File tree Expand file tree Collapse file tree 9 files changed +19
-12
lines changed
springdoc-openapi-common/src/main/java/org/springdoc/core
springdoc-openapi-ui/src/test/java/test/org/springdoc/ui
springdoc-openapi-webflux-core/src/test/java/test/org/springdoc/api/app66
springdoc-openapi-webmvc-core/src/test/java/test/org/springdoc/api Expand file tree Collapse file tree 9 files changed +19
-12
lines changed Original file line number Diff line number Diff line change @@ -15,6 +15,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
1515- Added separate module for spring-hateoas
1616- Added SpringDocUtils.addHiddenRestControllers(String ...)
1717- Added support for wrapper types on request
18+ - Mark GroupedOpenApi.setGroup as deprecated. Use GroupedOpenApi.group instead.
1819### Changed
1920- Upgrade swagger-ui to 3.25.4
2021- Upgrade to spring-boot 2.3.0.RELEASE
Original file line number Diff line number Diff line change @@ -116,11 +116,17 @@ private Builder() {
116116 // use static factory method in parent class
117117 }
118118
119+ @ Deprecated
119120 public Builder setGroup (String group ) {
120121 this .group = group ;
121122 return this ;
122123 }
123124
125+ public Builder group (String group ) {
126+ this .group = group ;
127+ return this ;
128+ }
129+
124130 public Builder pathsToMatch (String ... pathsToMatch ) {
125131 this .pathsToMatch = Arrays .asList (pathsToMatch );
126132 return this ;
Original file line number Diff line number Diff line change @@ -63,7 +63,7 @@ public void postProcessBeanFactory(ConfigurableListableBeanFactory beanFactory)
6363 builder .packagesToScan (elt .getPackagesToScan ().toArray (new String [0 ]));
6464 if (!CollectionUtils .isEmpty (elt .getPathsToMatch ()))
6565 builder .pathsToMatch (elt .getPathsToMatch ().toArray (new String [0 ]));
66- return builder .setGroup (elt .getGroup ()).build ();
66+ return builder .group (elt .getGroup ()).build ();
6767 })
6868 .collect (Collectors .toList ());
6969 groupedOpenApis .forEach (elt -> beanFactory .registerSingleton (elt .getGroup (), elt ));
Original file line number Diff line number Diff line change @@ -35,7 +35,7 @@ public static void main(String[] args) {
3535 public GroupedOpenApi storeOpenApi () {
3636 String paths [] = { "/store/**" };
3737 return GroupedOpenApi .builder ()
38- .setGroup ("stores" )
38+ .group ("stores" )
3939 .pathsToMatch (paths )
4040 .build ();
4141 }
@@ -44,7 +44,7 @@ public GroupedOpenApi storeOpenApi() {
4444 public GroupedOpenApi groupOpenApi () {
4545 String paths [] = { "/pet/**" };
4646 return GroupedOpenApi .builder ()
47- .setGroup ("pets" )
47+ .group ("pets" )
4848 .pathsToMatch (paths )
4949 .build ();
5050 }
Original file line number Diff line number Diff line change @@ -35,7 +35,7 @@ public static void main(String[] args) {
3535 public GroupedOpenApi storeOpenApi () {
3636 String paths [] = { "/store/**" };
3737 return GroupedOpenApi .builder ()
38- .setGroup ("stores" )
38+ .group ("stores" )
3939 .pathsToMatch (paths )
4040 .build ();
4141 }
@@ -44,7 +44,7 @@ public GroupedOpenApi storeOpenApi() {
4444 public GroupedOpenApi groupOpenApi () {
4545 String paths [] = { "/pet/**" };
4646 return GroupedOpenApi .builder ()
47- .setGroup ("pets" )
47+ .group ("pets" )
4848 .pathsToMatch (paths )
4949 .build ();
5050 }
Original file line number Diff line number Diff line change @@ -50,7 +50,7 @@ public OpenAPI customOpenAPI() {
5050 public GroupedOpenApi streamOpenApi () {
5151 String [] paths = { "/stream/**" };
5252 String [] packagedToMatch = { "test.org.springdoc.api.app66" };
53- return GroupedOpenApi .builder ().setGroup ("stream" ).pathsToMatch (paths )
53+ return GroupedOpenApi .builder ().group ("stream" ).pathsToMatch (paths )
5454 .build ();
5555 }
5656
Original file line number Diff line number Diff line change @@ -48,15 +48,15 @@ public static void main(String[] args) {
4848 @ Bean
4949 public GroupedOpenApi storeOpenApi () {
5050 return GroupedOpenApi .builder ()
51- .setGroup ("stores" )
51+ .group ("stores" )
5252 .pathsToMatch ("/store/**" )
5353 .build ();
5454 }
5555
5656 @ Bean
5757 public GroupedOpenApi userOpenApi () {
5858 return GroupedOpenApi .builder ()
59- .setGroup ("users" )
59+ .group ("users" )
6060 .packagesToScan ("test.org.springdoc.api.app68.api.user" ).addOpenApiCustomiser (serverOpenApiCustomiser1 ())
6161 .addOperationCustomizer (operationCustomizer ())
6262 .build ();
@@ -89,15 +89,15 @@ OperationCustomizer operationCustomizer() {
8989 @ Bean
9090 public GroupedOpenApi petOpenApi () {
9191 return GroupedOpenApi .builder ()
92- .setGroup ("pets" )
92+ .group ("pets" )
9393 .pathsToMatch ("/pet/**" ).addOpenApiCustomiser (serverOpenApiCustomiser2 ())
9494 .build ();
9595 }
9696
9797 @ Bean
9898 public GroupedOpenApi groupOpenApi () {
9999 return GroupedOpenApi .builder ()
100- .setGroup ("groups test" )
100+ .group ("groups test" )
101101 .pathsToMatch ("/v1/**" ).pathsToExclude ("/v1/users" )
102102 .packagesToScan ("test.org.springdoc.api.app68.api.user" , "test.org.springdoc.api.app68.api.store" )
103103 .build ();
Original file line number Diff line number Diff line change @@ -99,7 +99,7 @@ static class TestApp {
9999 @ Bean
100100 GroupedOpenApi testGroupedOpenApi () {
101101 return GroupedOpenApi .builder ()
102- .setGroup ("test-group" )
102+ .group ("test-group" )
103103 .packagesToScan ("org.test" )
104104 .build ();
105105 }
Original file line number Diff line number Diff line change @@ -48,7 +48,7 @@ static class TestApp {
4848 @ Bean
4949 GroupedOpenApi testGroupedOpenApi () {
5050 return GroupedOpenApi .builder ()
51- .setGroup ("test-group" )
51+ .group ("test-group" )
5252 .packagesToScan ("org.test" )
5353 .build ();
5454 }
You can’t perform that action at this time.
0 commit comments