Use CamelContextCustomizer from camel-api

Fixes #2637
apache · May 20, 2021 · 92f2254 · 92f2254
1 parent ca40252
commit 92f2254
Show file tree

Hide file tree

Showing 17 changed files with 29 additions and 52 deletions.
diff --git a/...loyment/src/main/java/org/apache/camel/quarkus/core/deployment/CamelContextProcessor.java b/...loyment/src/main/java/org/apache/camel/quarkus/core/deployment/CamelContextProcessor.java
@@ -58,7 +58,7 @@ public class CamelContextProcessor {
      * @param  modelJAXBContextFactory a list of known {@link ModelJAXBContextFactory}.
      * @param  modelDumper             a list of known {@link CamelModelToXMLDumperBuildItem}.
      * @param  factoryFinderResolver   a list of known {@link org.apache.camel.spi.FactoryFinderResolver}.
-     * @param  customizers             a list of {@link org.apache.camel.quarkus.core.CamelContextCustomizer} used to
+     * @param  customizers             a list of {@link org.apache.camel.spi.CamelContextCustomizer} used to
      *                                 customize the {@link CamelContext} at {@link ExecutionTime#STATIC_INIT}.
      * @return                         a build item holding an instance of a {@link CamelContext}
      */
@@ -113,7 +113,7 @@ CamelContextBuildItem context(
      *                              those known by the CDI container.
      * @param  recorder             the recorder
      * @param  context              a build item providing an augmented {@link org.apache.camel.CamelContext} instance.
-     * @param  customizers          a list of {@link org.apache.camel.quarkus.core.CamelContextCustomizer} used to customize
+     * @param  customizers          a list of {@link org.apache.camel.spi.CamelContextCustomizer} used to customize
      *                              the {@link CamelContext} at {@link ExecutionTime#RUNTIME_INIT}.
      * @param  routesBuilderClasses a list of known {@link org.apache.camel.RoutesBuilder} classes.
      * @param  runtimeTasks         a placeholder to ensure all the runtime task are properly are done.

diff --git a/...yment/src/main/java/org/apache/camel/quarkus/core/deployment/main/CamelMainProcessor.java b/...yment/src/main/java/org/apache/camel/quarkus/core/deployment/main/CamelMainProcessor.java
@@ -157,7 +157,7 @@ CamelMainBuildItem main(
      * @param  beanContainer   a reference to a fully initialized CDI bean container
      * @param  recorder        the recorder.
      * @param  main            a reference to a {@link CamelMain}.
-     * @param  customizers     a list of {@link org.apache.camel.quarkus.core.CamelContextCustomizer} that will be
+     * @param  customizers     a list of {@link org.apache.camel.spi.CamelContextCustomizer} that will be
      *                         executed before starting the {@link CamelContext} at {@link ExecutionTime#RUNTIME_INIT}.
      * @param  runtimeTasks    a placeholder to ensure all the runtime task are properly are done.
      * @param  camelMainConfig a {@link CamelMainConfig}

diff --git a/...in/java/org/apache/camel/quarkus/core/deployment/spi/CamelContextCustomizerBuildItem.java b/...in/java/org/apache/camel/quarkus/core/deployment/spi/CamelContextCustomizerBuildItem.java
@@ -18,7 +18,7 @@
 
 import io.quarkus.builder.item.MultiBuildItem;
 import io.quarkus.runtime.RuntimeValue;
-import org.apache.camel.quarkus.core.CamelContextCustomizer;
+import org.apache.camel.spi.CamelContextCustomizer;
 
 /**
  * A {@link MultiBuildItem} holding the {@link CamelContextCustomizer} {@link RuntimeValue} and could be used

diff --git a/.../org/apache/camel/quarkus/core/deployment/spi/RuntimeCamelContextCustomizerBuildItem.java b/.../org/apache/camel/quarkus/core/deployment/spi/RuntimeCamelContextCustomizerBuildItem.java
@@ -18,7 +18,7 @@
 
 import io.quarkus.builder.item.MultiBuildItem;
 import io.quarkus.runtime.RuntimeValue;
-import org.apache.camel.quarkus.core.CamelContextCustomizer;
+import org.apache.camel.spi.CamelContextCustomizer;
 
 /**
  * A {@link MultiBuildItem} holding the {@link CamelContextCustomizer} {@link RuntimeValue} and could be used

diff --git a/...nt/src/test/java/org/apache/camel/quarkus/core/deployment/CamelContextCustomizerTest.java b/...nt/src/test/java/org/apache/camel/quarkus/core/deployment/CamelContextCustomizerTest.java
@@ -28,8 +28,8 @@
 import io.quarkus.runtime.RuntimeValue;
 import io.quarkus.test.QuarkusUnitTest;
 import org.apache.camel.CamelContext;
-import org.apache.camel.quarkus.core.CamelContextCustomizer;
 import org.apache.camel.quarkus.core.deployment.spi.CamelContextCustomizerBuildItem;
+import org.apache.camel.spi.CamelContextCustomizer;
 import org.jboss.shrinkwrap.api.ShrinkWrap;
 import org.jboss.shrinkwrap.api.spec.JavaArchive;
 import org.junit.jupiter.api.Test;

diff --git a/...t/src/test/java/org/apache/camel/quarkus/core/deployment/RestConfigurationCustomizer.java b/...t/src/test/java/org/apache/camel/quarkus/core/deployment/RestConfigurationCustomizer.java
@@ -17,13 +17,13 @@
 package org.apache.camel.quarkus.core.deployment;
 
 import org.apache.camel.CamelContext;
-import org.apache.camel.quarkus.core.CamelContextCustomizer;
+import org.apache.camel.spi.CamelContextCustomizer;
 import org.apache.camel.spi.RestConfiguration;
 
 public class RestConfigurationCustomizer implements CamelContextCustomizer {
 
     @Override
-    public void customize(CamelContext context) {
+    public void configure(CamelContext context) {
         RestConfiguration restConfiguration = new RestConfiguration();
         restConfiguration.setApiContextPath("/example");
 

diff --git a/...core/core/runtime/src/main/java/org/apache/camel/quarkus/core/CamelContextCustomizer.java b/...core/core/runtime/src/main/java/org/apache/camel/quarkus/core/CamelContextCustomizer.java
diff --git a/...s-core/core/runtime/src/main/java/org/apache/camel/quarkus/core/CamelContextRecorder.java b/...s-core/core/runtime/src/main/java/org/apache/camel/quarkus/core/CamelContextRecorder.java
@@ -25,6 +25,7 @@
 import org.apache.camel.builder.LambdaRouteBuilder;
 import org.apache.camel.builder.RouteBuilder;
 import org.apache.camel.catalog.RuntimeCamelCatalog;
+import org.apache.camel.spi.CamelContextCustomizer;
 import org.apache.camel.spi.FactoryFinderResolver;
 import org.apache.camel.spi.ModelJAXBContextFactory;
 import org.apache.camel.spi.ModelToXMLDumper;
@@ -67,7 +68,7 @@ public RuntimeValue<CamelContext> createContext(
     }
 
     public void customize(RuntimeValue<CamelContext> context, RuntimeValue<CamelContextCustomizer> contextCustomizer) {
-        contextCustomizer.getValue().customize(context.getValue());
+        contextCustomizer.getValue().configure(context.getValue());
     }
 
     public RuntimeValue<CamelRuntime> createRuntime(BeanContainer beanContainer, RuntimeValue<CamelContext> context) {

diff --git a/...ions-core/core/runtime/src/main/java/org/apache/camel/quarkus/main/CamelMainRecorder.java b/...ions-core/core/runtime/src/main/java/org/apache/camel/quarkus/main/CamelMainRecorder.java
@@ -28,10 +28,10 @@
 import org.apache.camel.main.MainListenerSupport;
 import org.apache.camel.main.RoutesCollector;
 import org.apache.camel.quarkus.core.CamelConfig.FailureRemedy;
-import org.apache.camel.quarkus.core.CamelContextCustomizer;
 import org.apache.camel.quarkus.core.CamelProducers;
 import org.apache.camel.quarkus.core.CamelRuntime;
 import org.apache.camel.quarkus.core.RegistryRoutesLoader;
+import org.apache.camel.spi.CamelContextCustomizer;
 
 @Recorder
 public class CamelMainRecorder {
@@ -78,7 +78,7 @@ public void customizeContext(RuntimeValue<CamelMain> main, List<RuntimeValue<Cam
             @Override
             public void afterConfigure(BaseMainSupport main) {
                 for (RuntimeValue<CamelContextCustomizer> customizer : contextCustomizers) {
-                    customizer.getValue().customize(main.getCamelContext());
+                    customizer.getValue().configure(main.getCamelContext());
                 }
             }
         });

diff --git a/...me/src/main/java/org/apache/camel/quarkus/reactive/executor/ReactiveExecutorRecorder.java b/...me/src/main/java/org/apache/camel/quarkus/reactive/executor/ReactiveExecutorRecorder.java
@@ -21,15 +21,15 @@
 import io.vertx.core.Vertx;
 import org.apache.camel.CamelContext;
 import org.apache.camel.ExtendedCamelContext;
-import org.apache.camel.quarkus.core.CamelContextCustomizer;
 import org.apache.camel.reactive.vertx.VertXReactiveExecutor;
+import org.apache.camel.spi.CamelContextCustomizer;
 
 @Recorder
 public class ReactiveExecutorRecorder {
     public RuntimeValue<CamelContextCustomizer> createReactiveExecutorCustomizer(RuntimeValue<Vertx> vertx) {
         return new RuntimeValue<>(new CamelContextCustomizer() {
             @Override
-            public void customize(CamelContext context) {
+            public void configure(CamelContext context) {
                 VertXReactiveExecutor executor = new VertXReactiveExecutor();
                 executor.setVertx(vertx.getValue());
 

diff --git a/...pache/camel/quarkus/component/threadpoolfactory/vertx/ThreadPoolFactoryVertxRecorder.java b/...pache/camel/quarkus/component/threadpoolfactory/vertx/ThreadPoolFactoryVertxRecorder.java
@@ -21,15 +21,15 @@
 import io.vertx.core.Vertx;
 import org.apache.camel.CamelContext;
 import org.apache.camel.ExtendedCamelContext;
-import org.apache.camel.quarkus.core.CamelContextCustomizer;
 import org.apache.camel.reactive.vertx.VertXThreadPoolFactory;
+import org.apache.camel.spi.CamelContextCustomizer;
 
 @Recorder
 public class ThreadPoolFactoryVertxRecorder {
     public RuntimeValue<CamelContextCustomizer> createThreadPoolFactoryCustomizer(RuntimeValue<Vertx> vertx) {
         return new RuntimeValue<>(new CamelContextCustomizer() {
             @Override
-            public void customize(CamelContext context) {
+            public void configure(CamelContext context) {
                 VertXThreadPoolFactory threadPoolFactory = new VertXThreadPoolFactory();
                 threadPoolFactory.setVertx(vertx.getValue());
 

diff --git a/.../src/main/java/org/apache/camel/quarkus/component/management/CamelManagementRecorder.java b/.../src/main/java/org/apache/camel/quarkus/component/management/CamelManagementRecorder.java
@@ -19,7 +19,7 @@
 import io.quarkus.runtime.RuntimeValue;
 import io.quarkus.runtime.annotations.Recorder;
 import org.apache.camel.CamelContext;
-import org.apache.camel.quarkus.core.CamelContextCustomizer;
+import org.apache.camel.spi.CamelContextCustomizer;
 
 @Recorder
 public class CamelManagementRecorder {
@@ -31,7 +31,7 @@ public RuntimeValue<CamelContextCustomizer> createContextCustomizer() {
     private static final class CamelManagementCustomizer implements CamelContextCustomizer {
 
         @Override
-        public void customize(CamelContext context) {
+        public void configure(CamelContext context) {
             context.setManagementName(context.getName());
         }
     }

diff --git a/.../src/main/java/org/apache/camel/quarkus/component/headersmap/CamelHeadersmapRecorder.java b/.../src/main/java/org/apache/camel/quarkus/component/headersmap/CamelHeadersmapRecorder.java
@@ -21,15 +21,15 @@
 import org.apache.camel.CamelContext;
 import org.apache.camel.ExtendedCamelContext;
 import org.apache.camel.component.headersmap.FastHeadersMapFactory;
-import org.apache.camel.quarkus.core.CamelContextCustomizer;
+import org.apache.camel.spi.CamelContextCustomizer;
 
 @Recorder
 public class CamelHeadersmapRecorder {
 
     public RuntimeValue<CamelContextCustomizer> createFastHeadersMapFactory() {
         return new RuntimeValue<>(new CamelContextCustomizer() {
             @Override
-            public void customize(CamelContext context) {
+            public void configure(CamelContext context) {
                 context.adapt(ExtendedCamelContext.class).setHeadersMapFactory(new FastHeadersMapFactory());
             }
         });

diff --git a/...ions/jaxb/runtime/src/main/java/org/apache/camel/quarkus/component/jaxb/JaxbRecorder.java b/...ions/jaxb/runtime/src/main/java/org/apache/camel/quarkus/component/jaxb/JaxbRecorder.java
@@ -20,7 +20,7 @@
 import io.quarkus.runtime.annotations.Recorder;
 import org.apache.camel.ExtendedCamelContext;
 import org.apache.camel.converter.jaxb.JaxbRestBindingJaxbDataFormatFactory;
-import org.apache.camel.quarkus.core.CamelContextCustomizer;
+import org.apache.camel.spi.CamelContextCustomizer;
 
 @Recorder
 public class JaxbRecorder {

diff --git a/.../src/main/java/org/apache/camel/quarkus/component/micrometer/CamelMicrometerRecorder.java b/.../src/main/java/org/apache/camel/quarkus/component/micrometer/CamelMicrometerRecorder.java
@@ -23,7 +23,7 @@
 import org.apache.camel.component.micrometer.eventnotifier.MicrometerRouteEventNotifier;
 import org.apache.camel.component.micrometer.messagehistory.MicrometerMessageHistoryFactory;
 import org.apache.camel.component.micrometer.routepolicy.MicrometerRoutePolicyFactory;
-import org.apache.camel.quarkus.core.CamelContextCustomizer;
+import org.apache.camel.spi.CamelContextCustomizer;
 import org.apache.camel.spi.ManagementStrategy;
 
 @Recorder
@@ -45,7 +45,7 @@ public MicrometerContextCustomizer(CamelMicrometerConfig config) {
         }
 
         @Override
-        public void customize(CamelContext camelContext) {
+        public void configure(CamelContext camelContext) {
             if (config.enableRoutePolicy) {
                 camelContext.addRoutePolicyFactory(new MicrometerRoutePolicyFactory());
             }
@@ -69,7 +69,7 @@ public MicrometerRuntimeContextCustomizer(CamelMicrometerConfig config) {
         }
 
         @Override
-        public void customize(CamelContext camelContext) {
+        public void configure(CamelContext camelContext) {
             if (!config.enableMessageHistory) {
                 return;
             }

diff --git a/...amel/quarkus/component/microprofile/metrics/runtime/CamelMicroProfileMetricsRecorder.java b/...amel/quarkus/component/microprofile/metrics/runtime/CamelMicroProfileMetricsRecorder.java
@@ -25,7 +25,7 @@
 import org.apache.camel.component.microprofile.metrics.event.notifier.route.MicroProfileMetricsRouteEventNotifier;
 import org.apache.camel.component.microprofile.metrics.message.history.MicroProfileMetricsMessageHistoryFactory;
 import org.apache.camel.component.microprofile.metrics.route.policy.MicroProfileMetricsRoutePolicyFactory;
-import org.apache.camel.quarkus.core.CamelContextCustomizer;
+import org.apache.camel.spi.CamelContextCustomizer;
 import org.apache.camel.spi.ManagementStrategy;
 import org.eclipse.microprofile.metrics.MetricRegistry;
 import org.jboss.logging.Logger;
@@ -53,7 +53,7 @@ public MicroProfileMetricsContextCustomizer(CamelMicroProfileMetricsConfig confi
         }
 
         @Override
-        public void customize(CamelContext camelContext) {
+        public void configure(CamelContext camelContext) {
             if (config.enableRoutePolicy) {
                 camelContext.addRoutePolicyFactory(new MicroProfileMetricsRoutePolicyFactory());
             }
@@ -82,7 +82,7 @@ public MicroProfileMetricsRuntimeContextCustomizer(CamelMicroProfileMetricsConfi
         }
 
         @Override
-        public void customize(CamelContext camelContext) {
+        public void configure(CamelContext camelContext) {
             if (!config.enableMessageHistory) {
                 return;
             }

diff --git a/...ions/rest/runtime/src/main/java/org/apache/camel/quarkus/component/rest/RestRecorder.java b/...ions/rest/runtime/src/main/java/org/apache/camel/quarkus/component/rest/RestRecorder.java
@@ -20,7 +20,7 @@
 import io.quarkus.runtime.annotations.Recorder;
 import org.apache.camel.CamelContext;
 import org.apache.camel.component.platform.http.PlatformHttpConstants;
-import org.apache.camel.quarkus.core.CamelContextCustomizer;
+import org.apache.camel.spi.CamelContextCustomizer;
 import org.jboss.logging.Logger;
 
 @Recorder
@@ -31,7 +31,7 @@ public RuntimeValue<CamelContextCustomizer> customizeCamelContext() {
 
     private static class RestCamelContextCustomizer implements CamelContextCustomizer {
         @Override
-        public void customize(CamelContext context) {
+        public void configure(CamelContext context) {
             String component = context.getRestConfiguration().getComponent();
             if (component == null) {
                 Logger.getLogger(RestCamelContextCustomizer.class).debugf(