[camel] branch main updated: CAMEL-18425: camel-cli - Make regular Camel applications work with Camel CLI

[davsclaus]

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

davsclaus pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/camel.git


The following commit(s) were added to refs/heads/main by this push:
     new fe207a8fc16 CAMEL-18425: camel-cli - Make regular Camel applications 
work with Camel CLI
fe207a8fc16 is described below

commit fe207a8fc16f5c4cee2457566c1eca2c9ae2c38c
Author: Claus Ibsen <claus.ib...@gmail.com>
AuthorDate: Sat Aug 27 10:03:22 2022 +0200

    CAMEL-18425: camel-cli - Make regular Camel applications work with Camel CLI
---
 .../camel/cli/connector/DefaultCliConnectorFactory.java      |  2 +-
 .../org/apache/camel/cli/connector/LocalCliConnector.java    | 12 ++++++++----
 2 files changed, 9 insertions(+), 5 deletions(-)

diff --git 
a/dsl/camel-cli-connector/src/main/java/org/apache/camel/cli/connector/DefaultCliConnectorFactory.java
 
b/dsl/camel-cli-connector/src/main/java/org/apache/camel/cli/connector/DefaultCliConnectorFactory.java
index 7713ee98e42..1687c097e5d 100644
--- 
a/dsl/camel-cli-connector/src/main/java/org/apache/camel/cli/connector/DefaultCliConnectorFactory.java
+++ 
b/dsl/camel-cli-connector/src/main/java/org/apache/camel/cli/connector/DefaultCliConnectorFactory.java
@@ -69,7 +69,7 @@ public class DefaultCliConnectorFactory implements 
CliConnectorFactory {
     @Override
     public CliConnector createConnector() {
         if (enabled) {
-            return new LocalCliConnector();
+            return new LocalCliConnector(this);
         } else {
             return null;
         }
diff --git 
a/dsl/camel-cli-connector/src/main/java/org/apache/camel/cli/connector/LocalCliConnector.java
 
b/dsl/camel-cli-connector/src/main/java/org/apache/camel/cli/connector/LocalCliConnector.java
index f1b557df341..755d6a1519a 100644
--- 
a/dsl/camel-cli-connector/src/main/java/org/apache/camel/cli/connector/LocalCliConnector.java
+++ 
b/dsl/camel-cli-connector/src/main/java/org/apache/camel/cli/connector/LocalCliConnector.java
@@ -48,6 +48,7 @@ public class LocalCliConnector extends ServiceSupport 
implements CliConnector, C
 
     private static final Logger LOG = 
LoggerFactory.getLogger(LocalCliConnector.class);
 
+    private final CliConnectorFactory cliConnectorFactory;
     private CamelContext camelContext;
     private int delay = 2000;
     private String platform;
@@ -58,6 +59,10 @@ public class LocalCliConnector extends ServiceSupport 
implements CliConnector, C
     private File lockFile;
     private File statusFile;
 
+    public LocalCliConnector(CliConnectorFactory cliConnectorFactory) {
+        this.cliConnectorFactory = cliConnectorFactory;
+    }
+
     @Override
     public CamelContext getCamelContext() {
         return camelContext;
@@ -73,12 +78,11 @@ public class LocalCliConnector extends ServiceSupport 
implements CliConnector, C
         terminating.set(false);
 
         // what platform are we running
-        CliConnectorFactory ccf = 
camelContext.adapt(ExtendedCamelContext.class).getCliConnectorFactory();
-        mainClass = ccf.getRuntimeStartClass();
+        mainClass = cliConnectorFactory.getRuntimeStartClass();
         if (mainClass == null) {
             mainClass = camelContext.getGlobalOption("CamelMainClass");
         }
-        platform = ccf.getRuntime();
+        platform = cliConnectorFactory.getRuntime();
         if (platform == null) {
             // use camel context name to guess platform if not specified
             String sn = 
camelContext.getClass().getSimpleName().toLowerCase(Locale.ROOT);
@@ -98,7 +102,7 @@ public class LocalCliConnector extends ServiceSupport 
implements CliConnector, C
                 platform = "Camel";
             }
         }
-        platformVersion = ccf.getRuntimeVersion();
+        platformVersion = cliConnectorFactory.getRuntimeVersion();
 
         // create thread from JDK so it is not managed by Camel because we 
want the pool to be independent when
         // camel is being stopped which otherwise can lead to stopping the 
thread pool while the task is running