Use MainSupport as base for running Camel apache#9

docs/modules/ROOT/pages/_partials/component-extensions.adoc

@@ -10,6 +10,7 @@
 * `camel-quarkus-jdbc`
 * `camel-quarkus-log`
 * `camel-quarkus-mail`
+* `camel-quarkus-main`
 * `camel-quarkus-microprofile-metrics`
 * `camel-quarkus-netty-http`
 * `camel-quarkus-paho`

extensions/core/deployment/src/main/java/org/apache/camel/quarkus/core/deployment/BuildProcessor.java

@@ -16,44 +16,24 @@
  */
 package org.apache.camel.quarkus.core.deployment;
 
-import java.io.InputStream;
-import java.nio.file.Files;
-import java.nio.file.Path;
-import java.util.ArrayList;
-import java.util.Collection;
-import java.util.HashSet;
 import java.util.List;
-import java.util.Map;
 import java.util.Objects;
-import java.util.Properties;
-import java.util.Set;
-import java.util.stream.Stream;
 import javax.inject.Inject;
 
 import io.quarkus.arc.deployment.AdditionalBeanBuildItem;
 import io.quarkus.arc.deployment.BeanContainerBuildItem;
-import io.quarkus.arc.deployment.BeanContainerListenerBuildItem;
-import io.quarkus.arc.deployment.RuntimeBeanBuildItem;
 import io.quarkus.deployment.annotations.BuildProducer;
 import io.quarkus.deployment.annotations.BuildStep;
 import io.quarkus.deployment.annotations.ExecutionTime;
 import io.quarkus.deployment.annotations.Record;
 import io.quarkus.deployment.builditem.ApplicationArchivesBuildItem;
 import io.quarkus.deployment.builditem.CombinedIndexBuildItem;
-import io.quarkus.deployment.builditem.ServiceStartBuildItem;
-import io.quarkus.deployment.builditem.ShutdownContextBuildItem;
 import io.quarkus.runtime.RuntimeValue;
-import org.apache.camel.RoutesBuilder;
-import org.apache.camel.builder.AdviceWithRouteBuilder;
-import org.apache.camel.builder.RouteBuilder;
+import org.apache.camel.CamelContext;
 import org.apache.camel.quarkus.core.runtime.CamelConfig;
-import org.apache.camel.quarkus.core.runtime.CamelConfig.BuildTime;
 import org.apache.camel.quarkus.core.runtime.CamelProducers;
 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.jboss.jandex.ClassInfo;
