[camel-quarkus] 04/05: chore: replace MainSupport with BaseMainSupport in CamelMain

[lburgazzoli]

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 747b1dc27259a4ac4b4bef3c36572b91dcb4b01a
Author: lburgazzoli <lburgazz...@gmail.com>
AuthorDate: Sat Oct 5 14:39:04 2019 +0200

    chore: replace MainSupport with BaseMainSupport in CamelMain
---
 .../org/apache/camel/quarkus/core/CamelMain.java   | 30 +++++++++++++++++-----
 .../camel/quarkus/core/CamelMainRecorder.java      |  3 +--
 2 files changed, 24 insertions(+), 9 deletions(-)

diff --git 
a/extensions/core/runtime/src/main/java/org/apache/camel/quarkus/core/CamelMain.java
 
b/extensions/core/runtime/src/main/java/org/apache/camel/quarkus/core/CamelMain.java
index 2c71954..7e5c7f9 100644
--- 
a/extensions/core/runtime/src/main/java/org/apache/camel/quarkus/core/CamelMain.java
+++ 
b/extensions/core/runtime/src/main/java/org/apache/camel/quarkus/core/CamelMain.java
@@ -22,12 +22,16 @@ import java.util.Collections;
 import org.apache.camel.CamelContext;
 import org.apache.camel.CamelContextAware;
 import org.apache.camel.ProducerTemplate;
+import org.apache.camel.main.BaseMainSupport;
 import org.apache.camel.main.MainConfigurationProperties;
 import org.apache.camel.main.MainListener;
-import org.apache.camel.main.MainSupport;
 import org.apache.camel.support.service.ServiceHelper;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+public class CamelMain extends BaseMainSupport implements CamelContextAware {
+    private static final Logger LOGGER = 
LoggerFactory.getLogger(CamelMain.class);
 
-public class CamelMain extends MainSupport implements CamelContextAware {
     @Override
     public void setCamelContext(CamelContext camelContext) {
         this.camelContext = camelContext;
@@ -40,9 +44,15 @@ public class CamelMain extends MainSupport implements 
CamelContextAware {
 
     @Override
     protected void doStart() throws Exception {
-        beforeStart();
+        for (MainListener listener : listeners) {
+            listener.beforeStart(this);
+        }
+
         getCamelContext().start();
-        afterStart();
+
+        for (MainListener listener : listeners) {
+            listener.afterStart(this);
+        }
     }
 
     @Override
@@ -53,12 +63,18 @@ public class CamelMain extends MainSupport implements 
CamelContextAware {
                 camelTemplate = null;
             }
         } catch (Exception e) {
-            MainSupport.LOG.debug("Error stopping camelTemplate due " + 
e.getMessage() + ". This exception is ignored.", e);
+            LOGGER.debug("Error stopping camelTemplate due " + e.getMessage() 
+ ". This exception is ignored.", e);
+        }
+
+        for (MainListener listener : listeners) {
+            listener.beforeStop(this);
         }
 
-        beforeStop();
         getCamelContext().stop();
-        afterStop();
+
+        for (MainListener listener : listeners) {
+            listener.afterStop(this);
+        }
     }
 
     @Override
diff --git 
a/extensions/core/runtime/src/main/java/org/apache/camel/quarkus/core/CamelMainRecorder.java
 
b/extensions/core/runtime/src/main/java/org/apache/camel/quarkus/core/CamelMainRecorder.java
index 0c861a7..139ca38 100644
--- 
a/extensions/core/runtime/src/main/java/org/apache/camel/quarkus/core/CamelMainRecorder.java
+++ 
b/extensions/core/runtime/src/main/java/org/apache/camel/quarkus/core/CamelMainRecorder.java
@@ -38,7 +38,6 @@ public class CamelMainRecorder {
 
         CamelMain main = new CamelMain();
         main.setCamelContext(runtime.getValue());
-        main.disableHangupSupport();
         main.addMainListener(new CamelMainEventDispatcher());
 
         // register to the container
@@ -83,7 +82,7 @@ public class CamelMainRecorder {
 
         if (ObjectHelper.isNotEmpty(location)) {
             // TODO: if pointing to a directory, we should load all xmls in it
-            //   (maybe with glob support in it to be complete)
+            //       (maybe with glob support in it to be complete)
             try (InputStream is = 
ResourceHelper.resolveMandatoryResourceAsInputStream(main.getValue().getCamelContext(),
 location)) {
                 
main.getValue().getCamelContext().getExtension(Model.class).addRouteDefinitions(is);
             } catch (Exception e) {