Syslog native support

Fixes #595
apache · Feb 4, 2021 · 9361fec · 9361fec
1 parent f3758d9
commit 9361fec
Show file tree

Hide file tree

Showing 21 changed files with 338 additions and 95 deletions.
diff --git a/docs/modules/ROOT/pages/reference/extensions/syslog.adoc b/docs/modules/ROOT/pages/reference/extensions/syslog.adoc
@@ -2,15 +2,15 @@
 // This file was generated by camel-quarkus-maven-plugin:update-extension-doc-page
 = Syslog
 :cq-artifact-id: camel-quarkus-syslog
-:cq-native-supported: false
-:cq-status: Preview
+:cq-native-supported: true
+:cq-status: Stable
 :cq-description: Marshall SyslogMessages to RFC3164 and RFC5424 messages and back.
 :cq-deprecated: false
 :cq-jvm-since: 1.1.0
-:cq-native-since: n/a
+:cq-native-since: 1.7.0
 
 [.badges]
-[.badge-key]##JVM since##[.badge-supported]##1.1.0## [.badge-key]##Native##[.badge-unsupported]##unsupported##
+[.badge-key]##JVM since##[.badge-supported]##1.1.0## [.badge-key]##Native since##[.badge-supported]##1.7.0##
 
 Marshall SyslogMessages to RFC3164 and RFC5424 messages and back.
 

diff --git a/docs/modules/ROOT/partials/reference/dataformats/syslog.adoc b/docs/modules/ROOT/partials/reference/dataformats/syslog.adoc
@@ -2,11 +2,11 @@
 // This file was generated by camel-quarkus-maven-plugin:update-extension-doc-page
 :cq-artifact-id: camel-quarkus-syslog
 :cq-artifact-id-base: syslog
-:cq-native-supported: false
-:cq-status: Preview
+:cq-native-supported: true
+:cq-status: Stable
 :cq-deprecated: false
 :cq-jvm-since: 1.1.0
-:cq-native-since: n/a
+:cq-native-since: 1.7.0
 :cq-camel-part-name: syslog
 :cq-camel-part-title: Syslog
 :cq-camel-part-description: Marshall SyslogMessages to RFC3164 and RFC5424 messages and back.

diff --git a/extensions-jvm/pom.xml b/extensions-jvm/pom.xml
@@ -118,7 +118,6 @@
         <module>splunk-hec</module>
         <module>stomp</module>
         <module>stub</module>
-        <module>syslog</module>
         <module>thrift</module>
         <module>web3j</module>
         <module>weka</module>

diff --git a/...ation-test/src/main/java/org/apache/camel/quarkus/component/syslog/it/SyslogResource.java b/...ation-test/src/main/java/org/apache/camel/quarkus/component/syslog/it/SyslogResource.java
diff --git a/...ent/src/main/java/org/apache/camel/quarkus/component/netty/deployment/NettyProcessor.java b/...ent/src/main/java/org/apache/camel/quarkus/component/netty/deployment/NettyProcessor.java
@@ -16,8 +16,12 @@
  */
 package org.apache.camel.quarkus.component.netty.deployment;
 
+import io.netty.channel.socket.nio.NioDatagramChannel;
+import io.quarkus.deployment.annotations.BuildProducer;
 import io.quarkus.deployment.annotations.BuildStep;
 import io.quarkus.deployment.builditem.FeatureBuildItem;
