make pom generation template paramterizable

ctomc · tomazic89 · commit c53ae0a824a0 · 2024-02-06T11:58:42.000+01:00
diff --git a/asyncapi/implementation/src/main/java/org/iris_events/asyncapi/runtime/io/AsyncApiSerializer.java b/asyncapi/implementation/src/main/java/org/iris_events/asyncapi/runtime/io/AsyncApiSerializer.java
@@ -2,12 +2,12 @@
 
 import java.io.IOException;
 
-import io.apicurio.datamodels.Library;
 import org.iris_events.asyncapi.runtime.json.IrisObjectMapper;
 
 import com.fasterxml.jackson.core.JsonProcessingException;
 import com.fasterxml.jackson.databind.ObjectMapper;
 
+import io.apicurio.datamodels.Library;
 import io.apicurio.datamodels.models.asyncapi.v26.AsyncApi26Document;
 
 /**
diff --git a/asyncapi/implementation/src/main/java/org/iris_events/asyncapi/runtime/scanner/BaseAnnotationScanner.java b/asyncapi/implementation/src/main/java/org/iris_events/asyncapi/runtime/scanner/BaseAnnotationScanner.java
@@ -7,7 +7,6 @@
 import java.util.Objects;
 import java.util.Optional;
 
-import io.apicurio.datamodels.models.asyncapi.AsyncApiOperation;
 import org.iris_events.annotations.IrisGenerated;
 import org.iris_events.annotations.Scope;
 import org.iris_events.asyncapi.api.AsyncApiConfig;
@@ -36,15 +35,11 @@
 import io.apicurio.datamodels.Library;
 import io.apicurio.datamodels.models.ModelType;
 import io.apicurio.datamodels.models.asyncapi.AsyncApiChannelItem;
+import io.apicurio.datamodels.models.asyncapi.AsyncApiOperation;
 import io.apicurio.datamodels.models.asyncapi.v26.AsyncApi26BindingImpl;
 import io.apicurio.datamodels.models.asyncapi.v26.AsyncApi26ChannelBindingsImpl;
-import io.apicurio.datamodels.models.asyncapi.v26.AsyncApi26ChannelItemImpl;
-import io.apicurio.datamodels.models.asyncapi.v26.AsyncApi26ChannelsImpl;
 import io.apicurio.datamodels.models.asyncapi.v26.AsyncApi26ComponentsImpl;
 import io.apicurio.datamodels.models.asyncapi.v26.AsyncApi26Document;
-import io.apicurio.datamodels.models.asyncapi.v26.AsyncApi26Operation;
-import io.apicurio.datamodels.models.asyncapi.v26.AsyncApi26OperationBindingsImpl;
-import io.apicurio.datamodels.models.asyncapi.v26.AsyncApi26OperationImpl;
 import io.apicurio.datamodels.models.asyncapi.v26.AsyncApi26Schema;
 import io.apicurio.datamodels.models.asyncapi.v26.AsyncApi26SchemaImpl;
 
@@ -99,7 +94,7 @@ protected boolean annotatedClasses(AnnotationInstance annotation) {
     protected void createChannels(List<ChannelInfo> channelInfos, Map<String, Scope> messageScopes,
             AsyncApi26Document document) {
 
-        final var channels = document.getChannels() == null? document.createChannels(): document.getChannels();
+        final var channels = document.getChannels() == null ? document.createChannels() : document.getChannels();
         document.setChannels(channels);
 
         channelInfos.forEach(channelInfo -> {
@@ -152,7 +147,6 @@ protected void createChannels(List<ChannelInfo> channelInfos, Map<String, Scope>
             channels.addItem(channelKey, channelItem);
         });
 
-
     }
 
     private <T extends JsonNode> T getExchangeBindings(final String exchangeName, final ChannelInfo channelInfo) {
diff --git a/maven/asyncapi-generator-plugin/src/main/java/org/iris_events/plugin/asyncapi/generator/GenerateSchemaMojo.java b/maven/asyncapi-generator-plugin/src/main/java/org/iris_events/plugin/asyncapi/generator/GenerateSchemaMojo.java
@@ -13,8 +13,6 @@
 import java.util.Map;
 import java.util.Properties;
 
-import com.fasterxml.jackson.databind.node.ObjectNode;
-import io.apicurio.datamodels.Library;
 import org.apache.maven.artifact.DependencyResolutionRequiredException;
 import org.apache.maven.plugin.AbstractMojo;
 import org.apache.maven.plugin.MojoExecutionException;
@@ -34,7 +32,9 @@
 import org.jboss.jandex.IndexView;
 
 import com.fasterxml.jackson.databind.ObjectMapper;
+import com.fasterxml.jackson.databind.node.ObjectNode;
 
+import io.apicurio.datamodels.Library;
 import io.apicurio.datamodels.models.asyncapi.v26.AsyncApi26Document;
 import io.apicurio.registry.rest.client.RegistryClientFactory;
 
diff --git a/maven/model-generator-plugin/src/main/java/org/iris_events/plugin/model/generator/AmqpGenerator.java b/maven/model-generator-plugin/src/main/java/org/iris_events/plugin/model/generator/AmqpGenerator.java
@@ -60,6 +60,7 @@ public class AmqpGenerator {
     private final Pattern REF_PATTERN = Pattern.compile(StringConstants.REF_REGEX);
     private final Map<String, ChannelDetails> channelDetails;
     private final Set<String> eventClassNames;
+    private final String irisVersion;
     private final SchemaFileGenerator schemaFileGenerator;
     private final PathResolver pathResolver;
     private final ObjectMapper objectMapper;
@@ -79,10 +80,12 @@ public class AmqpGenerator {
     private final ExistingJavaTypeProcessor existingJavaTypeProcessor;
     private final CustomDependencies customDependencies;
 
-    public AmqpGenerator(SchemaFileGenerator schemaFileGenerator, ObjectMapper objectMapper, PathResolver pathResolver,
+    public AmqpGenerator(String irisVersion, SchemaFileGenerator schemaFileGenerator, ObjectMapper objectMapper,
+            PathResolver pathResolver,
             FileInteractor fileInteractor, Log log, String packageName, String modelVersion, String modelName,
             String asyncApiFilename, String asyncApiDirectory, String apicurioUrl,
             final CustomDependencies customDependencies) {
+        this.irisVersion = irisVersion;
         this.schemaFileGenerator = schemaFileGenerator;
         this.log = log;
         this.packageName = packageName;
@@ -506,6 +509,7 @@ private String preparePomTemplate() {
 
         return pomTemplate
                 .replace("@@ARTIFACT_ID@@", AmqpStringUtils.getPomArtifactId(modelName))
+                .replace("@@IRIS_VERSION@@", irisVersion)
                 .replace("@@APPLICATION_VERSION@@", modelVersion)
                 .replace("@@GROUP_ID@@", packageName)
                 .replace("@@CUSTOM_DEPENDENCIES@@", customDependencies.getDependenciesValue());
diff --git a/maven/model-generator-plugin/src/main/java/org/iris_events/plugin/model/generator/AmqpGeneratorMojo.java b/maven/model-generator-plugin/src/main/java/org/iris_events/plugin/model/generator/AmqpGeneratorMojo.java
@@ -2,10 +2,8 @@
 
 import org.apache.maven.plugin.AbstractMojo;
 import org.apache.maven.plugin.MojoExecutionException;
-import org.apache.maven.plugins.annotations.LifecyclePhase;
-import org.apache.maven.plugins.annotations.Mojo;
-import org.apache.maven.plugins.annotations.Parameter;
-import org.apache.maven.plugins.annotations.ResolutionScope;
+import org.apache.maven.plugin.descriptor.PluginDescriptor;
+import org.apache.maven.plugins.annotations.*;
 import org.iris_events.plugin.model.generator.exception.AmqpGeneratorException;
 import org.iris_events.plugin.model.generator.models.ArtifactSource;
 import org.iris_events.plugin.model.generator.utils.CustomDependencies;
@@ -52,6 +50,9 @@ public class AmqpGeneratorMojo extends AbstractMojo {
     @Parameter(property = "customDependency", defaultValue = "")
     String customDependency;
 
+    @Component
+    PluginDescriptor pluginDescriptor;
+
     public void execute() throws MojoExecutionException {
         final var log = getLog();
 
@@ -69,7 +70,8 @@ public void execute() throws MojoExecutionException {
                 objectMapper);
         fileInteractor.cleanUpDirectories(pathResolver.getWorkingDirectory());
 
-        final var generator = new AmqpGenerator(schemaFileGenerator, objectMapper, pathResolver, fileInteractor, log,
+        final var generator = new AmqpGenerator(pluginDescriptor.getVersion(), schemaFileGenerator, objectMapper, pathResolver,
+                fileInteractor, log,
                 packageName, modelVersion, modelName, asyncApiFilename, asyncApiDirectory, apicurioUrl, customDependencies);
 
         try {
diff --git a/maven/model-generator-plugin/src/main/resources/pom-template.xml b/maven/model-generator-plugin/src/main/resources/pom-template.xml
@@ -5,10 +5,9 @@
     <modelVersion>4.0.0</modelVersion>
 
     <properties>
-        <version.iris-common>5.0.9</version.iris-common>
-        <version.jandex-maven-plugin>3.1.5</version.jandex-maven-plugin>
-        <version.jackson-annotations>2.14.2</version.jackson-annotations>
-        <version.jackson-databind>2.15.3</version.jackson-databind>
+        <version.iris-common>@@IRIS_VERSION@@</version.iris-common>
+        <version.jandex-maven-plugin>3.1.6</version.jandex-maven-plugin>
+        <version.jackson>2.16.1</version.jackson>
         <version.jakarta-validation-api>3.0.2</version.jakarta-validation-api>
         <version.jakarta-annotation-api>2.1.1</version.jakarta-annotation-api>
         <maven.compiler.target>17</maven.compiler.target>
@@ -24,12 +23,12 @@
         <dependency>
             <groupId>com.fasterxml.jackson.core</groupId>
             <artifactId>jackson-databind</artifactId>
-            <version>${version.jackson-databind}</version>
+            <version>${version.jackson}</version>
         </dependency>
         <dependency>
             <groupId>com.fasterxml.jackson.core</groupId>
             <artifactId>jackson-annotations</artifactId>
-            <version>${version.jackson-annotations}</version>
+            <version>${version.jackson}</version>
         </dependency>
         <dependency>
             <groupId>org.iris-events</groupId>
diff --git a/maven/model-generator-plugin/src/test/java/org/iris_events/plugin/model/generator/AmqpGeneratorTest.java b/maven/model-generator-plugin/src/test/java/org/iris_events/plugin/model/generator/AmqpGeneratorTest.java
@@ -92,6 +92,7 @@ void setUp() throws IOException, AmqpGeneratorException {
                 objectMapper);
 
         AmqpGenerator generator = new AmqpGenerator(
+                "6.0.4",
                 schemaFileGenerator,
                 objectMapper,
                 pathResolver,
diff --git a/maven/model-generator-plugin/src/test/resources/pom-template.xml b/maven/model-generator-plugin/src/test/resources/pom-template.xml
@@ -5,10 +5,9 @@
     <modelVersion>4.0.0</modelVersion>
 
     <properties>
-        <version.iris-common>5.0.0</version.iris-common>
-        <version.jandex-maven-plugin>3.1.1</version.jandex-maven-plugin>
-        <version.jackson-annotations>2.14.2</version.jackson-annotations>
-        <version.jackson-databind>2.14.2</version.jackson-databind>
+        <version.iris-common>@@IRIS_VERSION@@</version.iris-common>
+        <version.jandex-maven-plugin>3.1.6</version.jandex-maven-plugin>
+        <version.jackson>2.16.1</version.jackson>
         <version.jakarta-validation-api>3.0.2</version.jakarta-validation-api>
         <version.jakarta-annotation-api>2.1.1</version.jakarta-annotation-api>
         <maven.compiler.target>17</maven.compiler.target>
@@ -24,12 +23,12 @@
         <dependency>
             <groupId>com.fasterxml.jackson.core</groupId>
             <artifactId>jackson-databind</artifactId>
-            <version>${version.jackson-databind}</version>
+            <version>${version.jackson}</version>
         </dependency>
         <dependency>
             <groupId>com.fasterxml.jackson.core</groupId>
             <artifactId>jackson-annotations</artifactId>
-            <version>${version.jackson-annotations}</version>
+            <version>${version.jackson}</version>
         </dependency>
         <dependency>
             <groupId>org.iris-events</groupId>
