From 2969f0764a04315f72bf4a61ba5ce6497c96fc96 Mon Sep 17 00:00:00 2001 From: LoveIsGrief Date: Fri, 25 Oct 2019 09:14:09 +0200 Subject: [PATCH] Place PathHandlerProvider.java of java-undertow-server in the apiPackage dir (#4255) * Fix copy-pasted string * Generate the PathHandlerProvider.java in the apiPackage This is a toss-up between apiPackage and invokerPackage since I don't know which one was intended, I'm assuming it's the apiPackage. It'd make sense to put the handler there since it is providing the API and handling calls to it... --- .../codegen/languages/JavaUndertowServerCodegen.java | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/JavaUndertowServerCodegen.java b/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/JavaUndertowServerCodegen.java index 47df13f7295..afa273f2850 100644 --- a/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/JavaUndertowServerCodegen.java +++ b/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/JavaUndertowServerCodegen.java @@ -25,6 +25,7 @@ import org.slf4j.LoggerFactory; import java.util.HashMap; import java.util.List; +import java.util.Locale; import java.util.Map; import static org.openapitools.codegen.utils.StringUtils.camelize; @@ -59,7 +60,7 @@ public class JavaUndertowServerCodegen extends AbstractJavaCodegen { apiDocTemplateFiles.remove("api_doc.mustache"); if(GlobalSettings.getProperty("swagger.codegen.undertow.apipackage") != null && GlobalSettings.getProperty("openapi.codegen.undertow.apipackage") == null) { - LOGGER.warn("System property 'swagger.codegen.undertow.apipackage' was renamed to 'swagger.codegen.undertow.apipackage'"); + LOGGER.warn("System property 'swagger.codegen.undertow.apipackage' was renamed to 'openapi.codegen.undertow.apipackage'"); apiPackage = GlobalSettings.getProperty("swagger.codegen.undertow.apipackage", "org.openapitools.handler"); } else { apiPackage = GlobalSettings.getProperty("openapi.codegen.undertow.apipackage", "org.openapitools.handler"); @@ -100,7 +101,7 @@ public class JavaUndertowServerCodegen extends AbstractJavaCodegen { // keep the yaml in config folder for framework validation. supportingFiles.add(new SupportingFile("openapi.mustache", ("src.main.resources.config").replace(".", java.io.File.separator), "openapi.json")); - supportingFiles.add(new SupportingFile("handler.mustache", ("src.main.java.org.openapitools.handler").replace(".", java.io.File.separator), "PathHandlerProvider.java")); + supportingFiles.add(new SupportingFile("handler.mustache", (String.format(Locale.ROOT, "src.main.java.%s", apiPackage)).replace(".", java.io.File.separator), "PathHandlerProvider.java")); supportingFiles.add(new SupportingFile("service.mustache", ("src.main.resources.META-INF.services").replace(".", java.io.File.separator), "com.networknt.server.HandlerProvider")); // configuration files