Upgrade to Apache Camel RC1 #139

apache · Sep 2, 2019 · 50735f1 · 50735f1
1 parent 62566b7
commit 50735f1
Show file tree

Hide file tree

Showing 45 changed files with 229 additions and 273 deletions.
diff --git a/docs/modules/ROOT/pages/_partials/component-extensions.adoc b/docs/modules/ROOT/pages/_partials/component-extensions.adoc
@@ -9,7 +9,7 @@
 * `camel-quarkus-infinispan`
 * `camel-quarkus-jdbc`
 * `camel-quarkus-log`
-* `camel-quarkus-netty4-http`
+* `camel-quarkus-netty-http`
 * `camel-quarkus-rest`
 * `camel-quarkus-salesforce`
 * `camel-quarkus-servlet`

diff --git a/extensions/core/deployment/pom.xml b/extensions/core/deployment/pom.xml
@@ -53,6 +53,10 @@
             <groupId>io.quarkus</groupId>
             <artifactId>quarkus-jaxb-deployment</artifactId>
         </dependency>
+        <dependency>
+            <groupId>io.quarkus</groupId>
+            <artifactId>quarkus-caffeine-deployment</artifactId>
+        </dependency>
         <!-- camel -->
         <dependency>
             <groupId>org.apache.camel.quarkus</groupId>

diff --git a/...ore/deployment/src/main/java/org/apache/camel/quarkus/core/deployment/BuildProcessor.java b/...ore/deployment/src/main/java/org/apache/camel/quarkus/core/deployment/BuildProcessor.java
@@ -51,8 +51,6 @@
 import org.apache.camel.quarkus.core.runtime.CamelRecorder;
 import org.apache.camel.quarkus.core.runtime.CamelRuntime;
 import org.apache.camel.quarkus.core.runtime.support.RuntimeRegistry;
-import org.eclipse.microprofile.config.Config;
-import org.eclipse.microprofile.config.ConfigProvider;
 import org.jboss.jandex.ClassInfo;
 import org.jboss.jandex.DotName;
 import org.slf4j.Logger;
