OpenAPI Generator 7.7.0 (#1614)

micronaut-projects · Jul 5, 2024 · e439872 · e439872
1 parent e84043f
commit e439872
Show file tree

Hide file tree

Showing 7 changed files with 38 additions and 4 deletions.
diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml
@@ -12,7 +12,7 @@ jspecify = "0.3.0"
 jdt-annotation = "2.3.0"
 android-annotation = "1.8.0"
 spotbugs-annotations = "4.8.6"
-openapi-generator = "7.6.0"
+openapi-generator = "7.7.0"
 swagger-parser = "1.0.71"
 swagger-parser-v3 = "2.1.22"
 javaparser = "3.26.1"

diff --git a/...-generator/src/main/java/io/micronaut/openapi/generator/AbstractMicronautJavaCodegen.java b/...-generator/src/main/java/io/micronaut/openapi/generator/AbstractMicronautJavaCodegen.java
@@ -66,7 +66,9 @@
 import static io.micronaut.openapi.generator.Utils.addStrValueToEnum;
 import static io.micronaut.openapi.generator.Utils.normalizeExtraAnnotations;
 import static io.micronaut.openapi.generator.Utils.processGenericAnnotations;
+import static org.openapitools.codegen.CodegenConstants.API_PACKAGE;
 import static org.openapitools.codegen.CodegenConstants.INVOKER_PACKAGE;
+import static org.openapitools.codegen.CodegenConstants.MODEL_PACKAGE;
 import static org.openapitools.codegen.utils.StringUtils.camelize;
 
 /**
@@ -113,7 +115,6 @@ public abstract class AbstractMicronautJavaCodegen<T extends GeneratorOptionsBui
 
     protected SecureRandom random = new SecureRandom();
     protected String title;
-    protected boolean useBeanValidation;
     protected boolean useOptional;
     protected boolean visitable;
     protected boolean lombok;
@@ -187,7 +188,7 @@ protected AbstractMicronautJavaCodegen() {
         updateOption(INVOKER_PACKAGE, getInvokerPackage());
         updateOption(CodegenConstants.ARTIFACT_ID, getArtifactId());
         updateOption(CodegenConstants.API_PACKAGE, apiPackage);
-        updateOption(CodegenConstants.MODEL_PACKAGE, modelPackage);
+        updateOption(MODEL_PACKAGE, modelPackage);
 
         cliOptions.add(new CliOption(OPT_TITLE, "Client service name").defaultValue(title));
         cliOptions.add(new CliOption(OPT_APPLICATION_NAME, "Micronaut application name (Defaults to the " + CodegenConstants.ARTIFACT_ID + " value)").defaultValue(appName));
@@ -293,7 +294,7 @@ public void setArtifactId(String artifactId) {
     @Override
     public void setModelPackage(String modelPackage) {
         super.setModelPackage(modelPackage);
-        updateOption(CodegenConstants.MODEL_PACKAGE, modelPackage);
+        updateOption(MODEL_PACKAGE, modelPackage);
     }
 
     @Override
@@ -363,6 +364,18 @@ public void processOpts() {
             additionalProperties.put(INVOKER_PACKAGE, invokerPackage);
         }
 
+        if (additionalProperties.containsKey(API_PACKAGE)) {
+            apiPackage = (String) additionalProperties.get(API_PACKAGE);
+        } else {
+            additionalProperties.put(API_PACKAGE, apiPackage);
+        }
+
+        if (additionalProperties.containsKey(MODEL_PACKAGE)) {
+            modelPackage = (String) additionalProperties.get(MODEL_PACKAGE);
+        } else {
+            additionalProperties.put(MODEL_PACKAGE, modelPackage);
+        }
+
         if (additionalProperties.containsKey(OPT_APPLICATION_NAME)) {
             appName = (String) additionalProperties.get(OPT_APPLICATION_NAME);
         } else {

diff --git a/...enerator/src/main/java/io/micronaut/openapi/generator/AbstractMicronautKotlinCodegen.java b/...enerator/src/main/java/io/micronaut/openapi/generator/AbstractMicronautKotlinCodegen.java
@@ -76,7 +76,9 @@
 import static io.micronaut.openapi.generator.Utils.addStrValueToEnum;
 import static io.micronaut.openapi.generator.Utils.normalizeExtraAnnotations;
 import static io.micronaut.openapi.generator.Utils.processGenericAnnotations;
+import static org.openapitools.codegen.CodegenConstants.API_PACKAGE;
 import static org.openapitools.codegen.CodegenConstants.INVOKER_PACKAGE;
+import static org.openapitools.codegen.CodegenConstants.MODEL_PACKAGE;
 import static org.openapitools.codegen.languages.KotlinClientCodegen.DATE_LIBRARY;
 import static org.openapitools.codegen.utils.StringUtils.camelize;
 import static org.openapitools.codegen.utils.StringUtils.underscore;
@@ -424,6 +426,18 @@ public void processOpts() {
             additionalProperties.put(INVOKER_PACKAGE, packageName);
         }
 
+        if (additionalProperties.containsKey(API_PACKAGE)) {
+            apiPackage = (String) additionalProperties.get(API_PACKAGE);
+        } else {
+            additionalProperties.put(API_PACKAGE, apiPackage);
+        }
+
+        if (additionalProperties.containsKey(MODEL_PACKAGE)) {
+            modelPackage = (String) additionalProperties.get(MODEL_PACKAGE);
+        } else {
+            additionalProperties.put(MODEL_PACKAGE, modelPackage);
+        }
+
         if (additionalProperties.containsKey(OPT_APPLICATION_NAME)) {
             appName = (String) additionalProperties.get(OPT_APPLICATION_NAME);
         } else {

diff --git a/openapi-generator/src/main/resources/templates/java-micronaut/common/model/pojo.mustache b/openapi-generator/src/main/resources/templates/java-micronaut/common/model/pojo.mustache
@@ -16,6 +16,7 @@
     {{/parent}}
 @Accessors(chain = true)
 @NoArgsConstructor
+@AllArgsConstructor
 @Data
 {{/lombok}}
 {{#micronaut_serde_jackson}}

diff --git a/...i-generator/src/main/resources/templates/java-micronaut/common/params/validation.mustache b/...i-generator/src/main/resources/templates/java-micronaut/common/params/validation.mustache
@@ -42,6 +42,7 @@
         {{/required}}
     {{/isNullable}}
     {{!Validate all pojos and enums}}
+    {{^isUuid}}
     {{^isContainer}}
         {{#isModel}}
     @Valid
@@ -109,4 +110,5 @@
             {{/maximum}}
         {{/isLong}}
     {{/isInteger}}
+    {{/isUuid}}
 {{/useBeanValidation}}
diff --git a/...generator/src/main/resources/templates/kotlin-micronaut/common/params/validation.mustache b/...generator/src/main/resources/templates/kotlin-micronaut/common/params/validation.mustache
@@ -22,6 +22,7 @@
         {{/required}}
     {{/isNullable}}
     {{!Validate all pojos and enums}}
+    {{^isUuid}}
     {{^isContainer}}
         {{#isModel}}
     @Valid
@@ -89,4 +90,5 @@
             {{/maximum}}
         {{/isLong}}
     {{/isInteger}}
+    {{/isUuid}}
 {{/useBeanValidation}}
diff --git a/...tor/src/main/resources/templates/kotlin-micronaut/common/params/validation_field.mustache b/...tor/src/main/resources/templates/kotlin-micronaut/common/params/validation_field.mustache
@@ -21,6 +21,7 @@
             {{/isReadOnly}}
         {{/required}}
     {{/isNullable}}
+    {{^isUuid}}
     {{!Validate all pojos and enums}}
     {{^isContainer}}
         {{#isModel}}
@@ -89,4 +90,5 @@
             {{/maximum}}
         {{/isLong}}
     {{/isInteger}}
+    {{/isUuid}}
 {{/useBeanValidation}}