This is an automated email from the ASF dual-hosted git repository.
jamesnetherton pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/camel-quarkus.git
commit 29da59dce7b09462d7b8ace1dacb8f6c565b28e1
Author: James Netherton <jamesnether...@gmail.com>
AuthorDate: Thu Feb 27 09:45:23 2025 +0000
Clean up usage of deprecated APIs
---
.../quarkus/core/deployment/ConsumeProcessor.java | 38 +++++++++----------
.../core/deployment/InjectionPointsProcessor.java | 33 ++++++++---------
.../activemq/deployment/ActiveMQProcessor.java | 2 +-
.../codegen/CamelQuarkusGrpcCodegenProvider.java | 4 +-
.../hazelcast/deployment/HazelcastProcessor.java | 2 +-
.../component/jpa/QuarkusTransactionStrategy.java | 5 +--
.../SmallRyeReactiveMessagingProcessor.java | 43 ++++++++++++----------
.../aws2/aws-secrets-manager/pom.xml | 5 +++
.../secrets/manager/it/AwsSecretsManagerTest.java | 2 +-
.../it/AwsSecretsManagerTestEnvCustomizer.java | 2 +-
.../secrets/manager/it/AwsSecretsManagerUtil.java | 2 +-
.../it/CamelContextRefreshOnSecretRefreshTest.java | 2 +-
.../manager/it/CamelContextSqsReloadTest.java | 2 +-
.../aws2/ddb/it/Aws2DdbTestEnvCustomizer.java | 6 +--
.../aws2/kinesis/it/Aws2KinesisFirehoseTest.java | 2 +-
.../kinesis/it/Aws2KinesisTestEnvCustomizer.java | 20 +++++-----
.../component/aws2/lambda/it/Aws2LambdaTest.java | 12 ++++++
.../lambda/it/Aws2LambdaTestEnvCustomizer.java | 4 +-
.../quarkus/component/aws2/s3/it/Aws2S3Test.java | 2 +-
.../aws2/s3/it/Aws2S3TestEnvCustomizer.java | 2 +-
.../quarkus/component/aws2/ses/it/Aws2SesTest.java | 2 +-
.../aws2/sns/it/Aws2SqsSnsTestEnvCustomizer.java | 6 +--
.../aws2/sqs/it/Aws2SqsTestEnvCustomizer.java | 8 ++--
.../azure/azure-key-vault/pom.xml | 5 +++
.../it/AbstractAzureKeyVaultContextReloadTest.java | 2 +-
.../storage/blob/it/AzureStorageBlobTest.java | 2 +-
.../storage/queue/it/AzureStorageQueueTest.java | 2 +-
.../soap/wss/client/it/CxfSoapWssClientTest.java | 2 +-
.../component/scheduler/it/SchedulerRoute.java | 10 ++---
.../component/spring/redis/it/SpringRedisTest.java | 2 +-
.../test/support/aws2/Aws2TestResource.java | 1 -
.../bigquery/it/GoogleBigqueryCustomizer.java | 2 +-
.../google/pubsub/it/GooglePubSubCustomizer.java | 16 ++++----
.../secret/manager/it/GooglePubSubCustomizer.java | 4 +-
.../infinispan/common/model/PersonSchema.java | 4 +-
.../quarkus/component/jt400/it/Jt400Test.java | 14 +++----
.../component/langchain/it/MirrorAiService.java | 3 +-
.../camel/quarkus/component/mail/MailTest.java | 2 +-
.../component/oaipmh/it/MockOaipmhServer.java | 17 +++------
.../platform/http/it/TestHeaderFilterStrategy.java | 4 +-
.../camel/quarkus/component/smb/it/SmbTest.java | 2 +-
.../component/splunk/hec/it/SplunkHecTest.java | 25 +++++++------
integration-tests/splunk/pom.xml | 5 +++
.../quarkus/component/splunk/it/SplunkTest.java | 16 ++++----
.../quarkus/component/tarfile/it/TarfileTest.java | 9 ++---
45 files changed, 189 insertions(+), 166 deletions(-)
diff --git
a/extensions-core/core/deployment/src/main/java/org/apache/camel/quarkus/core/deployment/ConsumeProcessor.java
b/extensions-core/core/deployment/src/main/java/org/apache/camel/quarkus/core/deployment/ConsumeProcessor.java
index ac30516ff4..497040977a 100644
---
a/extensions-core/core/deployment/src/main/java/org/apache/camel/quarkus/core/deployment/ConsumeProcessor.java
+++
b/extensions-core/core/deployment/src/main/java/org/apache/camel/quarkus/core/deployment/ConsumeProcessor.java
@@ -22,6 +22,7 @@ import java.util.Collection;
import java.util.HashSet;
import java.util.LinkedHashSet;
import java.util.List;
+import java.util.Objects;
import java.util.Optional;
import java.util.Set;
import java.util.stream.Collectors;
@@ -29,8 +30,6 @@ import java.util.stream.Stream;
import io.quarkus.arc.deployment.AnnotationsTransformerBuildItem;
import io.quarkus.arc.deployment.UnremovableBeanBuildItem;
-import io.quarkus.arc.processor.AnnotationsTransformer;
-import io.quarkus.arc.processor.Transformation;
import io.quarkus.deployment.annotations.BuildProducer;
import io.quarkus.deployment.annotations.BuildStep;
import io.quarkus.deployment.annotations.ExecutionTime;
@@ -57,7 +56,7 @@ import org.apache.camel.util.StringHelper;
import org.jboss.jandex.AnnotationInstance;
import org.jboss.jandex.AnnotationTarget;
import org.jboss.jandex.AnnotationTarget.Kind;
-import org.jboss.jandex.AnnotationValue;
+import org.jboss.jandex.AnnotationTransformation;
import org.jboss.jandex.ClassInfo;
import org.jboss.jandex.DotName;
import org.jboss.jandex.MethodInfo;
@@ -87,30 +86,30 @@ public class ConsumeProcessor {
void annotationsTransformers(
BuildProducer<AnnotationsTransformerBuildItem>
annotationsTransformers) {
- annotationsTransformers.produce(new
AnnotationsTransformerBuildItem(new AnnotationsTransformer() {
-
- public boolean appliesTo(org.jboss.jandex.AnnotationTarget.Kind
kind) {
+ annotationsTransformers.produce(new
AnnotationsTransformerBuildItem(new AnnotationTransformation() {
+ @Override
+ public boolean supports(org.jboss.jandex.AnnotationTarget.Kind
kind) {
return kind == Kind.CLASS;
}
@Override
- public void transform(TransformationContext ctx) {
- final ClassInfo classInfo = ctx.getTarget().asClass();
+ public void apply(TransformationContext ctx) {
+ final ClassInfo classInfo = ctx.declaration().asClass();
if (hasConsumeMethod(classInfo)) {
/* If there is @Consume on a method, make the declaring
class a named injectable bean */
String beanName = namedValue(classInfo);
- final Transformation transform = ctx.transform();
- if
(!classInfo.annotationsMap().keySet().stream().anyMatch(BEAN_DEFINING_ANNOTATIONS::contains))
{
+ if
(classInfo.annotationsMap().keySet().stream().noneMatch(BEAN_DEFINING_ANNOTATIONS::contains))
{
/* Only add @Singleton if there is no other bean
defining annotation yet */
- transform.add(Singleton.class);
+ ctx.add(Singleton.class);
}
if (beanName == null) {
beanName = ConsumeProcessor.uniqueBeanName(classInfo);
- transform.add(Named.class,
AnnotationValue.createStringValue("value", beanName));
+ AnnotationInstance namedAnnotation =
AnnotationInstance.builder(Named.class)
+ .add("value", beanName)
+ .build();
+ ctx.add(namedAnnotation);
}
-
- transform.done();
}
}
}));
@@ -153,8 +152,9 @@ public class ConsumeProcessor {
if (!consumeAnnotations.isEmpty()) {
final RuntimeValue<RoutesDefinition> routesDefinition =
recorder.createRoutesDefinition();
- final boolean beanCapabilityAvailable =
capabilities.stream().map(CapabilityBuildItem::getName)
- .anyMatch(feature ->
CamelCapabilities.BEAN.equals(feature));
+ final boolean beanCapabilityAvailable = capabilities.stream()
+ .map(CapabilityBuildItem::getName)
+ .anyMatch(CamelCapabilities.BEAN::equals);
for (AnnotationInstance annot : consumeAnnotations) {
final AnnotationTarget target = annot.target();
@@ -217,7 +217,7 @@ public class ConsumeProcessor {
Optional<MethodInfo> method = Stream.of(isGetter, getGetter, isGetter
+ "Endpoint", getGetter + "Endpoint")
.peek(triedMethods::add)
.map(declaringClass::method)
- .filter(m -> m != null)
+ .filter(Objects::nonNull)
.findFirst();
if (method.isEmpty()) {
if (propertyName.startsWith("on")) {
@@ -239,7 +239,7 @@ public class ConsumeProcessor {
final Collection<AnnotationInstance> consumeAnnotations =
index.getIndex().getAnnotations(CONSUME_ANNOTATION);
if (!consumeAnnotations.isEmpty()) {
- final Set<DotName> declaringClasses = new LinkedHashSet<DotName>();
+ final Set<DotName> declaringClasses = new LinkedHashSet<>();
for (AnnotationInstance annot : consumeAnnotations) {
final AnnotationTarget target = annot.target();
switch (target.kind()) {
@@ -266,7 +266,7 @@ public class ConsumeProcessor {
}
static String firstLower(String str) {
- char c[] = str.toCharArray();
+ char[] c = str.toCharArray();
c[0] = Character.toLowerCase(c[0]);
return new String(c);
}
diff --git
a/extensions-core/core/deployment/src/main/java/org/apache/camel/quarkus/core/deployment/InjectionPointsProcessor.java
b/extensions-core/core/deployment/src/main/java/org/apache/camel/quarkus/core/deployment/InjectionPointsProcessor.java
index 86d11457ee..86a883a6f6 100644
---
a/extensions-core/core/deployment/src/main/java/org/apache/camel/quarkus/core/deployment/InjectionPointsProcessor.java
+++
b/extensions-core/core/deployment/src/main/java/org/apache/camel/quarkus/core/deployment/InjectionPointsProcessor.java
@@ -31,7 +31,6 @@ import
io.quarkus.arc.deployment.AnnotationsTransformerBuildItem;
import io.quarkus.arc.deployment.BeanRegistrationPhaseBuildItem;
import io.quarkus.arc.deployment.QualifierRegistrarBuildItem;
import io.quarkus.arc.deployment.SyntheticBeanBuildItem;
-import io.quarkus.arc.processor.AnnotationsTransformer;
import io.quarkus.arc.processor.BuildExtension;
import io.quarkus.arc.processor.InjectionPointInfo;
import io.quarkus.arc.processor.QualifierRegistrar;
@@ -58,6 +57,7 @@ import
org.apache.camel.quarkus.core.deployment.spi.CamelRuntimeTaskBuildItem;
import org.jboss.jandex.AnnotationInstance;
import org.jboss.jandex.AnnotationTarget;
import org.jboss.jandex.AnnotationTarget.Kind;
+import org.jboss.jandex.AnnotationTransformation;
import org.jboss.jandex.ClassInfo;
import org.jboss.jandex.DotName;
import org.jboss.jandex.FieldInfo;
@@ -103,8 +103,8 @@ public class InjectionPointsProcessor {
final Set<String> created = new HashSet<>();
for (InjectionPointInfo injectionPoint :
beanRegistrationPhase.getContext().get(BuildExtension.Key.INJECTION_POINTS)) {
- if (injectionPoint.getTarget().kind() ==
AnnotationTarget.Kind.FIELD) {
- FieldInfo target = injectionPoint.getTarget().asField();
+ if (injectionPoint.getAnnotationTarget().kind() ==
AnnotationTarget.Kind.FIELD) {
+ FieldInfo target =
injectionPoint.getAnnotationTarget().asField();
if (!created.add(target.type().name().toString())) {
continue;
@@ -121,8 +121,8 @@ public class InjectionPointsProcessor {
}
}
- if (injectionPoint.getTarget().kind() ==
AnnotationTarget.Kind.METHOD) {
- final MethodInfo target =
injectionPoint.getTarget().asMethod();
+ if (injectionPoint.getAnnotationTarget().kind() ==
AnnotationTarget.Kind.METHOD) {
+ final MethodInfo target =
injectionPoint.getAnnotationTarget().asMethod();
final List<Type> types = target.parameterTypes();
for (int i = 0; i < types.size(); i++) {
@@ -159,22 +159,17 @@ public class InjectionPointsProcessor {
void annotationsTransformers(
BuildProducer<AnnotationsTransformerBuildItem>
annotationsTransformers) {
- annotationsTransformers.produce(new
AnnotationsTransformerBuildItem(new AnnotationsTransformer() {
-
- public boolean appliesTo(org.jboss.jandex.AnnotationTarget.Kind
kind) {
- return kind == Kind.FIELD || kind == Kind.METHOD;
- }
+ annotationsTransformers.produce(new
AnnotationsTransformerBuildItem(new AnnotationTransformation() {
@Override
- public void transform(TransformationContext ctx) {
-
- final AnnotationTarget target = ctx.getTarget();
+ public void apply(TransformationContext ctx) {
+ final AnnotationTarget target = ctx.declaration();
switch (target.kind()) {
case FIELD: {
final FieldInfo fieldInfo = target.asField();
if (fieldInfo.annotation(ENDPOINT_INJECT_ANNOTATION) !=
null
|| fieldInfo.annotation(PRODUCE_ANNOTATION) !=
null) {
- ctx.transform().add(Inject.class).done();
+ ctx.add(Inject.class);
}
break;
}
@@ -187,9 +182,12 @@ public class InjectionPointsProcessor {
default:
throw new IllegalStateException("Expected only field or
method, got " + target.kind());
}
-
}
+ @Override
+ public boolean supports(org.jboss.jandex.AnnotationTarget.Kind
kind) {
+ return kind == Kind.FIELD || kind == Kind.METHOD;
+ }
}));
}
@@ -351,8 +349,9 @@ public class InjectionPointsProcessor {
/* Requires camel-quarkus-bean */
if (beanCapabilityAvailable.get() == null) {
-
beanCapabilityAvailable.set(capabilities.stream().map(CapabilityBuildItem::getName)
- .anyMatch(feature ->
CamelCapabilities.BEAN.equals(feature)));
+ beanCapabilityAvailable.set(capabilities.stream()
+ .map(CapabilityBuildItem::getName)
+ .anyMatch(CamelCapabilities.BEAN::equals));
}
if (!beanCapabilityAvailable.get()) {
throw new IllegalStateException(
diff --git
a/extensions/activemq/deployment/src/main/java/org/apache/camel/quarkus/component/activemq/deployment/ActiveMQProcessor.java
b/extensions/activemq/deployment/src/main/java/org/apache/camel/quarkus/component/activemq/deployment/ActiveMQProcessor.java
index da3074dbad..c1f499cbd7 100644
---
a/extensions/activemq/deployment/src/main/java/org/apache/camel/quarkus/component/activemq/deployment/ActiveMQProcessor.java
+++
b/extensions/activemq/deployment/src/main/java/org/apache/camel/quarkus/component/activemq/deployment/ActiveMQProcessor.java
@@ -117,7 +117,7 @@ class ActiveMQProcessor {
};
for (String path : servicePaths) {
- reflectiveClass.produce(new ReflectiveClassBuildItem(true, false,
getServiceClass(path)));
+
reflectiveClass.produce(ReflectiveClassBuildItem.builder(getServiceClass(path)).methods().build());
}
nativeImage.produce(new NativeImageResourceBuildItem(servicePaths));
diff --git
a/extensions/grpc/codegen/src/main/java/org/apache/camel/quarkus/grpc/codegen/CamelQuarkusGrpcCodegenProvider.java
b/extensions/grpc/codegen/src/main/java/org/apache/camel/quarkus/grpc/codegen/CamelQuarkusGrpcCodegenProvider.java
index 4b8f437182..d8fb8db84c 100644
---
a/extensions/grpc/codegen/src/main/java/org/apache/camel/quarkus/grpc/codegen/CamelQuarkusGrpcCodegenProvider.java
+++
b/extensions/grpc/codegen/src/main/java/org/apache/camel/quarkus/grpc/codegen/CamelQuarkusGrpcCodegenProvider.java
@@ -73,8 +73,8 @@ public class CamelQuarkusGrpcCodegenProvider implements
CodeGenProvider {
}
@Override
- public String inputExtension() {
- return "proto";
+ public String[] inputExtensions() {
+ return new String[] { "proto" };
}
@Override
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 cdfb66e22d..95a5d3b2fe 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
@@ -117,7 +117,7 @@ class HazelcastProcessor {
DotName simpleName = DotName.createSimple(klass.getName());
reflectiveHierarchyClass.produce(
- new
ReflectiveHierarchyBuildItem.Builder().type(Type.create(simpleName,
Type.Kind.CLASS)).build());
+
ReflectiveHierarchyBuildItem.builder(Type.create(simpleName,
Type.Kind.CLASS)).build());
ignoreWarnings.produce(
new ReflectiveHierarchyIgnoreWarningBuildItem(simpleName));
diff --git
a/extensions/jpa/runtime/src/main/java/org/apache/camel/quarkus/component/jpa/QuarkusTransactionStrategy.java
b/extensions/jpa/runtime/src/main/java/org/apache/camel/quarkus/component/jpa/QuarkusTransactionStrategy.java
index 755968491a..8bf883b49d 100644
---
a/extensions/jpa/runtime/src/main/java/org/apache/camel/quarkus/component/jpa/QuarkusTransactionStrategy.java
+++
b/extensions/jpa/runtime/src/main/java/org/apache/camel/quarkus/component/jpa/QuarkusTransactionStrategy.java
@@ -18,14 +18,11 @@
package org.apache.camel.quarkus.component.jpa;
import io.quarkus.narayana.jta.QuarkusTransaction;
-import io.quarkus.narayana.jta.RunOptions;
import org.apache.camel.component.jpa.TransactionStrategy;
-import static io.quarkus.narayana.jta.QuarkusTransaction.runOptions;
-
public class QuarkusTransactionStrategy implements TransactionStrategy {
@Override
public void executeInTransaction(Runnable runnable) {
-
QuarkusTransaction.run(runOptions().semantic(RunOptions.Semantic.JOIN_EXISTING),
runnable);
+ QuarkusTransaction.joiningExisting().run(runnable);
}
}
diff --git
a/extensions/smallrye-reactive-messaging/deployment/src/main/java/org/apache/camel/quarkus/component/smallrye/reactive/messaging/deployment/SmallRyeReactiveMessagingProcessor.java
b/extensions/smallrye-reactive-messaging/deployment/src/main/java/org/apache/camel/quarkus/component/smallrye/reactive/messaging/deployment/SmallRyeReactiveMessagingProcessor.java
index 675646fa2d..3e4780eb6c 100644
---
a/extensions/smallrye-reactive-messaging/deployment/src/main/java/org/apache/camel/quarkus/component/smallrye/reactive/messaging/deployment/SmallRyeReactiveMessagingProcessor.java
+++
b/extensions/smallrye-reactive-messaging/deployment/src/main/java/org/apache/camel/quarkus/component/smallrye/reactive/messaging/deployment/SmallRyeReactiveMessagingProcessor.java
@@ -24,8 +24,10 @@ import io.quarkus.deployment.builditem.FeatureBuildItem;
import io.smallrye.reactive.messaging.camel.CamelConnector;
import org.jboss.jandex.AnnotationInstance;
import org.jboss.jandex.AnnotationTarget;
+import org.jboss.jandex.AnnotationTransformation;
import org.jboss.jandex.AnnotationValue;
import org.jboss.jandex.ClassInfo;
+import org.jboss.jandex.Declaration;
import org.jboss.jandex.DotName;
import org.jboss.jandex.FieldInfo;
import org.jboss.jandex.MethodInfo;
@@ -43,29 +45,32 @@ class SmallRyeReactiveMessagingProcessor {
@BuildStep
void
overrideSmallRyeReactiveMessagingConfiguration(BuildProducer<AnnotationsTransformerBuildItem>
transformers) {
// Veto setup & configuration logic that is already handled by the
camel-quarkus-reactive-streams extension
- transformers.produce(new AnnotationsTransformerBuildItem(context -> {
- if (context.isField()) {
- FieldInfo fieldInfo = context.getTarget().asField();
- ClassInfo classInfo = fieldInfo.declaringClass();
+ transformers.produce(new AnnotationsTransformerBuildItem(new
AnnotationTransformation() {
+ @Override
+ public void apply(TransformationContext context) {
+ Declaration declaration = context.declaration();
+ if (declaration.kind().equals(AnnotationTarget.Kind.FIELD)) {
+ FieldInfo fieldInfo = declaration.asField();
+ ClassInfo classInfo = fieldInfo.declaringClass();
- // Make CamelReactiveStreamsService injectable from producers
configured in the reactive-streams extension
- if (classInfo.name().equals(CAMEL_CONNECTOR_DOTNAME) &&
fieldInfo.name().equals("reactive")) {
- AnnotationInstance injectAnnotation =
getAnnotationInstance(DotNames.INJECT, fieldInfo);
- context.transform().add(injectAnnotation).done();
+ // Make CamelReactiveStreamsService injectable from
producers configured in the reactive-streams extension
+ if (classInfo.name().equals(CAMEL_CONNECTOR_DOTNAME) &&
fieldInfo.name().equals("reactive")) {
+ AnnotationInstance injectAnnotation =
getAnnotationInstance(DotNames.INJECT, fieldInfo);
+ context.add(injectAnnotation);
+ }
}
- }
- if (context.isMethod()) {
- MethodInfo methodInfo = context.getTarget().asMethod();
- ClassInfo classInfo = methodInfo.declaringClass();
+ if
(context.declaration().kind().equals(AnnotationTarget.Kind.METHOD)) {
+ MethodInfo methodInfo = declaration.asMethod();
+ ClassInfo classInfo = methodInfo.declaringClass();
- if (classInfo.name().equals(CAMEL_CONNECTOR_DOTNAME)) {
- // Disable CamelReactiveStreamsService producer since the
reactive-streams extension handles this
- if (methodInfo.name().equals("getCamelReactive")) {
- AnnotationInstance producesAnnotation =
getAnnotationInstance(DotNames.PRODUCES, methodInfo);
- context.transform()
- .remove(annotationInstance ->
annotationInstance.target().equals(producesAnnotation.target()))
- .done();
+ if (classInfo.name().equals(CAMEL_CONNECTOR_DOTNAME)) {
+ // Disable CamelReactiveStreamsService producer since
the reactive-streams extension handles this
+ if (methodInfo.name().equals("getCamelReactive")) {
+ AnnotationInstance producesAnnotation =
getAnnotationInstance(DotNames.PRODUCES, methodInfo);
+ context.remove(
+ annotationInstance ->
annotationInstance.target().equals(producesAnnotation.target()));
+ }
}
}
}
diff --git a/integration-test-groups/aws2/aws-secrets-manager/pom.xml
b/integration-test-groups/aws2/aws-secrets-manager/pom.xml
index efb84315ac..f2f7202c9f 100644
--- a/integration-test-groups/aws2/aws-secrets-manager/pom.xml
+++ b/integration-test-groups/aws2/aws-secrets-manager/pom.xml
@@ -73,6 +73,11 @@
<type>test-jar</type>
<scope>test</scope>
</dependency>
+ <dependency>
+ <groupId>org.awaitility</groupId>
+ <artifactId>awaitility</artifactId>
+ <scope>test</scope>
+ </dependency>
</dependencies>
<profiles>
diff --git
a/integration-test-groups/aws2/aws-secrets-manager/src/test/java/org/apache/camel/quarkus/component/aws/secrets/manager/it/AwsSecretsManagerTest.java
b/integration-test-groups/aws2/aws-secrets-manager/src/test/java/org/apache/camel/quarkus/component/aws/secrets/manager/it/AwsSecretsManagerTest.java
index 239cffea97..88cc9a8da5 100644
---
a/integration-test-groups/aws2/aws-secrets-manager/src/test/java/org/apache/camel/quarkus/component/aws/secrets/manager/it/AwsSecretsManagerTest.java
+++
b/integration-test-groups/aws2/aws-secrets-manager/src/test/java/org/apache/camel/quarkus/component/aws/secrets/manager/it/AwsSecretsManagerTest.java
@@ -31,8 +31,8 @@ import
org.apache.camel.quarkus.test.mock.backend.MockBackendDisabled;
import org.apache.camel.quarkus.test.mock.backend.MockBackendUtils;
import org.apache.camel.quarkus.test.support.aws2.Aws2TestResource;
import org.apache.camel.quarkus.test.support.aws2.BaseAWs2TestSupport;
+import org.awaitility.Awaitility;
import org.junit.jupiter.api.Test;
-import org.testcontainers.shaded.org.awaitility.Awaitility;
import static org.hamcrest.CoreMatchers.is;
import static org.junit.jupiter.api.Assertions.*;
diff --git
a/integration-test-groups/aws2/aws-secrets-manager/src/test/java/org/apache/camel/quarkus/component/aws/secrets/manager/it/AwsSecretsManagerTestEnvCustomizer.java
b/integration-test-groups/aws2/aws-secrets-manager/src/test/java/org/apache/camel/quarkus/component/aws/secrets/manager/it/AwsSecretsManagerTestEnvCustomizer.java
index c9961261e5..37ab7a9b7c 100644
---
a/integration-test-groups/aws2/aws-secrets-manager/src/test/java/org/apache/camel/quarkus/component/aws/secrets/manager/it/AwsSecretsManagerTestEnvCustomizer.java
+++
b/integration-test-groups/aws2/aws-secrets-manager/src/test/java/org/apache/camel/quarkus/component/aws/secrets/manager/it/AwsSecretsManagerTestEnvCustomizer.java
@@ -59,7 +59,7 @@ public class AwsSecretsManagerTestEnvCustomizer implements
Aws2TestEnvCustomizer
/* SQS */
final String queueName = "cq-secret-manager-sqs-reload-"
- +
RandomStringUtils.randomAlphanumeric(49).toLowerCase(Locale.ROOT);
+ +
RandomStringUtils.secure().nextAlphanumeric(49).toLowerCase(Locale.ROOT);
//configure endpoint override for properties function
if (envContext.isLocalStack()) {
diff --git
a/integration-test-groups/aws2/aws-secrets-manager/src/test/java/org/apache/camel/quarkus/component/aws/secrets/manager/it/AwsSecretsManagerUtil.java
b/integration-test-groups/aws2/aws-secrets-manager/src/test/java/org/apache/camel/quarkus/component/aws/secrets/manager/it/AwsSecretsManagerUtil.java
index 3144f5885c..f4f69e580c 100644
---
a/integration-test-groups/aws2/aws-secrets-manager/src/test/java/org/apache/camel/quarkus/component/aws/secrets/manager/it/AwsSecretsManagerUtil.java
+++
b/integration-test-groups/aws2/aws-secrets-manager/src/test/java/org/apache/camel/quarkus/component/aws/secrets/manager/it/AwsSecretsManagerUtil.java
@@ -26,7 +26,7 @@ import io.restassured.RestAssured;
import io.restassured.http.ContentType;
import org.apache.camel.component.aws.secretsmanager.SecretsManagerConstants;
import org.apache.camel.component.aws.secretsmanager.SecretsManagerOperations;
-import org.testcontainers.shaded.org.awaitility.Awaitility;
+import org.awaitility.Awaitility;
import static org.hamcrest.CoreMatchers.is;
diff --git
a/integration-test-groups/aws2/aws-secrets-manager/src/test/java/org/apache/camel/quarkus/component/aws/secrets/manager/it/CamelContextRefreshOnSecretRefreshTest.java
b/integration-test-groups/aws2/aws-secrets-manager/src/test/java/org/apache/camel/quarkus/component/aws/secrets/manager/it/CamelContextRefreshOnSecretRefreshTest.java
index cd95540eb2..11206181e8 100644
---
a/integration-test-groups/aws2/aws-secrets-manager/src/test/java/org/apache/camel/quarkus/component/aws/secrets/manager/it/CamelContextRefreshOnSecretRefreshTest.java
+++
b/integration-test-groups/aws2/aws-secrets-manager/src/test/java/org/apache/camel/quarkus/component/aws/secrets/manager/it/CamelContextRefreshOnSecretRefreshTest.java
@@ -29,9 +29,9 @@ import
org.apache.camel.component.aws.secretsmanager.SecretsManagerOperations;
import org.apache.camel.quarkus.test.EnabledIf;
import org.apache.camel.quarkus.test.mock.backend.MockBackendDisabled;
import org.apache.camel.quarkus.test.support.aws2.Aws2TestResource;
+import org.awaitility.Awaitility;
import org.eclipse.microprofile.config.ConfigProvider;
import org.junit.jupiter.api.Test;
-import org.testcontainers.shaded.org.awaitility.Awaitility;
import static org.hamcrest.CoreMatchers.is;
diff --git
a/integration-test-groups/aws2/aws-secrets-manager/src/test/java/org/apache/camel/quarkus/component/aws/secrets/manager/it/CamelContextSqsReloadTest.java
b/integration-test-groups/aws2/aws-secrets-manager/src/test/java/org/apache/camel/quarkus/component/aws/secrets/manager/it/CamelContextSqsReloadTest.java
index 37a54a3cde..57e07c4f84 100644
---
a/integration-test-groups/aws2/aws-secrets-manager/src/test/java/org/apache/camel/quarkus/component/aws/secrets/manager/it/CamelContextSqsReloadTest.java
+++
b/integration-test-groups/aws2/aws-secrets-manager/src/test/java/org/apache/camel/quarkus/component/aws/secrets/manager/it/CamelContextSqsReloadTest.java
@@ -30,11 +30,11 @@ import
org.apache.camel.component.aws.secretsmanager.SecretsManagerConstants;
import org.apache.camel.component.aws.secretsmanager.SecretsManagerOperations;
import org.apache.camel.quarkus.test.support.aws2.Aws2Client;
import org.apache.camel.quarkus.test.support.aws2.Aws2TestResource;
+import org.awaitility.Awaitility;
import org.eclipse.microprofile.config.ConfigProvider;
import org.junit.jupiter.api.Assertions;
import org.junit.jupiter.api.Test;
import org.testcontainers.containers.localstack.LocalStackContainer;
-import org.testcontainers.shaded.org.awaitility.Awaitility;
import software.amazon.awssdk.services.sqs.SqsClient;
import software.amazon.awssdk.services.sqs.model.SendMessageRequest;
import software.amazon.awssdk.services.sqs.model.SendMessageResponse;
diff --git
a/integration-test-groups/aws2/aws2-ddb/src/test/java/org/apache/camel/quarkus/component/aws2/ddb/it/Aws2DdbTestEnvCustomizer.java
b/integration-test-groups/aws2/aws2-ddb/src/test/java/org/apache/camel/quarkus/component/aws2/ddb/it/Aws2DdbTestEnvCustomizer.java
index 562307dad8..3718d1fa27 100644
---
a/integration-test-groups/aws2/aws2-ddb/src/test/java/org/apache/camel/quarkus/component/aws2/ddb/it/Aws2DdbTestEnvCustomizer.java
+++
b/integration-test-groups/aws2/aws2-ddb/src/test/java/org/apache/camel/quarkus/component/aws2/ddb/it/Aws2DdbTestEnvCustomizer.java
@@ -48,15 +48,15 @@ public class Aws2DdbTestEnvCustomizer implements
Aws2TestEnvCustomizer {
@Override
public void customize(Aws2TestEnvContext envContext) {
- final String tableName = "camel-quarkus-" +
RandomStringUtils.randomAlphanumeric(16).toLowerCase(Locale.ROOT);
+ final String tableName = "camel-quarkus-" +
RandomStringUtils.secure().nextAlphanumeric(16).toLowerCase(Locale.ROOT);
envContext.property("aws-ddb.table-name", tableName);
final String tableNameOperations = "camel-quarkus-operations-"
- +
RandomStringUtils.randomAlphanumeric(16).toLowerCase(Locale.ROOT);
+ +
RandomStringUtils.secure().nextAlphanumeric(16).toLowerCase(Locale.ROOT);
envContext.property("aws-ddb.operations-table-name",
tableNameOperations);
final String tableNameStreams = "camel-quarkus-streams-"
- +
RandomStringUtils.randomAlphanumeric(16).toLowerCase(Locale.ROOT);
+ +
RandomStringUtils.secure().nextAlphanumeric(16).toLowerCase(Locale.ROOT);
envContext.property("aws-ddb.stream-table-name", tableNameStreams);
List<String> tableNames = Stream.of(tableName, tableNameStreams,
tableNameOperations).collect(Collectors.toList());
diff --git
a/integration-test-groups/aws2/aws2-kinesis/src/test/java/org/apache/camel/quarkus/component/aws2/kinesis/it/Aws2KinesisFirehoseTest.java
b/integration-test-groups/aws2/aws2-kinesis/src/test/java/org/apache/camel/quarkus/component/aws2/kinesis/it/Aws2KinesisFirehoseTest.java
index b16c505952..92678e15f0 100644
---
a/integration-test-groups/aws2/aws2-kinesis/src/test/java/org/apache/camel/quarkus/component/aws2/kinesis/it/Aws2KinesisFirehoseTest.java
+++
b/integration-test-groups/aws2/aws2-kinesis/src/test/java/org/apache/camel/quarkus/component/aws2/kinesis/it/Aws2KinesisFirehoseTest.java
@@ -57,7 +57,7 @@ class Aws2KinesisFirehoseTest extends BaseAWs2TestSupport {
@Test
public void firehose() {
- final String msg = RandomStringUtils.randomAlphanumeric(32 * 1024);
+ final String msg = RandomStringUtils.secure().nextAlphanumeric(32 *
1024);
final String msgPrefix = msg.substring(0, 32);
final long maxDataBytes =
Aws2KinesisTestEnvCustomizer.BUFFERING_SIZE_MB * 1024 * 1024;
long bytesSent = 0;
diff --git
a/integration-test-groups/aws2/aws2-kinesis/src/test/java/org/apache/camel/quarkus/component/aws2/kinesis/it/Aws2KinesisTestEnvCustomizer.java
b/integration-test-groups/aws2/aws2-kinesis/src/test/java/org/apache/camel/quarkus/component/aws2/kinesis/it/Aws2KinesisTestEnvCustomizer.java
index 0be68ae047..b12bf7012d 100644
---
a/integration-test-groups/aws2/aws2-kinesis/src/test/java/org/apache/camel/quarkus/component/aws2/kinesis/it/Aws2KinesisTestEnvCustomizer.java
+++
b/integration-test-groups/aws2/aws2-kinesis/src/test/java/org/apache/camel/quarkus/component/aws2/kinesis/it/Aws2KinesisTestEnvCustomizer.java
@@ -33,8 +33,8 @@ import
software.amazon.awssdk.services.firehose.model.DeleteDeliveryStreamReques
import software.amazon.awssdk.services.firehose.model.DeliveryStreamStatus;
import software.amazon.awssdk.services.firehose.model.DeliveryStreamType;
import
software.amazon.awssdk.services.firehose.model.DescribeDeliveryStreamRequest;
+import
software.amazon.awssdk.services.firehose.model.ExtendedS3DestinationConfiguration;
import software.amazon.awssdk.services.firehose.model.InvalidArgumentException;
-import
software.amazon.awssdk.services.firehose.model.S3DestinationConfiguration;
import software.amazon.awssdk.services.iam.IamClient;
import software.amazon.awssdk.services.iam.model.AttachRolePolicyRequest;
import software.amazon.awssdk.services.iam.model.CreatePolicyRequest;
@@ -78,9 +78,9 @@ public class Aws2KinesisTestEnvCustomizer implements
Aws2TestEnvCustomizer {
@Override
public void customize(Aws2TestEnvContext envContext) {
- final String streamName = "camel-quarkus-" +
RandomStringUtils.randomAlphanumeric(16).toLowerCase(Locale.ROOT);
+ final String streamName = "camel-quarkus-" +
RandomStringUtils.secure().nextAlphanumeric(16).toLowerCase(Locale.ROOT);
final String streamNameForDefaultCredentials = "camel-quarkus-"
- +
RandomStringUtils.randomAlphanumeric(16).toLowerCase(Locale.ROOT);
+ +
RandomStringUtils.secure().nextAlphanumeric(16).toLowerCase(Locale.ROOT);
final String streamArn;
{
envContext.property("aws-kinesis.stream-name", streamName);
@@ -118,7 +118,7 @@ public class Aws2KinesisTestEnvCustomizer implements
Aws2TestEnvCustomizer {
final S3Client s3Client = envContext.client(Service.S3,
S3Client::builder);
final String bucketName = "camel-quarkus-firehose-"
- +
RandomStringUtils.randomAlphanumeric(32).toLowerCase(Locale.ROOT);
+ +
RandomStringUtils.secure().nextAlphanumeric(32).toLowerCase(Locale.ROOT);
final String bucketArn = "arn:aws:s3:::" + bucketName;
envContext.property("aws-kinesis.s3-bucket-name", bucketName);
s3Client.createBucket(CreateBucketRequest.builder().bucket(bucketName).build());
@@ -145,7 +145,7 @@ public class Aws2KinesisTestEnvCustomizer implements
Aws2TestEnvCustomizer {
}
final String deliveryStreamName = "camel-quarkus-firehose-delstr-"
- +
RandomStringUtils.randomAlphanumeric(16).toLowerCase(Locale.ROOT);
+ +
RandomStringUtils.secure().nextAlphanumeric(16).toLowerCase(Locale.ROOT);
envContext.property("aws-kinesis-firehose.delivery-stream-name",
deliveryStreamName);
final String roleName = "s3-" + deliveryStreamName;
@@ -159,7 +159,7 @@ public class Aws2KinesisTestEnvCustomizer implements
Aws2TestEnvCustomizer {
+ " \"Version\": \"2012-10-17\",\n"
+ " \"Statement\": [\n"
+ " {\n"
- + " \"Sid\": \"sid" +
RandomStringUtils.randomAlphanumeric(16) + "\",\n"
+ + " \"Sid\": \"sid" +
RandomStringUtils.secure().nextAlphanumeric(16) + "\",\n"
+ " \"Effect\": \"Allow\",\n"
+ " \"Principal\": {\n"
+ " \"Service\":
\"firehose.amazonaws.com\"\n"
@@ -183,7 +183,7 @@ public class Aws2KinesisTestEnvCustomizer implements
Aws2TestEnvCustomizer {
+ " \"Statement\":\n"
+ " [\n"
+ " {\n"
- + " \"Sid\": \"sid" +
RandomStringUtils.randomAlphanumeric(16) + "\",\n"
+ + " \"Sid\": \"sid" +
RandomStringUtils.secure().nextAlphanumeric(16) + "\",\n"
+ " \"Effect\": \"Allow\",\n"
+ " \"Action\": [\n"
+ " \"s3:AbortMultipartUpload\",\n"
@@ -199,7 +199,7 @@ public class Aws2KinesisTestEnvCustomizer implements
Aws2TestEnvCustomizer {
+ " ]\n"
+ " },\n"
+ " {\n"
- + " \"Sid\": \"sid" +
RandomStringUtils.randomAlphanumeric(16) + "\",\n"
+ + " \"Sid\": \"sid" +
RandomStringUtils.secure().nextAlphanumeric(16) + "\",\n"
+ " \"Effect\": \"Allow\",\n"
+ " \"Action\": [\n"
+ " \"kinesis:DescribeStream\",\n"
@@ -246,8 +246,8 @@ public class Aws2KinesisTestEnvCustomizer implements
Aws2TestEnvCustomizer {
fhClient.createDeliveryStream(
CreateDeliveryStreamRequest.builder()
.deliveryStreamName(deliveryStreamName)
- .s3DestinationConfiguration(
-
S3DestinationConfiguration.builder()
+
.extendedS3DestinationConfiguration(
+
ExtendedS3DestinationConfiguration.builder()
.bucketARN(bucketArn)
.roleARN(roleArn)
.bufferingHints(
diff --git
a/integration-test-groups/aws2/aws2-lambda/src/test/java/org/apache/camel/quarkus/component/aws2/lambda/it/Aws2LambdaTest.java
b/integration-test-groups/aws2/aws2-lambda/src/test/java/org/apache/camel/quarkus/component/aws2/lambda/it/Aws2LambdaTest.java
index 97529f7f61..b6491c0c1f 100644
---
a/integration-test-groups/aws2/aws2-lambda/src/test/java/org/apache/camel/quarkus/component/aws2/lambda/it/Aws2LambdaTest.java
+++
b/integration-test-groups/aws2/aws2-lambda/src/test/java/org/apache/camel/quarkus/component/aws2/lambda/it/Aws2LambdaTest.java
@@ -19,6 +19,8 @@ package org.apache.camel.quarkus.component.aws2.lambda.it;
import java.io.ByteArrayOutputStream;
import java.io.IOException;
import java.nio.charset.StandardCharsets;
+import java.nio.file.Files;
+import java.nio.file.Paths;
import java.util.Map;
import java.util.concurrent.TimeUnit;
import java.util.zip.ZipEntry;
@@ -32,7 +34,11 @@ import io.restassured.response.ExtractableResponse;
import org.apache.camel.quarkus.test.support.aws2.Aws2TestResource;
import org.apache.camel.quarkus.test.support.aws2.BaseAWs2TestSupport;
import org.jboss.logging.Logger;
+import org.junit.jupiter.api.Assumptions;
+import org.junit.jupiter.api.BeforeEach;
import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.condition.DisabledOnOs;
+import org.junit.jupiter.api.condition.OS;
import static org.awaitility.Awaitility.await;
import static org.hamcrest.Matchers.emptyOrNullString;
@@ -41,6 +47,7 @@ import static org.hamcrest.Matchers.is;
import static org.hamcrest.Matchers.not;
import static org.junit.jupiter.api.Assertions.assertNotNull;
+@DisabledOnOs(value = OS.MAC, disabledReason = "Requires /var/run/docker.sock
mount")
@QuarkusTest
@QuarkusTestResource(Aws2TestResource.class)
class Aws2LambdaTest extends BaseAWs2TestSupport {
@@ -50,6 +57,11 @@ class Aws2LambdaTest extends BaseAWs2TestSupport {
super("/aws2-lambda");
}
+ @BeforeEach
+ public void beforeEach() {
+
Assumptions.assumeTrue(Files.exists(Paths.get("/var/run/docker.sock")));
+ }
+
@Test
public void performingOperationsOnLambdaFunctionShouldSucceed() {
final String functionName = "cqFunction" +
java.util.UUID.randomUUID().toString().replace("-", "");
diff --git
a/integration-test-groups/aws2/aws2-lambda/src/test/java/org/apache/camel/quarkus/component/aws2/lambda/it/Aws2LambdaTestEnvCustomizer.java
b/integration-test-groups/aws2/aws2-lambda/src/test/java/org/apache/camel/quarkus/component/aws2/lambda/it/Aws2LambdaTestEnvCustomizer.java
index ac357cd05e..a9bc4bec72 100644
---
a/integration-test-groups/aws2/aws2-lambda/src/test/java/org/apache/camel/quarkus/component/aws2/lambda/it/Aws2LambdaTestEnvCustomizer.java
+++
b/integration-test-groups/aws2/aws2-lambda/src/test/java/org/apache/camel/quarkus/component/aws2/lambda/it/Aws2LambdaTestEnvCustomizer.java
@@ -52,7 +52,7 @@ public class Aws2LambdaTestEnvCustomizer implements
Aws2TestEnvCustomizer {
public void customize(Aws2TestEnvContext envContext) {
// Customize a role needed to execute AWS Lambda functions that can
moreover be triggered by an SQS queue event source
- final String id =
RandomStringUtils.randomAlphanumeric(16).toLowerCase(Locale.ROOT);
+ final String id =
RandomStringUtils.secure().nextAlphanumeric(16).toLowerCase(Locale.ROOT);
final String roleName = "cq-lambda-" + id;
final IamClient iamClient = envContext.client(Service.IAM,
IamClient::builder);
@@ -92,7 +92,7 @@ public class Aws2LambdaTestEnvCustomizer implements
Aws2TestEnvCustomizer {
envContext.property("aws-lambda.role-arn", roleArn);
// Create an SQS queue that will serve as event source in order to
test event source mappings
- final String queueName = "camel-quarkus-" +
RandomStringUtils.randomAlphanumeric(49).toLowerCase(Locale.ROOT);
+ final String queueName = "camel-quarkus-" +
RandomStringUtils.secure().nextAlphanumeric(49).toLowerCase(Locale.ROOT);
final SqsClient sqsClient = envContext.client(Service.SQS,
SqsClient::builder);
final CreateQueueRequest createQueueRequest =
CreateQueueRequest.builder().queueName(queueName).build();
diff --git
a/integration-test-groups/aws2/aws2-s3/src/test/java/org/apache/camel/quarkus/component/aws2/s3/it/Aws2S3Test.java
b/integration-test-groups/aws2/aws2-s3/src/test/java/org/apache/camel/quarkus/component/aws2/s3/it/Aws2S3Test.java
index 87c2703208..60c7499392 100644
---
a/integration-test-groups/aws2/aws2-s3/src/test/java/org/apache/camel/quarkus/component/aws2/s3/it/Aws2S3Test.java
+++
b/integration-test-groups/aws2/aws2-s3/src/test/java/org/apache/camel/quarkus/component/aws2/s3/it/Aws2S3Test.java
@@ -225,7 +225,7 @@ class Aws2S3Test extends BaseAWs2TestSupport {
final String oid2 = UUID.randomUUID().toString();
final String blobContent = "Hello " + oid1;
final String destinationBucket = "camel-quarkus-copy-object-"
- +
RandomStringUtils.randomAlphanumeric(32).toLowerCase(Locale.ROOT);
+ +
RandomStringUtils.secure().nextAlphanumeric(32).toLowerCase(Locale.ROOT);
// Create an object to copy
RestAssured.given()
diff --git
a/integration-test-groups/aws2/aws2-s3/src/test/java/org/apache/camel/quarkus/component/aws2/s3/it/Aws2S3TestEnvCustomizer.java
b/integration-test-groups/aws2/aws2-s3/src/test/java/org/apache/camel/quarkus/component/aws2/s3/it/Aws2S3TestEnvCustomizer.java
index 80501e90f0..468f6a7f54 100644
---
a/integration-test-groups/aws2/aws2-s3/src/test/java/org/apache/camel/quarkus/component/aws2/s3/it/Aws2S3TestEnvCustomizer.java
+++
b/integration-test-groups/aws2/aws2-s3/src/test/java/org/apache/camel/quarkus/component/aws2/s3/it/Aws2S3TestEnvCustomizer.java
@@ -41,7 +41,7 @@ public class Aws2S3TestEnvCustomizer implements
Aws2TestEnvCustomizer {
final S3Client s3Client = envContext.client(Service.S3,
S3Client::builder);
final KmsClient kmsClient = envContext.client(Service.KMS,
KmsClient::builder);
- final String bucketName = "camel-quarkus-" +
RandomStringUtils.randomAlphanumeric(49).toLowerCase(Locale.ROOT);
+ final String bucketName = "camel-quarkus-" +
RandomStringUtils.secure().nextAlphanumeric(49).toLowerCase(Locale.ROOT);
s3Client.createBucket(CreateBucketRequest.builder().bucket(bucketName).build());
envContext.property("aws-s3.bucket-name", bucketName);
envContext.closeable(() ->
s3Client.deleteBucket(DeleteBucketRequest.builder().bucket(bucketName).build()));
diff --git
a/integration-test-groups/aws2/aws2-ses/src/test/java/org/apache/camel/quarkus/component/aws2/ses/it/Aws2SesTest.java
b/integration-test-groups/aws2/aws2-ses/src/test/java/org/apache/camel/quarkus/component/aws2/ses/it/Aws2SesTest.java
index ef5d327c8a..84e8d37ce8 100644
---
a/integration-test-groups/aws2/aws2-ses/src/test/java/org/apache/camel/quarkus/component/aws2/ses/it/Aws2SesTest.java
+++
b/integration-test-groups/aws2/aws2-ses/src/test/java/org/apache/camel/quarkus/component/aws2/ses/it/Aws2SesTest.java
@@ -152,7 +152,7 @@ class Aws2SesTest extends BaseAWs2TestSupport {
assertThat(verified).isTrue();
/* All prerequisites should be set up now, so we can send the
message via SES */
- final String randomId =
RandomStringUtils.randomAlphanumeric(16).toLowerCase(Locale.ROOT);
+ final String randomId =
RandomStringUtils.secure().nextAlphanumeric(16).toLowerCase(Locale.ROOT);
final String subject = "Test " + randomId;
final String body = "Hello " + randomId;
LOG.infof("About to send message to %s with subject %s",
mailSlurpAddress, subject);
diff --git
a/integration-test-groups/aws2/aws2-sqs-sns/src/test/java/org/apache/camel/quarkus/component/aws2/sns/it/Aws2SqsSnsTestEnvCustomizer.java
b/integration-test-groups/aws2/aws2-sqs-sns/src/test/java/org/apache/camel/quarkus/component/aws2/sns/it/Aws2SqsSnsTestEnvCustomizer.java
index 151fd7e401..25ee03e269 100644
---
a/integration-test-groups/aws2/aws2-sqs-sns/src/test/java/org/apache/camel/quarkus/component/aws2/sns/it/Aws2SqsSnsTestEnvCustomizer.java
+++
b/integration-test-groups/aws2/aws2-sqs-sns/src/test/java/org/apache/camel/quarkus/component/aws2/sns/it/Aws2SqsSnsTestEnvCustomizer.java
@@ -50,7 +50,7 @@ public class Aws2SqsSnsTestEnvCustomizer implements
Aws2TestEnvCustomizer {
public void customize(Aws2TestEnvContext envContext) {
/* SQS */
- final String queueName = "camel-quarkus-" +
RandomStringUtils.randomAlphanumeric(49).toLowerCase(Locale.ROOT);
+ final String queueName = "camel-quarkus-" +
RandomStringUtils.secure().nextAlphanumeric(49).toLowerCase(Locale.ROOT);
envContext.property("aws-sqs.queue-name", queueName);
final SqsClient sqsClient = envContext.client(Service.SQS,
SqsClient::builder);
@@ -70,7 +70,7 @@ public class Aws2SqsSnsTestEnvCustomizer implements
Aws2TestEnvCustomizer {
}
private void customizeSns(Aws2TestEnvContext envContext, SqsClient
sqsClient, boolean fifo) {
- final String topicName = "camel-quarkus-" +
RandomStringUtils.randomAlphanumeric(49).toLowerCase(Locale.ROOT)
+ final String topicName = "camel-quarkus-" +
RandomStringUtils.secure().nextAlphanumeric(49).toLowerCase(Locale.ROOT)
+ (fifo ? ".fifo" : "");
envContext.property(fifo ? "aws-sns-fifo.topic-name" :
"aws-sns.topic-name", topicName);
@@ -94,7 +94,7 @@ public class Aws2SqsSnsTestEnvCustomizer implements
Aws2TestEnvCustomizer {
});
final String snsReceiverQueueName = "camel-quarkus-sns-receiver-"
- +
RandomStringUtils.randomAlphanumeric(30).toLowerCase(Locale.ROOT) + (fifo ?
".fifo" : "");
+ +
RandomStringUtils.secure().nextAlphanumeric(30).toLowerCase(Locale.ROOT) +
(fifo ? ".fifo" : "");
;
envContext.property(fifo ? "aws-sqs.sns-fifo-receiver-queue-name" :
"aws-sqs.sns-receiver-queue-name",
snsReceiverQueueName);
diff --git
a/integration-test-groups/aws2/aws2-sqs/src/test/java/org/apache/camel/quarkus/component/aws2/sqs/it/Aws2SqsTestEnvCustomizer.java
b/integration-test-groups/aws2/aws2-sqs/src/test/java/org/apache/camel/quarkus/component/aws2/sqs/it/Aws2SqsTestEnvCustomizer.java
index 679b0acb94..1039bdbc88 100644
---
a/integration-test-groups/aws2/aws2-sqs/src/test/java/org/apache/camel/quarkus/component/aws2/sqs/it/Aws2SqsTestEnvCustomizer.java
+++
b/integration-test-groups/aws2/aws2-sqs/src/test/java/org/apache/camel/quarkus/component/aws2/sqs/it/Aws2SqsTestEnvCustomizer.java
@@ -38,16 +38,16 @@ public class Aws2SqsTestEnvCustomizer implements
Aws2TestEnvCustomizer {
@Override
public void customize(Aws2TestEnvContext envContext) {
/* SQS */
- final String queueName = "camel-quarkus-" +
RandomStringUtils.randomAlphanumeric(49).toLowerCase(Locale.ROOT);
+ final String queueName = "camel-quarkus-" +
RandomStringUtils.secure().nextAlphanumeric(49).toLowerCase(Locale.ROOT);
envContext.property("aws-sqs.queue-name", queueName);
final String failingQueueName = "camel-quarkus-failing-"
- +
RandomStringUtils.randomAlphanumeric(49).toLowerCase(Locale.ROOT);
+ +
RandomStringUtils.secure().nextAlphanumeric(49).toLowerCase(Locale.ROOT);
envContext.property("aws-sqs.failing-name", failingQueueName);
final String deadletterQueueName = "camel-quarkus-dead-letter-"
- +
RandomStringUtils.randomAlphanumeric(49).toLowerCase(Locale.ROOT);
+ +
RandomStringUtils.secure().nextAlphanumeric(49).toLowerCase(Locale.ROOT);
envContext.property("aws-sqs.deadletter-name", deadletterQueueName);
final String delayedQueueName = "camel-quarkus-delayed-"
- +
RandomStringUtils.randomAlphanumeric(49).toLowerCase(Locale.ROOT);
+ +
RandomStringUtils.secure().nextAlphanumeric(49).toLowerCase(Locale.ROOT);
envContext.property("aws-sqs.delayed-name", delayedQueueName);
final SqsClient sqsClient = envContext.client(Service.SQS,
SqsClient::builder);
diff --git a/integration-test-groups/azure/azure-key-vault/pom.xml
b/integration-test-groups/azure/azure-key-vault/pom.xml
index c23e8133ad..b3610d357d 100644
--- a/integration-test-groups/azure/azure-key-vault/pom.xml
+++ b/integration-test-groups/azure/azure-key-vault/pom.xml
@@ -60,6 +60,11 @@
<artifactId>camel-quarkus-integration-tests-support-azure</artifactId>
<scope>test</scope>
</dependency>
+ <dependency>
+ <groupId>org.awaitility</groupId>
+ <artifactId>awaitility</artifactId>
+ <scope>test</scope>
+ </dependency>
</dependencies>
<profiles>
diff --git
a/integration-test-groups/azure/azure-key-vault/src/test/java/org/apache/camel/quarkus/component/azure/key/vault/it/AbstractAzureKeyVaultContextReloadTest.java
b/integration-test-groups/azure/azure-key-vault/src/test/java/org/apache/camel/quarkus/component/azure/key/vault/it/AbstractAzureKeyVaultContextReloadTest.java
index b899ae18aa..73d38a5edc 100644
---
a/integration-test-groups/azure/azure-key-vault/src/test/java/org/apache/camel/quarkus/component/azure/key/vault/it/AbstractAzureKeyVaultContextReloadTest.java
+++
b/integration-test-groups/azure/azure-key-vault/src/test/java/org/apache/camel/quarkus/component/azure/key/vault/it/AbstractAzureKeyVaultContextReloadTest.java
@@ -24,11 +24,11 @@ import com.azure.messaging.eventhubs.EventData;
import com.azure.messaging.eventhubs.EventHubClientBuilder;
import com.azure.messaging.eventhubs.EventHubProducerClient;
import io.restassured.RestAssured;
+import org.awaitility.Awaitility;
import org.eclipse.microprofile.config.ConfigProvider;
import org.hamcrest.CoreMatchers;
import org.jboss.logging.Logger;
import org.junit.jupiter.api.Test;
-import org.testcontainers.shaded.org.awaitility.Awaitility;
import static org.hamcrest.Matchers.is;
diff --git
a/integration-test-groups/azure/azure-storage-blob/src/test/java/org/apache/camel/quarkus/component/azure/storage/blob/it/AzureStorageBlobTest.java
b/integration-test-groups/azure/azure-storage-blob/src/test/java/org/apache/camel/quarkus/component/azure/storage/blob/it/AzureStorageBlobTest.java
index 816dc7a20a..3ec86637f2 100644
---
a/integration-test-groups/azure/azure-storage-blob/src/test/java/org/apache/camel/quarkus/component/azure/storage/blob/it/AzureStorageBlobTest.java
+++
b/integration-test-groups/azure/azure-storage-blob/src/test/java/org/apache/camel/quarkus/component/azure/storage/blob/it/AzureStorageBlobTest.java
@@ -38,12 +38,12 @@ import
org.apache.camel.quarkus.component.azure.storage.blob.it.AzureStorageHelp
import org.apache.camel.quarkus.test.EnabledIf;
import org.apache.camel.quarkus.test.mock.backend.MockBackendDisabled;
import org.apache.camel.quarkus.test.support.azure.AzureStorageTestResource;
+import org.awaitility.Awaitility;
import org.eclipse.microprofile.config.Config;
import org.eclipse.microprofile.config.ConfigProvider;
import org.junit.jupiter.api.AfterAll;
import org.junit.jupiter.api.BeforeAll;
import org.junit.jupiter.api.Test;
-import org.testcontainers.shaded.org.awaitility.Awaitility;
import static org.hamcrest.Matchers.anyOf;
import static org.hamcrest.Matchers.hasItems;
diff --git
a/integration-test-groups/azure/azure-storage-queue/src/test/java/org/apache/camel/quarkus/component/azure/storage/queue/it/AzureStorageQueueTest.java
b/integration-test-groups/azure/azure-storage-queue/src/test/java/org/apache/camel/quarkus/component/azure/storage/queue/it/AzureStorageQueueTest.java
index 4552494f59..91e1c69130 100644
---
a/integration-test-groups/azure/azure-storage-queue/src/test/java/org/apache/camel/quarkus/component/azure/storage/queue/it/AzureStorageQueueTest.java
+++
b/integration-test-groups/azure/azure-storage-queue/src/test/java/org/apache/camel/quarkus/component/azure/storage/queue/it/AzureStorageQueueTest.java
@@ -25,8 +25,8 @@ import io.quarkus.test.junit.QuarkusTest;
import io.restassured.RestAssured;
import io.restassured.http.ContentType;
import org.apache.camel.quarkus.test.support.azure.AzureStorageTestResource;
+import org.awaitility.Awaitility;
import org.junit.jupiter.api.Test;
-import org.testcontainers.shaded.org.awaitility.Awaitility;
import static io.restassured.RestAssured.given;
import static org.hamcrest.Matchers.containsString;
diff --git
a/integration-test-groups/cxf-soap/cxf-soap-ws-security-client/src/test/java/org/apache/camel/quarkus/component/cxf/soap/wss/client/it/CxfSoapWssClientTest.java
b/integration-test-groups/cxf-soap/cxf-soap-ws-security-client/src/test/java/org/apache/camel/quarkus/component/cxf/soap/wss/client/it/CxfSoapWssClientTest.java
index e51284bab1..00c03d5c12 100644
---
a/integration-test-groups/cxf-soap/cxf-soap-ws-security-client/src/test/java/org/apache/camel/quarkus/component/cxf/soap/wss/client/it/CxfSoapWssClientTest.java
+++
b/integration-test-groups/cxf-soap/cxf-soap-ws-security-client/src/test/java/org/apache/camel/quarkus/component/cxf/soap/wss/client/it/CxfSoapWssClientTest.java
@@ -37,11 +37,11 @@ import jakarta.xml.ws.WebServiceException;
import
org.apache.camel.quarkus.components.cxf.soap.wss.client.helloworld.SayHelloService;
import
org.apache.camel.quarkus.components.cxf.soap.wss.client.helloworld.SayHelloWrongWS;
import org.apache.cxf.ws.security.SecurityConstants;
+import org.awaitility.Awaitility;
import org.eclipse.microprofile.config.ConfigProvider;
import org.junit.jupiter.api.Assertions;
import org.junit.jupiter.api.Assumptions;
import org.junit.jupiter.api.Test;
-import org.testcontainers.shaded.org.awaitility.Awaitility;
import static org.hamcrest.Matchers.equalTo;
diff --git
a/integration-test-groups/foundation/scheduler/src/main/java/org/apache/camel/quarkus/component/scheduler/it/SchedulerRoute.java
b/integration-test-groups/foundation/scheduler/src/main/java/org/apache/camel/quarkus/component/scheduler/it/SchedulerRoute.java
index efac2a0dbb..f5b594e027 100644
---
a/integration-test-groups/foundation/scheduler/src/main/java/org/apache/camel/quarkus/component/scheduler/it/SchedulerRoute.java
+++
b/integration-test-groups/foundation/scheduler/src/main/java/org/apache/camel/quarkus/component/scheduler/it/SchedulerRoute.java
@@ -48,19 +48,19 @@ public class SchedulerRoute extends RouteBuilder {
@Override
public void configure() throws Exception {
-
from("scheduler:withInitialDelay?initialDelay=1").routeId("withInitialDelay").noAutoStartup()
+
from("scheduler:withInitialDelay?initialDelay=1").routeId("withInitialDelay").autoStartup(false)
.process(e -> schedulerCounter.incrementAndGet());
-
from("scheduler:withDelay?delay=100").routeId("withDelay").noAutoStartup()
+
from("scheduler:withDelay?delay=100").routeId("withDelay").autoStartup(false)
.process(e -> withDelayCounter.incrementAndGet());
-
from("scheduler:useFixedDelay?initialDelay=200&useFixedDelay=true").routeId("useFixedDelay").noAutoStartup()
+
from("scheduler:useFixedDelay?initialDelay=200&useFixedDelay=true").routeId("useFixedDelay").autoStartup(false)
.process(e -> useFixedDelayCounter.incrementAndGet());
-
from("scheduler:withDelayRepeat?delay=1&repeatCount=5").routeId("withDelayRepeat").noAutoStartup()
+
from("scheduler:withDelayRepeat?delay=1&repeatCount=5").routeId("withDelayRepeat").autoStartup(false)
.process(e -> withDelayRepeatCounter.incrementAndGet());
-
from("scheduler:greedy?delay=100&greedy=true").routeId("greedy").noAutoStartup()
+
from("scheduler:greedy?delay=100&greedy=true").routeId("greedy").autoStartup(false)
.process(e -> greedyCounter.incrementAndGet());
}
}
diff --git
a/integration-tests-jvm/spring-redis/src/test/java/org/apache/camel/quarkus/component/spring/redis/it/SpringRedisTest.java
b/integration-tests-jvm/spring-redis/src/test/java/org/apache/camel/quarkus/component/spring/redis/it/SpringRedisTest.java
index 63fd6be1c8..4299f1aac1 100644
---
a/integration-tests-jvm/spring-redis/src/test/java/org/apache/camel/quarkus/component/spring/redis/it/SpringRedisTest.java
+++
b/integration-tests-jvm/spring-redis/src/test/java/org/apache/camel/quarkus/component/spring/redis/it/SpringRedisTest.java
@@ -21,8 +21,8 @@ import java.util.concurrent.TimeUnit;
import io.quarkus.test.common.QuarkusTestResource;
import io.quarkus.test.junit.QuarkusTest;
import io.restassured.RestAssured;
+import org.awaitility.Awaitility;
import org.junit.jupiter.api.Test;
-import org.testcontainers.shaded.org.awaitility.Awaitility;
@QuarkusTest
@QuarkusTestResource(SpringRedisTestResource.class)
diff --git
a/integration-tests-support/aws2/src/test/java/org/apache/camel/quarkus/test/support/aws2/Aws2TestResource.java
b/integration-tests-support/aws2/src/test/java/org/apache/camel/quarkus/test/support/aws2/Aws2TestResource.java
index 31c5a1271e..10abd9e2c9 100644
---
a/integration-tests-support/aws2/src/test/java/org/apache/camel/quarkus/test/support/aws2/Aws2TestResource.java
+++
b/integration-tests-support/aws2/src/test/java/org/apache/camel/quarkus/test/support/aws2/Aws2TestResource.java
@@ -88,7 +88,6 @@ public final class Aws2TestResource implements
QuarkusTestResourceLifecycleManag
LocalStackContainer localstack = new LocalStackContainer(imageName)
.withServices(services);
localstack.withEnv("LS_LOG", localstackLogLevel);
- localstack.withEnv("LAMBDA_EXECUTOR", "local");
localstack.withEnv("PROVIDER_OVERRIDE_CLOUDWATCH", "v1");
localstack.withLogConsumer(new Slf4jLogConsumer(LOG));
localstack.start();
diff --git
a/integration-tests/google-bigquery/src/test/java/org/apache/camel/quarkus/component/google/bigquery/it/GoogleBigqueryCustomizer.java
b/integration-tests/google-bigquery/src/test/java/org/apache/camel/quarkus/component/google/bigquery/it/GoogleBigqueryCustomizer.java
index ed963bed68..eca478817f 100644
---
a/integration-tests/google-bigquery/src/test/java/org/apache/camel/quarkus/component/google/bigquery/it/GoogleBigqueryCustomizer.java
+++
b/integration-tests/google-bigquery/src/test/java/org/apache/camel/quarkus/component/google/bigquery/it/GoogleBigqueryCustomizer.java
@@ -137,7 +137,7 @@ public class GoogleBigqueryCustomizer implements
GoogleTestEnvCustomizer {
private String generateName(String name, GoogleCloudContext envContext,
boolean generateSuffixes) {
String retVal = "google_bigquery_" + name;
if (generateSuffixes) {
- retVal = retVal + "_" +
RandomStringUtils.randomAlphanumeric(49).toLowerCase(Locale.ROOT);
+ retVal = retVal + "_" +
RandomStringUtils.secure().nextAlphanumeric(49).toLowerCase(Locale.ROOT);
}
envContext.property("google-bigquery." + name, retVal);
return retVal;
diff --git
a/integration-tests/google-pubsub/src/test/java/org/apache/camel/quarkus/component/google/pubsub/it/GooglePubSubCustomizer.java
b/integration-tests/google-pubsub/src/test/java/org/apache/camel/quarkus/component/google/pubsub/it/GooglePubSubCustomizer.java
index b7f0a3625d..5a2a2b7315 100644
---
a/integration-tests/google-pubsub/src/test/java/org/apache/camel/quarkus/component/google/pubsub/it/GooglePubSubCustomizer.java
+++
b/integration-tests/google-pubsub/src/test/java/org/apache/camel/quarkus/component/google/pubsub/it/GooglePubSubCustomizer.java
@@ -72,34 +72,34 @@ public class GooglePubSubCustomizer implements
GoogleTestEnvCustomizer {
}
final String topicName = "camel-quarkus-topic-"
- +
RandomStringUtils.randomAlphanumeric(49).toLowerCase(Locale.ROOT);
+ +
RandomStringUtils.secure().nextAlphanumeric(49).toLowerCase(Locale.ROOT);
envContext.property("google-pubsub.topic-name", topicName);
final String subscriptionName = "camel-quarkus-subscription-"
- +
RandomStringUtils.randomAlphanumeric(49).toLowerCase(Locale.ROOT);
+ +
RandomStringUtils.secure().nextAlphanumeric(49).toLowerCase(Locale.ROOT);
envContext.property("google-pubsub.subscription-name",
subscriptionName);
final String groupedTopicName = "camel-quarkus-grouped-topic-"
- +
RandomStringUtils.randomAlphanumeric(49).toLowerCase(Locale.ROOT);
+ +
RandomStringUtils.secure().nextAlphanumeric(49).toLowerCase(Locale.ROOT);
envContext.property("google-pubsub.grouped-topic-name",
groupedTopicName);
final String groupedSubscriptionName =
"camel-quarkus-grouped-subscription-"
- +
RandomStringUtils.randomAlphanumeric(49).toLowerCase(Locale.ROOT);
+ +
RandomStringUtils.secure().nextAlphanumeric(49).toLowerCase(Locale.ROOT);
envContext.property("google-pubsub.grouped-subscription-name",
groupedSubscriptionName);
final String orderingTopicName = "camel-quarkus-ordering-topic-"
- +
RandomStringUtils.randomAlphanumeric(49).toLowerCase(Locale.ROOT);
+ +
RandomStringUtils.secure().nextAlphanumeric(49).toLowerCase(Locale.ROOT);
envContext.property("google-pubsub.ordering-topic-name",
orderingTopicName);
final String orderingSubscriptionName =
"camel-quarkus-ordering-subscription-"
- +
RandomStringUtils.randomAlphanumeric(49).toLowerCase(Locale.ROOT);
+ +
RandomStringUtils.secure().nextAlphanumeric(49).toLowerCase(Locale.ROOT);
envContext.property("google-pubsub.ordering-subscription-name",
orderingSubscriptionName);
final String ackTopicName = "camel-quarkus-ack-topic-"
- +
RandomStringUtils.randomAlphanumeric(49).toLowerCase(Locale.ROOT);
+ +
RandomStringUtils.secure().nextAlphanumeric(49).toLowerCase(Locale.ROOT);
envContext.property("google-pubsub.ack-topic-name", ackTopicName);
final String ackSubscriptionName =
"camel-quarkus-ack-subscription-"
- +
RandomStringUtils.randomAlphanumeric(49).toLowerCase(Locale.ROOT);
+ +
RandomStringUtils.secure().nextAlphanumeric(49).toLowerCase(Locale.ROOT);
envContext.property("google-pubsub.ack-subscription-name",
ackSubscriptionName);
Topic topic = createTopic(topicClient, topicName, projectId);
diff --git
a/integration-tests/google-secret-manager/src/test/java/org/apache/camel/quarkus/component/google/secret/manager/it/GooglePubSubCustomizer.java
b/integration-tests/google-secret-manager/src/test/java/org/apache/camel/quarkus/component/google/secret/manager/it/GooglePubSubCustomizer.java
index 84190ad4b5..b5af8feffd 100644
---
a/integration-tests/google-secret-manager/src/test/java/org/apache/camel/quarkus/component/google/secret/manager/it/GooglePubSubCustomizer.java
+++
b/integration-tests/google-secret-manager/src/test/java/org/apache/camel/quarkus/component/google/secret/manager/it/GooglePubSubCustomizer.java
@@ -65,11 +65,11 @@ public class GooglePubSubCustomizer implements
GoogleTestEnvCustomizer {
}
final String refreshTopicName = "camel-quarkus-refresh-topic-"
- +
RandomStringUtils.randomAlphanumeric(49).toLowerCase(Locale.ROOT);
+ +
RandomStringUtils.secure().nextAlphanumeric(49).toLowerCase(Locale.ROOT);
envContext.property("google-pubsub.refresh-topic-name",
refreshTopicName);
final String refreshSubscriptionName =
"camel-quarkus-refresh-subscription-"
- +
RandomStringUtils.randomAlphanumeric(49).toLowerCase(Locale.ROOT);
+ +
RandomStringUtils.secure().nextAlphanumeric(49).toLowerCase(Locale.ROOT);
envContext.property("google-pubsub.refresh-subscription-name",
refreshSubscriptionName);
Topic topic = createTopic(topicClient, refreshTopicName,
projectId);
diff --git
a/integration-tests/infinispan-common/src/main/java/org/apache/camel/quarkus/component/infinispan/common/model/PersonSchema.java
b/integration-tests/infinispan-common/src/main/java/org/apache/camel/quarkus/component/infinispan/common/model/PersonSchema.java
index a995930735..46f9e3c970 100644
---
a/integration-tests/infinispan-common/src/main/java/org/apache/camel/quarkus/component/infinispan/common/model/PersonSchema.java
+++
b/integration-tests/infinispan-common/src/main/java/org/apache/camel/quarkus/component/infinispan/common/model/PersonSchema.java
@@ -17,8 +17,8 @@
package org.apache.camel.quarkus.component.infinispan.common.model;
import org.infinispan.protostream.GeneratedSchema;
-import org.infinispan.protostream.annotations.AutoProtoSchemaBuilder;
+import org.infinispan.protostream.annotations.ProtoSchema;
-@AutoProtoSchemaBuilder(includeClasses = { Person.class }, schemaPackageName =
"person")
+@ProtoSchema(includeClasses = { Person.class }, schemaPackageName = "person")
interface PersonSchema extends GeneratedSchema {
}
diff --git
a/integration-tests/jt400/src/test/java/org/apache/camel/quarkus/component/jt400/it/Jt400Test.java
b/integration-tests/jt400/src/test/java/org/apache/camel/quarkus/component/jt400/it/Jt400Test.java
index f138516384..77e7562def 100644
---
a/integration-tests/jt400/src/test/java/org/apache/camel/quarkus/component/jt400/it/Jt400Test.java
+++
b/integration-tests/jt400/src/test/java/org/apache/camel/quarkus/component/jt400/it/Jt400Test.java
@@ -77,7 +77,7 @@ public class Jt400Test {
public void testDataQueue() {
LOGGER.debug("**** testDataQueue() ** has started ");
- String msg =
RandomStringUtils.randomAlphanumeric(MSG_LENGTH).toLowerCase(Locale.ROOT);
+ String msg =
RandomStringUtils.secure().nextAlphanumeric(MSG_LENGTH).toLowerCase(Locale.ROOT);
String answer = "Hello From DQ: " + msg;
RestAssured.given()
@@ -100,7 +100,7 @@ public class Jt400Test {
@Test
public void testDataQueueBinary() throws Exception {
LOGGER.debug("**** testDataQueueBinary() ** has started ");
- String msg =
RandomStringUtils.randomAlphanumeric(MSG_LENGTH).toLowerCase(Locale.ROOT);
+ String msg =
RandomStringUtils.secure().nextAlphanumeric(MSG_LENGTH).toLowerCase(Locale.ROOT);
String answer = "Hello (bin) " + msg;
RestAssured.given()
@@ -127,12 +127,12 @@ public class Jt400Test {
@Test
public void testKeyedDataQueue() {
LOGGER.debug("**** testKeyedDataQueue() ** has started ");
- String msg1 =
RandomStringUtils.randomAlphanumeric(MSG_LENGTH).toLowerCase(Locale.ROOT);
- String msg2 =
RandomStringUtils.randomAlphanumeric(MSG_LENGTH).toLowerCase(Locale.ROOT);
+ String msg1 =
RandomStringUtils.secure().nextAlphanumeric(MSG_LENGTH).toLowerCase(Locale.ROOT);
+ String msg2 =
RandomStringUtils.secure().nextAlphanumeric(MSG_LENGTH).toLowerCase(Locale.ROOT);
String answer1 = "Hello From KDQ: " + msg1;
String answer2 = "Hello From KDQ: " + msg2;
- String key1 = RandomStringUtils.randomAlphanumeric(MSG_LENGTH -
1).toLowerCase(Locale.ROOT);
+ String key1 = RandomStringUtils.secure().nextAlphanumeric(MSG_LENGTH -
1).toLowerCase(Locale.ROOT);
//key2 is right after key1
String key2 = key1 + "a";
@@ -180,7 +180,7 @@ public class Jt400Test {
public void testMessageQueue() throws Exception {
LOGGER.debug("**** testMessageQueue() ** has started ");
//write
- String msg =
RandomStringUtils.randomAlphanumeric(MSG_LENGTH).toLowerCase(Locale.ROOT);
+ String msg =
RandomStringUtils.secure().nextAlphanumeric(MSG_LENGTH).toLowerCase(Locale.ROOT);
String answer = "Hello from MQ: " + msg;
RestAssured.given()
@@ -215,7 +215,7 @@ public class Jt400Test {
public void testInquiryMessageQueue() throws Exception {
LOGGER.debug("**** testInquiryMessageQueue() **: has started ");
- String msg =
RandomStringUtils.randomAlphanumeric(10).toLowerCase(Locale.ROOT);
+ String msg =
RandomStringUtils.secure().nextAlphanumeric(10).toLowerCase(Locale.ROOT);
String replyMsg = "reply to: " + msg;
getClientHelper().registerForRemoval(Jt400TestResource.RESOURCE_TYPE.replyToQueueu,
msg);
getClientHelper().registerForRemoval(Jt400TestResource.RESOURCE_TYPE.replyToQueueu,
replyMsg);
diff --git
a/integration-tests/langchain4j/src/main/java/org/apache/camel/quarkus/component/langchain/it/MirrorAiService.java
b/integration-tests/langchain4j/src/main/java/org/apache/camel/quarkus/component/langchain/it/MirrorAiService.java
index d19c78b999..625c09f34c 100644
---
a/integration-tests/langchain4j/src/main/java/org/apache/camel/quarkus/component/langchain/it/MirrorAiService.java
+++
b/integration-tests/langchain4j/src/main/java/org/apache/camel/quarkus/component/langchain/it/MirrorAiService.java
@@ -36,7 +36,8 @@ public interface MirrorAiService {
public static class MirrorModelSupplier implements
Supplier<ChatLanguageModel> {
@Override
public ChatLanguageModel get() {
- return (messages) -> new Response<>(new
AiMessage(messages.get(0).text()));
+ return (messages) -> new Response<>(
+ new AiMessage(((dev.langchain4j.data.message.UserMessage)
messages.get(0)).singleText()));
}
}
diff --git
a/integration-tests/mail/src/test/java/org/apache/camel/quarkus/component/mail/MailTest.java
b/integration-tests/mail/src/test/java/org/apache/camel/quarkus/component/mail/MailTest.java
index e303e86564..148b0b3ae6 100644
---
a/integration-tests/mail/src/test/java/org/apache/camel/quarkus/component/mail/MailTest.java
+++
b/integration-tests/mail/src/test/java/org/apache/camel/quarkus/component/mail/MailTest.java
@@ -41,6 +41,7 @@ import org.apache.camel.ExchangePropertyKey;
import org.apache.camel.ServiceStatus;
import org.apache.camel.quarkus.test.support.certificate.CertificatesUtil;
import org.apache.camel.quarkus.test.support.certificate.TestCertificates;
+import org.awaitility.Awaitility;
import org.eclipse.angus.mail.util.MailConnectException;
import org.eclipse.microprofile.config.Config;
import org.eclipse.microprofile.config.ConfigProvider;
@@ -50,7 +51,6 @@ import org.junit.jupiter.api.BeforeEach;
import org.junit.jupiter.api.Test;
import org.junit.jupiter.params.ParameterizedTest;
import org.junit.jupiter.params.provider.ValueSource;
-import org.testcontainers.shaded.org.awaitility.Awaitility;
import static org.apache.camel.quarkus.component.mail.CamelRoute.EMAIL_ADDRESS;
import static org.apache.camel.quarkus.component.mail.CamelRoute.PASSWORD;
diff --git
a/integration-tests/oaipmh/src/test/java/org/apache/camel/quarkus/component/oaipmh/it/MockOaipmhServer.java
b/integration-tests/oaipmh/src/test/java/org/apache/camel/quarkus/component/oaipmh/it/MockOaipmhServer.java
index 9a36ce884a..a0408e9e44 100644
---
a/integration-tests/oaipmh/src/test/java/org/apache/camel/quarkus/component/oaipmh/it/MockOaipmhServer.java
+++
b/integration-tests/oaipmh/src/test/java/org/apache/camel/quarkus/component/oaipmh/it/MockOaipmhServer.java
@@ -26,12 +26,10 @@ import java.util.zip.ZipInputStream;
import com.github.tomakehurst.wiremock.WireMockServer;
import com.github.tomakehurst.wiremock.client.ResponseDefinitionBuilder;
-import com.github.tomakehurst.wiremock.common.FileSource;
import com.github.tomakehurst.wiremock.core.WireMockConfiguration;
-import com.github.tomakehurst.wiremock.extension.Parameters;
-import com.github.tomakehurst.wiremock.extension.ResponseDefinitionTransformer;
-import com.github.tomakehurst.wiremock.http.Request;
+import
com.github.tomakehurst.wiremock.extension.ResponseDefinitionTransformerV2;
import com.github.tomakehurst.wiremock.http.ResponseDefinition;
+import com.github.tomakehurst.wiremock.stubbing.ServeEvent;
import org.apache.camel.quarkus.test.AvailablePortFinder;
import org.apache.camel.quarkus.test.support.certificate.CertificatesUtil;
import org.apache.commons.codec.digest.DigestUtils;
@@ -82,7 +80,7 @@ public final class MockOaipmhServer {
responseCache = Collections.unmodifiableMap(cache);
}
} catch (IOException ioex) {
- throw new RuntimeException("An issue occured while initializing
the OAI-PMH mock server reponse cache", ioex);
+ throw new RuntimeException("An issue occurred while initializing
the OAI-PMH mock server response cache", ioex);
}
return responseCache;
}
@@ -115,12 +113,10 @@ public final class MockOaipmhServer {
return this.httpsPort;
}
- public static final class OaipmhMockTransformer extends
ResponseDefinitionTransformer {
-
+ public static final class OaipmhMockTransformer implements
ResponseDefinitionTransformerV2 {
@Override
- public ResponseDefinition transform(Request request,
ResponseDefinition responseDefinition, FileSource files,
- Parameters parameters) {
- String sha256Hex = DigestUtils.sha256Hex(request.getUrl());
+ public ResponseDefinition transform(ServeEvent event) {
+ String sha256Hex =
DigestUtils.sha256Hex(event.getRequest().getUrl());
return new
ResponseDefinitionBuilder().withStatus(200).withBody(getResponseCache().get(sha256Hex
+ ".xml")).build();
}
@@ -129,5 +125,4 @@ public final class MockOaipmhServer {
return "oaipmh-mock-transformer";
}
}
-
}
diff --git
a/integration-tests/platform-http/src/main/java/org/apache/camel/quarkus/component/platform/http/it/TestHeaderFilterStrategy.java
b/integration-tests/platform-http/src/main/java/org/apache/camel/quarkus/component/platform/http/it/TestHeaderFilterStrategy.java
index 30c2ac0760..268beb2e00 100644
---
a/integration-tests/platform-http/src/main/java/org/apache/camel/quarkus/component/platform/http/it/TestHeaderFilterStrategy.java
+++
b/integration-tests/platform-http/src/main/java/org/apache/camel/quarkus/component/platform/http/it/TestHeaderFilterStrategy.java
@@ -18,11 +18,11 @@ package org.apache.camel.quarkus.component.platform.http.it;
import jakarta.enterprise.context.ApplicationScoped;
import jakarta.inject.Named;
-import
org.apache.camel.component.platform.http.PlatformHttpHeaderFilterStrategy;
+import org.apache.camel.http.base.HttpHeaderFilterStrategy;
@ApplicationScoped
@Named("TestHeaderFilterStrategy")
-public class TestHeaderFilterStrategy extends PlatformHttpHeaderFilterStrategy
{
+public class TestHeaderFilterStrategy extends HttpHeaderFilterStrategy {
@Override
protected void initialize() {
diff --git
a/integration-tests/smb/src/test/java/org/apache/camel/quarkus/component/smb/it/SmbTest.java
b/integration-tests/smb/src/test/java/org/apache/camel/quarkus/component/smb/it/SmbTest.java
index d11856e8f0..5d51af934c 100644
---
a/integration-tests/smb/src/test/java/org/apache/camel/quarkus/component/smb/it/SmbTest.java
+++
b/integration-tests/smb/src/test/java/org/apache/camel/quarkus/component/smb/it/SmbTest.java
@@ -24,9 +24,9 @@ import io.quarkus.test.junit.QuarkusTest;
import io.restassured.RestAssured;
import org.apache.camel.component.smb.SmbConstants;
import org.apache.camel.quarkus.test.DisabledIfFipsMode;
+import org.awaitility.Awaitility;
import org.hamcrest.Matchers;
import org.junit.jupiter.api.Test;
-import org.testcontainers.shaded.org.awaitility.Awaitility;
import static org.assertj.core.api.Assertions.assertThat;
diff --git
a/integration-tests/splunk-hec/src/test/java/org/apache/camel/quarkus/component/splunk/hec/it/SplunkHecTest.java
b/integration-tests/splunk-hec/src/test/java/org/apache/camel/quarkus/component/splunk/hec/it/SplunkHecTest.java
index 6ec2986185..7066422f68 100644
---
a/integration-tests/splunk-hec/src/test/java/org/apache/camel/quarkus/component/splunk/hec/it/SplunkHecTest.java
+++
b/integration-tests/splunk-hec/src/test/java/org/apache/camel/quarkus/component/splunk/hec/it/SplunkHecTest.java
@@ -31,12 +31,14 @@ import org.apache.camel.quarkus.test.DisabledOnArm;
import org.apache.camel.quarkus.test.support.certificate.TestCertificates;
import org.apache.camel.quarkus.test.support.splunk.SplunkConstants;
import org.apache.camel.quarkus.test.support.splunk.SplunkTestResource;
+import org.awaitility.Awaitility;
import org.eclipse.microprofile.config.ConfigProvider;
import org.hamcrest.Matchers;
import org.junit.jupiter.api.Test;
-import org.testcontainers.shaded.org.awaitility.Awaitility;
import org.testcontainers.shaded.org.hamcrest.core.StringContains;
+import static org.hamcrest.Matchers.containsString;
+
@TestCertificates(docker = true, certificates = {
@Certificate(name = "splunk-hec", formats = { Format.PEM,
Format.PKCS12 }, password = "password"),
@Certificate(name = "splunk-hec-invalid", formats = { Format.PKCS12 },
password = "password")
@@ -62,17 +64,16 @@ public class SplunkHecTest {
.statusCode(200);
//there might a delay between the data written and received by the
search, therefore await()
- Awaitility.await().atMost(30, TimeUnit.SECONDS).until(
- () -> RestAssured.given()
- .request()
- .formParam("search", "search index=\"testindex\"")
- .formParam("exec_mode", "oneshot")
- .relaxedHTTPSValidation()
- .auth().basic("admin", "password")
- .post(url + "/services/search/jobs")
- .then().statusCode(200)
- .extract().asString(),
- StringContains.containsString("Hello Sheldon"));
+ Awaitility.await().atMost(30, TimeUnit.SECONDS).untilAsserted(() ->
RestAssured.given()
+ .request()
+ .formParam("search", "search index=\"testindex\"")
+ .formParam("exec_mode", "oneshot")
+ .relaxedHTTPSValidation()
+ .auth().basic("admin", "password")
+ .post(url + "/services/search/jobs")
+ .then()
+ .statusCode(200)
+ .body(containsString("Hello Sheldon")));
}
@Test
diff --git a/integration-tests/splunk/pom.xml b/integration-tests/splunk/pom.xml
index 6f1118475b..bf089f70e3 100644
--- a/integration-tests/splunk/pom.xml
+++ b/integration-tests/splunk/pom.xml
@@ -74,6 +74,11 @@
<artifactId>camel-quarkus-integration-tests-support-certificate-generator</artifactId>
<scope>test</scope>
</dependency>
+ <dependency>
+ <groupId>org.awaitility</groupId>
+ <artifactId>awaitility</artifactId>
+ <scope>test</scope>
+ </dependency>
</dependencies>
<profiles>
diff --git
a/integration-tests/splunk/src/test/java/org/apache/camel/quarkus/component/splunk/it/SplunkTest.java
b/integration-tests/splunk/src/test/java/org/apache/camel/quarkus/component/splunk/it/SplunkTest.java
index e484430270..e1a53ef856 100644
---
a/integration-tests/splunk/src/test/java/org/apache/camel/quarkus/component/splunk/it/SplunkTest.java
+++
b/integration-tests/splunk/src/test/java/org/apache/camel/quarkus/component/splunk/it/SplunkTest.java
@@ -33,14 +33,14 @@ import org.apache.camel.component.splunk.ProducerType;
import org.apache.camel.quarkus.test.DisabledOnArm;
import org.apache.camel.quarkus.test.support.splunk.SplunkConstants;
import org.apache.camel.quarkus.test.support.splunk.SplunkTestResource;
+import org.apache.commons.lang3.RandomStringUtils;
import org.apache.http.NoHttpResponseException;
+import org.awaitility.Awaitility;
import org.eclipse.microprofile.config.Config;
import org.eclipse.microprofile.config.ConfigProvider;
import org.hamcrest.Matchers;
import org.junit.jupiter.api.Assertions;
import org.junit.jupiter.api.Test;
-import org.testcontainers.shaded.org.apache.commons.lang3.RandomStringUtils;
-import org.testcontainers.shaded.org.awaitility.Awaitility;
import static org.hamcrest.Matchers.anyOf;
import static org.hamcrest.Matchers.is;
@@ -179,18 +179,18 @@ public class SplunkTest {
Map<String, String> data3;
if (raw) {
data1 = Map.of("_rawData", "Name: Sheldon" + suffix + " From:
Alpha Centauri", "data",
-
RandomStringUtils.randomAlphanumeric(lengthOfRandomString));
+
RandomStringUtils.secure().nextAlphanumeric(lengthOfRandomString));
data2 = Map.of("_rawData", "Name: Leonard" + suffix + " From:
Earth 2.0", "data",
-
RandomStringUtils.randomAlphanumeric(lengthOfRandomString));
+
RandomStringUtils.secure().nextAlphanumeric(lengthOfRandomString));
data3 = Map.of("_rawData", "Name: Irma" + suffix + " From: Earth",
"data",
-
RandomStringUtils.randomAlphanumeric(lengthOfRandomString));
+
RandomStringUtils.secure().nextAlphanumeric(lengthOfRandomString));
} else {
data1 = Map.of("entity", "Name: Sheldon" + suffix + " From: Alpha
Centauri", "data",
-
RandomStringUtils.randomAlphanumeric(lengthOfRandomString));
+
RandomStringUtils.secure().nextAlphanumeric(lengthOfRandomString));
data2 = Map.of("entity", "Name: Leonard" + suffix + " From: Earth
2.0", "data",
-
RandomStringUtils.randomAlphanumeric(lengthOfRandomString));
+
RandomStringUtils.secure().nextAlphanumeric(lengthOfRandomString));
data3 = Map.of("entity", "Name: Irma" + suffix + " From: Earth",
"data",
-
RandomStringUtils.randomAlphanumeric(lengthOfRandomString));
+
RandomStringUtils.secure().nextAlphanumeric(lengthOfRandomString));
}
write.accept(data1);
diff --git
a/integration-tests/tarfile/src/test/java/org/apache/camel/quarkus/component/tarfile/it/TarfileTest.java
b/integration-tests/tarfile/src/test/java/org/apache/camel/quarkus/component/tarfile/it/TarfileTest.java
index aaa072c2b1..d49eb11050 100644
---
a/integration-tests/tarfile/src/test/java/org/apache/camel/quarkus/component/tarfile/it/TarfileTest.java
+++
b/integration-tests/tarfile/src/test/java/org/apache/camel/quarkus/component/tarfile/it/TarfileTest.java
@@ -39,8 +39,8 @@ class TarfileTest {
byte[] body;
- ExtractableResponse response = RestAssured.given() //
- .contentType(ContentType.TEXT + "; charset=" +
encoding).body("Hello World").post("/tarfile/post") //
+ ExtractableResponse<?> response = RestAssured.given()
+ .contentType(ContentType.TEXT + "; charset=" +
encoding).body("Hello World").post("/tarfile/post")
.then().extract();
body = response.body().asByteArray();
@@ -48,10 +48,10 @@ class TarfileTest {
ByteArrayOutputStream bos = new ByteArrayOutputStream();
ByteArrayInputStream bis = new ByteArrayInputStream(body);
- TarArchiveInputStream tis = (TarArchiveInputStream) new
ArchiveStreamFactory()
+ TarArchiveInputStream tis = new ArchiveStreamFactory()
.createArchiveInputStream(ArchiveStreamFactory.TAR, bis);
- TarArchiveEntry entry = tis.getNextTarEntry();
+ TarArchiveEntry entry = tis.getNextEntry();
if (entry != null) {
IOHelper.copy(tis, bos);
}
@@ -59,5 +59,4 @@ class TarfileTest {
String str = bos.toString(encoding);
Assertions.assertEquals("Hello World", str);
}
-
}
