loafle/openapi-generator
3
0
Fork 0
forked from loafle/openapi-generator-original
Code Pull Requests Activity

[Java][Haskell][Python] fix errors with empty strings, missing basePath (#15866)

Browse Source 
* various fixes

* generate samples & docs
This commit is contained in:
martin-mfg 2023-06-20 04:05:02 +02:00 committed by GitHub
parent 6b1a9ba602
commit 396c6753b1
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
5 changed files with 7 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/AbstractJavaCodegen.java
View File

@ -1597,7 +1597,7 @@ public abstract class AbstractJavaCodegen extends DefaultCodegen implements Code
// If none of them is provided then fallbacks to default version // If none of them is provided then fallbacks to default version
if (additionalProperties.containsKey(CodegenConstants.ARTIFACT_VERSION) && additionalProperties.get(CodegenConstants.ARTIFACT_VERSION) != null) { if (additionalProperties.containsKey(CodegenConstants.ARTIFACT_VERSION) && additionalProperties.get(CodegenConstants.ARTIFACT_VERSION) != null) {
this.setArtifactVersion((String) additionalProperties.get(CodegenConstants.ARTIFACT_VERSION)); 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()); this.setArtifactVersion(openAPI.getInfo().getVersion());
} else { } else {
this.setArtifactVersion(ARTIFACT_VERSION_DEFAULT_VALUE); this.setArtifactVersion(ARTIFACT_VERSION_DEFAULT_VALUE);

5
modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/AbstractPythonConnexionServerCodegen.java
View File

@ -390,10 +390,7 @@ public abstract class AbstractPythonConnexionServerCodegen extends AbstractPytho
if (operation.getTags() != null && operation.getTags().size() > 0) { if (operation.getTags() != null && operation.getTags().size() > 0) {
tag = operation.getTags().get(0); tag = operation.getTags().get(0);
} }
String operationId = operation.getOperationId(); String operationId = getOrGenerateOperationId(operation, pathname, method.toString());
if (operationId == null) {
operationId = getOrGenerateOperationId(operation, pathname, method.toString());
}
operation.setOperationId(toOperationId(operationId)); operation.setOperationId(toOperationId(operationId));
if (operation.getExtensions() == null || operation.getExtensions().get("x-openapi-router-controller") == null) { if (operation.getExtensions() == null || operation.getExtensions().get("x-openapi-router-controller") == null) {
operation.addExtension( operation.addExtension(

2
modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/HaskellHttpClientCodegen.java
View File

@ -542,7 +542,7 @@ public class HaskellHttpClientCodegen extends DefaultCodegen implements CodegenC
public void preprocessOpenAPI(OpenAPI openAPI) { public void preprocessOpenAPI(OpenAPI openAPI) {
String baseTitle = openAPI.getInfo().getTitle(); String baseTitle = openAPI.getInfo().getTitle();
if (baseTitle == null) { if (StringUtils.isBlank(baseTitle)) {
baseTitle = "OpenAPI"; baseTitle = "OpenAPI";
} else { } else {
baseTitle = baseTitle.trim(); baseTitle = baseTitle.trim();

4
modules/openapi-generator/src/main/resources/JavaJaxRS/spec/libraries/quarkus/pom.mustache vendored
View File

@ -27,8 +27,8 @@
<quarkus.platform.version>3.0.1.Final</quarkus.platform.version> <quarkus.platform.version>3.0.1.Final</quarkus.platform.version>
{{/useJakartaEe}} {{/useJakartaEe}}
{{^useJakartaEe}} {{^useJakartaEe}}
<quarkus-plugin.version>1.1.1.Final</quarkus-plugin.version> <quarkus-plugin.version>1.13.7.Final</quarkus-plugin.version>
<quarkus.platform.version>1.1.1.Final</quarkus.platform.version> <quarkus.platform.version>1.13.7.Final</quarkus.platform.version>
{{/useJakartaEe}} {{/useJakartaEe}}
<quarkus.platform.artifact-id>quarkus-universe-bom</quarkus.platform.artifact-id> <quarkus.platform.artifact-id>quarkus-universe-bom</quarkus.platform.artifact-id>
<quarkus.platform.group-id>io.quarkus</quarkus.platform.group-id> <quarkus.platform.group-id>io.quarkus</quarkus.platform.group-id>

4
samples/server/petstore/jaxrs-spec-microprofile-openapi-annotations/pom.xml
View File

@ -15,8 +15,8 @@
<maven.compiler.target>1.8</maven.compiler.target> <maven.compiler.target>1.8</maven.compiler.target>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding> <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
<project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding> <project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
<quarkus-plugin.version>1.1.1.Final</quarkus-plugin.version> <quarkus-plugin.version>1.13.7.Final</quarkus-plugin.version>
<quarkus.platform.version>1.1.1.Final</quarkus.platform.version> <quarkus.platform.version>1.13.7.Final</quarkus.platform.version>
<quarkus.platform.artifact-id>quarkus-universe-bom</quarkus.platform.artifact-id> <quarkus.platform.artifact-id>quarkus-universe-bom</quarkus.platform.artifact-id>
<quarkus.platform.group-id>io.quarkus</quarkus.platform.group-id> <quarkus.platform.group-id>io.quarkus</quarkus.platform.group-id>
<surefire-plugin.version>2.22.1</surefire-plugin.version> <surefire-plugin.version>2.22.1</surefire-plugin.version>