This is an automated email from the ASF dual-hosted git repository.

lburgazzoli pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/camel-quarkus.git

commit e22a481646913ea5c61923550a278ff9bc5ec4d6
Author: lburgazzoli <[email protected]>
AuthorDate: Mon Jun 22 16:16:01 2020 +0200

    Observe Camel's events #1353 (cleanup core)
---
 .../camel/quarkus/core/CamelContextRecorder.java   |  2 +-
 .../quarkus/core/CamelLifecycleEventBridge.java    | 78 ++++++++++++++++++----
 ...Bridge.java => CamelManagementEventBridge.java} | 26 +++++---
 .../quarkus/core/events/ComponentAddEvent.java     |  3 +
 .../camel/quarkus/core/events/ComponentEvent.java  |  3 +
 .../quarkus/core/events/ComponentRemoveEvent.java  |  3 +
 .../quarkus/core/events/EndpointAddEvent.java      |  3 +
 .../camel/quarkus/core/events/EndpointEvent.java   |  3 +
 .../quarkus/core/events/EndpointRemoveEvent.java   |  3 +
 .../quarkus/core/events/ErrorHandlerAddEvent.java  |  3 +
 .../quarkus/core/events/ErrorHandlerEvent.java     |  3 +
 .../core/events/ErrorHandlerRemoveEvent.java       |  3 +
 .../camel/quarkus/core/events/ServiceAddEvent.java |  3 +
 .../camel/quarkus/core/events/ServiceEvent.java    |  3 +
 .../quarkus/core/events/ServiceRemoveEvent.java    |  3 +
 .../quarkus/core/events/ThreadPoolAddEvent.java    |  4 ++
 .../camel/quarkus/core/events/ThreadPoolEvent.java |  3 +
 .../quarkus/core/events/ThreadPoolRemoveEvent.java |  3 +
 18 files changed, 127 insertions(+), 25 deletions(-)

diff --git 
a/extensions-core/core/runtime/src/main/java/org/apache/camel/quarkus/core/CamelContextRecorder.java
 
