You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@camel.apache.org by pp...@apache.org on 2021/05/26 13:03:37 UTC
[camel-quarkus] branch main updated (e4d459b -> f720b50)
This is an automated email from the ASF dual-hosted git repository.
ppalaga pushed a change to branch main
in repository https://gitbox.apache.org/repos/asf/camel-quarkus.git.
from e4d459b upgrade json-smart fixes #2435
new bf1eeb6 Eagerly initialized Random in various extensions #2664
new e2d45e3 Reorder deps and routes in the old AWS2 test, remove deps tested elsewhere
new 5624f34 Workaround #2670 AWS2 test: org.apache.log4j.Priority required via netty, although netty should not be in the class path at all
new 452ed72 Temporarily disable CryptoIT #2673
new f585308 GraalVM 21.1, KafkaSaslSslIT: ClassNotFoundException: org.apache.kafka.common.security.scram.internals.ScramSaslClient #2674
new f8d6447 Reduce dependencies of Hazelcast test so that it suits into GH actions memory during native compilation
new f720b50 Await properly in FileTest, avoid premature content checks
The 7 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:
.github/workflows/camel-master-cron.yaml | 4 +-
.github/workflows/ci-build.yaml | 6 +-
.github/workflows/quarkus-master-cron.yaml | 4 +-
.../ahc/deployment/SupportAhcProcessor.java | 19 +-
extensions-support/aws2/deployment/pom.xml | 2 +-
.../commons/deployment/AwsCommonsProcessor.java | 7 +
extensions-support/aws2/runtime/pom.xml | 2 +-
.../google-http-client/deployment/pom.xml | 4 +
.../google-http-client/runtime/pom.xml | 4 +
extensions-support/httpclient/deployment/pom.xml | 4 +
extensions-support/httpclient/runtime/pom.xml | 4 +
.../aws2/ddb/deployment/Aws2DdbProcessor.java | 10 +
.../deployment/AzureEventhubsProcessor.java | 9 +
.../dropbox/deployment/DropboxProcessor.java | 14 ++
.../pubsub/deployment/GooglePubsubProcessor.java | 13 ++
.../hazelcast/deployment/HazelcastProcessor.java | 12 --
.../component/jslt/deployment/JsltProcessor.java | 16 +-
.../component/kafka/deployment/KafkaProcessor.java | 9 +
extensions/nitrite/deployment/pom.xml | 4 +
extensions/nitrite/runtime/pom.xml | 4 +
.../component/solr/deployment/SolrProcessor.java | 14 ++
.../twitter/deployment/TwitterProcessor.java | 12 ++
.../xchange/deployment/XchangeProcessor.java | 11 ++
.../deployment/XmlsecurityProcessor.java | 9 +
integration-tests/aws2/pom.xml | 13 +-
.../camel/quarkus/component/aws2/CamelRoute.java | 34 ++--
.../quarkus/component/crypto/it/CryptoIT.java | 2 +
.../camel/quarkus/component/file/it/FileTest.java | 76 ++++---
integration-tests/hazelcast/pom.xml | 8 -
.../it/AbstractHazelcastCollectionResource.java | 20 +-
.../hazelcast/it/AbstractHazelcastMapResource.java | 15 +-
.../hazelcast/it/HazelcastIdempotentResource.java | 13 +-
.../hazelcast/it/HazelcastInstanceResource.java | 12 +-
.../hazelcast/it/HazelcastPolicyResource.java | 13 +-
.../hazelcast/it/HazelcastQueueResource.java | 12 +-
.../component/hazelcast/it/HazelcastRoutes.java | 219 ++++++++++++++++-----
.../hazelcast/it/HazelcastSedaResource.java | 13 +-
.../hazelcast/it/HazelcastTopicResource.java | 14 +-
.../jslt/src/main/resources/application.properties | 2 +-
pom.xml | 7 +
poms/bom/pom.xml | 6 +
41 files changed, 475 insertions(+), 201 deletions(-)
[camel-quarkus] 01/07: Eagerly initialized Random in various
extensions #2664
Posted by pp...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
ppalaga pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/camel-quarkus.git
commit bf1eeb6941e228871cdb46541623c3038d89e6dd
Author: Peter Palaga <pp...@redhat.com>
AuthorDate: Tue May 25 10:33:35 2021 +0200
Eagerly initialized Random in various extensions #2664
---
.github/workflows/camel-master-cron.yaml | 4 ++--
.github/workflows/ci-build.yaml | 6 +++---
.github/workflows/quarkus-master-cron.yaml | 4 ++--
.../support/ahc/deployment/SupportAhcProcessor.java | 19 +++++++++----------
extensions-support/aws2/deployment/pom.xml | 2 +-
.../aws/commons/deployment/AwsCommonsProcessor.java | 7 +++++++
extensions-support/aws2/runtime/pom.xml | 2 +-
.../google-http-client/deployment/pom.xml | 4 ++++
extensions-support/google-http-client/runtime/pom.xml | 4 ++++
extensions-support/httpclient/deployment/pom.xml | 4 ++++
extensions-support/httpclient/runtime/pom.xml | 4 ++++
.../aws2/ddb/deployment/Aws2DdbProcessor.java | 10 ++++++++++
.../eventhubs/deployment/AzureEventhubsProcessor.java | 9 +++++++++
.../dropbox/deployment/DropboxProcessor.java | 14 ++++++++++++++
.../pubsub/deployment/GooglePubsubProcessor.java | 13 +++++++++++++
.../component/jslt/deployment/JsltProcessor.java | 16 ++++++++++++++--
extensions/nitrite/deployment/pom.xml | 4 ++++
extensions/nitrite/runtime/pom.xml | 4 ++++
.../component/solr/deployment/SolrProcessor.java | 14 ++++++++++++++
.../twitter/deployment/TwitterProcessor.java | 12 ++++++++++++
.../xchange/deployment/XchangeProcessor.java | 11 +++++++++++
.../xmlsecurity/deployment/XmlsecurityProcessor.java | 9 +++++++++
.../jslt/src/main/resources/application.properties | 2 +-
poms/bom/pom.xml | 6 ++++++
24 files changed, 162 insertions(+), 22 deletions(-)
diff --git a/.github/workflows/camel-master-cron.yaml b/.github/workflows/camel-master-cron.yaml
index 1e20348..790aaac 100644
--- a/.github/workflows/camel-master-cron.yaml
+++ b/.github/workflows/camel-master-cron.yaml
@@ -153,14 +153,14 @@ jobs:
if [[ ${JVM_MODULES[@]} ]]; then
eval ./mvnw ${MAVEN_ARGS} ${BRANCH_OPTIONS} clean test \
-Dformatter.skip -Dimpsort.skip -Denforcer.skip \
- -Pdocker,ci -Dquarkus.native.builder-image=quay.io/quarkus/ubi-quarkus-native-image:21.0.0-java11 \
+ -Pdocker,ci \
-pl "${JVM_MODULES[*]}"
fi
if [[ ${NATIVE_MODULES[@]} ]]; then
eval ./mvnw ${MAVEN_ARGS} ${BRANCH_OPTIONS} clean verify \
-Dformatter.skip -Dimpsort.skip -Denforcer.skip \
- -Pnative,docker,ci -Dquarkus.native.builder-image=quay.io/quarkus/ubi-quarkus-native-image:21.0.0-java11 \
+ -Pnative,docker,ci \
-pl "${NATIVE_MODULES[*]}"
fi
- name: Report Build Failure
diff --git a/.github/workflows/ci-build.yaml b/.github/workflows/ci-build.yaml
index c3aa9f5..4c73183 100644
--- a/.github/workflows/ci-build.yaml
+++ b/.github/workflows/ci-build.yaml
@@ -171,14 +171,14 @@ jobs:
if [[ ${JVM_MODULES[@]} ]]; then
eval ./mvnw ${MAVEN_ARGS} ${BRANCH_OPTIONS} clean test \
-Dformatter.skip -Dimpsort.skip -Denforcer.skip \
- -Pdocker,ci -Dquarkus.native.builder-image=quay.io/quarkus/ubi-quarkus-native-image:21.0.0-java11 \
+ -Pdocker,ci \
-pl "${JVM_MODULES[*]}"
fi
if [[ ${NATIVE_MODULES[@]} ]]; then
eval ./mvnw ${MAVEN_ARGS} ${BRANCH_OPTIONS} clean verify \
-Dformatter.skip -Dimpsort.skip -Denforcer.skip \
- -Pnative,docker,ci -Dquarkus.native.builder-image=quay.io/quarkus/ubi-quarkus-native-image:21.0.0-java11 \
+ -Pnative,docker,ci \
-pl "${NATIVE_MODULES[*]}"
fi
- name: Fail if there are uncommitted changes
@@ -374,4 +374,4 @@ jobs:
git clone --depth 1 --branch camel-quarkus-main https://github.com/apache/camel-quarkus-examples.git \
&& cd camel-quarkus-examples \
&& echo "Current Examples commit:" $(git rev-parse HEAD) \
- && ./mvnw-for-each.sh ${MAVEN_ARGS} ${BRANCH_OPTIONS} -Pnative,docker -Dquarkus.native.builder-image=quay.io/quarkus/ubi-quarkus-native-image:21.0.0-java11 clean verify
+ && ./mvnw-for-each.sh ${MAVEN_ARGS} ${BRANCH_OPTIONS} -Pnative,docker clean verify
diff --git a/.github/workflows/quarkus-master-cron.yaml b/.github/workflows/quarkus-master-cron.yaml
index 99dad77..5af44c5 100644
--- a/.github/workflows/quarkus-master-cron.yaml
+++ b/.github/workflows/quarkus-master-cron.yaml
@@ -162,14 +162,14 @@ jobs:
if [[ ${JVM_MODULES[@]} ]]; then
eval ./mvnw ${MAVEN_ARGS} ${BRANCH_OPTIONS} clean test \
-Dformatter.skip -Dimpsort.skip -Denforcer.skip \
- -Pdocker,ci -Dquarkus.native.builder-image=quay.io/quarkus/ubi-quarkus-native-image:21.0.0-java11 \
+ -Pdocker,ci \
-pl "${JVM_MODULES[*]}"
fi
if [[ ${NATIVE_MODULES[@]} ]]; then
eval ./mvnw ${MAVEN_ARGS} ${BRANCH_OPTIONS} clean verify \
-Dformatter.skip -Dimpsort.skip -Denforcer.skip \
- -Pnative,docker,ci -Dquarkus.native.builder-image=quay.io/quarkus/ubi-quarkus-native-image:21.0.0-java11 \
+ -Pnative,docker,ci \
-pl "${NATIVE_MODULES[*]}"
fi
- name: Report Build Failure
diff --git a/extensions-support/ahc/deployment/src/main/java/org/apache/camel/quarkus/component/support/ahc/deployment/SupportAhcProcessor.java b/extensions-support/ahc/deployment/src/main/java/org/apache/camel/quarkus/component/support/ahc/deployment/SupportAhcProcessor.java
index dc1c53f..0dec050 100644
--- a/extensions-support/ahc/deployment/src/main/java/org/apache/camel/quarkus/component/support/ahc/deployment/SupportAhcProcessor.java
+++ b/extensions-support/ahc/deployment/src/main/java/org/apache/camel/quarkus/component/support/ahc/deployment/SupportAhcProcessor.java
@@ -16,6 +16,8 @@
*/
package org.apache.camel.quarkus.component.support.ahc.deployment;
+import java.util.stream.Stream;
+
import io.quarkus.deployment.annotations.BuildProducer;
import io.quarkus.deployment.annotations.BuildStep;
import io.quarkus.deployment.builditem.ExtensionSslNativeSupportBuildItem;
@@ -26,12 +28,6 @@ import io.quarkus.deployment.builditem.nativeimage.RuntimeInitializedClassBuildI
class SupportAhcProcessor {
private static final String FEATURE = "camel-support-ahc";
- private static final String[] RUNTIME_INITIALIZED_CLASSES = new String[] {
- "org.asynchttpclient.netty.channel.ChannelManager",
- "org.asynchttpclient.netty.request.NettyRequestSender",
- "org.asynchttpclient.RequestBuilderBase",
- "org.asynchttpclient.resolver.RequestHostnameResolver"
- };
@BuildStep
FeatureBuildItem feature() {
@@ -52,9 +48,12 @@ class SupportAhcProcessor {
@BuildStep
void runtimeInitializedClasses(BuildProducer<RuntimeInitializedClassBuildItem> runtimeInitializedClass) {
- for (String className : RUNTIME_INITIALIZED_CLASSES) {
- runtimeInitializedClass
- .produce(new RuntimeInitializedClassBuildItem(className));
- }
+ Stream.of("org.asynchttpclient.netty.channel.ChannelManager",
+ "org.asynchttpclient.netty.request.NettyRequestSender",
+ "org.asynchttpclient.RequestBuilderBase",
+ "org.asynchttpclient.resolver.RequestHostnameResolver",
+ "org.asynchttpclient.ntlm.NtlmEngine")
+ .map(RuntimeInitializedClassBuildItem::new)
+ .forEach(runtimeInitializedClass::produce);
}
}
diff --git a/extensions-support/aws2/deployment/pom.xml b/extensions-support/aws2/deployment/pom.xml
index 704b2ae..d374c64 100644
--- a/extensions-support/aws2/deployment/pom.xml
+++ b/extensions-support/aws2/deployment/pom.xml
@@ -35,7 +35,7 @@
</dependency>
<dependency>
<groupId>org.apache.camel.quarkus</groupId>
- <artifactId>camel-quarkus-support-commons-logging-deployment</artifactId>
+ <artifactId>camel-quarkus-support-httpclient-deployment</artifactId>
</dependency>
<dependency>
<groupId>org.apache.camel.quarkus</groupId>
diff --git a/extensions-support/aws2/deployment/src/main/java/org/apache/camel/quarkus/component/aws/commons/deployment/AwsCommonsProcessor.java b/extensions-support/aws2/deployment/src/main/java/org/apache/camel/quarkus/component/aws/commons/deployment/AwsCommonsProcessor.java
index 86864bd..2852d62 100644
--- a/extensions-support/aws2/deployment/src/main/java/org/apache/camel/quarkus/component/aws/commons/deployment/AwsCommonsProcessor.java
+++ b/extensions-support/aws2/deployment/src/main/java/org/apache/camel/quarkus/component/aws/commons/deployment/AwsCommonsProcessor.java
@@ -24,6 +24,7 @@ import io.quarkus.deployment.annotations.BuildStep;
import io.quarkus.deployment.builditem.ExtensionSslNativeSupportBuildItem;
import io.quarkus.deployment.builditem.FeatureBuildItem;
import io.quarkus.deployment.builditem.nativeimage.NativeImageProxyDefinitionBuildItem;
+import io.quarkus.deployment.builditem.nativeimage.RuntimeInitializedClassBuildItem;
import io.quarkus.deployment.builditem.nativeimage.ServiceProviderBuildItem;
import software.amazon.awssdk.http.SdkHttpService;
@@ -68,4 +69,10 @@ class AwsCommonsProcessor {
}
}
+ @BuildStep
+ void runtimeInitialize(BuildProducer<RuntimeInitializedClassBuildItem> producer) {
+ producer.produce(
+ new RuntimeInitializedClassBuildItem("software.amazon.awssdk.core.retry.backoff.FullJitterBackoffStrategy"));
+ }
+
}
diff --git a/extensions-support/aws2/runtime/pom.xml b/extensions-support/aws2/runtime/pom.xml
index 04b719b..98e6f09 100644
--- a/extensions-support/aws2/runtime/pom.xml
+++ b/extensions-support/aws2/runtime/pom.xml
@@ -52,7 +52,7 @@
</dependency>
<dependency>
<groupId>org.apache.camel.quarkus</groupId>
- <artifactId>camel-quarkus-support-commons-logging</artifactId>
+ <artifactId>camel-quarkus-support-httpclient-deployment</artifactId>
</dependency>
<dependency>
<groupId>software.amazon.awssdk</groupId>
diff --git a/extensions-support/google-http-client/deployment/pom.xml b/extensions-support/google-http-client/deployment/pom.xml
index 7ef8f7e..8f3e634 100644
--- a/extensions-support/google-http-client/deployment/pom.xml
+++ b/extensions-support/google-http-client/deployment/pom.xml
@@ -36,6 +36,10 @@
</dependency>
<dependency>
<groupId>org.apache.camel.quarkus</groupId>
+ <artifactId>camel-quarkus-support-httpclient-deployment</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.camel.quarkus</groupId>
<artifactId>camel-quarkus-support-google-http-client</artifactId>
</dependency>
</dependencies>
diff --git a/extensions-support/google-http-client/runtime/pom.xml b/extensions-support/google-http-client/runtime/pom.xml
index 189dcb0..12ad724 100644
--- a/extensions-support/google-http-client/runtime/pom.xml
+++ b/extensions-support/google-http-client/runtime/pom.xml
@@ -52,6 +52,10 @@
<artifactId>camel-quarkus-core</artifactId>
</dependency>
<dependency>
+ <groupId>org.apache.camel.quarkus</groupId>
+ <artifactId>camel-quarkus-support-httpclient</artifactId>
+ </dependency>
+ <dependency>
<groupId>com.google.http-client</groupId>
<artifactId>google-http-client</artifactId>
</dependency>
diff --git a/extensions-support/httpclient/deployment/pom.xml b/extensions-support/httpclient/deployment/pom.xml
index 83b1ff3..25a6396 100644
--- a/extensions-support/httpclient/deployment/pom.xml
+++ b/extensions-support/httpclient/deployment/pom.xml
@@ -34,6 +34,10 @@
<artifactId>quarkus-core-deployment</artifactId>
</dependency>
<dependency>
+ <groupId>io.quarkus</groupId>
+ <artifactId>quarkus-apache-httpclient-deployment</artifactId>
+ </dependency>
+ <dependency>
<groupId>org.apache.camel.quarkus</groupId>
<artifactId>camel-quarkus-support-commons-logging-deployment</artifactId>
</dependency>
diff --git a/extensions-support/httpclient/runtime/pom.xml b/extensions-support/httpclient/runtime/pom.xml
index 0f7cc69..f4989f4 100644
--- a/extensions-support/httpclient/runtime/pom.xml
+++ b/extensions-support/httpclient/runtime/pom.xml
@@ -46,6 +46,10 @@
<artifactId>quarkus-core</artifactId>
</dependency>
<dependency>
+ <groupId>io.quarkus</groupId>
+ <artifactId>quarkus-apache-httpclient</artifactId>
+ </dependency>
+ <dependency>
<groupId>org.apache.camel.quarkus</groupId>
<artifactId>camel-quarkus-support-commons-logging</artifactId>
</dependency>
diff --git a/extensions/aws2-ddb/deployment/src/main/java/org/apache/camel/quarkus/component/aws2/ddb/deployment/Aws2DdbProcessor.java b/extensions/aws2-ddb/deployment/src/main/java/org/apache/camel/quarkus/component/aws2/ddb/deployment/Aws2DdbProcessor.java
index 589ef55..2e93263 100644
--- a/extensions/aws2-ddb/deployment/src/main/java/org/apache/camel/quarkus/component/aws2/ddb/deployment/Aws2DdbProcessor.java
+++ b/extensions/aws2-ddb/deployment/src/main/java/org/apache/camel/quarkus/component/aws2/ddb/deployment/Aws2DdbProcessor.java
@@ -27,6 +27,7 @@ import io.quarkus.deployment.builditem.CombinedIndexBuildItem;
import io.quarkus.deployment.builditem.FeatureBuildItem;
import io.quarkus.deployment.builditem.nativeimage.NativeImageResourceBuildItem;
import io.quarkus.deployment.builditem.nativeimage.ReflectiveClassBuildItem;
+import io.quarkus.deployment.builditem.nativeimage.RuntimeInitializedClassBuildItem;
import org.jboss.jandex.DotName;
import software.amazon.awssdk.core.interceptor.ExecutionInterceptor;
@@ -69,4 +70,13 @@ class Aws2DdbProcessor {
void archiveMarkers(BuildProducer<AdditionalApplicationArchiveMarkerBuildItem> archiveMarkers) {
archiveMarkers.produce(new AdditionalApplicationArchiveMarkerBuildItem(AWS_SDK_APPLICATION_ARCHIVE_MARKERS));
}
+
+ @BuildStep
+ void runtimeInitialize(BuildProducer<RuntimeInitializedClassBuildItem> producer) {
+ // This class triggers initialization of FullJitterBackoffStragegy so needs to get runtime-initialized
+ // as well
+ producer.produce(
+ new RuntimeInitializedClassBuildItem("software.amazon.awssdk.services.dynamodb.DynamoDbRetryPolicy"));
+ }
+
}
diff --git a/extensions/azure-eventhubs/deployment/src/main/java/org/apache/camel/quarkus/component/azure/eventhubs/deployment/AzureEventhubsProcessor.java b/extensions/azure-eventhubs/deployment/src/main/java/org/apache/camel/quarkus/component/azure/eventhubs/deployment/AzureEventhubsProcessor.java
index b817e72..e09f28a 100644
--- a/extensions/azure-eventhubs/deployment/src/main/java/org/apache/camel/quarkus/component/azure/eventhubs/deployment/AzureEventhubsProcessor.java
+++ b/extensions/azure-eventhubs/deployment/src/main/java/org/apache/camel/quarkus/component/azure/eventhubs/deployment/AzureEventhubsProcessor.java
@@ -16,6 +16,8 @@
*/
package org.apache.camel.quarkus.component.azure.eventhubs.deployment;
+import java.util.stream.Stream;
+
import io.quarkus.deployment.annotations.BuildProducer;
import io.quarkus.deployment.annotations.BuildStep;
import io.quarkus.deployment.builditem.CombinedIndexBuildItem;
@@ -24,6 +26,7 @@ import io.quarkus.deployment.builditem.FeatureBuildItem;
import io.quarkus.deployment.builditem.IndexDependencyBuildItem;
import io.quarkus.deployment.builditem.nativeimage.NativeImageResourceBuildItem;
import io.quarkus.deployment.builditem.nativeimage.ReflectiveClassBuildItem;
+import io.quarkus.deployment.builditem.nativeimage.RuntimeInitializedClassBuildItem;
import org.jboss.jandex.ClassInfo;
import org.jboss.jandex.DotName;
@@ -71,4 +74,10 @@ class AzureEventhubsProcessor {
"eventhubs-messages.properties"));
}
+ @BuildStep
+ void runtimeInitializedClasses(BuildProducer<RuntimeInitializedClassBuildItem> runtimeInitializedClasses) {
+ Stream.of("com.azure.messaging.eventhubs.PartitionBasedLoadBalancer")
+ .map(RuntimeInitializedClassBuildItem::new)
+ .forEach(runtimeInitializedClasses::produce);
+ }
}
diff --git a/extensions/dropbox/deployment/src/main/java/org/apache/camel/quarkus/component/dropbox/deployment/DropboxProcessor.java b/extensions/dropbox/deployment/src/main/java/org/apache/camel/quarkus/component/dropbox/deployment/DropboxProcessor.java
index 745ed30..139fdd0 100644
--- a/extensions/dropbox/deployment/src/main/java/org/apache/camel/quarkus/component/dropbox/deployment/DropboxProcessor.java
+++ b/extensions/dropbox/deployment/src/main/java/org/apache/camel/quarkus/component/dropbox/deployment/DropboxProcessor.java
@@ -16,6 +16,11 @@
*/
package org.apache.camel.quarkus.component.dropbox.deployment;
+import java.util.stream.Stream;
+
+import com.dropbox.core.DbxRequestUtil;
+import com.dropbox.core.v2.DbxRawClientV2;
+import io.quarkus.deployment.annotations.BuildProducer;
import io.quarkus.deployment.annotations.BuildStep;
import io.quarkus.deployment.builditem.ExtensionSslNativeSupportBuildItem;
import io.quarkus.deployment.builditem.FeatureBuildItem;
@@ -46,4 +51,13 @@ class DropboxProcessor {
// Required by com.dropbox.core.http.SSLConfig
return new NativeImageResourceBuildItem("com/dropbox/core/trusted-certs.raw", "com/dropbox/core/sdk-version.txt");
}
+
+ @BuildStep
+ void runtimeInitializedClasses(BuildProducer<RuntimeInitializedClassBuildItem> runtimeInitializedClasses) {
+ Stream.of(
+ DbxRequestUtil.class.getName(),
+ DbxRawClientV2.class.getName())
+ .map(RuntimeInitializedClassBuildItem::new)
+ .forEach(runtimeInitializedClasses::produce);
+ }
}
diff --git a/extensions/google-pubsub/deployment/src/main/java/org/apache/camel/quarkus/component/google/pubsub/deployment/GooglePubsubProcessor.java b/extensions/google-pubsub/deployment/src/main/java/org/apache/camel/quarkus/component/google/pubsub/deployment/GooglePubsubProcessor.java
index a2be3b2..9f4ef85 100644
--- a/extensions/google-pubsub/deployment/src/main/java/org/apache/camel/quarkus/component/google/pubsub/deployment/GooglePubsubProcessor.java
+++ b/extensions/google-pubsub/deployment/src/main/java/org/apache/camel/quarkus/component/google/pubsub/deployment/GooglePubsubProcessor.java
@@ -16,6 +16,8 @@
*/
package org.apache.camel.quarkus.component.google.pubsub.deployment;
+import java.util.stream.Stream;
+
import com.fasterxml.jackson.databind.ObjectMapper;
import io.quarkus.arc.deployment.UnremovableBeanBuildItem;
import io.quarkus.deployment.annotations.BuildProducer;
@@ -23,6 +25,7 @@ import io.quarkus.deployment.annotations.BuildStep;
import io.quarkus.deployment.annotations.ExecutionTime;
import io.quarkus.deployment.annotations.Record;
import io.quarkus.deployment.builditem.FeatureBuildItem;
+import io.quarkus.deployment.builditem.nativeimage.RuntimeInitializedClassBuildItem;
import io.quarkus.jackson.runtime.ObjectMapperProducer;
import org.apache.camel.component.google.pubsub.serializer.GooglePubsubSerializer;
import org.apache.camel.quarkus.component.google.pubsub.GooglePubsubRecorder;
@@ -51,4 +54,14 @@ class GooglePubsubProcessor {
return new CamelRuntimeBeanBuildItem("googlePubsubSerializer", GooglePubsubSerializer.class.getTypeName(),
recorder.createSerializer());
}
+
+ @BuildStep
+ void runtimeInitializedClasses(BuildProducer<RuntimeInitializedClassBuildItem> runtimeInitializedClass) {
+ Stream.of(
+ "io.grpc.internal.RetriableStream" // Consider moving this to a separate support extension if we need this in multiple top level extensions
+ )
+ .map(RuntimeInitializedClassBuildItem::new)
+ .forEach(runtimeInitializedClass::produce);
+ }
+
}
diff --git a/extensions/jslt/deployment/src/main/java/org/apache/camel/quarkus/component/jslt/deployment/JsltProcessor.java b/extensions/jslt/deployment/src/main/java/org/apache/camel/quarkus/component/jslt/deployment/JsltProcessor.java
index 950f195..1c77a42 100644
--- a/extensions/jslt/deployment/src/main/java/org/apache/camel/quarkus/component/jslt/deployment/JsltProcessor.java
+++ b/extensions/jslt/deployment/src/main/java/org/apache/camel/quarkus/component/jslt/deployment/JsltProcessor.java
@@ -16,17 +16,29 @@
*/
package org.apache.camel.quarkus.component.jslt.deployment;
+import java.util.stream.Stream;
+
+import com.schibsted.spt.data.jslt.impl.BuiltinFunctions;
+import io.quarkus.deployment.annotations.BuildProducer;
import io.quarkus.deployment.annotations.BuildStep;
import io.quarkus.deployment.builditem.FeatureBuildItem;
-import org.jboss.logging.Logger;
+import io.quarkus.deployment.builditem.nativeimage.RuntimeInitializedClassBuildItem;
class JsltProcessor {
- private static final Logger LOG = Logger.getLogger(JsltProcessor.class);
private static final String FEATURE = "camel-jslt";
@BuildStep
FeatureBuildItem feature() {
return new FeatureBuildItem(FEATURE);
}
+
+ @BuildStep
+ void runtimeInitializedClasses(BuildProducer<RuntimeInitializedClassBuildItem> runtimeInitializedClass) {
+ Stream.of(
+ BuiltinFunctions.class.getName(),
+ BuiltinFunctions.Random.class.getName())
+ .map(RuntimeInitializedClassBuildItem::new)
+ .forEach(runtimeInitializedClass::produce);
+ }
}
diff --git a/extensions/nitrite/deployment/pom.xml b/extensions/nitrite/deployment/pom.xml
index 548be7a..a3357c9 100644
--- a/extensions/nitrite/deployment/pom.xml
+++ b/extensions/nitrite/deployment/pom.xml
@@ -36,6 +36,10 @@
</dependency>
<dependency>
<groupId>org.apache.camel.quarkus</groupId>
+ <artifactId>camel-quarkus-support-httpclient-deployment</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.camel.quarkus</groupId>
<artifactId>camel-quarkus-nitrite</artifactId>
</dependency>
</dependencies>
diff --git a/extensions/nitrite/runtime/pom.xml b/extensions/nitrite/runtime/pom.xml
index 4849f24..30aff77 100644
--- a/extensions/nitrite/runtime/pom.xml
+++ b/extensions/nitrite/runtime/pom.xml
@@ -53,6 +53,10 @@
<artifactId>camel-quarkus-core</artifactId>
</dependency>
<dependency>
+ <groupId>org.apache.camel.quarkus</groupId>
+ <artifactId>camel-quarkus-support-httpclient</artifactId>
+ </dependency>
+ <dependency>
<groupId>org.apache.camel</groupId>
<artifactId>camel-nitrite</artifactId>
</dependency>
diff --git a/extensions/solr/deployment/src/main/java/org/apache/camel/quarkus/component/solr/deployment/SolrProcessor.java b/extensions/solr/deployment/src/main/java/org/apache/camel/quarkus/component/solr/deployment/SolrProcessor.java
index 1f9734f..212d4b3 100644
--- a/extensions/solr/deployment/src/main/java/org/apache/camel/quarkus/component/solr/deployment/SolrProcessor.java
+++ b/extensions/solr/deployment/src/main/java/org/apache/camel/quarkus/component/solr/deployment/SolrProcessor.java
@@ -16,12 +16,15 @@
*/
package org.apache.camel.quarkus.component.solr.deployment;
+import java.util.stream.Stream;
+
import io.quarkus.deployment.annotations.BuildProducer;
import io.quarkus.deployment.annotations.BuildStep;
import io.quarkus.deployment.builditem.CombinedIndexBuildItem;
import io.quarkus.deployment.builditem.ExtensionSslNativeSupportBuildItem;
import io.quarkus.deployment.builditem.FeatureBuildItem;
import io.quarkus.deployment.builditem.nativeimage.ReflectiveClassBuildItem;
+import io.quarkus.deployment.builditem.nativeimage.RuntimeInitializedClassBuildItem;
import org.jboss.jandex.AnnotationTarget;
import org.jboss.jandex.ClassInfo;
import org.jboss.jandex.DotName;
@@ -63,4 +66,15 @@ class SolrProcessor {
})
.forEach(reflectiveClass::produce);
}
+
+ @BuildStep
+ void runtimeInitializedClasses(BuildProducer<RuntimeInitializedClassBuildItem> runtimeInitializedClasses) {
+ Stream.of(
+ "org.apache.solr.client.solrj.routing.RequestReplicaListTransformerGenerator",
+ "org.apache.zookeeper.Login" // Move this to a separate support extension if it turns out to be needed in multiple top level extensions
+ )
+ .map(RuntimeInitializedClassBuildItem::new)
+ .forEach(runtimeInitializedClasses::produce);
+ }
+
}
diff --git a/extensions/twitter/deployment/src/main/java/org/apache/camel/quarkus/component/twitter/deployment/TwitterProcessor.java b/extensions/twitter/deployment/src/main/java/org/apache/camel/quarkus/component/twitter/deployment/TwitterProcessor.java
index e5e69ff..339ae12 100644
--- a/extensions/twitter/deployment/src/main/java/org/apache/camel/quarkus/component/twitter/deployment/TwitterProcessor.java
+++ b/extensions/twitter/deployment/src/main/java/org/apache/camel/quarkus/component/twitter/deployment/TwitterProcessor.java
@@ -16,12 +16,16 @@
*/
package org.apache.camel.quarkus.component.twitter.deployment;
+import java.util.stream.Stream;
+
import io.quarkus.deployment.annotations.BuildProducer;
import io.quarkus.deployment.annotations.BuildStep;
import io.quarkus.deployment.builditem.ExtensionSslNativeSupportBuildItem;
import io.quarkus.deployment.builditem.FeatureBuildItem;
import io.quarkus.deployment.builditem.nativeimage.ReflectiveClassBuildItem;
+import io.quarkus.deployment.builditem.nativeimage.RuntimeInitializedClassBuildItem;
import org.apache.camel.component.twitter.AbstractTwitterComponent;
+import twitter4j.auth.OAuthAuthorization;
class TwitterProcessor {
private static final String FEATURE = "camel-twitter";
@@ -41,4 +45,12 @@ class TwitterProcessor {
reflectiveClass.produce(new ReflectiveClassBuildItem(true, false,
AbstractTwitterComponent.class));
}
+
+ @BuildStep
+ void runtimeInitializedClasses(BuildProducer<RuntimeInitializedClassBuildItem> runtimeInitializedClasses) {
+ Stream.of(OAuthAuthorization.class.getName())
+ .map(RuntimeInitializedClassBuildItem::new)
+ .forEach(runtimeInitializedClasses::produce);
+ }
+
}
diff --git a/extensions/xchange/deployment/src/main/java/org/apache/camel/quarkus/component/xchange/deployment/XchangeProcessor.java b/extensions/xchange/deployment/src/main/java/org/apache/camel/quarkus/component/xchange/deployment/XchangeProcessor.java
index c20fc90..005e407 100644
--- a/extensions/xchange/deployment/src/main/java/org/apache/camel/quarkus/component/xchange/deployment/XchangeProcessor.java
+++ b/extensions/xchange/deployment/src/main/java/org/apache/camel/quarkus/component/xchange/deployment/XchangeProcessor.java
@@ -18,6 +18,7 @@ package org.apache.camel.quarkus.component.xchange.deployment;
import java.lang.reflect.Modifier;
import java.util.List;
+import java.util.stream.Stream;
import io.quarkus.bootstrap.model.AppArtifact;
import io.quarkus.bootstrap.model.AppDependency;
@@ -30,6 +31,7 @@ import io.quarkus.deployment.builditem.IndexDependencyBuildItem;
import io.quarkus.deployment.builditem.nativeimage.NativeImageProxyDefinitionBuildItem;
import io.quarkus.deployment.builditem.nativeimage.NativeImageResourceBuildItem;
import io.quarkus.deployment.builditem.nativeimage.ReflectiveClassBuildItem;
+import io.quarkus.deployment.builditem.nativeimage.RuntimeInitializedClassBuildItem;
import io.quarkus.deployment.pkg.builditem.CurateOutcomeBuildItem;
import org.jboss.jandex.AnnotationInstance;
import org.jboss.jandex.AnnotationTarget;
@@ -37,6 +39,7 @@ import org.jboss.jandex.ClassInfo;
import org.jboss.jandex.DotName;
import org.jboss.jandex.IndexView;
import org.knowm.xchange.BaseExchange;
+import org.knowm.xchange.dto.Order;
class XchangeProcessor {
@@ -125,4 +128,12 @@ class XchangeProcessor {
.map(NativeImageProxyDefinitionBuildItem::new)
.forEach(nativeImageProxy::produce);
}
+
+ @BuildStep
+ void runtimeInitializedClasses(BuildProducer<RuntimeInitializedClassBuildItem> runtimeInitializedClasses) {
+ Stream.of(Order.class.getName())
+ .map(RuntimeInitializedClassBuildItem::new)
+ .forEach(runtimeInitializedClasses::produce);
+ }
+
}
diff --git a/extensions/xmlsecurity/deployment/src/main/java/org/apache/camel/quarkus/component/xmlsecurity/deployment/XmlsecurityProcessor.java b/extensions/xmlsecurity/deployment/src/main/java/org/apache/camel/quarkus/component/xmlsecurity/deployment/XmlsecurityProcessor.java
index 1304051..4922f3c 100644
--- a/extensions/xmlsecurity/deployment/src/main/java/org/apache/camel/quarkus/component/xmlsecurity/deployment/XmlsecurityProcessor.java
+++ b/extensions/xmlsecurity/deployment/src/main/java/org/apache/camel/quarkus/component/xmlsecurity/deployment/XmlsecurityProcessor.java
@@ -28,7 +28,9 @@ import io.quarkus.deployment.builditem.ExtensionSslNativeSupportBuildItem;
import io.quarkus.deployment.builditem.FeatureBuildItem;
import io.quarkus.deployment.builditem.IndexDependencyBuildItem;
import io.quarkus.deployment.builditem.nativeimage.ReflectiveClassBuildItem;
+import io.quarkus.deployment.builditem.nativeimage.RuntimeInitializedClassBuildItem;
import org.apache.xml.security.c14n.CanonicalizerSpi;
+import org.apache.xml.security.stax.ext.XMLSecurityConstants;
import org.apache.xml.security.transforms.TransformSpi;
import org.jboss.jandex.DotName;
import org.jboss.jandex.IndexView;
@@ -68,4 +70,11 @@ class XmlsecurityProcessor {
.map(className -> new ReflectiveClassBuildItem(false, false, className))
.forEach(reflectiveClass::produce);
}
+
+ @BuildStep
+ void runtimeInitializedClasses(BuildProducer<RuntimeInitializedClassBuildItem> runtimeInitializedClasses) {
+ Stream.of(XMLSecurityConstants.class.getName())
+ .map(RuntimeInitializedClassBuildItem::new)
+ .forEach(runtimeInitializedClasses::produce);
+ }
}
diff --git a/integration-tests/jslt/src/main/resources/application.properties b/integration-tests/jslt/src/main/resources/application.properties
index 39a8841..1a1ab31 100644
--- a/integration-tests/jslt/src/main/resources/application.properties
+++ b/integration-tests/jslt/src/main/resources/application.properties
@@ -16,4 +16,4 @@
## ---------------------------------------------------------------------------
quarkus.camel.native.resources.include-patterns = demoPlayground/*.json,objectFilter/*.json,withVariables/*.json
-quarkus.test.flat-class-path=true
\ No newline at end of file
+quarkus.test.flat-class-path=true
diff --git a/poms/bom/pom.xml b/poms/bom/pom.xml
index 5086f21..6fdd92e 100644
--- a/poms/bom/pom.xml
+++ b/poms/bom/pom.xml
@@ -321,6 +321,12 @@
<groupId>org.apache.camel</groupId>
<artifactId>camel-aws2-kinesis</artifactId>
<version>${camel.version}</version>
+ <exclusions>
+ <exclusion>
+ <groupId>software.amazon.awssdk</groupId>
+ <artifactId>netty-nio-client</artifactId>
+ </exclusion>
+ </exclusions>
</dependency>
<dependency>
<groupId>org.apache.camel</groupId>
[camel-quarkus] 05/07: GraalVM 21.1,
KafkaSaslSslIT: ClassNotFoundException:
org.apache.kafka.common.security.scram.internals.ScramSaslClient #2674
Posted by pp...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
ppalaga pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/camel-quarkus.git
commit f585308369d277651b1752d8d1cda7b357022156
Author: Peter Palaga <pp...@redhat.com>
AuthorDate: Tue May 25 23:00:12 2021 +0200
GraalVM 21.1, KafkaSaslSslIT: ClassNotFoundException: org.apache.kafka.common.security.scram.internals.ScramSaslClient #2674
---
.../camel/quarkus/component/kafka/deployment/KafkaProcessor.java | 9 +++++++++
1 file changed, 9 insertions(+)
diff --git a/extensions/kafka/deployment/src/main/java/org/apache/camel/quarkus/component/kafka/deployment/KafkaProcessor.java b/extensions/kafka/deployment/src/main/java/org/apache/camel/quarkus/component/kafka/deployment/KafkaProcessor.java
index 270b340..1143bc4 100644
--- a/extensions/kafka/deployment/src/main/java/org/apache/camel/quarkus/component/kafka/deployment/KafkaProcessor.java
+++ b/extensions/kafka/deployment/src/main/java/org/apache/camel/quarkus/component/kafka/deployment/KafkaProcessor.java
@@ -18,14 +18,17 @@ package org.apache.camel.quarkus.component.kafka.deployment;
import java.util.List;
+import io.quarkus.deployment.annotations.BuildProducer;
import io.quarkus.deployment.annotations.BuildStep;
import io.quarkus.deployment.annotations.ExecutionTime;
import io.quarkus.deployment.annotations.Record;
import io.quarkus.deployment.builditem.FeatureBuildItem;
+import io.quarkus.deployment.builditem.nativeimage.ReflectiveClassBuildItem;
import io.quarkus.deployment.builditem.nativeimage.ServiceProviderBuildItem;
import org.apache.camel.component.kafka.KafkaComponent;
import org.apache.camel.quarkus.component.kafka.CamelKafkaRecorder;
import org.apache.camel.quarkus.core.deployment.spi.CamelRuntimeBeanBuildItem;
+import org.apache.kafka.common.security.scram.internals.ScramSaslClient.ScramSaslClientFactory;
class KafkaProcessor {
private static final String FEATURE = "camel-kafka";
@@ -46,4 +49,10 @@ class KafkaProcessor {
KafkaComponent.class.getName(),
recorder.createKafkaComponent());
}
+
+ @BuildStep
+ void reflectiveClasses(BuildProducer<ReflectiveClassBuildItem> reflectiveClasses) {
+ reflectiveClasses.produce(new ReflectiveClassBuildItem(false, false, ScramSaslClientFactory.class));
+ }
+
}
[camel-quarkus] 02/07: Reorder deps and routes in the old AWS2 test,
remove deps tested elsewhere
Posted by pp...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
ppalaga pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/camel-quarkus.git
commit e2d45e3394b8c17d6fe6d9d5f621319b5a506296
Author: Peter Palaga <pp...@redhat.com>
AuthorDate: Tue May 25 17:29:24 2021 +0200
Reorder deps and routes in the old AWS2 test, remove deps tested elsewhere
---
integration-tests/aws2/pom.xml | 9 ------
.../camel/quarkus/component/aws2/CamelRoute.java | 34 ++++++++++------------
2 files changed, 15 insertions(+), 28 deletions(-)
diff --git a/integration-tests/aws2/pom.xml b/integration-tests/aws2/pom.xml
index 55ee717..7908353 100644
--- a/integration-tests/aws2/pom.xml
+++ b/integration-tests/aws2/pom.xml
@@ -36,10 +36,6 @@
</dependency>
<dependency>
<groupId>org.apache.camel.quarkus</groupId>
- <artifactId>camel-quarkus-aws2-ddb</artifactId>
- </dependency>
- <dependency>
- <groupId>org.apache.camel.quarkus</groupId>
<artifactId>camel-quarkus-aws2-cw</artifactId>
</dependency>
<dependency>
@@ -68,10 +64,6 @@
</dependency>
<dependency>
<groupId>org.apache.camel.quarkus</groupId>
- <artifactId>camel-quarkus-aws2-lambda</artifactId>
- </dependency>
- <dependency>
- <groupId>org.apache.camel.quarkus</groupId>
<artifactId>camel-quarkus-aws2-mq</artifactId>
</dependency>
<dependency>
@@ -95,7 +87,6 @@
<artifactId>camel-quarkus-timer</artifactId>
</dependency>
-
<!-- test dependencies -->
<dependency>
<groupId>io.quarkus</groupId>
diff --git a/integration-tests/aws2/src/main/java/org/apache/camel/quarkus/component/aws2/CamelRoute.java b/integration-tests/aws2/src/main/java/org/apache/camel/quarkus/component/aws2/CamelRoute.java
index 3017265..95fa16b 100644
--- a/integration-tests/aws2/src/main/java/org/apache/camel/quarkus/component/aws2/CamelRoute.java
+++ b/integration-tests/aws2/src/main/java/org/apache/camel/quarkus/component/aws2/CamelRoute.java
@@ -26,8 +26,8 @@ public class CamelRoute extends RouteBuilder {
@Override
public void configure() {
- from("timer:quarkus-ec2?repeatCount=1")
- .to("aws2-ec2://instance?operation=describeInstances")
+ from("timer:quarkus-athena?repeatCount=1")
+ .to("aws2-athena://cluster?operation=listQueryExecutions")
.to("log:sf?showAll=true");
from("timer:quarkus-cw?repeatCount=1")
@@ -38,12 +38,9 @@ public class CamelRoute extends RouteBuilder {
.to("aws2-cw://test")
.to("log:sf?showAll=true");
- from("timer:quarkus-translate?repeatCount=1")
- .setHeader(Translate2Constants.SOURCE_LANGUAGE, constant(Translate2LanguageEnum.ITALIAN))
- .setHeader(Translate2Constants.TARGET_LANGUAGE, constant(Translate2LanguageEnum.GERMAN))
- .setBody(constant("Ciao"))
- .to("aws2-translate://cluster?operation=translateText")
- .log("Translation: ${body}");
+ from("timer:quarkus-ec2?repeatCount=1")
+ .to("aws2-ec2://instance?operation=describeInstances")
+ .to("log:sf?showAll=true");
from("timer:quarkus-ecs?repeatCount=1")
.to("aws2-ecs://cluster?operation=listClusters")
@@ -54,6 +51,10 @@ public class CamelRoute extends RouteBuilder {
.to("aws2-eks://cluster")
.to("log:sf?showAll=true");
+ from("timer:quarkus-eventbridge?repeatCount=1")
+ .to("aws2-eventbridge://default?operation=listRules")
+ .to("log:sf?showAll=true");
+
from("timer:quarkus-iam?repeatCount=1")
.to("aws2-iam://cluster?operation=listAccessKeys")
.to("log:sf?showAll=true");
@@ -70,21 +71,16 @@ public class CamelRoute extends RouteBuilder {
.to("aws2-msk://cluster?operation=listClusters")
.to("log:sf?showAll=true");
- from("timer:quarkus-athena?repeatCount=1")
- .to("aws2-athena://cluster?operation=listQueryExecutions")
- .to("log:sf?showAll=true");
-
- from("timer:quarkus-lambda?repeatCount=1")
- .to("aws2-lambda://cluster?operation=listFunctions")
- .to("log:sf?showAll=true");
-
from("timer:quarkus-sts?repeatCount=1")
.to("aws2-sts://myaccount?operation=getSessionToken")
.to("log:sf?showAll=true");
- from("timer:quarkus-eventbridge?repeatCount=1")
- .to("aws2-eventbridge://default?operation=listRules")
- .to("log:sf?showAll=true");
+ from("timer:quarkus-translate?repeatCount=1")
+ .setHeader(Translate2Constants.SOURCE_LANGUAGE, constant(Translate2LanguageEnum.ITALIAN))
+ .setHeader(Translate2Constants.TARGET_LANGUAGE, constant(Translate2LanguageEnum.GERMAN))
+ .setBody(constant("Ciao"))
+ .to("aws2-translate://cluster?operation=translateText")
+ .log("Translation: ${body}");
}
[camel-quarkus] 03/07: Workaround #2670 AWS2 test:
org.apache.log4j.Priority required via netty,
although netty should not be in the class path at all
Posted by pp...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
ppalaga pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/camel-quarkus.git
commit 5624f341cc38e68bda47300d543e1b08c514f213
Author: Peter Palaga <pp...@redhat.com>
AuthorDate: Tue May 25 17:30:28 2021 +0200
Workaround #2670 AWS2 test: org.apache.log4j.Priority required via netty, although netty should not be in the class path at all
---
integration-tests/aws2/pom.xml | 4 ++++
1 file changed, 4 insertions(+)
diff --git a/integration-tests/aws2/pom.xml b/integration-tests/aws2/pom.xml
index 7908353..7b7f24e 100644
--- a/integration-tests/aws2/pom.xml
+++ b/integration-tests/aws2/pom.xml
@@ -86,6 +86,10 @@
<groupId>org.apache.camel.quarkus</groupId>
<artifactId>camel-quarkus-timer</artifactId>
</dependency>
+ <dependency><!-- Workaround for https://github.com/apache/camel-quarkus/issues/2670 -->
+ <groupId>io.quarkus</groupId>
+ <artifactId>quarkus-resteasy</artifactId>
+ </dependency>
<!-- test dependencies -->
<dependency>
[camel-quarkus] 07/07: Await properly in FileTest,
avoid premature content checks
Posted by pp...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
ppalaga pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/camel-quarkus.git
commit f720b5097318576d81da342528c7c2748191d045
Author: Peter Palaga <pp...@redhat.com>
AuthorDate: Wed May 26 12:44:15 2021 +0200
Await properly in FileTest, avoid premature content checks
---
.../camel/quarkus/component/file/it/FileTest.java | 76 +++++++++++++---------
pom.xml | 7 ++
2 files changed, 52 insertions(+), 31 deletions(-)
diff --git a/integration-tests/file/src/test/java/org/apache/camel/quarkus/component/file/it/FileTest.java b/integration-tests/file/src/test/java/org/apache/camel/quarkus/component/file/it/FileTest.java
index 445f614..77e444c 100644
--- a/integration-tests/file/src/test/java/org/apache/camel/quarkus/component/file/it/FileTest.java
+++ b/integration-tests/file/src/test/java/org/apache/camel/quarkus/component/file/it/FileTest.java
@@ -33,7 +33,6 @@ import io.restassured.RestAssured;
import io.restassured.http.ContentType;
import io.restassured.path.json.JsonPath;
import io.restassured.response.ValidatableResponse;
-import org.hamcrest.Matcher;
import org.junit.jupiter.api.AfterEach;
import org.junit.jupiter.api.Test;
@@ -60,7 +59,7 @@ class FileTest {
try {
Files.delete(p);
} catch (IOException e) {
- //ignore
+ // ignore
}
});
@@ -86,12 +85,21 @@ class FileTest {
createFile(FILE_BODY_UTF8, "/file/create/charsetUTF8", "UTF-8", null);
createFile(FILE_BODY_UTF8, "/file/create/charsetISO", "UTF-8", null);
- await().atMost(10, TimeUnit.SECONDS).until(() -> getFromMock("charsetUTF8", equalTo(FILE_BODY_UTF8)));
-
- await().atMost(10, TimeUnit.SECONDS).until(() -> {
- // File content read as ISO-8859-1 has to have different content (because file contains some unknown characters)
- return getFromMock("charsetISO", equalTo(new String(FILE_BODY_UTF8.getBytes(), "ISO-8859-1")));
- });
+ await().atMost(10, TimeUnit.SECONDS).until(
+ () -> RestAssured
+ .get("/file/getFromMock/charsetUTF8")
+ .then()
+ .extract().asString(),
+ equalTo(FILE_BODY_UTF8));
+
+ // File content read as ISO-8859-1 has to have different content (because file contains some unknown
+ // characters)
+ await().atMost(10, TimeUnit.SECONDS).until(
+ () -> RestAssured
+ .get("/file/getFromMock/charsetISO")
+ .then()
+ .extract().asString(),
+ equalTo(new String(FILE_BODY_UTF8.getBytes(), "ISO-8859-1")));
}
@Test
@@ -100,7 +108,7 @@ class FileTest {
createFile(FILE_CONTENT_01, "/file/create/" + CONSUME_BATCH);
createFile(FILE_CONTENT_02, "/file/create/" + CONSUME_BATCH);
- //start route
+ // start route
startRouteAndWait(CONSUME_BATCH);
await().atMost(10, TimeUnit.SECONDS).until(() -> {
@@ -121,20 +129,30 @@ class FileTest {
// Create a new file
String fileName01 = createFile(FILE_CONTENT_01, "/file/create/idempotent");
- await().atMost(10, TimeUnit.SECONDS).until(() -> getFromMock("idempotent", equalTo(FILE_CONTENT_01)));
+ await().atMost(10, TimeUnit.SECONDS).until(
+ () -> RestAssured
+ .get("/file/getFromMock/idempotent")
+ .then()
+ .extract().asString(),
+ equalTo(FILE_CONTENT_01));
// move file back
Path donePath = Paths.get(fileName01.replaceFirst("target/idempotent", "target/idempotent/done"));
Path targetPath = Paths.get(fileName01);
Files.move(donePath, targetPath);
- //register file for deletion after tests
+ // register file for deletion after tests
pathsToDelete.add(targetPath);
- //create another file, to receive only this one in the next check
+ // create another file, to receive only this one in the next check
createFile(FILE_CONTENT_02, "/file/create/idempotent");
- //there should be no file in mock
- await().atMost(10, TimeUnit.SECONDS).until(() -> getFromMock("idempotent", equalTo(FILE_CONTENT_02)));
+ // there should be no file in mock
+ await().atMost(10, TimeUnit.SECONDS).until(
+ () -> RestAssured
+ .get("/file/getFromMock/idempotent")
+ .then()
+ .extract().asString(),
+ equalTo(FILE_CONTENT_02));
}
@Test
@@ -144,7 +162,12 @@ class FileTest {
pathsToDelete.add(Paths.get(fileName));
- await().atMost(10, TimeUnit.SECONDS).until(() -> getFromMock("filter", equalTo(FILE_CONTENT_02)));
+ await().atMost(10, TimeUnit.SECONDS).until(
+ () -> RestAssured
+ .get("/file/getFromMock/filter")
+ .then()
+ .extract().asString(),
+ equalTo(FILE_CONTENT_02));
}
@Test
@@ -155,9 +178,12 @@ class FileTest {
startRouteAndWait(SORT_BY);
- await().atMost(10, TimeUnit.SECONDS).until(() -> {
- return getFromMock(SORT_BY, equalTo(FILE_CONTENT_03 + SEPARATOR + FILE_CONTENT_02 + SEPARATOR + FILE_CONTENT_01));
- });
+ await().atMost(10, TimeUnit.SECONDS).until(
+ () -> RestAssured
+ .get("/file/getFromMock/" + SORT_BY)
+ .then()
+ .extract().asString(),
+ equalTo(FILE_CONTENT_03 + SEPARATOR + FILE_CONTENT_02 + SEPARATOR + FILE_CONTENT_01));
}
@Test
@@ -245,18 +271,6 @@ class FileTest {
.asString();
}
- private static boolean getFromMock(String mockId, Matcher matcher) {
- String records = RestAssured
- .get("/file/getFromMock/" + mockId)
- .then()
- .statusCode(200)
- .body(matcher)
- .extract().asString();
-
- //return true if content is not empty
- return records != null && !records.isEmpty();
- }
-
static void startRouteAndWait(String routeId) throws InterruptedException {
RestAssured.given()
.contentType(ContentType.TEXT)
@@ -265,7 +279,7 @@ class FileTest {
.then()
.statusCode(204);
- //wait for start
+ // wait for start
Thread.sleep(500);
}
diff --git a/pom.xml b/pom.xml
index a5a890f..abcb0ee 100644
--- a/pom.xml
+++ b/pom.xml
@@ -161,6 +161,7 @@
<maven-assembly-plugin.version>3.1.1</maven-assembly-plugin.version>
<maven-compiler-plugin.version>3.8.0</maven-compiler-plugin.version>
<maven-dependency-plugin.version>3.1.1</maven-dependency-plugin.version>
+ <maven-enforcer-plugin.version>3.0.0-M3</maven-enforcer-plugin.version>
<maven-gpg-plugin.version>1.6</maven-gpg-plugin.version>
<maven-deploy-plugin.version>3.0.0-M1</maven-deploy-plugin.version>
<maven-jar-plugin.version>3.2.0</maven-jar-plugin.version>
@@ -353,6 +354,12 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-enforcer-plugin</artifactId>
+ <version>${maven-enforcer-plugin.version}</version>
+ </plugin>
+
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-failsafe-plugin</artifactId>
<version>${maven-surefire-plugin.version}</version>
</plugin>
[camel-quarkus] 06/07: Reduce dependencies of Hazelcast test so
that it suits into GH actions memory during native compilation
Posted by pp...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
ppalaga pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/camel-quarkus.git
commit f8d6447138ea602da3995312291090448c703435
Author: Peter Palaga <pp...@redhat.com>
AuthorDate: Wed May 26 12:01:08 2021 +0200
Reduce dependencies of Hazelcast test so that it suits into GH actions memory during native compilation
---
.../hazelcast/deployment/HazelcastProcessor.java | 12 --
integration-tests/hazelcast/pom.xml | 8 -
.../it/AbstractHazelcastCollectionResource.java | 20 +-
.../hazelcast/it/AbstractHazelcastMapResource.java | 15 +-
.../hazelcast/it/HazelcastIdempotentResource.java | 13 +-
.../hazelcast/it/HazelcastInstanceResource.java | 12 +-
.../hazelcast/it/HazelcastPolicyResource.java | 13 +-
.../hazelcast/it/HazelcastQueueResource.java | 12 +-
.../component/hazelcast/it/HazelcastRoutes.java | 219 ++++++++++++++++-----
.../hazelcast/it/HazelcastSedaResource.java | 13 +-
.../hazelcast/it/HazelcastTopicResource.java | 14 +-
11 files changed, 231 insertions(+), 120 deletions(-)
diff --git a/extensions/hazelcast/deployment/src/main/java/org/apache/camel/quarkus/component/hazelcast/deployment/HazelcastProcessor.java b/extensions/hazelcast/deployment/src/main/java/org/apache/camel/quarkus/component/hazelcast/deployment/HazelcastProcessor.java
index 5b65052..9b02753 100644
--- a/extensions/hazelcast/deployment/src/main/java/org/apache/camel/quarkus/component/hazelcast/deployment/HazelcastProcessor.java
+++ b/extensions/hazelcast/deployment/src/main/java/org/apache/camel/quarkus/component/hazelcast/deployment/HazelcastProcessor.java
@@ -43,7 +43,6 @@ import io.quarkus.deployment.builditem.FeatureBuildItem;
import io.quarkus.deployment.builditem.nativeimage.ReflectiveClassBuildItem;
import io.quarkus.deployment.builditem.nativeimage.ReflectiveHierarchyBuildItem;
import io.quarkus.deployment.builditem.nativeimage.ReflectiveHierarchyIgnoreWarningBuildItem;
-import io.quarkus.deployment.builditem.nativeimage.RuntimeInitializedClassBuildItem;
import org.apache.camel.tooling.model.MainModel;
import org.jboss.jandex.DotName;
import org.jboss.jandex.Type;
@@ -52,10 +51,6 @@ class HazelcastProcessor {
private static final String FEATURE = "camel-hazelcast";
- private static final String[] RUNTIME_INITIALIZED_CLASSES = new String[] {
- "com.hazelcast.internal.util.ICMPHelper"
- };
-
@BuildStep
FeatureBuildItem feature() {
return new FeatureBuildItem(FEATURE);
@@ -115,11 +110,4 @@ class HazelcastProcessor {
}
}
- @BuildStep
- void configureRuntimeInitializedClasses(BuildProducer<RuntimeInitializedClassBuildItem> runtimeInitializedClass) {
- for (String className : RUNTIME_INITIALIZED_CLASSES) {
- runtimeInitializedClass.produce(new RuntimeInitializedClassBuildItem(className));
- }
- }
-
}
diff --git a/integration-tests/hazelcast/pom.xml b/integration-tests/hazelcast/pom.xml
index 97e84cc..eb3b96d 100644
--- a/integration-tests/hazelcast/pom.xml
+++ b/integration-tests/hazelcast/pom.xml
@@ -48,14 +48,6 @@
</dependency>
<dependency>
<groupId>org.apache.camel.quarkus</groupId>
- <artifactId>camel-quarkus-mock</artifactId>
- </dependency>
- <dependency>
- <groupId>org.apache.camel.quarkus</groupId>
- <artifactId>camel-quarkus-log</artifactId>
- </dependency>
- <dependency>
- <groupId>org.apache.camel.quarkus</groupId>
<artifactId>camel-quarkus-direct</artifactId>
</dependency>
diff --git a/integration-tests/hazelcast/src/main/java/org/apache/camel/quarkus/component/hazelcast/it/AbstractHazelcastCollectionResource.java b/integration-tests/hazelcast/src/main/java/org/apache/camel/quarkus/component/hazelcast/it/AbstractHazelcastCollectionResource.java
index 63c3966..7d75e60 100644
--- a/integration-tests/hazelcast/src/main/java/org/apache/camel/quarkus/component/hazelcast/it/AbstractHazelcastCollectionResource.java
+++ b/integration-tests/hazelcast/src/main/java/org/apache/camel/quarkus/component/hazelcast/it/AbstractHazelcastCollectionResource.java
@@ -17,9 +17,10 @@
package org.apache.camel.quarkus.component.hazelcast.it;
import java.util.List;
-import java.util.stream.Collectors;
+import java.util.Map;
import javax.inject.Inject;
+import javax.inject.Named;
import javax.ws.rs.DELETE;
import javax.ws.rs.GET;
import javax.ws.rs.POST;
@@ -27,13 +28,11 @@ import javax.ws.rs.PUT;
import javax.ws.rs.Path;
import javax.ws.rs.core.Response;
-import com.hazelcast.collection.ItemEvent;
import io.quarkus.runtime.StartupEvent;
import org.apache.camel.CamelContext;
import org.apache.camel.ProducerTemplate;
import org.apache.camel.component.hazelcast.HazelcastConstants;
import org.apache.camel.component.hazelcast.HazelcastOperation;
-import org.apache.camel.component.mock.MockEndpoint;
import org.jboss.logging.Logger;
public abstract class AbstractHazelcastCollectionResource {
@@ -46,6 +45,10 @@ public abstract class AbstractHazelcastCollectionResource {
@Inject
CamelContext context;
+ @Inject
+ @Named("hazelcastResults")
+ Map<String, List<String>> hazelcastResults;
+
protected String endpointUri;
protected String mockAddedEndpoint;
protected String mockDeletedEndpoint;
@@ -92,20 +95,13 @@ public abstract class AbstractHazelcastCollectionResource {
@GET
@Path("added")
public List<String> getAddedValues() {
- return getValues(mockAddedEndpoint);
+ return hazelcastResults.get(mockAddedEndpoint);
}
@GET
@Path("deleted")
public List<String> getDeletedValues() {
- return getValues(mockDeletedEndpoint);
+ return hazelcastResults.get(mockDeletedEndpoint);
}
- public List<String> getValues(String endpointName) {
- LOG.infof("getting response from mock endpoint %s", endpointName);
- MockEndpoint mockEndpoint = context.getEndpoint(endpointName, MockEndpoint.class);
- return mockEndpoint.getReceivedExchanges().stream().map(
- exchange -> (String) exchange.getIn().getBody(ItemEvent.class).getItem())
- .collect(Collectors.toList());
- }
}
diff --git a/integration-tests/hazelcast/src/main/java/org/apache/camel/quarkus/component/hazelcast/it/AbstractHazelcastMapResource.java b/integration-tests/hazelcast/src/main/java/org/apache/camel/quarkus/component/hazelcast/it/AbstractHazelcastMapResource.java
index 16ae67a..d20114e 100644
--- a/integration-tests/hazelcast/src/main/java/org/apache/camel/quarkus/component/hazelcast/it/AbstractHazelcastMapResource.java
+++ b/integration-tests/hazelcast/src/main/java/org/apache/camel/quarkus/component/hazelcast/it/AbstractHazelcastMapResource.java
@@ -19,9 +19,9 @@ package org.apache.camel.quarkus.component.hazelcast.it;
import java.util.HashMap;
import java.util.List;
import java.util.Map;
-import java.util.stream.Collectors;
import javax.inject.Inject;
+import javax.inject.Named;
import javax.ws.rs.DELETE;
import javax.ws.rs.GET;
import javax.ws.rs.POST;
@@ -34,12 +34,9 @@ import org.apache.camel.CamelContext;
import org.apache.camel.ProducerTemplate;
import org.apache.camel.component.hazelcast.HazelcastConstants;
import org.apache.camel.component.hazelcast.HazelcastOperation;
-import org.apache.camel.component.mock.MockEndpoint;
import org.apache.camel.quarkus.component.hazelcast.it.model.HazelcastMapRequest;
-import org.jboss.logging.Logger;
public abstract class AbstractHazelcastMapResource {
- private static final Logger LOG = Logger.getLogger(AbstractHazelcastMapResource.class);
protected String endpointUri;
protected String mockAddedEndpoint;
@@ -53,6 +50,10 @@ public abstract class AbstractHazelcastMapResource {
@Inject
CamelContext context;
+ @Inject
+ @Named("hazelcastResults")
+ Map<String, List<String>> hazelcastResults;
+
/**
* init endpoints
*/
@@ -129,10 +130,6 @@ public abstract class AbstractHazelcastMapResource {
}
protected List<String> getValues(String endpointName) {
- LOG.infof("getting response from mock endpoint %s", endpointName);
- MockEndpoint mockEndpoint = context.getEndpoint(endpointName, MockEndpoint.class);
- return mockEndpoint.getReceivedExchanges().stream().map(
- exchange -> exchange.getIn().getHeader(HazelcastConstants.OBJECT_ID, String.class))
- .collect(Collectors.toList());
+ return hazelcastResults.get(endpointName);
}
}
diff --git a/integration-tests/hazelcast/src/main/java/org/apache/camel/quarkus/component/hazelcast/it/HazelcastIdempotentResource.java b/integration-tests/hazelcast/src/main/java/org/apache/camel/quarkus/component/hazelcast/it/HazelcastIdempotentResource.java
index 88c162b..4f3f34f 100644
--- a/integration-tests/hazelcast/src/main/java/org/apache/camel/quarkus/component/hazelcast/it/HazelcastIdempotentResource.java
+++ b/integration-tests/hazelcast/src/main/java/org/apache/camel/quarkus/component/hazelcast/it/HazelcastIdempotentResource.java
@@ -17,10 +17,11 @@
package org.apache.camel.quarkus.component.hazelcast.it;
import java.util.List;
-import java.util.stream.Collectors;
+import java.util.Map;
import javax.enterprise.context.ApplicationScoped;
import javax.inject.Inject;
+import javax.inject.Named;
import javax.ws.rs.Consumes;
import javax.ws.rs.GET;
import javax.ws.rs.POST;
@@ -31,7 +32,6 @@ import javax.ws.rs.core.Response;
import org.apache.camel.CamelContext;
import org.apache.camel.ProducerTemplate;
-import org.apache.camel.component.mock.MockEndpoint;
import org.apache.camel.quarkus.component.hazelcast.it.model.HazelcastMapRequest;
import static org.apache.camel.quarkus.component.hazelcast.it.HazelcastRoutes.MOCK_IDEMPOTENT_ADDED;
@@ -48,6 +48,10 @@ public class HazelcastIdempotentResource {
@Inject
CamelContext context;
+ @Inject
+ @Named("hazelcastResults")
+ Map<String, List<String>> hazelcastResults;
+
@POST
public Response add(HazelcastMapRequest request) {
producerTemplate.sendBodyAndHeader("direct:in-idempotent", request.getValue(), "messageId", request.getId());
@@ -56,9 +60,6 @@ public class HazelcastIdempotentResource {
@GET
public List<String> get() {
- MockEndpoint mockEndpoint = context.getEndpoint(MOCK_IDEMPOTENT_ADDED, MockEndpoint.class);
- return mockEndpoint.getReceivedExchanges().stream().map(
- exchange -> exchange.getIn().getBody(String.class))
- .collect(Collectors.toList());
+ return hazelcastResults.get(MOCK_IDEMPOTENT_ADDED);
}
}
diff --git a/integration-tests/hazelcast/src/main/java/org/apache/camel/quarkus/component/hazelcast/it/HazelcastInstanceResource.java b/integration-tests/hazelcast/src/main/java/org/apache/camel/quarkus/component/hazelcast/it/HazelcastInstanceResource.java
index 158ee95..9f84b02 100644
--- a/integration-tests/hazelcast/src/main/java/org/apache/camel/quarkus/component/hazelcast/it/HazelcastInstanceResource.java
+++ b/integration-tests/hazelcast/src/main/java/org/apache/camel/quarkus/component/hazelcast/it/HazelcastInstanceResource.java
@@ -16,8 +16,12 @@
*/
package org.apache.camel.quarkus.component.hazelcast.it;
+import java.util.List;
+import java.util.Map;
+
import javax.enterprise.context.ApplicationScoped;
import javax.inject.Inject;
+import javax.inject.Named;
import javax.ws.rs.Consumes;
import javax.ws.rs.GET;
import javax.ws.rs.Path;
@@ -25,7 +29,6 @@ import javax.ws.rs.Produces;
import javax.ws.rs.core.MediaType;
import org.apache.camel.CamelContext;
-import org.apache.camel.component.mock.MockEndpoint;
import static org.apache.camel.quarkus.component.hazelcast.it.HazelcastRoutes.MOCK_INSTANCE_ADDED;
import static org.apache.camel.quarkus.component.hazelcast.it.HazelcastRoutes.MOCK_INSTANCE_REMOVED;
@@ -39,6 +42,10 @@ public class HazelcastInstanceResource {
@Inject
CamelContext context;
+ @Inject
+ @Named("hazelcastResults")
+ Map<String, List<String>> hazelcastResults;
+
@GET
@Path("added")
public Integer added() {
@@ -52,8 +59,7 @@ public class HazelcastInstanceResource {
}
public Integer getValues(String endpointName) {
- MockEndpoint mockEndpoint = context.getEndpoint(endpointName, MockEndpoint.class);
- return mockEndpoint.getReceivedExchanges().size();
+ return hazelcastResults.get(endpointName).size();
}
}
diff --git a/integration-tests/hazelcast/src/main/java/org/apache/camel/quarkus/component/hazelcast/it/HazelcastPolicyResource.java b/integration-tests/hazelcast/src/main/java/org/apache/camel/quarkus/component/hazelcast/it/HazelcastPolicyResource.java
index 6658725..d512d94 100644
--- a/integration-tests/hazelcast/src/main/java/org/apache/camel/quarkus/component/hazelcast/it/HazelcastPolicyResource.java
+++ b/integration-tests/hazelcast/src/main/java/org/apache/camel/quarkus/component/hazelcast/it/HazelcastPolicyResource.java
@@ -17,10 +17,11 @@
package org.apache.camel.quarkus.component.hazelcast.it;
import java.util.List;
-import java.util.stream.Collectors;
+import java.util.Map;
import javax.enterprise.context.ApplicationScoped;
import javax.inject.Inject;
+import javax.inject.Named;
import javax.ws.rs.Consumes;
import javax.ws.rs.GET;
import javax.ws.rs.POST;
@@ -31,7 +32,6 @@ import javax.ws.rs.core.Response;
import org.apache.camel.CamelContext;
import org.apache.camel.ProducerTemplate;
-import org.apache.camel.component.mock.MockEndpoint;
import static org.apache.camel.quarkus.component.hazelcast.it.HazelcastRoutes.MOCK_POLICY;
@@ -47,6 +47,10 @@ public class HazelcastPolicyResource {
@Inject
ProducerTemplate producerTemplate;
+ @Inject
+ @Named("hazelcastResults")
+ Map<String, List<String>> hazelcastResults;
+
@POST
public Response post(String message) {
producerTemplate.sendBody("direct:in-policy", message);
@@ -55,9 +59,6 @@ public class HazelcastPolicyResource {
@GET
public List<String> get() {
- MockEndpoint mockEndpoint = context.getEndpoint(MOCK_POLICY, MockEndpoint.class);
- return mockEndpoint.getReceivedExchanges().stream().map(
- exchange -> exchange.getIn().getBody(String.class))
- .collect(Collectors.toList());
+ return hazelcastResults.get(MOCK_POLICY);
}
}
diff --git a/integration-tests/hazelcast/src/main/java/org/apache/camel/quarkus/component/hazelcast/it/HazelcastQueueResource.java b/integration-tests/hazelcast/src/main/java/org/apache/camel/quarkus/component/hazelcast/it/HazelcastQueueResource.java
index 7275da0..9946a22 100644
--- a/integration-tests/hazelcast/src/main/java/org/apache/camel/quarkus/component/hazelcast/it/HazelcastQueueResource.java
+++ b/integration-tests/hazelcast/src/main/java/org/apache/camel/quarkus/component/hazelcast/it/HazelcastQueueResource.java
@@ -20,11 +20,11 @@ import java.util.ArrayList;
import java.util.HashMap;
import java.util.List;
import java.util.Map;
-import java.util.stream.Collectors;
import javax.enterprise.context.ApplicationScoped;
import javax.enterprise.event.Observes;
import javax.inject.Inject;
+import javax.inject.Named;
import javax.ws.rs.Consumes;
import javax.ws.rs.DELETE;
import javax.ws.rs.GET;
@@ -39,7 +39,6 @@ import com.hazelcast.core.HazelcastInstance;
import io.quarkus.runtime.StartupEvent;
import org.apache.camel.component.hazelcast.HazelcastConstants;
import org.apache.camel.component.hazelcast.HazelcastOperation;
-import org.apache.camel.component.mock.MockEndpoint;
import static org.apache.camel.quarkus.component.hazelcast.it.HazelcastRoutes.MOCK_QUEUE_ADDED;
import static org.apache.camel.quarkus.component.hazelcast.it.HazelcastRoutes.MOCK_QUEUE_DELETED;
@@ -54,6 +53,10 @@ public class HazelcastQueueResource extends AbstractHazelcastCollectionResource
@Inject
HazelcastInstance hazelcastInstance;
+ @Inject
+ @Named("hazelcastResults")
+ Map<String, List<String>> hazelcastResults;
+
@Override
public void init(@Observes StartupEvent startupEvent) {
endpointUri = "hazelcast-queue:foo-queue";
@@ -129,10 +132,7 @@ public class HazelcastQueueResource extends AbstractHazelcastCollectionResource
@GET
@Path("polled")
public List<String> getPolledValues() {
- MockEndpoint mockEndpoint = context.getEndpoint(MOCK_QUEUE_POLL, MockEndpoint.class);
- return mockEndpoint.getReceivedExchanges().stream().map(
- exchange -> exchange.getIn().getBody(String.class))
- .collect(Collectors.toList());
+ return hazelcastResults.get(MOCK_QUEUE_POLL);
}
}
diff --git a/integration-tests/hazelcast/src/main/java/org/apache/camel/quarkus/component/hazelcast/it/HazelcastRoutes.java b/integration-tests/hazelcast/src/main/java/org/apache/camel/quarkus/component/hazelcast/it/HazelcastRoutes.java
index e81784c..4db4af5 100644
--- a/integration-tests/hazelcast/src/main/java/org/apache/camel/quarkus/component/hazelcast/it/HazelcastRoutes.java
+++ b/integration-tests/hazelcast/src/main/java/org/apache/camel/quarkus/component/hazelcast/it/HazelcastRoutes.java
@@ -16,15 +16,24 @@
*/
package org.apache.camel.quarkus.component.hazelcast.it;
+import java.util.List;
+import java.util.Map;
+import java.util.concurrent.ConcurrentHashMap;
+import java.util.concurrent.CopyOnWriteArrayList;
import java.util.concurrent.TimeUnit;
import javax.enterprise.context.ApplicationScoped;
import javax.inject.Inject;
import javax.inject.Named;
+import javax.inject.Singleton;
import javax.ws.rs.Produces;
+import com.hazelcast.collection.ItemEvent;
import com.hazelcast.core.HazelcastInstance;
+import com.hazelcast.topic.impl.DataAwareMessage;
import io.quarkus.arc.Unremovable;
+import org.apache.camel.Exchange;
+import org.apache.camel.Processor;
import org.apache.camel.builder.RouteBuilder;
import org.apache.camel.component.hazelcast.HazelcastConstants;
import org.apache.camel.component.hazelcast.HazelcastDefaultComponent;
@@ -42,9 +51,12 @@ import org.apache.camel.component.hazelcast.set.HazelcastSetComponent;
import org.apache.camel.component.hazelcast.topic.HazelcastTopicComponent;
import org.apache.camel.processor.idempotent.hazelcast.HazelcastIdempotentRepository;
import org.apache.camel.spi.RoutePolicy;
+import org.jboss.logging.Logger;
@ApplicationScoped
public class HazelcastRoutes extends RouteBuilder {
+ private static final Logger LOG = Logger.getLogger(HazelcastRoutes.class);
+
public static final String MOCK_LIST_ADDED = "mock:list-added";
public static final String MOCK_LIST_DELETED = "mock:list-removed";
public static final String MOCK_SET_ADDED = "mock:set-added";
@@ -73,6 +85,10 @@ public class HazelcastRoutes extends RouteBuilder {
@Inject
HazelcastInstance hazelcastInstance;
+ @Inject
+ @Named("hazelcastResults")
+ Map<String, List<String>> hazelcastResults;
+
@Produces
@ApplicationScoped
@Unremovable
@@ -183,105 +199,145 @@ public class HazelcastRoutes extends RouteBuilder {
@Override
public void configure() {
// HazelcastListConsumer
- from("hazelcast-list:foo-list").log("object...").choice()
+ from("hazelcast-list:foo-list")
+ .process(e -> LOG.info("object..."))
+ .choice()
.when(header(HazelcastConstants.LISTENER_ACTION).isEqualTo(HazelcastConstants.ADDED))
- .log("...added").to(MOCK_LIST_ADDED)
+ .process(e -> LOG.info("...added"))
+ .process(new ItemEventCollector(hazelcastResults, MOCK_LIST_ADDED))
.when(header(HazelcastConstants.LISTENER_ACTION).isEqualTo(HazelcastConstants.REMOVED))
- .log("...removed").to(MOCK_LIST_DELETED).otherwise()
- .log("fail!");
+ .process(e -> LOG.info("...removed"))
+ .process(new ItemEventCollector(hazelcastResults, MOCK_LIST_DELETED))
+ .otherwise()
+ .process(e -> LOG.info("fail!"));
// HazelcastMapConsumer
- from("hazelcast-map:foo-map").log("object...").choice()
+ from("hazelcast-map:foo-map")
+ .process(e -> LOG.info("object..."))
+ .choice()
.when(header(HazelcastConstants.LISTENER_ACTION).isEqualTo(HazelcastConstants.ADDED))
- .log("...added").to(MOCK_MAP_ADDED)
+ .process(e -> LOG.info("...added"))
+ .process(new ObjectIdCollector(hazelcastResults, MOCK_MAP_ADDED))
.when(header(HazelcastConstants.LISTENER_ACTION).isEqualTo(HazelcastConstants.EVICTED))
- .log("...evicted").to(MOCK_MAP_EVICTED)
+ .process(e -> LOG.info("...evicted"))
+ .process(new ObjectIdCollector(hazelcastResults, MOCK_MAP_EVICTED))
.when(header(HazelcastConstants.LISTENER_ACTION).isEqualTo(HazelcastConstants.UPDATED))
- .log("...updated").to(MOCK_MAP_UPDATED)
+ .process(e -> LOG.info("...updated"))
+ .process(new ObjectIdCollector(hazelcastResults, MOCK_MAP_UPDATED))
.when(header(HazelcastConstants.LISTENER_ACTION).isEqualTo(HazelcastConstants.REMOVED))
- .log("...removed").to(MOCK_MAP_DELETED)
- .otherwise().log("fail!");
+ .process(e -> LOG.info("...removed"))
+ .process(new ObjectIdCollector(hazelcastResults, MOCK_MAP_DELETED))
+ .otherwise()
+ .process(e -> LOG.info("fail!"));
- //HazelcastMultimapConsumer
- from("hazelcast-multimap:foo-multimap").log("object...").choice()
- .when(header(HazelcastConstants.LISTENER_ACTION).isEqualTo(HazelcastConstants.ADDED)).log("...added")
- .to(MOCK_MULTIMAP_ADDED)
+ // HazelcastMultimapConsumer
+ from("hazelcast-multimap:foo-multimap")
+ .process(e -> LOG.info("object..."))
+ .choice()
+ .when(header(HazelcastConstants.LISTENER_ACTION).isEqualTo(HazelcastConstants.ADDED))
+ .process(e -> LOG.info("...added"))
+ .process(new ObjectIdCollector(hazelcastResults, MOCK_MULTIMAP_ADDED))
.when(header(HazelcastConstants.LISTENER_ACTION).isEqualTo(HazelcastConstants.REMOVED))
- .log("...removed").to(MOCK_MULTIMAP_DELETED).otherwise().log("fail!");
+ .process(e -> LOG.info("...removed"))
+ .process(new ObjectIdCollector(hazelcastResults, MOCK_MULTIMAP_DELETED))
+ .otherwise()
+ .process(e -> LOG.info("fail!"));
- //HazelcastReplicatedmapConsumer
- from("hazelcast-replicatedmap:foo-replicate").log("object...").choice()
- .when(header(HazelcastConstants.LISTENER_ACTION).isEqualTo(HazelcastConstants.ADDED)).log("...added")
- .to(MOCK_REPLICATED_ADDED)
+ // HazelcastReplicatedmapConsumer
+ from("hazelcast-replicatedmap:foo-replicate")
+ .process(e -> LOG.info("object..."))
+ .choice()
+ .when(header(HazelcastConstants.LISTENER_ACTION).isEqualTo(HazelcastConstants.ADDED))
+ .process(e -> LOG.info("...added"))
+ .process(new ObjectIdCollector(hazelcastResults, MOCK_REPLICATED_ADDED))
.when(header(HazelcastConstants.LISTENER_ACTION).isEqualTo(HazelcastConstants.REMOVED))
- .log("...removed").to(MOCK_REPLICATED_DELETED).otherwise().log("fail!");
+ .process(e -> LOG.info("...removed"))
+ .process(new ObjectIdCollector(hazelcastResults, MOCK_REPLICATED_DELETED))
+ .otherwise()
+ .process(e -> LOG.info("fail!"));
// HazelcastSetConsumer
- from("hazelcast-set:foo-set").log("object...").choice()
+ from("hazelcast-set:foo-set")
+ .process(e -> LOG.info("object..."))
+ .choice()
.when(header(HazelcastConstants.LISTENER_ACTION).isEqualTo(HazelcastConstants.ADDED))
- .log("...added").to(MOCK_SET_ADDED)
+ .process(e -> LOG.info("...added"))
+ .process(new ItemEventCollector(hazelcastResults, MOCK_SET_ADDED))
.when(header(HazelcastConstants.LISTENER_ACTION).isEqualTo(HazelcastConstants.REMOVED))
- .log("...removed").to(MOCK_SET_DELETED).otherwise()
- .log("fail!");
+ .process(e -> LOG.info("...removed"))
+ .process(new ItemEventCollector(hazelcastResults, MOCK_SET_DELETED))
+ .otherwise()
+ .process(e -> LOG.info("fail!"));
- //HazelcastTopicConsumer
- from("hazelcast-topic:foo-topic").log("object...")
+ // HazelcastTopicConsumer
+ from("hazelcast-topic:foo-topic")
+ .process(e -> LOG.info("object..."))
.choice()
.when(header(HazelcastConstants.LISTENER_ACTION).isEqualTo(HazelcastConstants.RECEIVED))
- .log("...received").to(MOCK_TOPIC_RECEIVED)
+ .process(e -> LOG.info("...received"))
+ .process(new DataAwareCollector(hazelcastResults, MOCK_TOPIC_RECEIVED))
.otherwise()
- .log("fail!");
+ .process(e -> LOG.info("fail!"));
// 2 different consumers of type : HazelcastQueueConsumer
- // consumer mode : LISTEN
- from("hazelcast-queue:foo-queue").log("object...").choice()
+ // consumer mode : LISTEN
+ from("hazelcast-queue:foo-queue")
+ .process(e -> LOG.info("object..."))
+ .choice()
.when(header(HazelcastConstants.LISTENER_ACTION).isEqualTo(HazelcastConstants.ADDED))
- .log("...added").to(MOCK_QUEUE_ADDED)
+ .process(e -> LOG.info("...added"))
+ .process(new ItemEventCollector(hazelcastResults, MOCK_QUEUE_ADDED))
.when(header(HazelcastConstants.LISTENER_ACTION).isEqualTo(HazelcastConstants.REMOVED))
- .log("...removed").to(MOCK_QUEUE_DELETED).otherwise()
- .log("fail!");
+ .process(e -> LOG.info("...removed"))
+ .process(new ItemEventCollector(hazelcastResults, MOCK_QUEUE_DELETED))
+ .otherwise()
+ .process(e -> LOG.info("fail!"));
// consumer mode : poll
from("hazelcast-queue:foo-queue-poll?queueConsumerMode=Poll")
- .to(MOCK_QUEUE_POLL);
+ .process(new StringBodyCollector(hazelcastResults, MOCK_QUEUE_POLL));
- //different HazelcastSedaConsumer
+ // different HazelcastSedaConsumer
// FIFO consumer
from("hazelcast-seda:foo-fifo")
- .to(MOCK_SEDA_FIFO);
+ .process(new StringBodyCollector(hazelcastResults, MOCK_SEDA_FIFO));
// IN ONLY consumer
from("hazelcast-seda:foo-in-only")
- .to(MOCK_SEDA_IN_ONLY);
+ .process(new StringBodyCollector(hazelcastResults, MOCK_SEDA_IN_ONLY));
// IN OUT consumer
from("hazelcast-seda:foo-in-out")
- .to(MOCK_SEDA_IN_OUT);
+ .process(new StringBodyCollector(hazelcastResults, MOCK_SEDA_IN_OUT));
// IN OUT transacted consumer
from("hazelcast-seda:foo-in-out-trans?transacted=true")
- .to(MOCK_SEDA_IN_OUT_TRANSACTED);
+ .process(new StringBodyCollector(hazelcastResults, MOCK_SEDA_IN_OUT_TRANSACTED));
// HazelcastInstanceConsumer
- from("hazelcast-instance:foo-instance").log("instance...")
+ from("hazelcast-instance:foo-instance")
+ .process(e -> LOG.info("instance..."))
.choice()
.when(header(HazelcastConstants.LISTENER_ACTION).isEqualTo(HazelcastConstants.ADDED))
- .log("...added").to(MOCK_INSTANCE_ADDED)
- .otherwise().log("...removed").to(MOCK_INSTANCE_REMOVED);
+ .process(e -> LOG.info("...added"))
+ .process(new ObjectIdCollector(hazelcastResults, MOCK_INSTANCE_ADDED))
+ .otherwise()
+ .process(e -> LOG.info("...removed"))
+ .process(new ObjectIdCollector(hazelcastResults, MOCK_INSTANCE_REMOVED));
// Idempotent Repository
HazelcastIdempotentRepository repo = new HazelcastIdempotentRepository(hazelcastInstance, "myRepo");
from("direct:in-idempotent")
.idempotentConsumer(header("messageId"), repo)
- .to(MOCK_IDEMPOTENT_ADDED);
+ .process(new StringBodyCollector(hazelcastResults, MOCK_IDEMPOTENT_ADDED));
// route policy
from("direct:in-policy")
.routeId("id-value")
.routePolicy(createRoutePolicy())
- .to(MOCK_POLICY);
+ .process(new StringBodyCollector(hazelcastResults, MOCK_POLICY));
}
/**
* Creates a RoutePolicy
- *
+ *
*/
private RoutePolicy createRoutePolicy() {
HazelcastRoutePolicy policy = new HazelcastRoutePolicy(hazelcastInstance);
@@ -291,4 +347,77 @@ public class HazelcastRoutes extends RouteBuilder {
policy.setTryLockTimeout(5, TimeUnit.SECONDS);
return policy;
}
+
+ static class Producers {
+ @javax.enterprise.inject.Produces
+ @Singleton
+ @Named("hazelcastResults")
+ Map<String, List<String>> hazelcastResults() {
+ return new ConcurrentHashMap<>();
+ }
+ }
+
+ static class ObjectIdCollector implements Processor {
+ private final List<String> results;
+
+ public ObjectIdCollector(Map<String, List<String>> hazelcastResults, String key) {
+ final List<String> r = new CopyOnWriteArrayList<>();
+ hazelcastResults.put(key, r);
+ this.results = r;
+ }
+
+ @Override
+ public void process(Exchange exchange) throws Exception {
+ final String val = exchange.getMessage().getHeader(HazelcastConstants.OBJECT_ID, String.class);
+ results.add(val);
+ }
+ }
+
+ static class StringBodyCollector implements Processor {
+ private final List<String> results;
+
+ public StringBodyCollector(Map<String, List<String>> hazelcastResults, String key) {
+ final List<String> r = new CopyOnWriteArrayList<>();
+ hazelcastResults.put(key, r);
+ this.results = r;
+ }
+
+ @Override
+ public void process(Exchange exchange) throws Exception {
+ final String val = exchange.getMessage().getBody(String.class);
+ results.add(val);
+ }
+ }
+
+ static class ItemEventCollector implements Processor {
+ private final List<String> results;
+
+ public ItemEventCollector(Map<String, List<String>> hazelcastResults, String key) {
+ final List<String> r = new CopyOnWriteArrayList<>();
+ hazelcastResults.put(key, r);
+ this.results = r;
+ }
+
+ @Override
+ public void process(Exchange exchange) throws Exception {
+ final String val = (String) exchange.getMessage().getBody(ItemEvent.class).getItem();
+ results.add(val);
+ }
+ }
+
+ static class DataAwareCollector implements Processor {
+ private final List<String> results;
+
+ public DataAwareCollector(Map<String, List<String>> hazelcastResults, String key) {
+ final List<String> r = new CopyOnWriteArrayList<>();
+ hazelcastResults.put(key, r);
+ this.results = r;
+ }
+
+ @Override
+ public void process(Exchange exchange) throws Exception {
+ final String val = (String) exchange.getMessage().getBody(DataAwareMessage.class).getMessageObject();
+ results.add(val);
+ }
+ }
}
diff --git a/integration-tests/hazelcast/src/main/java/org/apache/camel/quarkus/component/hazelcast/it/HazelcastSedaResource.java b/integration-tests/hazelcast/src/main/java/org/apache/camel/quarkus/component/hazelcast/it/HazelcastSedaResource.java
index cec8adc..82b1e40 100644
--- a/integration-tests/hazelcast/src/main/java/org/apache/camel/quarkus/component/hazelcast/it/HazelcastSedaResource.java
+++ b/integration-tests/hazelcast/src/main/java/org/apache/camel/quarkus/component/hazelcast/it/HazelcastSedaResource.java
@@ -17,10 +17,11 @@
package org.apache.camel.quarkus.component.hazelcast.it;
import java.util.List;
-import java.util.stream.Collectors;
+import java.util.Map;
import javax.enterprise.context.ApplicationScoped;
import javax.inject.Inject;
+import javax.inject.Named;
import javax.ws.rs.Consumes;
import javax.ws.rs.GET;
import javax.ws.rs.PUT;
@@ -32,7 +33,6 @@ import javax.ws.rs.core.Response;
import org.apache.camel.CamelContext;
import org.apache.camel.ExchangePattern;
import org.apache.camel.ProducerTemplate;
-import org.apache.camel.component.mock.MockEndpoint;
import static org.apache.camel.quarkus.component.hazelcast.it.HazelcastRoutes.MOCK_SEDA_FIFO;
import static org.apache.camel.quarkus.component.hazelcast.it.HazelcastRoutes.MOCK_SEDA_IN_ONLY;
@@ -51,6 +51,10 @@ public class HazelcastSedaResource {
@Inject
CamelContext context;
+ @Inject
+ @Named("hazelcastResults")
+ Map<String, List<String>> hazelcastResults;
+
@PUT
@Path("fifo")
public Response addFifo(String value) {
@@ -104,9 +108,6 @@ public class HazelcastSedaResource {
}
private List<String> getValues(String endpoint) {
- MockEndpoint mockEndpoint = context.getEndpoint(endpoint, MockEndpoint.class);
- return mockEndpoint.getReceivedExchanges().stream().map(
- exchange -> exchange.getMessage().getBody(String.class))
- .collect(Collectors.toList());
+ return hazelcastResults.get(endpoint);
}
}
diff --git a/integration-tests/hazelcast/src/main/java/org/apache/camel/quarkus/component/hazelcast/it/HazelcastTopicResource.java b/integration-tests/hazelcast/src/main/java/org/apache/camel/quarkus/component/hazelcast/it/HazelcastTopicResource.java
index 9413799..061e094 100644
--- a/integration-tests/hazelcast/src/main/java/org/apache/camel/quarkus/component/hazelcast/it/HazelcastTopicResource.java
+++ b/integration-tests/hazelcast/src/main/java/org/apache/camel/quarkus/component/hazelcast/it/HazelcastTopicResource.java
@@ -17,10 +17,11 @@
package org.apache.camel.quarkus.component.hazelcast.it;
import java.util.List;
-import java.util.stream.Collectors;
+import java.util.Map;
import javax.enterprise.context.ApplicationScoped;
import javax.inject.Inject;
+import javax.inject.Named;
import javax.ws.rs.Consumes;
import javax.ws.rs.GET;
import javax.ws.rs.POST;
@@ -29,12 +30,10 @@ import javax.ws.rs.Produces;
import javax.ws.rs.core.MediaType;
import javax.ws.rs.core.Response;
-import com.hazelcast.topic.impl.DataAwareMessage;
import org.apache.camel.CamelContext;
import org.apache.camel.ProducerTemplate;
import org.apache.camel.component.hazelcast.HazelcastConstants;
import org.apache.camel.component.hazelcast.HazelcastOperation;
-import org.apache.camel.component.mock.MockEndpoint;
import static org.apache.camel.quarkus.component.hazelcast.it.HazelcastRoutes.MOCK_TOPIC_RECEIVED;
@@ -50,6 +49,10 @@ public class HazelcastTopicResource {
@Inject
CamelContext context;
+ @Inject
+ @Named("hazelcastResults")
+ Map<String, List<String>> hazelcastResults;
+
@POST
public Response publish(String message) {
producerTemplate.sendBodyAndHeader("hazelcast-topic:foo-topic", message, HazelcastConstants.OPERATION,
@@ -59,9 +62,6 @@ public class HazelcastTopicResource {
@GET
public List<String> getValues() {
- MockEndpoint mockEndpoint = context.getEndpoint(MOCK_TOPIC_RECEIVED, MockEndpoint.class);
- return mockEndpoint.getReceivedExchanges().stream().map(
- exchange -> (String) exchange.getMessage().getBody(DataAwareMessage.class).getMessageObject())
- .collect(Collectors.toList());
+ return hazelcastResults.get(MOCK_TOPIC_RECEIVED);
}
}
[camel-quarkus] 04/07: Temporarily disable CryptoIT #2673
Posted by pp...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
ppalaga pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/camel-quarkus.git
commit 452ed725e746eede23309e9d0617aade92d0a926
Author: Peter Palaga <pp...@redhat.com>
AuthorDate: Tue May 25 22:41:55 2021 +0200
Temporarily disable CryptoIT #2673
---
.../java/org/apache/camel/quarkus/component/crypto/it/CryptoIT.java | 2 ++
1 file changed, 2 insertions(+)
diff --git a/integration-tests/crypto/src/test/java/org/apache/camel/quarkus/component/crypto/it/CryptoIT.java b/integration-tests/crypto/src/test/java/org/apache/camel/quarkus/component/crypto/it/CryptoIT.java
index e87d7e3..fa8c586 100644
--- a/integration-tests/crypto/src/test/java/org/apache/camel/quarkus/component/crypto/it/CryptoIT.java
+++ b/integration-tests/crypto/src/test/java/org/apache/camel/quarkus/component/crypto/it/CryptoIT.java
@@ -17,7 +17,9 @@
package org.apache.camel.quarkus.component.crypto.it;
import io.quarkus.test.junit.NativeImageTest;
+import org.junit.jupiter.api.Disabled;
+@Disabled("https://github.com/apache/camel-quarkus/issues/2673")
@NativeImageTest
class CryptoIT extends CryptoTest {