camel-jackson-avro data format native support

Fixes #2610
apache · Jun 9, 2021 · 798a5be · 798a5be
1 parent cb689e0
commit 798a5be
Show file tree

Hide file tree

Showing 22 changed files with 475 additions and 90 deletions.
diff --git a/docs/modules/ROOT/pages/reference/extensions/jackson-avro.adoc b/docs/modules/ROOT/pages/reference/extensions/jackson-avro.adoc
@@ -3,16 +3,16 @@
 = Avro Jackson
 :linkattrs:
 :cq-artifact-id: camel-quarkus-jackson-avro
-:cq-native-supported: false
-:cq-status: Preview
-:cq-status-deprecation: Preview
+:cq-native-supported: true
+:cq-status: Stable
+:cq-status-deprecation: Stable
 :cq-description: Marshal POJOs to Avro and back using Jackson.
 :cq-deprecated: false
 :cq-jvm-since: 2.0.0
-:cq-native-since: n/a
+:cq-native-since: 2.0.0
 
 [.badges]
-[.badge-key]##JVM since##[.badge-supported]##2.0.0## [.badge-key]##Native##[.badge-unsupported]##unsupported##
+[.badge-key]##JVM since##[.badge-supported]##2.0.0## [.badge-key]##Native since##[.badge-supported]##2.0.0##
 
 Marshal POJOs to Avro and back using Jackson.
 
@@ -24,6 +24,10 @@ Please refer to the above link for usage and configuration details.
 
 == Maven coordinates
 
+https://code.quarkus.io/?extension-search=camel-quarkus-jackson-avro[Create a new project with this extension on code.quarkus.io, window="_blank"]
+
+Or add the coordinates to your existing project:
+
 [source,xml]
 ----
 <dependency>

diff --git a/docs/modules/ROOT/partials/reference/dataformats/avro-jackson.adoc b/docs/modules/ROOT/partials/reference/dataformats/avro-jackson.adoc
@@ -2,11 +2,11 @@
 // This file was generated by camel-quarkus-maven-plugin:update-extension-doc-page
 :cq-artifact-id: camel-quarkus-jackson-avro
 :cq-artifact-id-base: jackson-avro
-:cq-native-supported: false
-:cq-status: Preview
+:cq-native-supported: true
+:cq-status: Stable
 :cq-deprecated: false
 :cq-jvm-since: 2.0.0
-:cq-native-since: n/a
+:cq-native-since: 2.0.0
 :cq-camel-part-name: avro-jackson
 :cq-camel-part-title: Avro Jackson
 :cq-camel-part-description: Marshal POJOs to Avro and back using Jackson.

diff --git a/...src/main/java/org/apache/camel/quarkus/component/jackson/avro/it/JacksonAvroResource.java b/...src/main/java/org/apache/camel/quarkus/component/jackson/avro/it/JacksonAvroResource.java
diff --git a/extensions-jvm/pom.xml b/extensions-jvm/pom.xml
@@ -77,7 +77,6 @@
         <module>ignite</module>
         <module>iota</module>
         <module>irc</module>
-        <module>jackson-avro</module>
         <module>jasypt</module>
         <module>java-joor-dsl</module>
         <module>jbpm</module>

diff --git a/...sions-jvm/jackson-avro/deployment/pom.xml → extensions/jackson-avro/deployment/pom.xml b/...sions-jvm/jackson-avro/deployment/pom.xml → extensions/jackson-avro/deployment/pom.xml
@@ -34,6 +34,10 @@
             <groupId>org.apache.camel.quarkus</groupId>
             <artifactId>camel-quarkus-core-deployment</artifactId>
         </dependency>
+        <dependency>
+            <groupId>org.apache.camel.quarkus</groupId>
+            <artifactId>camel-quarkus-jackson-deployment</artifactId>
+        </dependency>
         <dependency>
             <groupId>org.apache.camel.quarkus</groupId>
             <artifactId>camel-quarkus-jackson-avro</artifactId>

diff --git a/...avro/deployment/JacksonAvroProcessor.java → ...avro/deployment/JacksonAvroProcessor.java b/...avro/deployment/JacksonAvroProcessor.java → ...avro/deployment/JacksonAvroProcessor.java
@@ -17,11 +17,7 @@
 package org.apache.camel.quarkus.component.jackson.avro.deployment;
 
 import io.quarkus.deployment.annotations.BuildStep;
-import io.quarkus.deployment.annotations.ExecutionTime;
-import io.quarkus.deployment.annotations.Record;
 import io.quarkus.deployment.builditem.FeatureBuildItem;
