Add bean validation feature from apicurio-codegen 1.2.5.Final

Author: mcruzdev

.all-contributorsrc

@@ -455,6 +455,15 @@
       "contributions": [
         "code"
       ]
+    },
+    {
+      "login": "cmoine-swi",
+      "name": "Christophe Moine",
+      "avatar_url": "https://avatars.githubusercontent.com/u/180930830?v=4",
+      "profile": "https://github.com/cmoine-swi",
+      "contributions": [
+        "code"
+      ]
     }
   ],
   "contributorsPerLine": 7,

README.md

@@ -10,7 +10,7 @@
 <br>
 
 <!-- ALL-CONTRIBUTORS-BADGE:START - Do not remove or modify this section -->
-[![All Contributors](https://img.shields.io/badge/all_contributors-48-orange.svg?style=flat-square)](#contributors-)
+[![All Contributors](https://img.shields.io/badge/all_contributors-49-orange.svg?style=flat-square)](#contributors-)
 <!-- ALL-CONTRIBUTORS-BADGE:END -->
 [![Build](<https://img.shields.io/github/actions/workflow/status/quarkiverse/quarkus-openapi-generator/build.yml?branch=main&logo=GitHub&style=flat-square>)](https://github.com/quarkiverse/quarkus-openapi-generator/actions?query=workflow%3ABuild)
 [![Maven Central](https://img.shields.io/maven-central/v/io.quarkiverse.openapi.generator/quarkus-openapi-generator.svg?label=Maven%20Central&style=flat-square)](https://search.maven.org/artifact/io.quarkiverse.openapi.generator/quarkus-openapi-generator)
@@ -109,6 +109,7 @@ Thanks goes to these wonderful people ([emoji key](https://allcontributors.org/d
       <td align="center" valign="top" width="14.28%"><a href="https://dev.to/dellamas"><img src="https://avatars.githubusercontent.com/u/80655200?v=4?s=100" width="100px;" alt="Luis Fabrício De Llamas"/><br /><sub><b>Luis Fabrício De Llamas</b></sub></a><br /><a href="https://github.com/quarkiverse/quarkus-openapi-generator/commits?author=dellamas" title="Documentation">📖</a> <a href="https://github.com/quarkiverse/quarkus-openapi-generator/commits?author=dellamas" title="Tests">⚠️</a></td>
       <td align="center" valign="top" width="14.28%"><a href="https://github.com/jghagemann"><img src="https://avatars.githubusercontent.com/u/42047435?v=4?s=100" width="100px;" alt="João Guilherme Hagemann"/><br /><sub><b>João Guilherme Hagemann</b></sub></a><br /><a href="https://github.com/quarkiverse/quarkus-openapi-generator/commits?author=jghagemann" title="Documentation">📖</a></td>
       <td align="center" valign="top" width="14.28%"><a href="https://github.com/omatheusmesmo"><img src="https://avatars.githubusercontent.com/u/99829531?v=4?s=100" width="100px;" alt="Matheus Oliveira da Silva"/><br /><sub><b>Matheus Oliveira da Silva</b></sub></a><br /><a href="https://github.com/quarkiverse/quarkus-openapi-generator/commits?author=omatheusmesmo" title="Code">💻</a></td>
+      <td align="center" valign="top" width="14.28%"><a href="https://github.com/cmoine-swi"><img src="https://avatars.githubusercontent.com/u/180930830?v=4?s=100" width="100px;" alt="Christophe Moine"/><br /><sub><b>Christophe Moine</b></sub></a><br /><a href="https://github.com/quarkiverse/quarkus-openapi-generator/commits?author=cmoine-swi" title="Code">💻</a></td>
     </tr>
   </tbody>
 </table>

moqu/core/pom.xml

@@ -11,7 +11,7 @@
     <name>Quarkus :: Openapi Generator :: Moqu :: Core</name>
 
     <properties>
-        <commons.io.version>2.19.0</commons.io.version>
+        <commons.io.version>2.20.0</commons.io.version>
     </properties>
 
     <dependencies>

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.24.3</quarkus.version>
-    <apicurio.version>1.2.1.Final</apicurio.version>
+    <quarkus.version>3.24.4</quarkus.version>
+    <apicurio.version>1.2.5.Final</apicurio.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

@@ -22,6 +22,7 @@
 
 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;
 
 public class ApicurioCodegenWrapper {
@@ -42,6 +43,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 +66,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 +114,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);
     }