diff --git a/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/AbstractJavaCodegen.java b/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/AbstractJavaCodegen.java index 2968c25d849..201b76c2a96 100644 --- a/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/AbstractJavaCodegen.java +++ b/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/AbstractJavaCodegen.java @@ -1597,7 +1597,7 @@ public abstract class AbstractJavaCodegen extends DefaultCodegen implements Code // If none of them is provided then fallbacks to default version if (additionalProperties.containsKey(CodegenConstants.ARTIFACT_VERSION) && additionalProperties.get(CodegenConstants.ARTIFACT_VERSION) != null) { this.setArtifactVersion((String) additionalProperties.get(CodegenConstants.ARTIFACT_VERSION)); - } else if (openAPI.getInfo() != null && openAPI.getInfo().getVersion() != null) { + } else if (openAPI.getInfo() != null && !StringUtils.isBlank(openAPI.getInfo().getVersion())) { this.setArtifactVersion(openAPI.getInfo().getVersion()); } else { this.setArtifactVersion(ARTIFACT_VERSION_DEFAULT_VALUE); diff --git a/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/AbstractPythonConnexionServerCodegen.java b/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/AbstractPythonConnexionServerCodegen.java index 88ae7be78fd..4ec36d33d4c 100644 --- a/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/AbstractPythonConnexionServerCodegen.java +++ b/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/AbstractPythonConnexionServerCodegen.java @@ -390,10 +390,7 @@ public abstract class AbstractPythonConnexionServerCodegen extends AbstractPytho if (operation.getTags() != null && operation.getTags().size() > 0) { tag = operation.getTags().get(0); } - String operationId = operation.getOperationId(); - if (operationId == null) { - operationId = getOrGenerateOperationId(operation, pathname, method.toString()); - } + String operationId = getOrGenerateOperationId(operation, pathname, method.toString()); operation.setOperationId(toOperationId(operationId)); if (operation.getExtensions() == null || operation.getExtensions().get("x-openapi-router-controller") == null) { operation.addExtension( diff --git a/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/HaskellHttpClientCodegen.java b/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/HaskellHttpClientCodegen.java index 407e05a09af..f50a6ac4f7e 100644 --- a/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/HaskellHttpClientCodegen.java +++ b/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/HaskellHttpClientCodegen.java @@ -542,7 +542,7 @@ public class HaskellHttpClientCodegen extends DefaultCodegen implements CodegenC public void preprocessOpenAPI(OpenAPI openAPI) { String baseTitle = openAPI.getInfo().getTitle(); - if (baseTitle == null) { + if (StringUtils.isBlank(baseTitle)) { baseTitle = "OpenAPI"; } else { baseTitle = baseTitle.trim(); diff --git a/modules/openapi-generator/src/main/resources/JavaJaxRS/spec/libraries/quarkus/pom.mustache b/modules/openapi-generator/src/main/resources/JavaJaxRS/spec/libraries/quarkus/pom.mustache index 6a875ddb717..348c2ea3078 100644 --- a/modules/openapi-generator/src/main/resources/JavaJaxRS/spec/libraries/quarkus/pom.mustache +++ b/modules/openapi-generator/src/main/resources/JavaJaxRS/spec/libraries/quarkus/pom.mustache @@ -27,8 +27,8 @@ 3.0.1.Final {{/useJakartaEe}} {{^useJakartaEe}} - 1.1.1.Final - 1.1.1.Final + 1.13.7.Final + 1.13.7.Final {{/useJakartaEe}} quarkus-universe-bom io.quarkus diff --git a/samples/server/petstore/jaxrs-spec-microprofile-openapi-annotations/pom.xml b/samples/server/petstore/jaxrs-spec-microprofile-openapi-annotations/pom.xml index 667541e4e82..2b84d8826d5 100644 --- a/samples/server/petstore/jaxrs-spec-microprofile-openapi-annotations/pom.xml +++ b/samples/server/petstore/jaxrs-spec-microprofile-openapi-annotations/pom.xml @@ -15,8 +15,8 @@ 1.8 UTF-8 UTF-8 - 1.1.1.Final - 1.1.1.Final + 1.13.7.Final + 1.13.7.Final quarkus-universe-bom io.quarkus 2.22.1