@@ -73,20 +71,8 @@ CamelRuntimeBuildItem create(
             List<CamelRegistryBuildItem> registryItems,
             BuildProducer<RuntimeBeanBuildItem> runtimeBeans) {
 
-        Properties properties = new Properties();
-        Config configProvider = ConfigProvider.getConfig();
-        for (String property : configProvider.getPropertyNames()) {
-            if (property.startsWith("camel.")) {
-                properties.put(property, configProvider.getValue(property, String.class));
-            }
-            if (property.startsWith("integration.")) {
-                properties.put(property.substring("integration.".length()), configProvider.getValue(property, String.class));
-            }
-        }
-
-
         RuntimeRegistry registry = new RuntimeRegistry();
-        RuntimeValue<CamelRuntime> camelRuntime = recorder.create(registry, properties);
+        RuntimeValue<CamelRuntime> camelRuntime = recorder.create(registry);
 
         getBuildTimeRouteBuilderClasses().forEach(
             b -> recorder.addBuilder(camelRuntime, b)

diff --git a/...deployment/src/main/java/org/apache/camel/quarkus/core/deployment/SubstrateProcessor.java b/...deployment/src/main/java/org/apache/camel/quarkus/core/deployment/SubstrateProcessor.java
@@ -85,7 +85,7 @@ SubstrateConfigBuildItem substrate() {
             .build();
     }
 
-    @BuildStep(applicationArchiveMarkers = { CamelSupport.CAMEL_SERVICE_BASE_PATH, CamelSupport.CAMEL_ROOT_PACKAGE_DIRECTORY })
+    @BuildStep
     void process() {
         IndexView view = combinedIndexBuildItem.getIndex();
 

diff --git a/.../core/deployment/src/main/java/org/apache/camel/quarkus/core/deployment/XmlProcessor.java b/.../core/deployment/src/main/java/org/apache/camel/quarkus/core/deployment/XmlProcessor.java
@@ -21,20 +21,20 @@
 import io.quarkus.deployment.builditem.substrate.ReflectiveClassBuildItem;
 import io.quarkus.jaxb.deployment.JaxbEnabledBuildItem;
 import io.quarkus.jaxb.deployment.JaxbFileRootBuildItem;
-import org.apache.camel.quarkus.core.runtime.JaxbDisabled;
+import org.apache.camel.quarkus.core.runtime.support.Flags;
 
 class XmlProcessor {
     @BuildStep
     JaxbFileRootBuildItem fileRoot() {
         return new JaxbFileRootBuildItem(CamelSupport.CAMEL_ROOT_PACKAGE_DIRECTORY);
     }
 
-    @BuildStep(onlyIfNot = JaxbDisabled.class)
+    @BuildStep(onlyIfNot = Flags.JaxbDisabled.class)
     JaxbEnabledBuildItem handleJaxbSupport() {
         return new JaxbEnabledBuildItem();
     }
 
-    @BuildStep(onlyIfNot = JaxbDisabled.class)
+    @BuildStep(onlyIfNot = Flags.JaxbDisabled.class)
     void registerReflectiveClasses(BuildProducer<ReflectiveClassBuildItem> reflectiveClass) {
         reflectiveClass.produce(
             new ReflectiveClassBuildItem(

diff --git a/extensions/core/runtime/pom.xml b/extensions/core/runtime/pom.xml
@@ -49,17 +49,15 @@
             <groupId>io.quarkus</groupId>
             <artifactId>quarkus-arc</artifactId>
         </dependency>
+        <dependency>
+            <groupId>io.quarkus</groupId>
+            <artifactId>quarkus-caffeine</artifactId>
+        </dependency>
 
         <!-- camel -->
         <dependency>
             <groupId>org.apache.camel</groupId>
             <artifactId>camel-core-engine</artifactId>
-            <exclusions>
-                <exclusion><!-- See https://github.com/apache/camel-quarkus/issues/80 -->
-                    <groupId>org.apache.camel</groupId>
-                    <artifactId>camel-caffeine-lrucache</artifactId>
-                </exclusion>
-            </exclusions>
         </dependency>
         <dependency>
             <groupId>org.apache.camel</groupId>
@@ -69,6 +67,14 @@
             <groupId>org.apache.camel</groupId>
             <artifactId>camel-properties</artifactId>
         </dependency>
+        <dependency>
+            <groupId>org.apache.camel</groupId>
+            <artifactId>camel-caffeine-lrucache</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>org.apache.camel</groupId>
+            <artifactId>camel-microprofile-config</artifactId>
+        </dependency>
 
         <dependency>
             <groupId>com.oracle.substratevm</groupId>

diff --git a/extensions/core/runtime/src/main/java/org/apache/camel/quarkus/core/runtime/CamelConfig.java b/extensions/core/runtime/src/main/java/org/apache/camel/quarkus/core/runtime/CamelConfig.java
@@ -21,7 +21,7 @@
 import io.quarkus.runtime.annotations.ConfigItem;
 import io.quarkus.runtime.annotations.ConfigPhase;
 import io.quarkus.runtime.annotations.ConfigRoot;
-import org.apache.camel.quarkus.core.runtime.graal.XmlDisabled;
+import org.apache.camel.quarkus.core.runtime.support.Flags;
 
 public class CamelConfig {
 
@@ -46,7 +46,7 @@ public static class BuildTime {
          * at runtime. This is useful when routes at loaded at build time and
          * thus the camel route model is not used at runtime anymore.
          *
-         * @see JaxbDisabled
+         * @see Flags.JaxbDisabled
          */
         @ConfigItem(defaultValue = "false")
         public boolean disableJaxb;
@@ -57,7 +57,7 @@ public static class BuildTime {
          * a lot of code space in the native binary (and a lot of cpu resources
          * when building), this allows to disable both libraries.
          *
-         * @see XmlDisabled
+         * @see Flags.XmlDisabled
          */
         @ConfigItem(defaultValue = "false")
         public boolean disableXml;

diff --git a/...sions/core/runtime/src/main/java/org/apache/camel/quarkus/core/runtime/CamelRecorder.java b/...sions/core/runtime/src/main/java/org/apache/camel/quarkus/core/runtime/CamelRecorder.java
@@ -16,8 +16,6 @@
  */
 package org.apache.camel.quarkus.core.runtime;
 
-import java.util.Properties;
-
 import io.quarkus.arc.runtime.BeanContainerListener;
 import io.quarkus.runtime.RuntimeValue;
 import io.quarkus.runtime.ShutdownContext;
@@ -29,13 +27,10 @@
 @Recorder
 public class CamelRecorder {
 
-    public RuntimeValue<CamelRuntime> create(
-            Registry registry,
-            Properties properties) {
+    public RuntimeValue<CamelRuntime> create(Registry registry) {
 
         FastCamelRuntime fcr = new FastCamelRuntime();
         fcr.setRegistry(registry);
-        fcr.setProperties(properties);
 
         return new RuntimeValue<>(fcr);
     }

diff --git a/.../runtime/src/main/java/org/apache/camel/quarkus/core/runtime/InitAtBuildTimeSelector.java b/.../runtime/src/main/java/org/apache/camel/quarkus/core/runtime/InitAtBuildTimeSelector.java
diff --git a/...nsions/core/runtime/src/main/java/org/apache/camel/quarkus/core/runtime/JaxbDisabled.java b/...nsions/core/runtime/src/main/java/org/apache/camel/quarkus/core/runtime/JaxbDisabled.java
diff --git a/...he/camel/quarkus/core/runtime/graal/Target_org_apache_camel_reifier_ProcessorReifier.java b/...he/camel/quarkus/core/runtime/graal/Target_org_apache_camel_reifier_ProcessorReifier.java
@@ -23,10 +23,10 @@
 import com.oracle.svm.core.annotate.RecomputeFieldValue;
 import com.oracle.svm.core.annotate.TargetClass;
 import org.apache.camel.model.ProcessorDefinition;
-import org.apache.camel.quarkus.core.runtime.InitAtBuildTimeSelector;
+import org.apache.camel.quarkus.core.runtime.support.Flags;
 import org.apache.camel.reifier.ProcessorReifier;
 
-@TargetClass(className = "org.apache.camel.reifier.ProcessorReifier", onlyWith = InitAtBuildTimeSelector.class)
+@TargetClass(className = "org.apache.camel.reifier.ProcessorReifier", onlyWith = Flags.InitAtBuildTime.class)
 final class Target_org_apache_camel_reifier_ProcessorReifier {
     @Alias
     @RecomputeFieldValue(kind = RecomputeFieldValue.Kind.FromAlias)

diff --git a/...rkus/core/runtime/graal/Target_org_apache_camel_reifier_dataformat_DataFormatReifier.java b/...rkus/core/runtime/graal/Target_org_apache_camel_reifier_dataformat_DataFormatReifier.java
@@ -23,10 +23,10 @@
 import com.oracle.svm.core.annotate.RecomputeFieldValue;
 import com.oracle.svm.core.annotate.TargetClass;
 import org.apache.camel.model.DataFormatDefinition;
-import org.apache.camel.quarkus.core.runtime.InitAtBuildTimeSelector;
+import org.apache.camel.quarkus.core.runtime.support.Flags;
 import org.apache.camel.reifier.dataformat.DataFormatReifier;
 
-@TargetClass(className = "org.apache.camel.reifier.dataformat.DataFormatReifier", onlyWith = InitAtBuildTimeSelector.class)
+@TargetClass(className = "org.apache.camel.reifier.dataformat.DataFormatReifier", onlyWith = Flags.InitAtBuildTime.class)
 final class Target_org_apache_camel_reifier_dataformat_DataFormatReifier {
     @Alias
     @RecomputeFieldValue(kind = RecomputeFieldValue.Kind.FromAlias)

diff --git a/.../core/runtime/graal/Target_org_apache_camel_reifier_loadbalancer_LoadBalancerReifier.java b/.../core/runtime/graal/Target_org_apache_camel_reifier_loadbalancer_LoadBalancerReifier.java
@@ -23,10 +23,10 @@
 import com.oracle.svm.core.annotate.RecomputeFieldValue;
 import com.oracle.svm.core.annotate.TargetClass;
 import org.apache.camel.model.LoadBalancerDefinition;
-import org.apache.camel.quarkus.core.runtime.InitAtBuildTimeSelector;
+import org.apache.camel.quarkus.core.runtime.support.Flags;
 import org.apache.camel.reifier.loadbalancer.LoadBalancerReifier;
 
-@TargetClass(className = "org.apache.camel.reifier.loadbalancer.LoadBalancerReifier", onlyWith = InitAtBuildTimeSelector.class)
+@TargetClass(className = "org.apache.camel.reifier.loadbalancer.LoadBalancerReifier", onlyWith = Flags.InitAtBuildTime.class)
 final class Target_org_apache_camel_reifier_loadbalancer_LoadBalancerReifier {
     @Alias
     @RecomputeFieldValue(kind = RecomputeFieldValue.Kind.FromAlias)

diff --git a/...us/core/runtime/graal/Target_org_apache_camel_reifier_transformer_TransformerReifier.java b/...us/core/runtime/graal/Target_org_apache_camel_reifier_transformer_TransformerReifier.java
@@ -23,10 +23,10 @@
 import com.oracle.svm.core.annotate.RecomputeFieldValue;
 import com.oracle.svm.core.annotate.TargetClass;
 import org.apache.camel.model.transformer.TransformerDefinition;
-import org.apache.camel.quarkus.core.runtime.InitAtBuildTimeSelector;
+import org.apache.camel.quarkus.core.runtime.support.Flags;
 import org.apache.camel.reifier.transformer.TransformerReifier;
 
-@TargetClass(className = "org.apache.camel.reifier.transformer.TransformerReifier", onlyWith = InitAtBuildTimeSelector.class)
+@TargetClass(className = "org.apache.camel.reifier.transformer.TransformerReifier", onlyWith = Flags.InitAtBuildTime.class)
 final class Target_org_apache_camel_reifier_transformer_TransformerReifier {
     @Alias
     @RecomputeFieldValue(kind = RecomputeFieldValue.Kind.FromAlias)

diff --git a/...uarkus/core/runtime/graal/Target_org_apache_camel_reifier_validator_ValidatorReifier.java b/...uarkus/core/runtime/graal/Target_org_apache_camel_reifier_validator_ValidatorReifier.java
@@ -23,10 +23,10 @@
 import com.oracle.svm.core.annotate.RecomputeFieldValue;
 import com.oracle.svm.core.annotate.TargetClass;
 import org.apache.camel.model.validator.ValidatorDefinition;
-import org.apache.camel.quarkus.core.runtime.InitAtBuildTimeSelector;
+import org.apache.camel.quarkus.core.runtime.support.Flags;
 import org.apache.camel.reifier.validator.ValidatorReifier;
 
-@TargetClass(className = "org.apache.camel.reifier.validator.ValidatorReifier", onlyWith = InitAtBuildTimeSelector.class)
+@TargetClass(className = "org.apache.camel.reifier.validator.ValidatorReifier", onlyWith = Flags.InitAtBuildTime.class)
 final class Target_org_apache_camel_reifier_validator_ValidatorReifier {
     @Alias
     @RecomputeFieldValue(kind = RecomputeFieldValue.Kind.FromAlias)

diff --git a/...amel/quarkus/core/runtime/graal/Target_org_apache_camel_support_IntrospectionSupport.java b/...amel/quarkus/core/runtime/graal/Target_org_apache_camel_support_IntrospectionSupport.java
@@ -21,14 +21,14 @@
 import com.oracle.svm.core.annotate.Alias;
 import com.oracle.svm.core.annotate.RecomputeFieldValue;
 import com.oracle.svm.core.annotate.TargetClass;
-import org.apache.camel.support.IntrospectionSupport;
+import org.apache.camel.spi.BeanIntrospection;
 import org.apache.camel.support.LRUCacheFactory;
 
-@TargetClass(IntrospectionSupport.class)
+@TargetClass(className = "org.apache.camel.support.IntrospectionSupport")
 final class Target_org_apache_camel_support_IntrospectionSupport {
 
     @Alias
     @RecomputeFieldValue(kind = RecomputeFieldValue.Kind.FromAlias)
-    private static Map<Class<?>, IntrospectionSupport.ClassInfo> CACHE = LRUCacheFactory.newLRUWeakCache(256);
+    private static Map<Class<?>, BeanIntrospection.ClassInfo> CACHE = LRUCacheFactory.newLRUWeakCache(256);
 
 }
diff --git a/...s/core/runtime/src/main/java/org/apache/camel/quarkus/core/runtime/graal/XmlDisabled.java b/...s/core/runtime/src/main/java/org/apache/camel/quarkus/core/runtime/graal/XmlDisabled.java