From c4b18f206dba39357ccff59c85b199932275dc28 Mon Sep 17 00:00:00 2001 From: Kapil Gupta Date: Sat, 4 Nov 2023 14:22:17 +0530 Subject: [PATCH] [Server][Spring] fix support interface and implementation classes for API controllers (#16945) * [Server][Spring] support interface and implementation classes for API controllers * Omitted new string calls * Added Log messages * remove else * Removed redundant if * Update missed ; --- .../codegen/DefaultGenerator.java | 23 ++++++++++++++++--- .../.openapi-generator/FILES | 2 -- .../.openapi-generator/FILES | 3 --- .../springboot-3/.openapi-generator/FILES | 3 --- .../.openapi-generator/FILES | 6 ----- .../.openapi-generator/FILES | 6 ----- .../.openapi-generator/FILES | 3 --- .../springboot/.openapi-generator/FILES | 3 --- .../.openapi-generator/FILES | 6 ----- .../.openapi-generator/FILES | 6 ----- .../.openapi-generator/FILES | 6 ----- .../.openapi-generator/FILES | 3 --- .../.openapi-generator/FILES | 6 ----- .../.openapi-generator/FILES | 3 --- .../.openapi-generator/FILES | 6 ----- .../.openapi-generator/FILES | 6 ----- .../.openapi-generator/FILES | 6 ----- .../.openapi-generator/FILES | 7 ------ .../.openapi-generator/FILES | 7 ------ .../.openapi-generator/FILES | 7 ------ .../.openapi-generator/FILES | 7 ------ .../.openapi-generator/FILES | 1 - .../.openapi-generator/FILES | 6 ----- .../.openapi-generator/FILES | 6 ----- .../springboot/.openapi-generator/FILES | 6 ----- 25 files changed, 20 insertions(+), 124 deletions(-) diff --git a/modules/openapi-generator/src/main/java/org/openapitools/codegen/DefaultGenerator.java b/modules/openapi-generator/src/main/java/org/openapitools/codegen/DefaultGenerator.java index b7ee6c165f2..a1383cac91d 100644 --- a/modules/openapi-generator/src/main/java/org/openapitools/codegen/DefaultGenerator.java +++ b/modules/openapi-generator/src/main/java/org/openapitools/codegen/DefaultGenerator.java @@ -99,6 +99,8 @@ public class DefaultGenerator implements Generator { protected TemplateProcessor templateProcessor = null; private List userDefinedTemplates = new ArrayList<>(); + private String generatorCheck = "spring"; + private String templateCheck = "apiController.mustache"; public DefaultGenerator() { @@ -694,14 +696,23 @@ public class DefaultGenerator implements Generator { addAuthenticationSwitches(operation); for (String templateName : config.apiTemplateFiles().keySet()) { - File written; + File written = null; if (config.templateOutputDirs().containsKey(templateName)) { String outputDir = config.getOutputDir() + File.separator + config.templateOutputDirs().get(templateName); String filename = config.apiFilename(templateName, tag, outputDir); - written = processTemplateToFile(operation, templateName, filename, generateApis, CodegenConstants.APIS, outputDir); + // do not overwrite apiController file for spring server + if (apiFilePreCheck(filename, generatorCheck, templateName, templateCheck)){ + written = processTemplateToFile(operation, templateName, filename, generateApis, CodegenConstants.APIS, outputDir); + } else { + LOGGER.info("Implementation file {} is not overwritten",filename); + } } else { String filename = config.apiFilename(templateName, tag); - written = processTemplateToFile(operation, templateName, filename, generateApis, CodegenConstants.APIS); + if(apiFilePreCheck(filename, generatorCheck, templateName, templateCheck)){ + written = processTemplateToFile(operation, templateName, filename, generateApis, CodegenConstants.APIS); + } else { + LOGGER.info("Implementation file {} is not overwritten",filename); + } } if (written != null) { files.add(written); @@ -752,6 +763,12 @@ public class DefaultGenerator implements Generator { } + // checking if apiController file is already existed for spring generator + private boolean apiFilePreCheck(String filename, String generator, String templateName, String apiControllerTemplate){ + File apiFile = new File(filename); + return !(apiFile.exists() && config.getName().equals(generator) && templateName.equals(apiControllerTemplate)); + } + private void generateSupportingFiles(List files, Map bundle) { if (!generateSupportingFiles) { // TODO: process these anyway and report via dryRun? diff --git a/samples/openapi3/server/petstore/spring-boot-oneof/.openapi-generator/FILES b/samples/openapi3/server/petstore/spring-boot-oneof/.openapi-generator/FILES index a44588157f3..392c6ed2118 100644 --- a/samples/openapi3/server/petstore/spring-boot-oneof/.openapi-generator/FILES +++ b/samples/openapi3/server/petstore/spring-boot-oneof/.openapi-generator/FILES @@ -4,9 +4,7 @@ src/main/java/org/openapitools/OpenApiGeneratorApplication.java src/main/java/org/openapitools/RFC3339DateFormat.java src/main/java/org/openapitools/api/ApiUtil.java src/main/java/org/openapitools/api/BarApi.java -src/main/java/org/openapitools/api/BarApiController.java src/main/java/org/openapitools/api/FooApi.java -src/main/java/org/openapitools/api/FooApiController.java src/main/java/org/openapitools/configuration/EnumConverterConfiguration.java src/main/java/org/openapitools/configuration/HomeController.java src/main/java/org/openapitools/configuration/SpringDocConfiguration.java diff --git a/samples/openapi3/server/petstore/spring-boot-springdoc/.openapi-generator/FILES b/samples/openapi3/server/petstore/spring-boot-springdoc/.openapi-generator/FILES index 48cc8196064..b15e2c45d45 100644 --- a/samples/openapi3/server/petstore/spring-boot-springdoc/.openapi-generator/FILES +++ b/samples/openapi3/server/petstore/spring-boot-springdoc/.openapi-generator/FILES @@ -4,11 +4,8 @@ src/main/java/org/openapitools/OpenApiGeneratorApplication.java src/main/java/org/openapitools/RFC3339DateFormat.java src/main/java/org/openapitools/api/ApiUtil.java src/main/java/org/openapitools/api/PetApi.java -src/main/java/org/openapitools/api/PetApiController.java src/main/java/org/openapitools/api/StoreApi.java -src/main/java/org/openapitools/api/StoreApiController.java src/main/java/org/openapitools/api/UserApi.java -src/main/java/org/openapitools/api/UserApiController.java src/main/java/org/openapitools/configuration/HomeController.java src/main/java/org/openapitools/configuration/SpringDocConfiguration.java src/main/java/org/openapitools/model/Category.java diff --git a/samples/openapi3/server/petstore/springboot-3/.openapi-generator/FILES b/samples/openapi3/server/petstore/springboot-3/.openapi-generator/FILES index 48cc8196064..b15e2c45d45 100644 --- a/samples/openapi3/server/petstore/springboot-3/.openapi-generator/FILES +++ b/samples/openapi3/server/petstore/springboot-3/.openapi-generator/FILES @@ -4,11 +4,8 @@ src/main/java/org/openapitools/OpenApiGeneratorApplication.java src/main/java/org/openapitools/RFC3339DateFormat.java src/main/java/org/openapitools/api/ApiUtil.java src/main/java/org/openapitools/api/PetApi.java -src/main/java/org/openapitools/api/PetApiController.java src/main/java/org/openapitools/api/StoreApi.java -src/main/java/org/openapitools/api/StoreApiController.java src/main/java/org/openapitools/api/UserApi.java -src/main/java/org/openapitools/api/UserApiController.java src/main/java/org/openapitools/configuration/HomeController.java src/main/java/org/openapitools/configuration/SpringDocConfiguration.java src/main/java/org/openapitools/model/Category.java diff --git a/samples/openapi3/server/petstore/springboot-delegate/.openapi-generator/FILES b/samples/openapi3/server/petstore/springboot-delegate/.openapi-generator/FILES index 8e12e3455c0..c875e201428 100644 --- a/samples/openapi3/server/petstore/springboot-delegate/.openapi-generator/FILES +++ b/samples/openapi3/server/petstore/springboot-delegate/.openapi-generator/FILES @@ -3,23 +3,17 @@ pom.xml src/main/java/org/openapitools/OpenApiGeneratorApplication.java src/main/java/org/openapitools/RFC3339DateFormat.java src/main/java/org/openapitools/api/AnotherFakeApi.java -src/main/java/org/openapitools/api/AnotherFakeApiController.java src/main/java/org/openapitools/api/AnotherFakeApiDelegate.java src/main/java/org/openapitools/api/ApiUtil.java src/main/java/org/openapitools/api/FakeApi.java -src/main/java/org/openapitools/api/FakeApiController.java src/main/java/org/openapitools/api/FakeApiDelegate.java src/main/java/org/openapitools/api/FakeClassnameTestApi.java -src/main/java/org/openapitools/api/FakeClassnameTestApiController.java src/main/java/org/openapitools/api/FakeClassnameTestApiDelegate.java src/main/java/org/openapitools/api/PetApi.java -src/main/java/org/openapitools/api/PetApiController.java src/main/java/org/openapitools/api/PetApiDelegate.java src/main/java/org/openapitools/api/StoreApi.java -src/main/java/org/openapitools/api/StoreApiController.java src/main/java/org/openapitools/api/StoreApiDelegate.java src/main/java/org/openapitools/api/UserApi.java -src/main/java/org/openapitools/api/UserApiController.java src/main/java/org/openapitools/api/UserApiDelegate.java src/main/java/org/openapitools/configuration/EnumConverterConfiguration.java src/main/java/org/openapitools/configuration/HomeController.java diff --git a/samples/openapi3/server/petstore/springboot-implicitHeaders/.openapi-generator/FILES b/samples/openapi3/server/petstore/springboot-implicitHeaders/.openapi-generator/FILES index 8e1c754a6cd..0f85b5e51c3 100644 --- a/samples/openapi3/server/petstore/springboot-implicitHeaders/.openapi-generator/FILES +++ b/samples/openapi3/server/petstore/springboot-implicitHeaders/.openapi-generator/FILES @@ -3,18 +3,12 @@ pom.xml src/main/java/org/openapitools/OpenApiGeneratorApplication.java src/main/java/org/openapitools/RFC3339DateFormat.java src/main/java/org/openapitools/api/AnotherFakeApi.java -src/main/java/org/openapitools/api/AnotherFakeApiController.java src/main/java/org/openapitools/api/ApiUtil.java src/main/java/org/openapitools/api/FakeApi.java -src/main/java/org/openapitools/api/FakeApiController.java src/main/java/org/openapitools/api/FakeClassnameTestApi.java -src/main/java/org/openapitools/api/FakeClassnameTestApiController.java src/main/java/org/openapitools/api/PetApi.java -src/main/java/org/openapitools/api/PetApiController.java src/main/java/org/openapitools/api/StoreApi.java -src/main/java/org/openapitools/api/StoreApiController.java src/main/java/org/openapitools/api/UserApi.java -src/main/java/org/openapitools/api/UserApiController.java src/main/java/org/openapitools/configuration/EnumConverterConfiguration.java src/main/java/org/openapitools/configuration/HomeController.java src/main/java/org/openapitools/configuration/SpringDocConfiguration.java diff --git a/samples/openapi3/server/petstore/springboot-source/.openapi-generator/FILES b/samples/openapi3/server/petstore/springboot-source/.openapi-generator/FILES index 3a114308838..ca0f61c4ae7 100644 --- a/samples/openapi3/server/petstore/springboot-source/.openapi-generator/FILES +++ b/samples/openapi3/server/petstore/springboot-source/.openapi-generator/FILES @@ -4,11 +4,8 @@ src/main/java/org/openapitools/OpenApiGeneratorApplication.java src/main/java/org/openapitools/RFC3339DateFormat.java src/main/java/org/openapitools/api/ApiUtil.java src/main/java/org/openapitools/api/PetApi.java -src/main/java/org/openapitools/api/PetApiController.java src/main/java/org/openapitools/api/StoreApi.java -src/main/java/org/openapitools/api/StoreApiController.java src/main/java/org/openapitools/api/UserApi.java -src/main/java/org/openapitools/api/UserApiController.java src/main/java/org/openapitools/configuration/HomeController.java src/main/java/org/openapitools/model/Category.java src/main/java/org/openapitools/model/ModelApiResponse.java diff --git a/samples/openapi3/server/petstore/springboot/.openapi-generator/FILES b/samples/openapi3/server/petstore/springboot/.openapi-generator/FILES index 60d8efc53ef..472c803491f 100644 --- a/samples/openapi3/server/petstore/springboot/.openapi-generator/FILES +++ b/samples/openapi3/server/petstore/springboot/.openapi-generator/FILES @@ -4,11 +4,8 @@ src/main/java/org/openapitools/OpenApiGeneratorApplication.java src/main/java/org/openapitools/RFC3339DateFormat.java src/main/java/org/openapitools/api/ApiUtil.java src/main/java/org/openapitools/api/PetApi.java -src/main/java/org/openapitools/api/PetApiController.java src/main/java/org/openapitools/api/StoreApi.java -src/main/java/org/openapitools/api/StoreApiController.java src/main/java/org/openapitools/api/UserApi.java -src/main/java/org/openapitools/api/UserApiController.java src/main/java/org/openapitools/configuration/HomeController.java src/main/java/org/openapitools/configuration/SpringDocConfiguration.java src/main/java/org/openapitools/model/Category.java diff --git a/samples/server/petstore/springboot-beanvalidation-no-nullable/.openapi-generator/FILES b/samples/server/petstore/springboot-beanvalidation-no-nullable/.openapi-generator/FILES index f3691a72bd4..95a549621f7 100644 --- a/samples/server/petstore/springboot-beanvalidation-no-nullable/.openapi-generator/FILES +++ b/samples/server/petstore/springboot-beanvalidation-no-nullable/.openapi-generator/FILES @@ -3,18 +3,12 @@ pom.xml src/main/java/org/openapitools/OpenApiGeneratorApplication.java src/main/java/org/openapitools/RFC3339DateFormat.java src/main/java/org/openapitools/api/AnotherFakeApi.java -src/main/java/org/openapitools/api/AnotherFakeApiController.java src/main/java/org/openapitools/api/ApiUtil.java src/main/java/org/openapitools/api/FakeApi.java -src/main/java/org/openapitools/api/FakeApiController.java src/main/java/org/openapitools/api/FakeClassnameTestApi.java -src/main/java/org/openapitools/api/FakeClassnameTestApiController.java src/main/java/org/openapitools/api/PetApi.java -src/main/java/org/openapitools/api/PetApiController.java src/main/java/org/openapitools/api/StoreApi.java -src/main/java/org/openapitools/api/StoreApiController.java src/main/java/org/openapitools/api/UserApi.java -src/main/java/org/openapitools/api/UserApiController.java src/main/java/org/openapitools/configuration/EnumConverterConfiguration.java src/main/java/org/openapitools/configuration/HomeController.java src/main/java/org/openapitools/configuration/SpringFoxConfiguration.java diff --git a/samples/server/petstore/springboot-beanvalidation/.openapi-generator/FILES b/samples/server/petstore/springboot-beanvalidation/.openapi-generator/FILES index 3ac88a992f9..5e2378b3ee8 100644 --- a/samples/server/petstore/springboot-beanvalidation/.openapi-generator/FILES +++ b/samples/server/petstore/springboot-beanvalidation/.openapi-generator/FILES @@ -3,18 +3,12 @@ pom.xml src/main/java/org/openapitools/OpenApiGeneratorApplication.java src/main/java/org/openapitools/RFC3339DateFormat.java src/main/java/org/openapitools/api/AnotherFakeApi.java -src/main/java/org/openapitools/api/AnotherFakeApiController.java src/main/java/org/openapitools/api/ApiUtil.java src/main/java/org/openapitools/api/FakeApi.java -src/main/java/org/openapitools/api/FakeApiController.java src/main/java/org/openapitools/api/FakeClassnameTestApi.java -src/main/java/org/openapitools/api/FakeClassnameTestApiController.java src/main/java/org/openapitools/api/PetApi.java -src/main/java/org/openapitools/api/PetApiController.java src/main/java/org/openapitools/api/StoreApi.java -src/main/java/org/openapitools/api/StoreApiController.java src/main/java/org/openapitools/api/UserApi.java -src/main/java/org/openapitools/api/UserApiController.java src/main/java/org/openapitools/configuration/EnumConverterConfiguration.java src/main/java/org/openapitools/configuration/HomeController.java src/main/java/org/openapitools/configuration/SpringFoxConfiguration.java diff --git a/samples/server/petstore/springboot-delegate-j8/.openapi-generator/FILES b/samples/server/petstore/springboot-delegate-j8/.openapi-generator/FILES index fc1d5a0fa9e..d568b26f5be 100644 --- a/samples/server/petstore/springboot-delegate-j8/.openapi-generator/FILES +++ b/samples/server/petstore/springboot-delegate-j8/.openapi-generator/FILES @@ -3,23 +3,17 @@ pom.xml src/main/java/org/openapitools/OpenApiGeneratorApplication.java src/main/java/org/openapitools/RFC3339DateFormat.java src/main/java/org/openapitools/api/AnotherFakeApi.java -src/main/java/org/openapitools/api/AnotherFakeApiController.java src/main/java/org/openapitools/api/AnotherFakeApiDelegate.java src/main/java/org/openapitools/api/ApiUtil.java src/main/java/org/openapitools/api/FakeApi.java -src/main/java/org/openapitools/api/FakeApiController.java src/main/java/org/openapitools/api/FakeApiDelegate.java src/main/java/org/openapitools/api/FakeClassnameTestApi.java -src/main/java/org/openapitools/api/FakeClassnameTestApiController.java src/main/java/org/openapitools/api/FakeClassnameTestApiDelegate.java src/main/java/org/openapitools/api/PetApi.java -src/main/java/org/openapitools/api/PetApiController.java src/main/java/org/openapitools/api/PetApiDelegate.java src/main/java/org/openapitools/api/StoreApi.java -src/main/java/org/openapitools/api/StoreApiController.java src/main/java/org/openapitools/api/StoreApiDelegate.java src/main/java/org/openapitools/api/UserApi.java -src/main/java/org/openapitools/api/UserApiController.java src/main/java/org/openapitools/api/UserApiDelegate.java src/main/java/org/openapitools/configuration/EnumConverterConfiguration.java src/main/java/org/openapitools/configuration/HomeController.java diff --git a/samples/server/petstore/springboot-delegate-no-response-entity/.openapi-generator/FILES b/samples/server/petstore/springboot-delegate-no-response-entity/.openapi-generator/FILES index 4e2214f1e7f..8b682c5e7ce 100644 --- a/samples/server/petstore/springboot-delegate-no-response-entity/.openapi-generator/FILES +++ b/samples/server/petstore/springboot-delegate-no-response-entity/.openapi-generator/FILES @@ -4,13 +4,10 @@ src/main/java/org/openapitools/OpenApiGeneratorApplication.java src/main/java/org/openapitools/RFC3339DateFormat.java src/main/java/org/openapitools/api/ApiUtil.java src/main/java/org/openapitools/api/PetApi.java -src/main/java/org/openapitools/api/PetApiController.java src/main/java/org/openapitools/api/PetApiDelegate.java src/main/java/org/openapitools/api/StoreApi.java -src/main/java/org/openapitools/api/StoreApiController.java src/main/java/org/openapitools/api/StoreApiDelegate.java src/main/java/org/openapitools/api/UserApi.java -src/main/java/org/openapitools/api/UserApiController.java src/main/java/org/openapitools/api/UserApiDelegate.java src/main/java/org/openapitools/configuration/HomeController.java src/main/java/org/openapitools/configuration/SpringFoxConfiguration.java diff --git a/samples/server/petstore/springboot-delegate/.openapi-generator/FILES b/samples/server/petstore/springboot-delegate/.openapi-generator/FILES index fc1d5a0fa9e..d568b26f5be 100644 --- a/samples/server/petstore/springboot-delegate/.openapi-generator/FILES +++ b/samples/server/petstore/springboot-delegate/.openapi-generator/FILES @@ -3,23 +3,17 @@ pom.xml src/main/java/org/openapitools/OpenApiGeneratorApplication.java src/main/java/org/openapitools/RFC3339DateFormat.java src/main/java/org/openapitools/api/AnotherFakeApi.java -src/main/java/org/openapitools/api/AnotherFakeApiController.java src/main/java/org/openapitools/api/AnotherFakeApiDelegate.java src/main/java/org/openapitools/api/ApiUtil.java src/main/java/org/openapitools/api/FakeApi.java -src/main/java/org/openapitools/api/FakeApiController.java src/main/java/org/openapitools/api/FakeApiDelegate.java src/main/java/org/openapitools/api/FakeClassnameTestApi.java -src/main/java/org/openapitools/api/FakeClassnameTestApiController.java src/main/java/org/openapitools/api/FakeClassnameTestApiDelegate.java src/main/java/org/openapitools/api/PetApi.java -src/main/java/org/openapitools/api/PetApiController.java src/main/java/org/openapitools/api/PetApiDelegate.java src/main/java/org/openapitools/api/StoreApi.java -src/main/java/org/openapitools/api/StoreApiController.java src/main/java/org/openapitools/api/StoreApiDelegate.java src/main/java/org/openapitools/api/UserApi.java -src/main/java/org/openapitools/api/UserApiController.java src/main/java/org/openapitools/api/UserApiDelegate.java src/main/java/org/openapitools/configuration/EnumConverterConfiguration.java src/main/java/org/openapitools/configuration/HomeController.java diff --git a/samples/server/petstore/springboot-implicitHeaders-annotationLibrary/.openapi-generator/FILES b/samples/server/petstore/springboot-implicitHeaders-annotationLibrary/.openapi-generator/FILES index baf10ab6b83..f309423544f 100644 --- a/samples/server/petstore/springboot-implicitHeaders-annotationLibrary/.openapi-generator/FILES +++ b/samples/server/petstore/springboot-implicitHeaders-annotationLibrary/.openapi-generator/FILES @@ -4,11 +4,8 @@ src/main/java/org/openapitools/OpenApiGeneratorApplication.java src/main/java/org/openapitools/RFC3339DateFormat.java src/main/java/org/openapitools/api/ApiUtil.java src/main/java/org/openapitools/api/PetApi.java -src/main/java/org/openapitools/api/PetApiController.java src/main/java/org/openapitools/api/StoreApi.java -src/main/java/org/openapitools/api/StoreApiController.java src/main/java/org/openapitools/api/UserApi.java -src/main/java/org/openapitools/api/UserApiController.java src/main/java/org/openapitools/configuration/HomeController.java src/main/java/org/openapitools/model/Category.java src/main/java/org/openapitools/model/ModelApiResponse.java diff --git a/samples/server/petstore/springboot-implicitHeaders/.openapi-generator/FILES b/samples/server/petstore/springboot-implicitHeaders/.openapi-generator/FILES index f3691a72bd4..95a549621f7 100644 --- a/samples/server/petstore/springboot-implicitHeaders/.openapi-generator/FILES +++ b/samples/server/petstore/springboot-implicitHeaders/.openapi-generator/FILES @@ -3,18 +3,12 @@ pom.xml src/main/java/org/openapitools/OpenApiGeneratorApplication.java src/main/java/org/openapitools/RFC3339DateFormat.java src/main/java/org/openapitools/api/AnotherFakeApi.java -src/main/java/org/openapitools/api/AnotherFakeApiController.java src/main/java/org/openapitools/api/ApiUtil.java src/main/java/org/openapitools/api/FakeApi.java -src/main/java/org/openapitools/api/FakeApiController.java src/main/java/org/openapitools/api/FakeClassnameTestApi.java -src/main/java/org/openapitools/api/FakeClassnameTestApiController.java src/main/java/org/openapitools/api/PetApi.java -src/main/java/org/openapitools/api/PetApiController.java src/main/java/org/openapitools/api/StoreApi.java -src/main/java/org/openapitools/api/StoreApiController.java src/main/java/org/openapitools/api/UserApi.java -src/main/java/org/openapitools/api/UserApiController.java src/main/java/org/openapitools/configuration/EnumConverterConfiguration.java src/main/java/org/openapitools/configuration/HomeController.java src/main/java/org/openapitools/configuration/SpringFoxConfiguration.java diff --git a/samples/server/petstore/springboot-reactive-noResponseEntity/.openapi-generator/FILES b/samples/server/petstore/springboot-reactive-noResponseEntity/.openapi-generator/FILES index 64711ce4717..93297148e9b 100644 --- a/samples/server/petstore/springboot-reactive-noResponseEntity/.openapi-generator/FILES +++ b/samples/server/petstore/springboot-reactive-noResponseEntity/.openapi-generator/FILES @@ -3,23 +3,17 @@ pom.xml src/main/java/org/openapitools/OpenApiGeneratorApplication.java src/main/java/org/openapitools/RFC3339DateFormat.java src/main/java/org/openapitools/api/AnotherFakeApi.java -src/main/java/org/openapitools/api/AnotherFakeApiController.java src/main/java/org/openapitools/api/AnotherFakeApiDelegate.java src/main/java/org/openapitools/api/ApiUtil.java src/main/java/org/openapitools/api/FakeApi.java -src/main/java/org/openapitools/api/FakeApiController.java src/main/java/org/openapitools/api/FakeApiDelegate.java src/main/java/org/openapitools/api/FakeClassnameTestApi.java -src/main/java/org/openapitools/api/FakeClassnameTestApiController.java src/main/java/org/openapitools/api/FakeClassnameTestApiDelegate.java src/main/java/org/openapitools/api/PetApi.java -src/main/java/org/openapitools/api/PetApiController.java src/main/java/org/openapitools/api/PetApiDelegate.java src/main/java/org/openapitools/api/StoreApi.java -src/main/java/org/openapitools/api/StoreApiController.java src/main/java/org/openapitools/api/StoreApiDelegate.java src/main/java/org/openapitools/api/UserApi.java -src/main/java/org/openapitools/api/UserApiController.java src/main/java/org/openapitools/api/UserApiDelegate.java src/main/java/org/openapitools/configuration/EnumConverterConfiguration.java src/main/java/org/openapitools/configuration/HomeController.java diff --git a/samples/server/petstore/springboot-reactive/.openapi-generator/FILES b/samples/server/petstore/springboot-reactive/.openapi-generator/FILES index 64711ce4717..93297148e9b 100644 --- a/samples/server/petstore/springboot-reactive/.openapi-generator/FILES +++ b/samples/server/petstore/springboot-reactive/.openapi-generator/FILES @@ -3,23 +3,17 @@ pom.xml src/main/java/org/openapitools/OpenApiGeneratorApplication.java src/main/java/org/openapitools/RFC3339DateFormat.java src/main/java/org/openapitools/api/AnotherFakeApi.java -src/main/java/org/openapitools/api/AnotherFakeApiController.java src/main/java/org/openapitools/api/AnotherFakeApiDelegate.java src/main/java/org/openapitools/api/ApiUtil.java src/main/java/org/openapitools/api/FakeApi.java -src/main/java/org/openapitools/api/FakeApiController.java src/main/java/org/openapitools/api/FakeApiDelegate.java src/main/java/org/openapitools/api/FakeClassnameTestApi.java -src/main/java/org/openapitools/api/FakeClassnameTestApiController.java src/main/java/org/openapitools/api/FakeClassnameTestApiDelegate.java src/main/java/org/openapitools/api/PetApi.java -src/main/java/org/openapitools/api/PetApiController.java src/main/java/org/openapitools/api/PetApiDelegate.java src/main/java/org/openapitools/api/StoreApi.java -src/main/java/org/openapitools/api/StoreApiController.java src/main/java/org/openapitools/api/StoreApiDelegate.java src/main/java/org/openapitools/api/UserApi.java -src/main/java/org/openapitools/api/UserApiController.java src/main/java/org/openapitools/api/UserApiDelegate.java src/main/java/org/openapitools/configuration/EnumConverterConfiguration.java src/main/java/org/openapitools/configuration/HomeController.java diff --git a/samples/server/petstore/springboot-spring-pageable-delegatePattern-without-j8/.openapi-generator/FILES b/samples/server/petstore/springboot-spring-pageable-delegatePattern-without-j8/.openapi-generator/FILES index f41a04cca5d..ade930debbf 100644 --- a/samples/server/petstore/springboot-spring-pageable-delegatePattern-without-j8/.openapi-generator/FILES +++ b/samples/server/petstore/springboot-spring-pageable-delegatePattern-without-j8/.openapi-generator/FILES @@ -3,26 +3,19 @@ pom.xml src/main/java/org/openapitools/OpenApiGeneratorApplication.java src/main/java/org/openapitools/RFC3339DateFormat.java src/main/java/org/openapitools/api/AnotherFakeApi.java -src/main/java/org/openapitools/api/AnotherFakeApiController.java src/main/java/org/openapitools/api/AnotherFakeApiDelegate.java src/main/java/org/openapitools/api/ApiUtil.java src/main/java/org/openapitools/api/FakeApi.java -src/main/java/org/openapitools/api/FakeApiController.java src/main/java/org/openapitools/api/FakeApiDelegate.java src/main/java/org/openapitools/api/FakeClassnameTestApi.java -src/main/java/org/openapitools/api/FakeClassnameTestApiController.java src/main/java/org/openapitools/api/FakeClassnameTestApiDelegate.java src/main/java/org/openapitools/api/PetApi.java -src/main/java/org/openapitools/api/PetApiController.java src/main/java/org/openapitools/api/PetApiDelegate.java src/main/java/org/openapitools/api/StoreApi.java -src/main/java/org/openapitools/api/StoreApiController.java src/main/java/org/openapitools/api/StoreApiDelegate.java src/main/java/org/openapitools/api/UserApi.java -src/main/java/org/openapitools/api/UserApiController.java src/main/java/org/openapitools/api/UserApiDelegate.java src/main/java/org/openapitools/api/VersioningApi.java -src/main/java/org/openapitools/api/VersioningApiController.java src/main/java/org/openapitools/api/VersioningApiDelegate.java src/main/java/org/openapitools/configuration/EnumConverterConfiguration.java src/main/java/org/openapitools/configuration/HomeController.java diff --git a/samples/server/petstore/springboot-spring-pageable-delegatePattern/.openapi-generator/FILES b/samples/server/petstore/springboot-spring-pageable-delegatePattern/.openapi-generator/FILES index f41a04cca5d..ade930debbf 100644 --- a/samples/server/petstore/springboot-spring-pageable-delegatePattern/.openapi-generator/FILES +++ b/samples/server/petstore/springboot-spring-pageable-delegatePattern/.openapi-generator/FILES @@ -3,26 +3,19 @@ pom.xml src/main/java/org/openapitools/OpenApiGeneratorApplication.java src/main/java/org/openapitools/RFC3339DateFormat.java src/main/java/org/openapitools/api/AnotherFakeApi.java -src/main/java/org/openapitools/api/AnotherFakeApiController.java src/main/java/org/openapitools/api/AnotherFakeApiDelegate.java src/main/java/org/openapitools/api/ApiUtil.java src/main/java/org/openapitools/api/FakeApi.java -src/main/java/org/openapitools/api/FakeApiController.java src/main/java/org/openapitools/api/FakeApiDelegate.java src/main/java/org/openapitools/api/FakeClassnameTestApi.java -src/main/java/org/openapitools/api/FakeClassnameTestApiController.java src/main/java/org/openapitools/api/FakeClassnameTestApiDelegate.java src/main/java/org/openapitools/api/PetApi.java -src/main/java/org/openapitools/api/PetApiController.java src/main/java/org/openapitools/api/PetApiDelegate.java src/main/java/org/openapitools/api/StoreApi.java -src/main/java/org/openapitools/api/StoreApiController.java src/main/java/org/openapitools/api/StoreApiDelegate.java src/main/java/org/openapitools/api/UserApi.java -src/main/java/org/openapitools/api/UserApiController.java src/main/java/org/openapitools/api/UserApiDelegate.java src/main/java/org/openapitools/api/VersioningApi.java -src/main/java/org/openapitools/api/VersioningApiController.java src/main/java/org/openapitools/api/VersioningApiDelegate.java src/main/java/org/openapitools/configuration/EnumConverterConfiguration.java src/main/java/org/openapitools/configuration/HomeController.java diff --git a/samples/server/petstore/springboot-spring-pageable-without-j8/.openapi-generator/FILES b/samples/server/petstore/springboot-spring-pageable-without-j8/.openapi-generator/FILES index 3eb92a4787f..166ece42f55 100644 --- a/samples/server/petstore/springboot-spring-pageable-without-j8/.openapi-generator/FILES +++ b/samples/server/petstore/springboot-spring-pageable-without-j8/.openapi-generator/FILES @@ -3,20 +3,13 @@ pom.xml src/main/java/org/openapitools/OpenApiGeneratorApplication.java src/main/java/org/openapitools/RFC3339DateFormat.java src/main/java/org/openapitools/api/AnotherFakeApi.java -src/main/java/org/openapitools/api/AnotherFakeApiController.java src/main/java/org/openapitools/api/ApiUtil.java src/main/java/org/openapitools/api/FakeApi.java -src/main/java/org/openapitools/api/FakeApiController.java src/main/java/org/openapitools/api/FakeClassnameTestApi.java -src/main/java/org/openapitools/api/FakeClassnameTestApiController.java src/main/java/org/openapitools/api/PetApi.java -src/main/java/org/openapitools/api/PetApiController.java src/main/java/org/openapitools/api/StoreApi.java -src/main/java/org/openapitools/api/StoreApiController.java src/main/java/org/openapitools/api/UserApi.java -src/main/java/org/openapitools/api/UserApiController.java src/main/java/org/openapitools/api/VersioningApi.java -src/main/java/org/openapitools/api/VersioningApiController.java src/main/java/org/openapitools/configuration/EnumConverterConfiguration.java src/main/java/org/openapitools/configuration/HomeController.java src/main/java/org/openapitools/configuration/SpringFoxConfiguration.java diff --git a/samples/server/petstore/springboot-spring-pageable/.openapi-generator/FILES b/samples/server/petstore/springboot-spring-pageable/.openapi-generator/FILES index 3eb92a4787f..166ece42f55 100644 --- a/samples/server/petstore/springboot-spring-pageable/.openapi-generator/FILES +++ b/samples/server/petstore/springboot-spring-pageable/.openapi-generator/FILES @@ -3,20 +3,13 @@ pom.xml src/main/java/org/openapitools/OpenApiGeneratorApplication.java src/main/java/org/openapitools/RFC3339DateFormat.java src/main/java/org/openapitools/api/AnotherFakeApi.java -src/main/java/org/openapitools/api/AnotherFakeApiController.java src/main/java/org/openapitools/api/ApiUtil.java src/main/java/org/openapitools/api/FakeApi.java -src/main/java/org/openapitools/api/FakeApiController.java src/main/java/org/openapitools/api/FakeClassnameTestApi.java -src/main/java/org/openapitools/api/FakeClassnameTestApiController.java src/main/java/org/openapitools/api/PetApi.java -src/main/java/org/openapitools/api/PetApiController.java src/main/java/org/openapitools/api/StoreApi.java -src/main/java/org/openapitools/api/StoreApiController.java src/main/java/org/openapitools/api/UserApi.java -src/main/java/org/openapitools/api/UserApiController.java src/main/java/org/openapitools/api/VersioningApi.java -src/main/java/org/openapitools/api/VersioningApiController.java src/main/java/org/openapitools/configuration/EnumConverterConfiguration.java src/main/java/org/openapitools/configuration/HomeController.java src/main/java/org/openapitools/configuration/SpringFoxConfiguration.java diff --git a/samples/server/petstore/springboot-spring-provide-args/.openapi-generator/FILES b/samples/server/petstore/springboot-spring-provide-args/.openapi-generator/FILES index 86abe7f3936..59748a69ffb 100644 --- a/samples/server/petstore/springboot-spring-provide-args/.openapi-generator/FILES +++ b/samples/server/petstore/springboot-spring-provide-args/.openapi-generator/FILES @@ -4,7 +4,6 @@ src/main/java/org/openapitools/OpenApiGeneratorApplication.java src/main/java/org/openapitools/RFC3339DateFormat.java src/main/java/org/openapitools/api/ApiUtil.java src/main/java/org/openapitools/api/UserApi.java -src/main/java/org/openapitools/api/UserApiController.java src/main/java/org/openapitools/configuration/HomeController.java src/main/java/org/openapitools/configuration/SpringDocConfiguration.java src/main/java/org/openapitools/model/Category.java diff --git a/samples/server/petstore/springboot-useoptional/.openapi-generator/FILES b/samples/server/petstore/springboot-useoptional/.openapi-generator/FILES index f3691a72bd4..95a549621f7 100644 --- a/samples/server/petstore/springboot-useoptional/.openapi-generator/FILES +++ b/samples/server/petstore/springboot-useoptional/.openapi-generator/FILES @@ -3,18 +3,12 @@ pom.xml src/main/java/org/openapitools/OpenApiGeneratorApplication.java src/main/java/org/openapitools/RFC3339DateFormat.java src/main/java/org/openapitools/api/AnotherFakeApi.java -src/main/java/org/openapitools/api/AnotherFakeApiController.java src/main/java/org/openapitools/api/ApiUtil.java src/main/java/org/openapitools/api/FakeApi.java -src/main/java/org/openapitools/api/FakeApiController.java src/main/java/org/openapitools/api/FakeClassnameTestApi.java -src/main/java/org/openapitools/api/FakeClassnameTestApiController.java src/main/java/org/openapitools/api/PetApi.java -src/main/java/org/openapitools/api/PetApiController.java src/main/java/org/openapitools/api/StoreApi.java -src/main/java/org/openapitools/api/StoreApiController.java src/main/java/org/openapitools/api/UserApi.java -src/main/java/org/openapitools/api/UserApiController.java src/main/java/org/openapitools/configuration/EnumConverterConfiguration.java src/main/java/org/openapitools/configuration/HomeController.java src/main/java/org/openapitools/configuration/SpringFoxConfiguration.java diff --git a/samples/server/petstore/springboot-virtualan/.openapi-generator/FILES b/samples/server/petstore/springboot-virtualan/.openapi-generator/FILES index 1f44133fbd0..629a3cc7437 100644 --- a/samples/server/petstore/springboot-virtualan/.openapi-generator/FILES +++ b/samples/server/petstore/springboot-virtualan/.openapi-generator/FILES @@ -6,18 +6,12 @@ src/main/java/org/openapitools/configuration/EnumConverterConfiguration.java src/main/java/org/openapitools/configuration/HomeController.java src/main/java/org/openapitools/configuration/SpringDocConfiguration.java src/main/java/org/openapitools/virtualan/api/AnotherFakeApi.java -src/main/java/org/openapitools/virtualan/api/AnotherFakeApiController.java src/main/java/org/openapitools/virtualan/api/ApiUtil.java src/main/java/org/openapitools/virtualan/api/FakeApi.java -src/main/java/org/openapitools/virtualan/api/FakeApiController.java src/main/java/org/openapitools/virtualan/api/FakeClassnameTestApi.java -src/main/java/org/openapitools/virtualan/api/FakeClassnameTestApiController.java src/main/java/org/openapitools/virtualan/api/PetApi.java -src/main/java/org/openapitools/virtualan/api/PetApiController.java src/main/java/org/openapitools/virtualan/api/StoreApi.java -src/main/java/org/openapitools/virtualan/api/StoreApiController.java src/main/java/org/openapitools/virtualan/api/UserApi.java -src/main/java/org/openapitools/virtualan/api/UserApiController.java src/main/java/org/openapitools/virtualan/model/AdditionalPropertiesAnyType.java src/main/java/org/openapitools/virtualan/model/AdditionalPropertiesArray.java src/main/java/org/openapitools/virtualan/model/AdditionalPropertiesBoolean.java diff --git a/samples/server/petstore/springboot/.openapi-generator/FILES b/samples/server/petstore/springboot/.openapi-generator/FILES index 17c1e122b6b..bee80ebd189 100644 --- a/samples/server/petstore/springboot/.openapi-generator/FILES +++ b/samples/server/petstore/springboot/.openapi-generator/FILES @@ -3,18 +3,12 @@ pom.xml src/main/java/org/openapitools/OpenApiGeneratorApplication.java src/main/java/org/openapitools/RFC3339DateFormat.java src/main/java/org/openapitools/api/AnotherFakeApi.java -src/main/java/org/openapitools/api/AnotherFakeApiController.java src/main/java/org/openapitools/api/ApiUtil.java src/main/java/org/openapitools/api/FakeApi.java -src/main/java/org/openapitools/api/FakeApiController.java src/main/java/org/openapitools/api/FakeClassnameTestApi.java -src/main/java/org/openapitools/api/FakeClassnameTestApiController.java src/main/java/org/openapitools/api/PetApi.java -src/main/java/org/openapitools/api/PetApiController.java src/main/java/org/openapitools/api/StoreApi.java -src/main/java/org/openapitools/api/StoreApiController.java src/main/java/org/openapitools/api/UserApi.java -src/main/java/org/openapitools/api/UserApiController.java src/main/java/org/openapitools/configuration/EnumConverterConfiguration.java src/main/java/org/openapitools/configuration/HomeController.java src/main/java/org/openapitools/configuration/SpringFoxConfiguration.java