Fixed missing registry values in native mode apache#867

aldettinger · Mar 11, 2020 · b38edaa · b38edaa
1 parent 16cf8e5
commit b38edaa
Show file tree

Hide file tree

Showing 5 changed files with 25 additions and 4 deletions.
diff --git a/...ployment/src/main/java/org/apache/camel/quarkus/core/deployment/NativeImageProcessor.java b/...ployment/src/main/java/org/apache/camel/quarkus/core/deployment/NativeImageProcessor.java
@@ -224,8 +224,9 @@ void process(
             // 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
@@ -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/...gration-tests/core-main/src/main/java/org/apache/camel/quarkus/core/CoreMainResource.java b/...gration-tests/core-main/src/main/java/org/apache/camel/quarkus/core/CoreMainResource.java
@@ -228,4 +228,12 @@ public JsonObject describeRegistryComponent(@PathParam("name") String name) {
 
         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
@@ -172,4 +172,14 @@ public void testCustomComponent() {
                         "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/.../mustache/src/main/java/org/apache/camel/quarkus/component/mustache/it/MustacheRoute.java b/.../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