b/extensions-core/core/runtime/src/main/java/org/apache/camel/quarkus/core/CamelContextRecorder.java
index 00d99da..17cb43b 100644
--- 
a/extensions-core/core/runtime/src/main/java/org/apache/camel/quarkus/core/CamelContextRecorder.java
+++ 
b/extensions-core/core/runtime/src/main/java/org/apache/camel/quarkus/core/CamelContextRecorder.java
@@ -55,7 +55,7 @@ public class CamelContextRecorder {
         context.setModelJAXBContextFactory(contextFactory.getValue());
         context.build();
         context.addLifecycleStrategy(new CamelLifecycleEventBridge());
-        context.getManagementStrategy().addEventNotifier(new 
CamelEventBridge());
+        context.getManagementStrategy().addEventNotifier(new 
CamelManagementEventBridge());
 
         // register to the container
         beanContainer.instance(CamelProducers.class).setContext(context);
diff --git 
a/extensions-core/core/runtime/src/main/java/org/apache/camel/quarkus/core/CamelLifecycleEventBridge.java
 
b/extensions-core/core/runtime/src/main/java/org/apache/camel/quarkus/core/CamelLifecycleEventBridge.java
index e8c4603..8b535b1 100644
--- 
a/extensions-core/core/runtime/src/main/java/org/apache/camel/quarkus/core/CamelLifecycleEventBridge.java
+++ 
b/extensions-core/core/runtime/src/main/java/org/apache/camel/quarkus/core/CamelLifecycleEventBridge.java
@@ -16,12 +16,13 @@
  */
 package org.apache.camel.quarkus.core;
 
+import java.util.Collection;
 import java.util.concurrent.ThreadPoolExecutor;
+import java.util.function.Supplier;
 
 import javax.enterprise.inject.spi.BeanManager;
 
 import io.quarkus.arc.Arc;
-import io.quarkus.arc.ArcContainer;
 import org.apache.camel.CamelContext;
 import org.apache.camel.Component;
 import org.apache.camel.Endpoint;
@@ -29,6 +30,7 @@ import org.apache.camel.ErrorHandlerFactory;
 import org.apache.camel.Processor;
 import org.apache.camel.Route;
 import org.apache.camel.Service;
+import org.apache.camel.VetoCamelContextStartException;
 import org.apache.camel.quarkus.core.events.ComponentAddEvent;
 import org.apache.camel.quarkus.core.events.ComponentRemoveEvent;
 import org.apache.camel.quarkus.core.events.EndpointAddEvent;
@@ -40,9 +42,39 @@ import 
org.apache.camel.quarkus.core.events.ServiceRemoveEvent;
 import org.apache.camel.quarkus.core.events.ThreadPoolAddEvent;
 import org.apache.camel.quarkus.core.events.ThreadPoolRemoveEvent;
 import org.apache.camel.spi.CamelEvent;
-import org.apache.camel.support.LifecycleStrategySupport;
+import org.apache.camel.spi.LifecycleStrategy;
+import org.apache.camel.util.function.Suppliers;
+
+/**
+ * Bridges {@link org.apache.camel.spi.LifecycleStrategy} callbacks and CDI by 
producing the correspondent
+ * events.
+ * <p>
+ * Note that this class does not implement all the callback as some 
notifications them are already covered
+ * by management events {@link CamelManagementEventBridge}
+ * <p>
+ * 
+ * @see ComponentAddEvent
+ * @see ComponentRemoveEvent
+ * @see EndpointAddEvent
+ * @see EndpointRemoveEvent
+ * @see ErrorHandlerAddEvent
+ * @see ErrorHandlerRemoveEvent
+ * @see ServiceAddEvent
+ * @see ServiceRemoveEvent
+ * @see ThreadPoolAddEvent
+ * @see ThreadPoolRemoveEvent
+ */
+public class CamelLifecycleEventBridge implements LifecycleStrategy {
+    private final Supplier<BeanManager> beanManager;
+
+    public CamelLifecycleEventBridge() {
+        this.beanManager = Suppliers.memorize(Arc.container()::beanManager);
+    }
+
+    private <T extends CamelEvent> void fireEvent(T event) {
+        beanManager.get().getEvent().select(CamelEvent.class).fire(event);
+    }
 
-public class CamelLifecycleEventBridge extends LifecycleStrategySupport {
     @Override
     public void onComponentAdd(String name, Component component) {
         fireEvent(new ComponentAddEvent(component));
@@ -94,17 +126,37 @@ public class CamelLifecycleEventBridge extends 
LifecycleStrategySupport {
         fireEvent(new ServiceRemoveEvent(context, service, route));
     }
 
-    private static <T extends CamelEvent> void fireEvent(T event) {
-        fireEvent(CamelEvent.class, event);
+    @Override
+    public void onContextStart(CamelContext context) throws 
VetoCamelContextStartException {
+        // superseded by management events
+    }
+
+    @Override
+    public void onContextStop(CamelContext context) {
+
+        // superseded by management events
+    }
+
+    @Override
+    public void onRoutesAdd(Collection<Route> routes) {
+
+        // superseded by management events
+    }
+
+    @Override
+    public void onRoutesRemove(Collection<Route> routes) {
+
+        // superseded by management events
+    }
+
+    @Override
+    public void onRouteContextCreate(Route route) {
+
+        // superseded by management events
     }
 
-    private static <T> void fireEvent(Class<T> clazz, T event) {
-        ArcContainer container = Arc.container();
-        if (container != null) {
-            BeanManager beanManager = container.beanManager();
-            if (beanManager != null) {
-                beanManager.getEvent().select(clazz).fire(event);
-            }
-        }
+    @Override
+    public void onContextInitialized(CamelContext context) throws 
VetoCamelContextStartException {
+        // superseded by management events
     }
 }
diff --git 
a/extensions-core/core/runtime/src/main/java/org/apache/camel/quarkus/core/CamelEventBridge.java
 
b/extensions-core/core/runtime/src/main/java/org/apache/camel/quarkus/core/CamelManagementEventBridge.java
similarity index 74%
rename from 
extensions-core/core/runtime/src/main/java/org/apache/camel/quarkus/core/CamelEventBridge.java
rename to 
extensions-core/core/runtime/src/main/java/org/apache/camel/quarkus/core/CamelManagementEventBridge.java
index d58c997..980b847 100644
--- 
a/extensions-core/core/runtime/src/main/java/org/apache/camel/quarkus/core/CamelEventBridge.java
+++ 
b/extensions-core/core/runtime/src/main/java/org/apache/camel/quarkus/core/CamelManagementEventBridge.java
@@ -19,22 +19,26 @@ package org.apache.camel.quarkus.core;
 import javax.enterprise.inject.spi.BeanManager;
 
 import io.quarkus.arc.Arc;
-import io.quarkus.arc.ArcContainer;
 import org.apache.camel.spi.CamelEvent;
+import org.apache.camel.spi.EventNotifier;
 import org.apache.camel.support.EventNotifierSupport;
 
-public class CamelEventBridge extends EventNotifierSupport {
+/**
+ * Bridges Camel Management events to CDI.
+ *
+ * @see EventNotifier
+ */
+public class CamelManagementEventBridge extends EventNotifierSupport {
+    private BeanManager beanManager;
+
     @Override
-    public void notify(CamelEvent event) throws Exception {
-        ArcContainer container = Arc.container();
-        if (container == null) {
-            return;
-        }
+    protected void doInit() {
+        beanManager = Arc.container().beanManager();
+    }
 
-        BeanManager manager = container.beanManager();
-        if (manager != null) {
-            manager.fireEvent(event);
-        }
+    @Override
+    public void notify(CamelEvent event) throws Exception {
+        beanManager.getEvent().select(CamelEvent.class).fire(event);
     }
 
     @Override
diff --git 
a/extensions-core/core/runtime/src/main/java/org/apache/camel/quarkus/core/events/ComponentAddEvent.java
 
b/extensions-core/core/runtime/src/main/java/org/apache/camel/quarkus/core/events/ComponentAddEvent.java
index bf7d95b..382c5a1 100644
--- 
a/extensions-core/core/runtime/src/main/java/org/apache/camel/quarkus/core/events/ComponentAddEvent.java
+++ 
b/extensions-core/core/runtime/src/main/java/org/apache/camel/quarkus/core/events/ComponentAddEvent.java
@@ -18,6 +18,9 @@ package org.apache.camel.quarkus.core.events;
 
 import org.apache.camel.Component;
 
+/**
+ * @see org.apache.camel.spi.LifecycleStrategy#onComponentAdd(String, 
Component)
+ */
 public class ComponentAddEvent extends ComponentEvent {
     public ComponentAddEvent(Component component) {
         super(component);
diff --git 
a/extensions-core/core/runtime/src/main/java/org/apache/camel/quarkus/core/events/ComponentEvent.java
 
b/extensions-core/core/runtime/src/main/java/org/apache/camel/quarkus/core/events/ComponentEvent.java
index 6ca3ae3..291d7f3 100644
--- 
a/extensions-core/core/runtime/src/main/java/org/apache/camel/quarkus/core/events/ComponentEvent.java
+++ 
b/extensions-core/core/runtime/src/main/java/org/apache/camel/quarkus/core/events/ComponentEvent.java
@@ -20,6 +20,9 @@ import org.apache.camel.CamelContext;
 import org.apache.camel.Component;
 import org.apache.camel.spi.CamelEvent;
 
+/**
+ * Base {@link CamelEvent} for {@link Component} related events.
+ */
 public class ComponentEvent implements CamelEvent.CamelContextEvent {
     private final Component component;
 
diff --git 
a/extensions-core/core/runtime/src/main/java/org/apache/camel/quarkus/core/events/ComponentRemoveEvent.java
 
b/extensions-core/core/runtime/src/main/java/org/apache/camel/quarkus/core/events/ComponentRemoveEvent.java
index 5605adf..8134337 100644
--- 
a/extensions-core/core/runtime/src/main/java/org/apache/camel/quarkus/core/events/ComponentRemoveEvent.java
+++ 
b/extensions-core/core/runtime/src/main/java/org/apache/camel/quarkus/core/events/ComponentRemoveEvent.java
@@ -18,6 +18,9 @@ package org.apache.camel.quarkus.core.events;
 
 import org.apache.camel.Component;
 
+/**
+ * @see org.apache.camel.spi.LifecycleStrategy#onComponentRemove(String, 
Component)
+ */
 public class ComponentRemoveEvent extends ComponentEvent {
     public ComponentRemoveEvent(Component component) {
         super(component);
diff --git 
a/extensions-core/core/runtime/src/main/java/org/apache/camel/quarkus/core/events/EndpointAddEvent.java
 
b/extensions-core/core/runtime/src/main/java/org/apache/camel/quarkus/core/events/EndpointAddEvent.java
index b3411c6..fb20ad5 100644
--- 
a/extensions-core/core/runtime/src/main/java/org/apache/camel/quarkus/core/events/EndpointAddEvent.java
+++ 
b/extensions-core/core/runtime/src/main/java/org/apache/camel/quarkus/core/events/EndpointAddEvent.java
@@ -18,6 +18,9 @@ package org.apache.camel.quarkus.core.events;
 
 import org.apache.camel.Endpoint;
 
+/**
+ * @see org.apache.camel.spi.LifecycleStrategy#onEndpointAdd(Endpoint)
+ */
 public class EndpointAddEvent extends EndpointEvent {
     public EndpointAddEvent(Endpoint endpoint) {
         super(endpoint);
diff --git 
a/extensions-core/core/runtime/src/main/java/org/apache/camel/quarkus/core/events/EndpointEvent.java
 
b/extensions-core/core/runtime/src/main/java/org/apache/camel/quarkus/core/events/EndpointEvent.java
index 7a575ad..e45abaa 100644
--- 
a/extensions-core/core/runtime/src/main/java/org/apache/camel/quarkus/core/events/EndpointEvent.java
+++ 
b/extensions-core/core/runtime/src/main/java/org/apache/camel/quarkus/core/events/EndpointEvent.java
@@ -20,6 +20,9 @@ import org.apache.camel.CamelContext;
 import org.apache.camel.Endpoint;
 import org.apache.camel.spi.CamelEvent;
 
+/**
+ * Base {@link CamelEvent} for {@link Endpoint} related events.
+ */
 public class EndpointEvent implements CamelEvent.CamelContextEvent {
     private final Endpoint endpoint;
 
diff --git 
a/extensions-core/core/runtime/src/main/java/org/apache/camel/quarkus/core/events/EndpointRemoveEvent.java
 
b/extensions-core/core/runtime/src/main/java/org/apache/camel/quarkus/core/events/EndpointRemoveEvent.java
index 8d2f0bc..a6b5ffc 100644
--- 
a/extensions-core/core/runtime/src/main/java/org/apache/camel/quarkus/core/events/EndpointRemoveEvent.java
+++ 
b/extensions-core/core/runtime/src/main/java/org/apache/camel/quarkus/core/events/EndpointRemoveEvent.java
@@ -18,6 +18,9 @@ package org.apache.camel.quarkus.core.events;
 
 import org.apache.camel.Endpoint;
 
+/**
+ * @see org.apache.camel.spi.LifecycleStrategy#onEndpointRemove(Endpoint)
+ */
 public class EndpointRemoveEvent extends EndpointEvent {
     public EndpointRemoveEvent(Endpoint endpoint) {
         super(endpoint);
diff --git 
a/extensions-core/core/runtime/src/main/java/org/apache/camel/quarkus/core/events/ErrorHandlerAddEvent.java
 
b/extensions-core/core/runtime/src/main/java/org/apache/camel/quarkus/core/events/ErrorHandlerAddEvent.java
index d9d720c..0a6f60f 100644
--- 
a/extensions-core/core/runtime/src/main/java/org/apache/camel/quarkus/core/events/ErrorHandlerAddEvent.java
+++ 
b/extensions-core/core/runtime/src/main/java/org/apache/camel/quarkus/core/events/ErrorHandlerAddEvent.java
@@ -20,6 +20,9 @@ import org.apache.camel.ErrorHandlerFactory;
 import org.apache.camel.Processor;
 import org.apache.camel.Route;
 
+/**
+ * @see org.apache.camel.spi.LifecycleStrategy#onErrorHandlerAdd(Route, 
Processor, ErrorHandlerFactory)
+ */
 public class ErrorHandlerAddEvent extends ErrorHandlerEvent {
     public ErrorHandlerAddEvent(Route route, Processor errorHandler, 
ErrorHandlerFactory errorHandlerFactory) {
         super(route, errorHandler, errorHandlerFactory);
diff --git 
a/extensions-core/core/runtime/src/main/java/org/apache/camel/quarkus/core/events/ErrorHandlerEvent.java
 
b/extensions-core/core/runtime/src/main/java/org/apache/camel/quarkus/core/events/ErrorHandlerEvent.java
index e41f2ba..10df15a 100644
--- 
a/extensions-core/core/runtime/src/main/java/org/apache/camel/quarkus/core/events/ErrorHandlerEvent.java
+++ 
b/extensions-core/core/runtime/src/main/java/org/apache/camel/quarkus/core/events/ErrorHandlerEvent.java
@@ -21,6 +21,9 @@ import org.apache.camel.Processor;
 import org.apache.camel.Route;
 import org.apache.camel.spi.CamelEvent;
 
+/**
+ * Base {@link CamelEvent} for {@link ErrorHandlerFactory} related events.
+ */
 public class ErrorHandlerEvent implements CamelEvent.RouteEvent {
     private final Route route;
     private final Processor errorHandler;
diff --git 
a/extensions-core/core/runtime/src/main/java/org/apache/camel/quarkus/core/events/ErrorHandlerRemoveEvent.java
 
b/extensions-core/core/runtime/src/main/java/org/apache/camel/quarkus/core/events/ErrorHandlerRemoveEvent.java
index 937b053..75fd9be 100644
--- 
a/extensions-core/core/runtime/src/main/java/org/apache/camel/quarkus/core/events/ErrorHandlerRemoveEvent.java
+++ 
b/extensions-core/core/runtime/src/main/java/org/apache/camel/quarkus/core/events/ErrorHandlerRemoveEvent.java
@@ -20,6 +20,9 @@ import org.apache.camel.ErrorHandlerFactory;
 import org.apache.camel.Processor;
 import org.apache.camel.Route;
 
+/**
+ * @see org.apache.camel.spi.LifecycleStrategy#onErrorHandlerRemove(Route, 
Processor, ErrorHandlerFactory)
+ */
 public class ErrorHandlerRemoveEvent extends ErrorHandlerEvent {
     public ErrorHandlerRemoveEvent(Route route, Processor errorHandler, 
ErrorHandlerFactory errorHandlerFactory) {
         super(route, errorHandler, errorHandlerFactory);
diff --git 
a/extensions-core/core/runtime/src/main/java/org/apache/camel/quarkus/core/events/ServiceAddEvent.java
 
b/extensions-core/core/runtime/src/main/java/org/apache/camel/quarkus/core/events/ServiceAddEvent.java
index ada8537..e8f5524 100644
--- 
a/extensions-core/core/runtime/src/main/java/org/apache/camel/quarkus/core/events/ServiceAddEvent.java
+++ 
b/extensions-core/core/runtime/src/main/java/org/apache/camel/quarkus/core/events/ServiceAddEvent.java
@@ -20,6 +20,9 @@ import org.apache.camel.CamelContext;
 import org.apache.camel.Route;
 import org.apache.camel.Service;
 
+/**
+ * @see org.apache.camel.spi.LifecycleStrategy#onServiceAdd(CamelContext, 
Service, Route)
+ */
 public class ServiceAddEvent extends ServiceEvent {
     public ServiceAddEvent(CamelContext camelContext, Service service, Route 
route) {
         super(camelContext, service, route);
diff --git 
a/extensions-core/core/runtime/src/main/java/org/apache/camel/quarkus/core/events/ServiceEvent.java
 
b/extensions-core/core/runtime/src/main/java/org/apache/camel/quarkus/core/events/ServiceEvent.java
index 85c47ad..5c597ab 100644
--- 
a/extensions-core/core/runtime/src/main/java/org/apache/camel/quarkus/core/events/ServiceEvent.java
+++ 
b/extensions-core/core/runtime/src/main/java/org/apache/camel/quarkus/core/events/ServiceEvent.java
@@ -23,6 +23,9 @@ import org.apache.camel.Route;
 import org.apache.camel.Service;
 import org.apache.camel.spi.CamelEvent;
 
+/**
+ * Base {@link CamelEvent} for {@link Service} related events.
+ */
 public class ServiceEvent implements CamelEvent.CamelContextEvent {
     private final CamelContext camelContext;
     private final Service service;
diff --git 
a/extensions-core/core/runtime/src/main/java/org/apache/camel/quarkus/core/events/ServiceRemoveEvent.java
 
b/extensions-core/core/runtime/src/main/java/org/apache/camel/quarkus/core/events/ServiceRemoveEvent.java
index 1f87f99..b08a3ce 100644
--- 
a/extensions-core/core/runtime/src/main/java/org/apache/camel/quarkus/core/events/ServiceRemoveEvent.java
+++ 
b/extensions-core/core/runtime/src/main/java/org/apache/camel/quarkus/core/events/ServiceRemoveEvent.java
@@ -20,6 +20,9 @@ import org.apache.camel.CamelContext;
 import org.apache.camel.Route;
 import org.apache.camel.Service;
 
+/**
+ * @see org.apache.camel.spi.LifecycleStrategy#onServiceRemove(CamelContext, 
Service, Route)
+ */
 public class ServiceRemoveEvent extends ServiceEvent {
     public ServiceRemoveEvent(CamelContext camelContext, Service service, 
Route route) {
         super(camelContext, service, route);
diff --git 
a/extensions-core/core/runtime/src/main/java/org/apache/camel/quarkus/core/events/ThreadPoolAddEvent.java
 
b/extensions-core/core/runtime/src/main/java/org/apache/camel/quarkus/core/events/ThreadPoolAddEvent.java
index dfa3750..927c45c 100644
--- 
a/extensions-core/core/runtime/src/main/java/org/apache/camel/quarkus/core/events/ThreadPoolAddEvent.java
+++ 
b/extensions-core/core/runtime/src/main/java/org/apache/camel/quarkus/core/events/ThreadPoolAddEvent.java
@@ -21,6 +21,10 @@ import java.util.concurrent.ThreadPoolExecutor;
 
 import org.apache.camel.CamelContext;
 
+/**
+ * @see org.apache.camel.spi.LifecycleStrategy#onThreadPoolAdd(CamelContext, 
ThreadPoolExecutor, String, String, String,
+ *      String)
+ */
 public class ThreadPoolAddEvent extends ThreadPoolEvent {
     private final String id;
     private final String sourceId;
diff --git 
a/extensions-core/core/runtime/src/main/java/org/apache/camel/quarkus/core/events/ThreadPoolEvent.java
 
b/extensions-core/core/runtime/src/main/java/org/apache/camel/quarkus/core/events/ThreadPoolEvent.java
index 8f59431..227db7a 100644
--- 
a/extensions-core/core/runtime/src/main/java/org/apache/camel/quarkus/core/events/ThreadPoolEvent.java
+++ 
b/extensions-core/core/runtime/src/main/java/org/apache/camel/quarkus/core/events/ThreadPoolEvent.java
@@ -21,6 +21,9 @@ import java.util.concurrent.ThreadPoolExecutor;
 import org.apache.camel.CamelContext;
 import org.apache.camel.spi.CamelEvent;
 
+/**
+ * Base {@link CamelEvent} for {@link ThreadPoolExecutor} related events.
+ */
 public class ThreadPoolEvent implements CamelEvent.CamelContextEvent {
     private final CamelContext camelContext;
     private final ThreadPoolExecutor threadPool;
diff --git 
a/extensions-core/core/runtime/src/main/java/org/apache/camel/quarkus/core/events/ThreadPoolRemoveEvent.java
 
b/extensions-core/core/runtime/src/main/java/org/apache/camel/quarkus/core/events/ThreadPoolRemoveEvent.java
index 372a546..ff9735b 100644
--- 
a/extensions-core/core/runtime/src/main/java/org/apache/camel/quarkus/core/events/ThreadPoolRemoveEvent.java
+++ 
b/extensions-core/core/runtime/src/main/java/org/apache/camel/quarkus/core/events/ThreadPoolRemoveEvent.java
@@ -20,6 +20,9 @@ import java.util.concurrent.ThreadPoolExecutor;
 
 import org.apache.camel.CamelContext;
 
+/**
+ * @see 
org.apache.camel.spi.LifecycleStrategy#onThreadPoolRemove(CamelContext, 
ThreadPoolExecutor)
+ */
 public class ThreadPoolRemoveEvent extends ThreadPoolEvent {
     public ThreadPoolRemoveEvent(CamelContext camelContext, ThreadPoolExecutor 
executor) {
         super(camelContext, executor);

Reply via email to