Skip to content

[main-lts] Upgrade apicurio-codegen dependency using bean validation #1255

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
wants to merge 2 commits into from
Closed

[main-lts] Upgrade apicurio-codegen dependency using bean validation #1255

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
248fd78
Add bean validation feature from apicurio-codegen 1.2.5.Final (#1245)
mcruzdev Jul 24, 2025
25507a2
Merge branch 'main-lts' into main-lts_upgrade-apicurio-codegen
mcruzdev Jul 24, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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>
Expand Down
10 changes: 10 additions & 0 deletions ...yment/src/main/java/io/quarkiverse/openapi/server/generator/deployment/CodegenConfig.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,8 @@ public interface CodegenConfig extends ServerCodegenConfig {
String CODEGEN_SPEC = CODEGEN_TIME_CONFIG_PREFIX + ".spec";
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;
Expand All @@ -29,4 +31,12 @@ static String getInputBaseDirPropertyName() {
static String getCodegenReactive() {
return CODEGEN_REACTIVE;
}

static String getGenerateBuilders() {
return GENERATE_BUILDERS;
}

static String getUseBeanValidation() {
return CODEGEN_BEAN_VALIDATION;
}
}
6 changes: 6 additions & 0 deletions ...src/main/java/io/quarkiverse/openapi/server/generator/deployment/ServerCodegenConfig.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,4 +31,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();
}
22 changes: 18 additions & 4 deletions ...va/io/quarkiverse/openapi/server/generator/deployment/codegen/ApicurioCodegenWrapper.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 {
Expand All @@ -38,8 +39,10 @@ public ApicurioCodegenWrapper(Config config, File outdir) {
public ApicurioCodegenWrapper(Config config, File outdir, JaxRsProjectSettings projectSettings) {
this.outdir = outdir;
this.projectSettings = projectSettings;
this.projectSettings.setJavaPackage(getBasePackage(config));
this.projectSettings.setReactive(getReactiveValue(config));
this.projectSettings.setJavaPackage(getBasePackage());
this.projectSettings.setReactive(getReactiveValue());
this.projectSettings.setUseJsr303(getUseBeanValidation());
this.projectSettings.setGenerateBuilders(getGenerateBuilders());
}

public void generate(Path openApiResource) throws CodeGenException {
Expand All @@ -65,6 +68,7 @@ public void generate(Path openApiResource) throws CodeGenException {
generator.setSettings(projectSettings);
generator.setUpdateOnly(true);
generator.setOpenApiDocument(openApiStream);

log.info("Generating code...");
generator.generate(fos);
} catch (Exception e) {
Expand Down Expand Up @@ -108,13 +112,23 @@ private void unzip(File fromZipFile, File toOutputDir) throws IOException {

private String getBasePackage(final Config config) {
return config
.getOptionalValue(getBasePackagePropertyName(), String.class)
.getOptionalValue(CodegenConfig.getBasePackagePropertyName(), String.class)
.orElse(DEFAULT_PACKAGE);
}

private Boolean getReactiveValue(final Config config) {
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);
}

Expand Down
Loading