-import io.quarkus.deployment.pkg.steps.NativeBuild;
-import org.apache.camel.quarkus.core.JvmOnlyRecorder;
 import org.jboss.logging.Logger;
 
 class JacksonAvroProcessor {
@@ -33,14 +29,4 @@ class JacksonAvroProcessor {
     FeatureBuildItem feature() {
         return new FeatureBuildItem(FEATURE);
     }
-
-    /**
-     * Remove this once this extension starts supporting the native mode.
-     */
-    @BuildStep(onlyIf = NativeBuild.class)
-    @Record(value = ExecutionTime.RUNTIME_INIT)
-    void warnJvmInNative(JvmOnlyRecorder recorder) {
-        JvmOnlyRecorder.warnJvmInNative(LOG, FEATURE); // warn at build time
-        recorder.warnJvmInNative(FEATURE); // warn at runtime
-    }
 }
diff --git a/extensions-jvm/jackson-avro/pom.xml → extensions/jackson-avro/pom.xml b/extensions-jvm/jackson-avro/pom.xml → extensions/jackson-avro/pom.xml
@@ -33,6 +33,5 @@
     <modules>
         <module>deployment</module>
         <module>runtime</module>
-        <module>integration-test</module>
     </modules>
 </project>
diff --git a/extensions-jvm/jackson-avro/runtime/pom.xml → extensions/jackson-avro/runtime/pom.xml b/extensions-jvm/jackson-avro/runtime/pom.xml → extensions/jackson-avro/runtime/pom.xml
@@ -32,6 +32,7 @@
 
     <properties>
         <camel.quarkus.jvmSince>2.0.0</camel.quarkus.jvmSince>
+        <camel.quarkus.nativeSince>2.0.0</camel.quarkus.nativeSince>
     </properties>
 
     <dependencyManagement>
@@ -51,6 +52,10 @@
             <groupId>org.apache.camel.quarkus</groupId>
             <artifactId>camel-quarkus-core</artifactId>
         </dependency>
+        <dependency>
+            <groupId>org.apache.camel.quarkus</groupId>
+            <artifactId>camel-quarkus-jackson</artifactId>
+        </dependency>
         <dependency>
             <groupId>org.apache.camel</groupId>
             <artifactId>camel-jackson-avro</artifactId>

diff --git a/...resources/META-INF/quarkus-extension.yaml → ...resources/META-INF/quarkus-extension.yaml b/...resources/META-INF/quarkus-extension.yaml → ...resources/META-INF/quarkus-extension.yaml
diff --git a/extensions/pom.xml b/extensions/pom.xml
@@ -126,6 +126,7 @@
         <module>influxdb</module>
         <module>ipfs</module>
         <module>jackson</module>
+        <module>jackson-avro</module>
         <module>jackson-protobuf</module>
         <module>jacksonxml</module>
         <module>jaxb</module>

diff --git a/...jvm/jackson-avro/integration-test/pom.xml → integration-tests/jackson-avro/pom.xml b/...jvm/jackson-avro/integration-test/pom.xml → integration-tests/jackson-avro/pom.xml
@@ -21,13 +21,12 @@
     <modelVersion>4.0.0</modelVersion>
     <parent>
         <groupId>org.apache.camel.quarkus</groupId>
-        <artifactId>camel-quarkus-build-parent-it</artifactId>
+        <artifactId>camel-quarkus-integration-tests</artifactId>
         <version>2.0.0-SNAPSHOT</version>
-        <relativePath>../../../poms/build-parent-it/pom.xml</relativePath>
     </parent>
 
-    <artifactId>camel-quarkus-jackson-avro-integration-test</artifactId>
-    <name>Camel Quarkus :: Avro Jackson :: Integration Test</name>
+    <artifactId>camel-quarkus-integration-test-jackson-avro</artifactId>
+    <name>Camel Quarkus :: Integration Tests :: Avro Jackson</name>
     <description>Integration tests for Camel Quarkus Avro Jackson extension</description>
 
     <dependencyManagement>
@@ -43,6 +42,10 @@
     </dependencyManagement>
 
     <dependencies>
+        <dependency>
+            <groupId>org.apache.camel.quarkus</groupId>
+            <artifactId>camel-quarkus-direct</artifactId>
+        </dependency>
         <dependency>
             <groupId>org.apache.camel.quarkus</groupId>
             <artifactId>camel-quarkus-jackson-avro</artifactId>
@@ -65,6 +68,19 @@
         </dependency>
 
         <!-- The following dependencies guarantee that this module is built after them. You can update them by running `mvn process-resources -Pformat -N` from the source tree root directory -->
+        <dependency>
+            <groupId>org.apache.camel.quarkus</groupId>
+            <artifactId>camel-quarkus-direct-deployment</artifactId>
+            <version>${project.version}</version>
+            <type>pom</type>
+            <scope>test</scope>
+            <exclusions>
+                <exclusion>
+                    <groupId>*</groupId>
+                    <artifactId>*</artifactId>
+                </exclusion>
+            </exclusions>
+        </dependency>
         <dependency>
             <groupId>org.apache.camel.quarkus</groupId>
             <artifactId>camel-quarkus-jackson-avro-deployment</artifactId>
@@ -79,4 +95,34 @@
             </exclusions>
         </dependency>
     </dependencies>
+
+    <profiles>
+        <profile>
+            <id>native</id>
+            <activation>
+                <property>
+                    <name>native</name>
+                </property>
+            </activation>
+            <properties>
+                <quarkus.package.type>native</quarkus.package.type>
+            </properties>
+            <build>
+                <plugins>
+                    <plugin>
+                        <groupId>org.apache.maven.plugins</groupId>
+                        <artifactId>maven-failsafe-plugin</artifactId>
+                        <executions>
+                            <execution>
+                                <goals>
+                                    <goal>integration-test</goal>
+                                    <goal>verify</goal>
+                                </goals>
+                            </execution>
+                        </executions>
+                    </plugin>
+                </plugins>
+            </build>
+        </profile>
+    </profiles>
 </project>