This is an automated email from the ASF dual-hosted git repository. nfilotto pushed a commit to branch 5067/expression-extractor-with-properties-to-set in repository https://gitbox.apache.org/repos/asf/camel-quarkus.git
commit 00d8161b0f9474e0bd6edd66c45681ffa802c00e Author: Nicolas Filotto <nfilo...@talend.com> AuthorDate: Fri Jul 7 17:21:27 2023 +0200 Ref #5067: Make expression extractor supports properties --- extensions-support/language/deployment/pom.xml | 10 +++ .../language/deployment/dm/DryModeComponent.java | 9 ++- .../language/deployment/dm/DryModeEndpoint.java | 5 ++ .../language/deployment/PropertiesToSetTest.java | 82 ++++++++++++++++++++++ 4 files changed, 105 insertions(+), 1 deletion(-) diff --git a/extensions-support/language/deployment/pom.xml b/extensions-support/language/deployment/pom.xml index 40549c3c1b..dba18416c3 100644 --- a/extensions-support/language/deployment/pom.xml +++ b/extensions-support/language/deployment/pom.xml @@ -42,6 +42,16 @@ <groupId>org.apache.camel</groupId> <artifactId>camel-main</artifactId> </dependency> + <dependency> + <groupId>org.apache.camel</groupId> + <artifactId>camel-timer</artifactId> + <scope>test</scope> + </dependency> + <dependency> + <groupId>io.quarkus</groupId> + <artifactId>quarkus-junit5-internal</artifactId> + <scope>test</scope> + </dependency> </dependencies> <build> diff --git a/extensions-support/language/deployment/src/main/java/org/apache/camel/quarkus/support/language/deployment/dm/DryModeComponent.java b/extensions-support/language/deployment/src/main/java/org/apache/camel/quarkus/support/language/deployment/dm/DryModeComponent.java index 3586ec36f8..0277c1adbc 100644 --- a/extensions-support/language/deployment/src/main/java/org/apache/camel/quarkus/support/language/deployment/dm/DryModeComponent.java +++ b/extensions-support/language/deployment/src/main/java/org/apache/camel/quarkus/support/language/deployment/dm/DryModeComponent.java @@ -31,6 +31,13 @@ public class DryModeComponent extends DefaultComponent { @Override protected Endpoint createEndpoint(String uri, String remaining, Map<String, Object> parameters) { - return new DryModeEndpoint(uri); + DryModeEndpoint endpoint = new DryModeEndpoint(uri); + endpoint.setComponent(this); + return endpoint; + } + + @Override + protected boolean resolveRawParameterValues() { + return false; } } diff --git a/extensions-support/language/deployment/src/main/java/org/apache/camel/quarkus/support/language/deployment/dm/DryModeEndpoint.java b/extensions-support/language/deployment/src/main/java/org/apache/camel/quarkus/support/language/deployment/dm/DryModeEndpoint.java index 87b79765c0..d85acc9154 100644 --- a/extensions-support/language/deployment/src/main/java/org/apache/camel/quarkus/support/language/deployment/dm/DryModeEndpoint.java +++ b/extensions-support/language/deployment/src/main/java/org/apache/camel/quarkus/support/language/deployment/dm/DryModeEndpoint.java @@ -55,6 +55,11 @@ public class DryModeEndpoint extends DefaultEndpoint { return String.format("dm:%s", uri); } + @Override + public boolean isLenientProperties() { + return true; + } + private static class DryModeConsumer extends DefaultConsumer { DryModeConsumer(Endpoint endpoint, Processor processor) { diff --git a/extensions-support/language/deployment/src/test/java/org/apache/camel/quarkus/support/language/deployment/PropertiesToSetTest.java b/extensions-support/language/deployment/src/test/java/org/apache/camel/quarkus/support/language/deployment/PropertiesToSetTest.java new file mode 100644 index 0000000000..806938aa3f --- /dev/null +++ b/extensions-support/language/deployment/src/test/java/org/apache/camel/quarkus/support/language/deployment/PropertiesToSetTest.java @@ -0,0 +1,82 @@ +/* + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed with + * this work for additional information regarding copyright ownership. + * The ASF licenses this file to You under the Apache License, Version 2.0 + * (the "License"); you may not use this file except in compliance with + * the License. You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ +package org.apache.camel.quarkus.support.language.deployment; + +import java.io.IOException; +import java.io.StringWriter; +import java.io.Writer; +import java.util.Properties; +import java.util.function.Consumer; + +import io.quarkus.builder.BuildChainBuilder; +import io.quarkus.test.QuarkusUnitTest; +import jakarta.inject.Inject; +import org.apache.camel.CamelContext; +import org.apache.camel.builder.RouteBuilder; +import org.jboss.shrinkwrap.api.ShrinkWrap; +import org.jboss.shrinkwrap.api.asset.Asset; +import org.jboss.shrinkwrap.api.asset.StringAsset; +import org.jboss.shrinkwrap.api.spec.JavaArchive; +import org.junit.jupiter.api.Test; +import org.junit.jupiter.api.extension.RegisterExtension; + +import static org.junit.jupiter.api.Assertions.assertEquals; + +public class PropertiesToSetTest { + + @RegisterExtension + static final QuarkusUnitTest CONFIG = new QuarkusUnitTest() + .addBuildChainCustomizer(new Consumer<>() { + @Override + public void accept(BuildChainBuilder buildChainBuilder) { + buildChainBuilder.addFinal(ExpressionExtractionResultBuildItem.class); + } + }) + .setArchiveProducer(() -> ShrinkWrap.create(JavaArchive.class) + .addAsResource(applicationProperties(), "application.properties")); + + public static Asset applicationProperties() { + Writer writer = new StringWriter(); + + Properties props = new Properties(); + props.setProperty("quarkus.camel.expression.on-build-time-analysis-failure", "fail"); + + try { + props.store(writer, ""); + } catch (IOException e) { + throw new RuntimeException(e); + } + + return new StringAsset(writer.toString()); + } + + @Inject + CamelContext context; + + @Test + void routeWithPropertiesToSet() { + assertEquals(1, context.getRoutesSize()); + } + + public static class Routes extends RouteBuilder { + @Override + public void configure() throws Exception { + from("timer:myTimer?period=1&repeatCount=1&delay=1") + .log("body value is: ${body}"); + } + } +}