Merge pull request #10880 from sleicht/fix_10879

frantuma · web-flow · commit 452e77b76048 · 2021-12-14T11:48:19.000+01:00
diff --git a/modules/swagger-codegen/src/main/java/io/swagger/codegen/v3/DefaultGenerator.java b/modules/swagger-codegen/src/main/java/io/swagger/codegen/v3/DefaultGenerator.java
@@ -202,7 +202,7 @@ private void configureGeneratorProperties() {
         config.additionalProperties().put(CodegenConstants.GENERATE_MODEL_DOCS, generateModelDocumentation);
         
         // Additional properties could be set already (f.e. using Maven plugin)
-        if (useOas2Option != null || !config.additionalProperties().containsKey(CodegenConstants.USE_OAS2)) {
+        if (useOas2Option != null && !config.additionalProperties().containsKey(CodegenConstants.USE_OAS2)) {
             config.additionalProperties().put(CodegenConstants.USE_OAS2, useOas2);
         }
 

Original file line number	Diff line number	Diff line change
`@@ -202,7 +202,7 @@ private void configureGeneratorProperties() {`
`202`	`202`	`config.additionalProperties().put(CodegenConstants.GENERATE_MODEL_DOCS, generateModelDocumentation);`
`203`	`203`
`204`	`204`	`// Additional properties could be set already (f.e. using Maven plugin)`
`205`		`- if (useOas2Option != null \|\| !config.additionalProperties().containsKey(CodegenConstants.USE_OAS2)) {`
	`205`	`+ if (useOas2Option != null && !config.additionalProperties().containsKey(CodegenConstants.USE_OAS2)) {`
`206`	`206`	`config.additionalProperties().put(CodegenConstants.USE_OAS2, useOas2);`
`207`	`207`	`}`
`208`	`208`