You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@camel.apache.org by al...@apache.org on 2020/03/11 12:11:08 UTC

[camel-quarkus] branch master updated: Fixed missing registry values in native mode #867

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

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


The following commit(s) were added to refs/heads/master by this push:
     new b38edaa  Fixed missing registry values in native mode #867
b38edaa is described below

commit b38edaa6dc812f462fe895a5520a87e3796fc203
Author: aldettinger <al...@gmail.com>
AuthorDate: Wed Mar 11 10:49:33 2020 +0100

    Fixed missing registry values in native mode #867
---
 .../camel/quarkus/core/deployment/NativeImageProcessor.java    |  5 +++--
 .../main/java/org/apache/camel/quarkus/core/CamelRoute.java    |  4 ++++
 .../java/org/apache/camel/quarkus/core/CoreMainResource.java   |  8 ++++++++
 .../test/java/org/apache/camel/quarkus/core/CoreMainTest.java  | 10 ++++++++++
 .../camel/quarkus/component/mustache/it/MustacheRoute.java     |  2 --
 5 files changed, 25 insertions(+), 4 deletions(-)

diff --git a/extensions-core/core/deployment/src/main/java/org/apache/camel/quarkus/core/deployment/NativeImageProcessor.java b/extensions-core/core/deployment/src/main/java/org/apache/camel/quarkus/core/deployment/NativeImageProcessor.java
index f8f1d04..5f4b528 100644
--- a/extensions-core/core/deployment/src/main/java/org/apache/camel/quarkus/core/deployment/NativeImageProcessor.java
+++ b/extensions-core/core/deployment/src/main/java/org/apache/camel/quarkus/core/deployment/NativeImageProcessor.java
@@ -224,8 +224,9 @@ class NativeImageProcessor {
             // Register routes as reflection aware as camel-main main use reflection
             // to bind beans to the registry
             //
-            camelRoutesBuilders.forEach(dotName -> {
-                reflectiveClass.produce(new ReflectiveClassBuildItem(true, true, dotName.toString()));
+            camelRoutesBuilders.forEach(camelRoutesBuilderClassBuildItem -> {
+                reflectiveClass.produce(
+                        new ReflectiveClassBuildItem(true, true, camelRoutesBuilderClassBuildItem.getDotName().toString()));
             });
 
             reflectiveClass.produce(new ReflectiveClassBuildItem(
diff --git a/integration-tests/core-main/src/main/java/org/apache/camel/quarkus/core/CamelRoute.java b/integration-tests/core-main/src/main/java/org/apache/camel/quarkus/core/CamelRoute.java
index 60b007a..83e666c 100644
--- a/integration-tests/core-main/src/main/java/org/apache/camel/quarkus/core/CamelRoute.java
+++ b/integration-tests/core-main/src/main/java/org/apache/camel/quarkus/core/CamelRoute.java
@@ -16,10 +16,14 @@
  */
 package org.apache.camel.quarkus.core;
 
+import org.apache.camel.BindToRegistry;
 import org.apache.camel.builder.RouteBuilder;
 
 public class CamelRoute extends RouteBuilder {
 
+    @BindToRegistry
+    private String stringFromRegistry = "String From Registry";
+
     @Override
     public void configure() {
         from("timer:keep-alive")
diff --git a/integration-tests/core-main/src/main/java/org/apache/camel/quarkus/core/CoreMainResource.java b/integration-tests/core-main/src/main/java/org/apache/camel/quarkus/core/CoreMainResource.java
index d17f118..11a4ba8 100644
--- a/integration-tests/core-main/src/main/java/org/apache/camel/quarkus/core/CoreMainResource.java
+++ b/integration-tests/core-main/src/main/java/org/apache/camel/quarkus/core/CoreMainResource.java
@@ -228,4 +228,12 @@ public class CoreMainResource {
 
         return builder.build();
     }
+
+    @Path("/registry/string/{name}")
+    @GET
+    @Produces(MediaType.TEXT_PLAIN)
+    public String getStringValueFromRegistry(@PathParam("name") String name) {
+        final DefaultRegistry registry = context.getRegistry(DefaultRegistry.class);
+        return registry.getFallbackRegistry().lookupByNameAndType(name, String.class);
+    }
 }
diff --git a/integration-tests/core-main/src/test/java/org/apache/camel/quarkus/core/CoreMainTest.java b/integration-tests/core-main/src/test/java/org/apache/camel/quarkus/core/CoreMainTest.java
index c0e4ed0..7313944 100644
--- a/integration-tests/core-main/src/test/java/org/apache/camel/quarkus/core/CoreMainTest.java
+++ b/integration-tests/core-main/src/test/java/org/apache/camel/quarkus/core/CoreMainTest.java
@@ -172,4 +172,14 @@ public class CoreMainTest {
                         "registry", is("repository"),
                         "registry-type", is("org.apache.camel.quarkus.core.RuntimeBeanRepository"));
     }
+
+    @Test
+    public void testGetStringFromRegistry() {
+        RestAssured.given()
+                .accept(MediaType.TEXT_PLAIN)
+                .get("/test/registry/string/stringFromRegistry")
+                .then()
+                .statusCode(200)
+                .body(is("String From Registry"));
+    }
 }
diff --git a/integration-tests/mustache/src/main/java/org/apache/camel/quarkus/component/mustache/it/MustacheRoute.java b/integration-tests/mustache/src/main/java/org/apache/camel/quarkus/component/mustache/it/MustacheRoute.java
index ce3ad42..06b62aa 100644
--- a/integration-tests/mustache/src/main/java/org/apache/camel/quarkus/component/mustache/it/MustacheRoute.java
+++ b/integration-tests/mustache/src/main/java/org/apache/camel/quarkus/component/mustache/it/MustacheRoute.java
@@ -16,11 +16,9 @@
  */
 package org.apache.camel.quarkus.component.mustache.it;
 
-import io.quarkus.runtime.annotations.RegisterForReflection;
 import org.apache.camel.BindToRegistry;
 import org.apache.camel.builder.RouteBuilder;
 
-@RegisterForReflection(fields = true, methods = false)
 public class MustacheRoute extends RouteBuilder {
 
     @BindToRegistry