From 3746f90723c39da899781d53d1165b6854971878 Mon Sep 17 00:00:00 2001 From: Ben Zegveld Date: Fri, 14 Jan 2022 14:27:35 +0100 Subject: [PATCH] #93: added an option to choose between the javax and jakarta generated annotation. --- .../org/assertj/maven/AssertJAssertionsGeneratorMojo.java | 8 ++++++++ .../org/assertj/maven/generator/AssertionsGenerator.java | 5 +++++ 2 files changed, 13 insertions(+) diff --git a/src/main/java/org/assertj/maven/AssertJAssertionsGeneratorMojo.java b/src/main/java/org/assertj/maven/AssertJAssertionsGeneratorMojo.java index f066861..1b9e05d 100644 --- a/src/main/java/org/assertj/maven/AssertJAssertionsGeneratorMojo.java +++ b/src/main/java/org/assertj/maven/AssertJAssertionsGeneratorMojo.java @@ -41,6 +41,7 @@ import org.apache.maven.plugins.annotations.Mojo; import org.apache.maven.plugins.annotations.Parameter; import org.apache.maven.project.MavenProject; +import org.assertj.assertions.generator.GeneratedAnnotationSource; import org.assertj.core.util.VisibleForTesting; import org.assertj.maven.generator.AssertionsGenerator; import org.assertj.maven.generator.AssertionsGeneratorReport; @@ -198,6 +199,12 @@ public class AssertJAssertionsGeneratorMojo extends AbstractMojo { @Parameter(property = "assertj.includePackagePrivateClasses") public boolean includePackagePrivateClasses = false; + /** + * Where the @Generated annotation should come from. Options: JAVAX (default), JAKARTA, NONE. + */ + @Parameter(property = "assertj.annotationSource") + public GeneratedAnnotationSource generatedAnnotationSource = GeneratedAnnotationSource.JAVAX; + @Override public void execute() throws MojoExecutionException, MojoFailureException { if (skip) { @@ -211,6 +218,7 @@ public void execute() throws MojoExecutionException, MojoFailureException { assertionGenerator.generateAssertionsForAllFields(this.generateAssertionsForAllFields); assertionGenerator.setIncludePatterns(includes); assertionGenerator.setExcludePatterns(excludes); + assertionGenerator.setGeneratedAnnotationSource(generatedAnnotationSource); if (generateAssertions) assertionGenerator.enableEntryPointClassesGenerationFor(STANDARD); if (generateBddAssertions) assertionGenerator.enableEntryPointClassesGenerationFor(BDD); if (generateSoftAssertions) assertionGenerator.enableEntryPointClassesGenerationFor(SOFT); diff --git a/src/main/java/org/assertj/maven/generator/AssertionsGenerator.java b/src/main/java/org/assertj/maven/generator/AssertionsGenerator.java index a4902de..8c957fd 100644 --- a/src/main/java/org/assertj/maven/generator/AssertionsGenerator.java +++ b/src/main/java/org/assertj/maven/generator/AssertionsGenerator.java @@ -30,6 +30,7 @@ import org.apache.maven.plugin.logging.Log; import org.assertj.assertions.generator.AssertionsEntryPointType; import org.assertj.assertions.generator.BaseAssertionGenerator; +import org.assertj.assertions.generator.GeneratedAnnotationSource; import org.assertj.assertions.generator.Template; import org.assertj.assertions.generator.description.ClassDescription; import org.assertj.assertions.generator.description.converter.ClassToClassDescriptionConverter; @@ -203,4 +204,8 @@ public void generateAssertionsForAllFields(boolean generateAssertionsForAllField public void setGeneratedAssertionsPackage(String generateAssertionsInPackage) { this.generator.setGeneratedAssertionsPackage(generateAssertionsInPackage); } + + public void setGeneratedAnnotationSource(GeneratedAnnotationSource generatedAnnotationSource) { + generator.setGeneratedAnnotationSource(generatedAnnotationSource); + } }