Add bean validation feature from apicurio-codegen 1.2.5.Final

Author: mcruzdev

pom.xml

@@ -28,8 +28,8 @@
     <maven.compiler.release>17</maven.compiler.release>
     <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
     <project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
-    <quarkus.version>3.20.1</quarkus.version>
-    <apicurio.version>1.2.1.Final</apicurio.version>
+    <apicurio.version>1.2.5.Final</apicurio.version>
+    <quarkus.version>3.25.0</quarkus.version>
     <version.com.github.javaparser>3.27.0</version.com.github.javaparser>
     <version.org.assertj>3.27.3</version.org.assertj>
     <version.org.eclipse.microprofile.fault-tolerance>4.1.2</version.org.eclipse.microprofile.fault-tolerance>

server/deployment/src/main/java/io/quarkiverse/openapi/server/generator/deployment/CodegenConfig.java

@@ -14,6 +14,7 @@ public interface CodegenConfig extends ServerCodegenConfig {
     String INPUT_BASE_DIR = CODEGEN_TIME_CONFIG_PREFIX + ".input-base-dir";
     String CODEGEN_REACTIVE = CODEGEN_TIME_CONFIG_PREFIX + ".reactive";
     String GENERATE_BUILDERS = CODEGEN_TIME_CONFIG_PREFIX + ".builders";
+    String CODEGEN_BEAN_VALIDATION = CODEGEN_TIME_CONFIG_PREFIX + ".bean-validation";
 
     static String getBasePackagePropertyName() {
         return CODEGEN_BASE_PACKAGE;
@@ -34,4 +35,8 @@ static String getCodegenReactive() {
     static String getGenerateBuilders() {
         return GENERATE_BUILDERS;
     }
+
+    static String getUseBeanValidation() {
+        return CODEGEN_BEAN_VALIDATION;
+    }
 }

server/deployment/src/main/java/io/quarkiverse/openapi/server/generator/deployment/ServerCodegenConfig.java

@@ -37,4 +37,10 @@ public interface ServerCodegenConfig {
      */
     @WithDefault(DEFAULT_PACKAGE)
     Optional<String> basePackage();
+
+    /**
+     * Whether it must generate resources and beans using bean validation (JSR-303).
+     */
+    @WithDefault("false")
+    boolean useBeanValidation();
 }

server/deployment/src/main/java/io/quarkiverse/openapi/server/generator/deployment/codegen/ApicurioCodegenWrapper.java

@@ -1,8 +1,13 @@
 package io.quarkiverse.openapi.server.generator.deployment.codegen;
 
-import static io.quarkiverse.openapi.server.generator.deployment.CodegenConfig.getBasePackagePropertyName;
-import static io.quarkiverse.openapi.server.generator.deployment.CodegenConfig.getCodegenReactive;
-import static io.quarkiverse.openapi.server.generator.deployment.ServerCodegenConfig.DEFAULT_PACKAGE;
+import io.apicurio.hub.api.codegen.JaxRsProjectSettings;
+import io.apicurio.hub.api.codegen.OpenApi2JaxRs;
+import io.quarkiverse.openapi.server.generator.deployment.CodegenConfig;
+import io.quarkus.bootstrap.prebuild.CodeGenException;
+import org.apache.commons.io.IOUtils;
+import org.eclipse.microprofile.config.Config;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 
 import java.io.File;
 import java.io.FileInputStream;
@@ -15,14 +20,7 @@
 import java.util.zip.ZipEntry;
 import java.util.zip.ZipFile;
 
-import org.apache.commons.io.IOUtils;
-import org.eclipse.microprofile.config.Config;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
-import io.apicurio.hub.api.codegen.JaxRsProjectSettings;
-import io.apicurio.hub.api.codegen.OpenApi2JaxRs;
-import io.quarkus.bootstrap.prebuild.CodeGenException;
+import static io.quarkiverse.openapi.server.generator.deployment.ServerCodegenConfig.DEFAULT_PACKAGE;
 
 public class ApicurioCodegenWrapper {
 
@@ -42,6 +40,8 @@ public ApicurioCodegenWrapper(Config config, File outdir, JaxRsProjectSettings p
         this.projectSettings = projectSettings;
         this.projectSettings.setJavaPackage(getBasePackage());
         this.projectSettings.setReactive(getReactiveValue());
+        this.projectSettings.setUseJsr303(getUseBeanValidation());
+        this.projectSettings.setGenerateBuilders(getGenerateBuilders());
     }
 
     public void generate(Path openApiResource) throws CodeGenException {
@@ -63,14 +63,11 @@ public void generate(Path openApiResource) throws CodeGenException {
 
         try (FileOutputStream fos = new FileOutputStream(zipFile);
                 FileInputStream openApiStream = new FileInputStream(openApiFile)) {
-            OpenApi2JaxRs generator = new OpenApi2JaxRs() {
-                {
-                    config = new ConfigurableGenerationConfig(ApicurioCodegenWrapper.this.config);
-                }
-            };
+            OpenApi2JaxRs generator = new OpenApi2JaxRs();
             generator.setSettings(projectSettings);
             generator.setUpdateOnly(true);
             generator.setOpenApiDocument(openApiStream);
+
             log.info("Generating code...");
             generator.generate(fos);
         } catch (Exception e) {
@@ -114,13 +111,23 @@ private void unzip(File fromZipFile, File toOutputDir) throws IOException {
 
     private String getBasePackage() {
         return config
-                .getOptionalValue(getBasePackagePropertyName(), String.class)
+                .getOptionalValue(CodegenConfig.getBasePackagePropertyName(), String.class)
                 .orElse(DEFAULT_PACKAGE);
     }
 
     private Boolean getReactiveValue() {
         return config
-                .getOptionalValue(getCodegenReactive(), Boolean.class)
+                .getOptionalValue(CodegenConfig.getCodegenReactive(), Boolean.class)
+                .orElse(Boolean.FALSE);
+    }
+
+    private Boolean getUseBeanValidation() {
+        return config.getOptionalValue(CodegenConfig.getUseBeanValidation(), Boolean.class)
+                .orElse(Boolean.FALSE);
+    }
+
+    private Boolean getGenerateBuilders() {
+        return config.getOptionalValue(CodegenConfig.getGenerateBuilders(), Boolean.class)
                 .orElse(Boolean.FALSE);
     }