-import org.jboss.jandex.DotName;
+import org.apache.camel.spi.Registry;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
@@ -67,151 +47,57 @@ class BuildProcessor {
 
     @Record(ExecutionTime.STATIC_INIT)
     @BuildStep
-    CamelRuntimeBuildItem create(
+    CamelRegistryBuildItem registry(
             CamelRecorder recorder,
-            List<CamelBeanBuildItem> camelBeans,
-            BuildProducer<RuntimeBeanBuildItem> runtimeBeans) {
+            List<CamelBeanBuildItem> registryItems) {
 
-        RuntimeRegistry registry = new RuntimeRegistry();
-        RuntimeValue<CamelRuntime> camelRuntime = recorder.create(registry);
+        RuntimeValue<Registry> registry = recorder.createRegistry();
 
-        getBuildTimeRouteBuilderClasses().forEach(
-            b -> recorder.addBuilder(camelRuntime, b)
-        );
-
-        services().filter(
-            si -> camelBeans.stream().noneMatch(
+        CamelSupport.services(applicationArchivesBuildItem).filter(
+            si -> registryItems.stream().noneMatch(
                 c -> Objects.equals(si.name, c.getName()) && c.getType().isAssignableFrom(si.type)
             )
         ).forEach(
             si -> {
                 LOGGER.debug("Binding camel service {} with type {}", si.name, si.type);
 
                 recorder.bind(
-                    camelRuntime,
+                    registry,
                     si.name,
                     si.type
                 );
             }
         );
 
-        for (CamelBeanBuildItem item: camelBeans) {
+        for (CamelBeanBuildItem item: registryItems) {
             LOGGER.debug("Binding item with name: {}, type {}", item.getName(), item.getType());
 
             recorder.bind(
-                camelRuntime,
+                registry,
                 item.getName(),
                 item.getType(),
                 item.getValue()
             );
         }
 
-        runtimeBeans.produce(RuntimeBeanBuildItem.builder(CamelRuntime.class).setRuntimeValue(camelRuntime).build());
-
-        return new CamelRuntimeBuildItem(camelRuntime);
+        return new CamelRegistryBuildItem(registry);
     }
 
     @Record(ExecutionTime.STATIC_INIT)
     @BuildStep
-    AdditionalBeanBuildItem createProducers(
-            CamelRuntimeBuildItem runtime,
+    CamelContextBuildItem context(
             CamelRecorder recorder,
-            BuildProducer<BeanContainerListenerBuildItem> listeners) {
-
-        listeners.produce(new BeanContainerListenerBuildItem(recorder.initRuntimeInjection(runtime.getRuntime())));
-
-        return AdditionalBeanBuildItem.unremovableOf(CamelProducers.class);
-    }
-
-    @Record(ExecutionTime.STATIC_INIT)
-    @BuildStep
-    void init(
-            // TODO: keep this field as we need to be sure ArC is initialized before starting events
-            //       We need to re-evaluate the need of fire events from context once doing
-            //       https://github.com/apache/camel-quarkus/issues/9
+            CamelRegistryBuildItem registry,
+            // TODO: this add a dependency on Arc
             BeanContainerBuildItem beanContainerBuildItem,
-            CamelRuntimeBuildItem runtime,
-            CamelRecorder recorder,
-            BuildTime buildTimeConfig) {
+            CamelConfig.BuildTime buildTimeConfig) {
 
-        recorder.init(runtime.getRuntime(), buildTimeConfig);
+        RuntimeValue<CamelContext> context = recorder.createContext(registry.getRegistry(), beanContainerBuildItem.getValue(), buildTimeConfig);
+        return new CamelContextBuildItem(context);
     }
 
-    @Record(ExecutionTime.RUNTIME_INIT)
     @BuildStep
-    void start(
-            CamelRecorder recorder,
-            CamelRuntimeBuildItem runtime,
-            ShutdownContextBuildItem shutdown,
-            // TODO: keep this list as placeholder to ensure the ArC container is fully
-            //       started before starting the runtime
-            List<ServiceStartBuildItem> startList,
-            CamelConfig.Runtime runtimeConfig)
-            throws Exception {
-
-        recorder.start(shutdown, runtime.getRuntime(), runtimeConfig);
-    }
-
-    protected Stream<String> getBuildTimeRouteBuilderClasses() {
-        Set<ClassInfo> allKnownImplementors = new HashSet<>();
-        allKnownImplementors.addAll(
-                combinedIndexBuildItem.getIndex().getAllKnownImplementors(DotName.createSimple(RoutesBuilder.class.getName())));
-        allKnownImplementors.addAll(
-                combinedIndexBuildItem.getIndex().getAllKnownSubclasses(DotName.createSimple(RouteBuilder.class.getName())));
-        allKnownImplementors.addAll(combinedIndexBuildItem.getIndex()
-                .getAllKnownSubclasses(DotName.createSimple(AdviceWithRouteBuilder.class.getName())));
-
-        return allKnownImplementors
-                .stream()
-                .filter(CamelSupport::isConcrete)
-                .filter(CamelSupport::isPublic)
-                .map(ClassInfo::toString);
-    }
-
-    protected Stream<ServiceInfo> services() {
-        return CamelSupport.resources(applicationArchivesBuildItem, CamelSupport.CAMEL_SERVICE_BASE_PATH)
-            .map(this::services)
-            .flatMap(Collection::stream);
-    }
-
-    protected List<ServiceInfo> services(Path p) {
-        List<ServiceInfo> answer = new ArrayList<>();
-
-        String name = p.getFileName().toString();
-        try (InputStream is = Files.newInputStream(p)) {
-            Properties props = new Properties();
-            props.load(is);
-            for (Map.Entry<Object, Object> entry : props.entrySet()) {
-                String k = entry.getKey().toString();
-                if (k.equals("class")) {
-                    String clazz = entry.getValue().toString();
-                    Class<?> cl = Class.forName(clazz);
-
-                    answer.add(new ServiceInfo(name, cl));
-                }
-            }
-        } catch (Exception e) {
-            throw new RuntimeException(e);
-        }
-
-        return answer;
-    }
-
-    static class ServiceInfo {
-        final String name;
-        final Class<?> type;
-
-        public ServiceInfo(String name, Class<?> type) {
-            this.name = name;
-            this.type = type;
-        }
-
-        @Override
-        public String toString() {
-            return "ServiceInfo{"
-                + "name='" + name + '\''
-                + ", type=" + type
-                + '}';
-        }
+    void beans(BuildProducer<AdditionalBeanBuildItem> beanProducer) {
+        beanProducer.produce(AdditionalBeanBuildItem.unremovableOf(CamelProducers.class));
     }
 }

extensions/core/deployment/src/main/java/org/apache/camel/quarkus/core/deployment/CamelRuntimeBuildItem.java → extensions/core/deployment/src/main/java/org/apache/camel/quarkus/core/deployment/CamelContextBuildItem.java

@@ -16,19 +16,19 @@
  */
 package org.apache.camel.quarkus.core.deployment;
 
+
 import io.quarkus.builder.item.SimpleBuildItem;
 import io.quarkus.runtime.RuntimeValue;
-import org.apache.camel.quarkus.core.runtime.CamelRuntime;
-
-public final class CamelRuntimeBuildItem extends SimpleBuildItem {
+import org.apache.camel.CamelContext;
 
-    private final RuntimeValue<CamelRuntime> runtime;
+public final class CamelContextBuildItem extends SimpleBuildItem {
+    private final RuntimeValue<CamelContext> value;
 
-    public CamelRuntimeBuildItem(RuntimeValue<CamelRuntime> runtime) {
-        this.runtime = runtime;
+    public CamelContextBuildItem(RuntimeValue<CamelContext> value) {
+        this.value = value;
     }
 
-    public RuntimeValue<CamelRuntime> getRuntime() {
-        return runtime;
+    public RuntimeValue<CamelContext> getCamelContext() {
+        return value;
     }
 }

extensions/core/deployment/src/main/java/org/apache/camel/quarkus/core/deployment/CamelRegistryBuildItem.java

@@ -0,0 +1,33 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements.  See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License.  You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.apache.camel.quarkus.core.deployment;
+
+import io.quarkus.builder.item.SimpleBuildItem;
+import io.quarkus.runtime.RuntimeValue;
+import org.apache.camel.spi.Registry;
+
+public final class CamelRegistryBuildItem extends SimpleBuildItem {
+    private final RuntimeValue<Registry> value;
+
+    public CamelRegistryBuildItem(RuntimeValue<Registry> value) {
+        this.value = value;
+    }
+
+    public RuntimeValue<Registry> getRegistry() {
+        return value;
+    }
+}

extensions/core/deployment/src/main/java/org/apache/camel/quarkus/core/deployment/CamelSupport.java

@@ -18,13 +18,26 @@
 
 import java.io.IOError;
 import java.io.IOException;
+import java.io.InputStream;
 import java.lang.reflect.Modifier;
 import java.nio.file.Files;
 import java.nio.file.Path;
+import java.util.ArrayList;
+import java.util.Collection;
+import java.util.HashSet;
+import java.util.List;
+import java.util.Map;
+import java.util.Properties;
+import java.util.Set;
 import java.util.stream.Stream;
 
 import io.quarkus.deployment.builditem.ApplicationArchivesBuildItem;
+import org.apache.camel.RoutesBuilder;
+import org.apache.camel.builder.AdviceWithRouteBuilder;
+import org.apache.camel.builder.RouteBuilder;
 import org.jboss.jandex.ClassInfo;
+import org.jboss.jandex.DotName;
+import org.jboss.jandex.IndexView;
 
 public final class CamelSupport {
     public static final String CAMEL_SERVICE_BASE_PATH = "META-INF/services/org/apache/camel";
@@ -56,4 +69,67 @@ public static Stream<Path> resources(ApplicationArchivesBuildItem archives, Stri
             .flatMap(CamelSupport::safeWalk)
             .filter(Files::isRegularFile);
     }
+
+    public static Stream<String> getRouteBuilderClasses(IndexView view) {
+        Set<ClassInfo> allKnownImplementors = new HashSet<>();
+        allKnownImplementors.addAll(
+            view.getAllKnownImplementors(DotName.createSimple(RoutesBuilder.class.getName())));
+        allKnownImplementors.addAll(
+            view.getAllKnownSubclasses(DotName.createSimple(RouteBuilder.class.getName())));
+        allKnownImplementors.addAll(
+            view.getAllKnownSubclasses(DotName.createSimple(AdviceWithRouteBuilder.class.getName())));
+
+        return allKnownImplementors
+            .stream()
+            .filter(CamelSupport::isConcrete)
+            .filter(CamelSupport::isPublic)
+            .map(ClassInfo::toString);
+    }
+
+    public static Stream<ServiceInfo> services(ApplicationArchivesBuildItem applicationArchivesBuildItem) {
+        return CamelSupport.resources(applicationArchivesBuildItem, CamelSupport.CAMEL_SERVICE_BASE_PATH)
+            .map(CamelSupport::services)
+            .flatMap(Collection::stream);
+    }
+
+    public static List<ServiceInfo> services(Path p) {
+        List<ServiceInfo> answer = new ArrayList<>();
+
+        String name = p.getFileName().toString();
+        try (InputStream is = Files.newInputStream(p)) {
+            Properties props = new Properties();
+            props.load(is);
+            for (Map.Entry<Object, Object> entry : props.entrySet()) {
+                String k = entry.getKey().toString();
+                if (k.equals("class")) {
+                    String clazz = entry.getValue().toString();
+                    Class<?> cl = Class.forName(clazz);
+
+                    answer.add(new ServiceInfo(name, cl));
+                }
+            }
+        } catch (Exception e) {
+            throw new RuntimeException(e);
+        }
+
+        return answer;
+    }
+
+    public static class ServiceInfo {
+        public final String name;
+        public final Class<?> type;
+
+        public ServiceInfo(String name, Class<?> type) {
+            this.name = name;
+            this.type = type;
+        }
+
+        @Override
+        public String toString() {
+            return "ServiceInfo{"
+                + "name='" + name + '\''
+                + ", type=" + type
+                + '}';
+        }
+    }
 }

extensions/core/deployment/src/main/java/org/apache/camel/quarkus/core/deployment/SubstrateProcessor.java

@@ -44,6 +44,7 @@
 import org.apache.camel.Producer;
 import org.apache.camel.TypeConverter;
 import org.apache.camel.spi.ExchangeFormatter;
+import org.apache.camel.spi.PropertiesComponent;
 import org.apache.camel.spi.ScheduledPollConsumerScheduler;
 import org.apache.camel.spi.StreamCachingStrategy;
 import org.jboss.jandex.AnnotationTarget.Kind;
@@ -66,7 +67,8 @@ class SubstrateProcessor {
             Component.class,
             CamelContext.class,
             StreamCachingStrategy.class,
-            StreamCachingStrategy.SpoolUsedHeapMemoryLimit.class);
+            StreamCachingStrategy.SpoolUsedHeapMemoryLimit.class,
+            PropertiesComponent.class);
 
     @Inject
     BuildProducer<ReflectiveClassBuildItem> reflectiveClass;