You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@camel.apache.org by nf...@apache.org on 2023/07/07 15:24:51 UTC
[camel-quarkus] branch 5067/expression-extractor-with-properties-to-set updated (00d8161b0f -> 0b28954624)
This is an automated email from the ASF dual-hosted git repository.
nfilotto pushed a change to branch 5067/expression-extractor-with-properties-to-set
in repository https://gitbox.apache.org/repos/asf/camel-quarkus.git
discard 00d8161b0f Ref #5067: Make expression extractor supports properties
omit eb2636d2d8 Ref #5056: Replace the deprecated RecorderContext#classProxy
add bcf6bd4a82 Updated CHANGELOG.md
add 279944f957 Ref #5056: Replace the deprecated RecorderContext#classProxy
add 65a5ce1617 Fix #5068 to add a pooling test with quarkus-qpid-jms (#5069)
add 9a5790022e Restrict downloading of com.atlassian dependencies to packages.atlassian.com
add 039b8e5a19 Bump htmlunit-driver from 4.9.1 to 4.10.0
add e97f3885c2 Bump os-maven-plugin from 1.7.0 to 1.7.1
add a57ae34b5a Use NativeImageFeatureBuildItem instead of deprecated AutomaticFeature annotation
add da6b251c87 Register additional JDK classes for serialization required by Nitrite
new 0b28954624 Ref #5067: Make expression extractor supports properties
This update added new revisions after undoing existing revisions.
That is to say, some revisions that were in the old version of the
branch are not in the new version. This situation occurs
when a user --force pushes a change and generates a repository
containing something like this:
* -- * -- B -- O -- O -- O (00d8161b0f)
\
N -- N -- N refs/heads/5067/expression-extractor-with-properties-to-set (0b28954624)
You should already have received notification emails for all of the O
revisions, and so the following emails describe only the N revisions
from the common base, B.
Any revisions marked "omit" are not gone; other references still
refer to them. Any revisions marked "discard" are gone forever.
The 1 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:
.mvn/maven.config | 2 ++
.mvn/rrf/groupId-atlassian.txt | 6 ++++++
CHANGELOG.md | 3 +++
.../ROOT/pages/reference/extensions/amqp.adoc | 21 ++++++++++++++++-----
.../deployment/CamelSerializationProcessor.java | 8 ++++++--
.../xalan/deployment/XalanNativeImageProcessor.java | 9 ++++++---
.../amqp/runtime/src/main/doc/limitations.adoc | 3 ---
extensions/amqp/runtime/src/main/doc/usage.adoc | 19 +++++++++++++++++++
integration-tests/amqp/pom.xml | 6 ++++++
.../src/main/resources/application.properties | 2 +-
.../amqp/it/{AmqpIT.java => AmqpPoolingIT.java} | 2 +-
.../amqp/it/{AmqpTest.java => AmqpPoolingTest.java} | 9 ++++++++-
.../component/amqp}/it/JmsPoolingEnabled.java | 3 ++-
integration-tests/jms-qpid-amqp-client/pom.xml | 13 +++++++------
.../src/main/resources/application.properties | 2 +-
.../component/jms/qpid}/it/JmsPoolingEnabled.java | 3 ++-
.../it/{JmsQpidIT.java => JmsQpidPoolingIT.java} | 2 +-
.../{JmsQpidTest.java => JmsQpidPoolingTest.java} | 10 +++++++++-
pom.xml | 4 ++--
19 files changed, 98 insertions(+), 29 deletions(-)
create mode 100644 .mvn/maven.config
create mode 100644 .mvn/rrf/groupId-atlassian.txt
delete mode 100644 extensions/amqp/runtime/src/main/doc/limitations.adoc
copy integration-tests/{jms-ibmmq-client => amqp}/src/main/resources/application.properties (96%)
copy integration-tests/amqp/src/test/java/org/apache/camel/quarkus/component/amqp/it/{AmqpIT.java => AmqpPoolingIT.java} (95%)
copy integration-tests/amqp/src/test/java/org/apache/camel/quarkus/component/amqp/it/{AmqpTest.java => AmqpPoolingTest.java} (85%)
copy integration-tests/{jms-artemis-client/src/test/java/org/apache/camel/quarkus/component/jms/artemis => amqp/src/test/java/org/apache/camel/quarkus/component/amqp}/it/JmsPoolingEnabled.java (92%)
copy integration-tests/{jms-ibmmq-client => jms-qpid-amqp-client}/src/main/resources/application.properties (96%)
copy integration-tests/{jms-artemis-client/src/test/java/org/apache/camel/quarkus/component/jms/artemis => jms-qpid-amqp-client/src/test/java/org/apache/camel/quarkus/component/jms/qpid}/it/JmsPoolingEnabled.java (92%)
copy integration-tests/jms-qpid-amqp-client/src/test/java/org/apache/camel/quarkus/component/jms/qpid/it/{JmsQpidIT.java => JmsQpidPoolingIT.java} (94%)
copy integration-tests/jms-qpid-amqp-client/src/test/java/org/apache/camel/quarkus/component/jms/qpid/it/{JmsQpidTest.java => JmsQpidPoolingTest.java} (88%)
[camel-quarkus] 01/01: Ref #5067: Make expression extractor supports properties
Posted by nf...@apache.org.
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 0b28954624c271f6d5b7e1c06c0340c791bacb20
Author: Nicolas Filotto <nf...@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}");
+ }
+ }
+}