Fix apache#129 Properies evaluation broken after the introduction of …

…PropertyBindingSupport
ppalaga · Aug 12, 2019 · fcb0a56 · fcb0a56
1 parent dce74db
commit fcb0a56
Show file tree

Hide file tree

Showing 3 changed files with 24 additions and 1 deletion.
diff --git a/...runtime/src/main/java/org/apache/camel/quarkus/core/runtime/support/FastCamelContext.java b/...runtime/src/main/java/org/apache/camel/quarkus/core/runtime/support/FastCamelContext.java
@@ -374,7 +374,7 @@ protected <T> T resolve(Class<T> clazz, String type, String name, CamelContext c
                 this,
                 result,
                 new HashMap<>((Map) props),
-                CamelRuntime.PFX_CAMEL + type + "." + name);
+                CamelRuntime.PFX_CAMEL + type + "." + name + ".");
         }
 
         return result;

diff --git a/integration-tests/core/src/main/resources/application.properties b/integration-tests/core/src/main/resources/application.properties
@@ -32,6 +32,8 @@ quarkus.camel.defer-init-phase=true
 #
 camel.context.name=quarkus-camel-example
 
+# Timer
+camel.component.timer.resolve-property-placeholders = false
 #
 # Integration
 #

diff --git a/integration-tests/core/src/test/java/org/apache/camel/quarkus/core/CamelTest.java b/integration-tests/core/src/test/java/org/apache/camel/quarkus/core/CamelTest.java
@@ -18,13 +18,24 @@
 
 import io.quarkus.test.junit.QuarkusTest;
 import io.restassured.RestAssured;
+
+import org.junit.jupiter.api.Assertions;
 import org.junit.jupiter.api.Test;
 
 import static org.hamcrest.Matchers.containsString;
 import static org.hamcrest.Matchers.is;
 
+import javax.inject.Inject;
+
+import org.apache.camel.CamelContext;
+import org.apache.camel.component.timer.TimerComponent;
+
 @QuarkusTest
 public class CamelTest {
+
+    @Inject
+    CamelContext camelContext;
+
     @Test
     public void testRoutes() {
         RestAssured.when().get("/test/routes").then().body(containsString("timer"));
@@ -34,4 +45,14 @@ public void testRoutes() {
     public void testProperties() {
         RestAssured.when().get("/test/property/camel.context.name").then().body(is("quarkus-camel-example"));
     }
+
+    @Test
+    public void timerPropertyPropagated() {
+        RestAssured.when().get("/test/property/camel.component.timer.resolve-property-placeholders").then().body(is("false"));
+        Assertions.assertNotNull(camelContext);
+        final TimerComponent timerComponent = camelContext.getComponent("timer", TimerComponent.class);
+        Assertions.assertNotNull(timerComponent);
+        Assertions.assertFalse(timerComponent.isResolvePropertyPlaceholders());
+    }
+
 }