You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@camel.apache.org by lb...@apache.org on 2019/10/06 14:06:19 UTC

[camel-quarkus] branch master updated (8100e8c -> 6a1e1d8)

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

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


    from 8100e8c  Merge pull request #134 from ppalaga/i133
     new 8fe41e0  chore: do not use deprecated methods
     new 6a1e1d8  chore: remove unused constants

The 2 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails.  The revisions
listed as "add" were already present in the repository and have only
been added to this reference.


Summary of changes:
 .../org/apache/camel/quarkus/core/CamelMainRecorder.java     | 12 ++----------
 .../java/org/apache/camel/quarkus/core/FastCamelContext.java |  7 -------
 2 files changed, 2 insertions(+), 17 deletions(-)


[camel-quarkus] 01/02: chore: do not use deprecated methods

Posted by lb...@apache.org.
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 8fe41e08db0223dbe076aa91e4ce234884245e0d
Author: lburgazzoli <lb...@gmail.com>
AuthorDate: Sun Oct 6 14:14:08 2019 +0200

    chore: do not use deprecated methods
---
 .../org/apache/camel/quarkus/core/CamelMainRecorder.java     | 12 ++----------
 1 file changed, 2 insertions(+), 10 deletions(-)

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 139ca38..c2d206c 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
@@ -24,7 +24,6 @@ import io.quarkus.runtime.ShutdownContext;
 import io.quarkus.runtime.annotations.Recorder;
 import org.apache.camel.CamelContext;
 import org.apache.camel.RoutesBuilder;
-import org.apache.camel.builder.RouteBuilder;
 import org.apache.camel.main.MainListener;
 import org.apache.camel.model.Model;
 import org.apache.camel.support.ResourceHelper;
@@ -62,17 +61,10 @@ public class CamelMainRecorder {
             RuntimeValue<CamelMain> main,
             RuntimeValue<RoutesBuilder> routesBuilder) {
 
-        RoutesBuilder builder = routesBuilder.getValue();
-
-        // TODO: camel main may need to support RoutesBuilder instead of RouteBuilder only
-        if (!(builder instanceof RouteBuilder)) {
-            throw new IllegalArgumentException("Cannot handle routes builder of type: '" + builder.getClass().getName() + "'");
-        }
-
         try {
-            main.getValue().addRouteBuilder((RouteBuilder)builder);
+            main.getValue().addRoutesBuilder(routesBuilder.getValue());
         } catch (Exception e) {
-            throw new RuntimeException("Could not add route builder '" + builder.getClass().getName() + "'", e);
+            throw new RuntimeException("Could not add route builder '" + routesBuilder.getValue().getClass().getName() + "'", e);
         }
     }
 


[camel-quarkus] 02/02: chore: remove unused constants

Posted by lb...@apache.org.
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 6a1e1d823ec1e661f90e51b6a452b6f1198a0746
Author: lburgazzoli <lb...@gmail.com>
AuthorDate: Sun Oct 6 14:14:34 2019 +0200

    chore: remove unused constants
---
 .../main/java/org/apache/camel/quarkus/core/FastCamelContext.java  | 7 -------
 1 file changed, 7 deletions(-)

diff --git a/extensions/core/runtime/src/main/java/org/apache/camel/quarkus/core/FastCamelContext.java b/extensions/core/runtime/src/main/java/org/apache/camel/quarkus/core/FastCamelContext.java
index a73b143..163bd3b 100644
--- a/extensions/core/runtime/src/main/java/org/apache/camel/quarkus/core/FastCamelContext.java
+++ b/extensions/core/runtime/src/main/java/org/apache/camel/quarkus/core/FastCamelContext.java
@@ -104,15 +104,8 @@ import org.apache.camel.spi.TypeConverterRegistry;
 import org.apache.camel.spi.UnitOfWorkFactory;
 import org.apache.camel.spi.UuidGenerator;
 import org.apache.camel.spi.ValidatorRegistry;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
 
 public class FastCamelContext extends AbstractCamelContext {
-    public static final String PFX_CAMEL = "camel.";
-    public static final String PFX_CAMEL_CONTEXT = PFX_CAMEL + "context.";
-    public static final String PFX_CAMEL_PROPERTIES = PFX_CAMEL + "component.properties.";
-    private static final Logger LOG = LoggerFactory.getLogger(FastCamelContext.class);
-
     private Model model;
 
     public FastCamelContext() {