From c422debf056bb6a36031b8af0f19d543835c5400 Mon Sep 17 00:00:00 2001 From: Anastasiia Smirnova Date: Tue, 24 Dec 2019 13:56:35 +0200 Subject: [PATCH] GroupedOpenApi: replace array parameter with vararg --- .../org/springdoc/core/GroupedOpenApi.java | 4 ++-- .../springdoc/api/app68/SpringDocTestApp.java | 22 +++++++++++-------- 2 files changed, 15 insertions(+), 11 deletions(-) diff --git a/springdoc-openapi-common/src/main/java/org/springdoc/core/GroupedOpenApi.java b/springdoc-openapi-common/src/main/java/org/springdoc/core/GroupedOpenApi.java index 284e3805d..3d22c5740 100644 --- a/springdoc-openapi-common/src/main/java/org/springdoc/core/GroupedOpenApi.java +++ b/springdoc-openapi-common/src/main/java/org/springdoc/core/GroupedOpenApi.java @@ -60,12 +60,12 @@ public Builder setGroup(String group) { return this; } - public Builder pathsToMatch(String[] pathsToMatch) { + public Builder pathsToMatch(String... pathsToMatch) { this.pathsToMatch = Arrays.asList(pathsToMatch); return this; } - public Builder packagesToScan(String[] packagesToScan) { + public Builder packagesToScan(String... packagesToScan) { this.packagesToScan = Arrays.asList(packagesToScan); return this; } diff --git a/springdoc-openapi-webmvc-core/src/test/java/test/org/springdoc/api/app68/SpringDocTestApp.java b/springdoc-openapi-webmvc-core/src/test/java/test/org/springdoc/api/app68/SpringDocTestApp.java index fa8ff259c..1b2455526 100644 --- a/springdoc-openapi-webmvc-core/src/test/java/test/org/springdoc/api/app68/SpringDocTestApp.java +++ b/springdoc-openapi-webmvc-core/src/test/java/test/org/springdoc/api/app68/SpringDocTestApp.java @@ -18,30 +18,34 @@ public static void main(String[] args) { @Bean public GroupedOpenApi storeOpenApi() { - String paths[] = {"/store/**"}; - return GroupedOpenApi.builder().setGroup("stores").pathsToMatch(paths) + return GroupedOpenApi.builder() + .setGroup("stores") + .pathsToMatch("/store/**") .build(); } @Bean public GroupedOpenApi userOpenApi() { - String packagesToscan[] = {"test.org.springdoc.api.app68.api.user"}; - return GroupedOpenApi.builder().setGroup("users").packagesToScan(packagesToscan) + return GroupedOpenApi.builder() + .setGroup("users") + .packagesToScan("test.org.springdoc.api.app68.api.user") .build(); } @Bean public GroupedOpenApi petOpenApi() { - String paths[] = {"/pet/**"}; - return GroupedOpenApi.builder().setGroup("pets").pathsToMatch(paths) + return GroupedOpenApi.builder() + .setGroup("pets") + .pathsToMatch("/pet/**") .build(); } @Bean public GroupedOpenApi groupOpenApi() { - String paths[] = {"/v1/**"}; - String packagesToscan[] = {"test.org.springdoc.api.app68.api.user", "test.org.springdoc.api.app68.api.store"}; - return GroupedOpenApi.builder().setGroup("groups").pathsToMatch(paths).packagesToScan(packagesToscan) + return GroupedOpenApi.builder() + .setGroup("groups") + .pathsToMatch("/v1/**") + .packagesToScan("test.org.springdoc.api.app68.api.user", "test.org.springdoc.api.app68.api.store") .build(); }