+import io.quarkus.deployment.builditem.nativeimage.ReflectiveClassBuildItem;
+import org.apache.camel.component.netty.NettyConfiguration;
 
 class NettyProcessor {
 
@@ -27,4 +31,10 @@ class NettyProcessor {
     FeatureBuildItem feature() {
         return new FeatureBuildItem(FEATURE);
     }
+
+    @BuildStep
+    void registerForReflection(BuildProducer<ReflectiveClassBuildItem> reflectiveClass) {
+        reflectiveClass.produce(new ReflectiveClassBuildItem(false, false, NioDatagramChannel.class));
+        reflectiveClass.produce(new ReflectiveClassBuildItem(true, false, NettyConfiguration.class));
+    }
 }
diff --git a/extensions/pom.xml b/extensions/pom.xml
@@ -214,6 +214,7 @@
         <module>stax</module>
         <module>stream</module>
         <module>stringtemplate</module>
+        <module>syslog</module>
         <module>tagsoup</module>
         <module>tarfile</module>
         <module>telegram</module>

diff --git a/extensions-jvm/syslog/deployment/pom.xml → extensions/syslog/deployment/pom.xml b/extensions-jvm/syslog/deployment/pom.xml → extensions/syslog/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-netty-deployment</artifactId>
+        </dependency>
         <dependency>
             <groupId>org.apache.camel.quarkus</groupId>
             <artifactId>camel-quarkus-syslog</artifactId>

diff --git a/...nt/syslog/deployment/SyslogProcessor.java → ...nt/syslog/deployment/SyslogProcessor.java b/...nt/syslog/deployment/SyslogProcessor.java → ...nt/syslog/deployment/SyslogProcessor.java
@@ -17,30 +17,14 @@
 package org.apache.camel.quarkus.component.syslog.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 SyslogProcessor {
 
-    private static final Logger LOG = Logger.getLogger(SyslogProcessor.class);
     private static final String FEATURE = "camel-syslog";
 
     @BuildStep
     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/syslog/pom.xml → extensions/syslog/pom.xml b/extensions-jvm/syslog/pom.xml → extensions/syslog/pom.xml
@@ -33,6 +33,5 @@
     <modules>
         <module>deployment</module>
         <module>runtime</module>
-        <module>integration-test</module>
     </modules>
 </project>
diff --git a/extensions-jvm/syslog/runtime/pom.xml → extensions/syslog/runtime/pom.xml b/extensions-jvm/syslog/runtime/pom.xml → extensions/syslog/runtime/pom.xml
@@ -32,6 +32,7 @@
 
     <properties>
         <camel.quarkus.jvmSince>1.1.0</camel.quarkus.jvmSince>
+        <camel.quarkus.nativeSince>1.7.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-netty</artifactId>
+        </dependency>
         <dependency>
             <groupId>org.apache.camel</groupId>
             <artifactId>camel-syslog</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
@@ -24,9 +24,8 @@
 name: "Camel Syslog"
 description: "Marshall SyslogMessages to RFC3164 and RFC5424 messages and back"
 metadata:
-  unlisted: true
   guide: "https://camel.apache.org/camel-quarkus/latest/reference/extensions/syslog.html"
   categories:
   - "integration"
   status:
-  - "preview"
+  - "stable"
diff --git a/integration-tests/pom.xml b/integration-tests/pom.xml
@@ -180,6 +180,7 @@
         <module>stax</module>
         <module>stringtemplate</module>
         <module>syndication</module>
+        <module>syslog</module>
         <module>tarfile</module>
         <module>telegram</module>
         <module>tika</module>

diff --git a/...sions-jvm/syslog/integration-test/pom.xml → integration-tests/syslog/pom.xml b/...sions-jvm/syslog/integration-test/pom.xml → integration-tests/syslog/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>1.7.0-SNAPSHOT</version>
-        <relativePath>../../../poms/build-parent-it/pom.xml</relativePath>
     </parent>
 
-    <artifactId>camel-quarkus-syslog-integration-test</artifactId>
-    <name>Camel Quarkus :: Syslog :: Integration Test</name>
+    <artifactId>camel-quarkus-integration-test-syslog</artifactId>
+    <name>Camel Quarkus :: Integration Tests :: Syslog</name>
     <description>Integration tests for Camel Quarkus Syslog extension</description>
 
     <dependencyManagement>
@@ -43,6 +42,10 @@
     </dependencyManagement>
 
     <dependencies>
+        <dependency>
+            <groupId>org.apache.camel.quarkus</groupId>
+            <artifactId>camel-quarkus-seda</artifactId>
+        </dependency>
         <dependency>
             <groupId>org.apache.camel.quarkus</groupId>
             <artifactId>camel-quarkus-syslog</artifactId>
@@ -51,20 +54,41 @@
             <groupId>io.quarkus</groupId>
             <artifactId>quarkus-resteasy</artifactId>
         </dependency>
+        <dependency>
+            <groupId>org.apache.camel.quarkus</groupId>
+            <artifactId>camel-quarkus-integration-test-support</artifactId>
+        </dependency>
 
         <!-- test dependencies -->
         <dependency>
             <groupId>io.quarkus</groupId>
             <artifactId>quarkus-junit5</artifactId>
             <scope>test</scope>
         </dependency>
+        <dependency>
+            <groupId>io.quarkus</groupId>
+            <artifactId>quarkus-resteasy-jsonb</artifactId>
+        </dependency>
         <dependency>
             <groupId>io.rest-assured</groupId>
             <artifactId>rest-assured</artifactId>
             <scope>test</scope>
         </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-seda-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-syslog-deployment</artifactId>
@@ -80,4 +104,34 @@
         </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>