This is an automated email from the ASF dual-hosted git repository. davsclaus pushed a commit to branch main in repository https://gitbox.apache.org/repos/asf/camel-spring-boot.git
The following commit(s) were added to refs/heads/main by this push: new 8017956ad0d Use org.springframework.context.annotation.Configuration for Annotation (#520) 8017956ad0d is described below commit 8017956ad0d0229cf16f4e20a70315b66179e25e Author: Tom Cunningham <tcunn...@redhat.com> AuthorDate: Wed Apr 13 00:56:26 2022 -0400 Use org.springframework.context.annotation.Configuration for Annotation (#520) --- .../src/test/java/org/apache/camel/component/aws2/BaseDdb2.java | 2 +- .../test/java/org/apache/camel/component/aws2/ddb/Ddb2QueryTest.java | 2 +- .../src/test/java/org/apache/camel/component/aws2/ddb/Ddb2ScanTest.java | 2 +- .../java/org/apache/camel/component/aws2/ddb/Ddb2UpdateItemTest.java | 2 +- .../org/apache/camel/component/aws2/ddb/Ddb2UpdateTableByIdTest.java | 2 +- .../src/test/java/org/apache/camel/component/aws2/sqs/BaseSqs.java | 2 +- .../java/org/apache/camel/component/aws2/sqs/JmsStyleSelectorTest.java | 2 +- .../test/java/org/apache/camel/component/aws2/sqs/SqsComponentTest.java | 2 +- .../java/org/apache/camel/component/aws2/sqs/SqsDeadletterTest.java | 2 +- .../java/org/apache/camel/component/aws2/sqs/SqsOperationsTest.java | 2 +- .../apache/camel/component/aws2/sqs/SqsProducerAutoCreateQueueTest.java | 2 +- 11 files changed, 11 insertions(+), 11 deletions(-) diff --git a/components-starter/camel-aws2-ddb-starter/src/test/java/org/apache/camel/component/aws2/BaseDdb2.java b/components-starter/camel-aws2-ddb-starter/src/test/java/org/apache/camel/component/aws2/BaseDdb2.java index 2347f4ef515..34b69921190 100644 --- a/components-starter/camel-aws2-ddb-starter/src/test/java/org/apache/camel/component/aws2/BaseDdb2.java +++ b/components-starter/camel-aws2-ddb-starter/src/test/java/org/apache/camel/component/aws2/BaseDdb2.java @@ -1,7 +1,6 @@ package org.apache.camel.component.aws2; import org.apache.camel.CamelContext; -import org.apache.camel.Configuration; import org.apache.camel.ProducerTemplate; import org.apache.camel.component.mock.MockEndpoint; import org.apache.camel.test.infra.aws2.clients.AWSSDKClientUtils; @@ -10,6 +9,7 @@ import org.apache.camel.test.infra.aws.common.services.AWSService; import org.apache.camel.test.infra.aws2.services.AWSServiceFactory; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.context.annotation.Bean; +import org.springframework.context.annotation.Configuration; import software.amazon.awssdk.services.dynamodb.DynamoDbClient; public class BaseDdb2 { diff --git a/components-starter/camel-aws2-ddb-starter/src/test/java/org/apache/camel/component/aws2/ddb/Ddb2QueryTest.java b/components-starter/camel-aws2-ddb-starter/src/test/java/org/apache/camel/component/aws2/ddb/Ddb2QueryTest.java index 78a5b3a9d07..7121bf1d401 100644 --- a/components-starter/camel-aws2-ddb-starter/src/test/java/org/apache/camel/component/aws2/ddb/Ddb2QueryTest.java +++ b/components-starter/camel-aws2-ddb-starter/src/test/java/org/apache/camel/component/aws2/ddb/Ddb2QueryTest.java @@ -16,7 +16,6 @@ */ package org.apache.camel.component.aws2.ddb; -import org.apache.camel.Configuration; import org.apache.camel.EndpointInject; import org.apache.camel.Exchange; import org.apache.camel.ProducerTemplate; @@ -30,6 +29,7 @@ import org.junit.jupiter.api.BeforeAll; import org.junit.jupiter.api.Test; import org.springframework.boot.test.context.SpringBootTest; import org.springframework.context.annotation.Bean; +import org.springframework.context.annotation.Configuration; import org.springframework.test.annotation.DirtiesContext; import software.amazon.awssdk.services.dynamodb.DynamoDbClient; import software.amazon.awssdk.services.dynamodb.model.AttributeDefinition; diff --git a/components-starter/camel-aws2-ddb-starter/src/test/java/org/apache/camel/component/aws2/ddb/Ddb2ScanTest.java b/components-starter/camel-aws2-ddb-starter/src/test/java/org/apache/camel/component/aws2/ddb/Ddb2ScanTest.java index 9e515291d08..c10eec92914 100644 --- a/components-starter/camel-aws2-ddb-starter/src/test/java/org/apache/camel/component/aws2/ddb/Ddb2ScanTest.java +++ b/components-starter/camel-aws2-ddb-starter/src/test/java/org/apache/camel/component/aws2/ddb/Ddb2ScanTest.java @@ -16,7 +16,6 @@ */ package org.apache.camel.component.aws2.ddb; -import org.apache.camel.Configuration; import org.apache.camel.EndpointInject; import org.apache.camel.Exchange; import org.apache.camel.ProducerTemplate; @@ -30,6 +29,7 @@ import org.junit.jupiter.api.BeforeAll; import org.junit.jupiter.api.Test; import org.springframework.boot.test.context.SpringBootTest; import org.springframework.context.annotation.Bean; +import org.springframework.context.annotation.Configuration; import org.springframework.test.annotation.DirtiesContext; import software.amazon.awssdk.services.dynamodb.DynamoDbClient; import software.amazon.awssdk.services.dynamodb.model.AttributeDefinition; diff --git a/components-starter/camel-aws2-ddb-starter/src/test/java/org/apache/camel/component/aws2/ddb/Ddb2UpdateItemTest.java b/components-starter/camel-aws2-ddb-starter/src/test/java/org/apache/camel/component/aws2/ddb/Ddb2UpdateItemTest.java index 62bb4525857..fa89a7225cb 100644 --- a/components-starter/camel-aws2-ddb-starter/src/test/java/org/apache/camel/component/aws2/ddb/Ddb2UpdateItemTest.java +++ b/components-starter/camel-aws2-ddb-starter/src/test/java/org/apache/camel/component/aws2/ddb/Ddb2UpdateItemTest.java @@ -16,7 +16,6 @@ */ package org.apache.camel.component.aws2.ddb; -import org.apache.camel.Configuration; import org.apache.camel.EndpointInject; import org.apache.camel.Exchange; import org.apache.camel.Processor; @@ -28,6 +27,7 @@ import org.apache.camel.test.spring.junit5.CamelSpringBootTest; import org.junit.jupiter.api.Test; import org.springframework.boot.test.context.SpringBootTest; import org.springframework.context.annotation.Bean; +import org.springframework.context.annotation.Configuration; import org.springframework.test.annotation.DirtiesContext; import software.amazon.awssdk.services.dynamodb.model.AttributeAction; import software.amazon.awssdk.services.dynamodb.model.AttributeValue; diff --git a/components-starter/camel-aws2-ddb-starter/src/test/java/org/apache/camel/component/aws2/ddb/Ddb2UpdateTableByIdTest.java b/components-starter/camel-aws2-ddb-starter/src/test/java/org/apache/camel/component/aws2/ddb/Ddb2UpdateTableByIdTest.java index 0acf42ccd48..fcf5e6e7043 100644 --- a/components-starter/camel-aws2-ddb-starter/src/test/java/org/apache/camel/component/aws2/ddb/Ddb2UpdateTableByIdTest.java +++ b/components-starter/camel-aws2-ddb-starter/src/test/java/org/apache/camel/component/aws2/ddb/Ddb2UpdateTableByIdTest.java @@ -16,7 +16,6 @@ */ package org.apache.camel.component.aws2.ddb; -import org.apache.camel.Configuration; import org.apache.camel.EndpointInject; import org.apache.camel.Exchange; import org.apache.camel.Processor; @@ -28,6 +27,7 @@ import org.apache.camel.test.spring.junit5.CamelSpringBootTest; import org.junit.jupiter.api.Test; import org.springframework.boot.test.context.SpringBootTest; import org.springframework.context.annotation.Bean; +import org.springframework.context.annotation.Configuration; import org.springframework.test.annotation.DirtiesContext; import software.amazon.awssdk.services.dynamodb.model.KeyType; import software.amazon.awssdk.services.dynamodb.model.ScalarAttributeType; diff --git a/components-starter/camel-aws2-sqs-starter/src/test/java/org/apache/camel/component/aws2/sqs/BaseSqs.java b/components-starter/camel-aws2-sqs-starter/src/test/java/org/apache/camel/component/aws2/sqs/BaseSqs.java index c05ff0076a0..e439b75ce81 100644 --- a/components-starter/camel-aws2-sqs-starter/src/test/java/org/apache/camel/component/aws2/sqs/BaseSqs.java +++ b/components-starter/camel-aws2-sqs-starter/src/test/java/org/apache/camel/component/aws2/sqs/BaseSqs.java @@ -1,7 +1,6 @@ package org.apache.camel.component.aws2.sqs; import org.apache.camel.CamelContext; -import org.apache.camel.Configuration; import org.apache.camel.ConsumerTemplate; import org.apache.camel.ProducerTemplate; import org.apache.camel.component.mock.MockEndpoint; @@ -14,6 +13,7 @@ import org.junit.jupiter.api.AfterAll; import org.junit.jupiter.api.extension.RegisterExtension; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.context.annotation.Bean; +import org.springframework.context.annotation.Configuration; import software.amazon.awssdk.services.sqs.SqsClient; import java.util.UUID; diff --git a/components-starter/camel-aws2-sqs-starter/src/test/java/org/apache/camel/component/aws2/sqs/JmsStyleSelectorTest.java b/components-starter/camel-aws2-sqs-starter/src/test/java/org/apache/camel/component/aws2/sqs/JmsStyleSelectorTest.java index 45e5c861293..8c580e77fcc 100644 --- a/components-starter/camel-aws2-sqs-starter/src/test/java/org/apache/camel/component/aws2/sqs/JmsStyleSelectorTest.java +++ b/components-starter/camel-aws2-sqs-starter/src/test/java/org/apache/camel/component/aws2/sqs/JmsStyleSelectorTest.java @@ -16,7 +16,6 @@ */ package org.apache.camel.component.aws2.sqs; -import org.apache.camel.Configuration; import org.apache.camel.EndpointInject; import org.apache.camel.Exchange; import org.apache.camel.ExchangePattern; @@ -29,6 +28,7 @@ import org.apache.camel.test.spring.junit5.CamelSpringBootTest; import org.junit.jupiter.api.Test; import org.springframework.boot.test.context.SpringBootTest; import org.springframework.context.annotation.Bean; +import org.springframework.context.annotation.Configuration; import org.springframework.test.annotation.DirtiesContext; import static org.junit.jupiter.api.Assertions.assertEquals; diff --git a/components-starter/camel-aws2-sqs-starter/src/test/java/org/apache/camel/component/aws2/sqs/SqsComponentTest.java b/components-starter/camel-aws2-sqs-starter/src/test/java/org/apache/camel/component/aws2/sqs/SqsComponentTest.java index 52915ff9251..6f7a1240956 100644 --- a/components-starter/camel-aws2-sqs-starter/src/test/java/org/apache/camel/component/aws2/sqs/SqsComponentTest.java +++ b/components-starter/camel-aws2-sqs-starter/src/test/java/org/apache/camel/component/aws2/sqs/SqsComponentTest.java @@ -16,7 +16,6 @@ */ package org.apache.camel.component.aws2.sqs; -import org.apache.camel.Configuration; import org.apache.camel.EndpointInject; import org.apache.camel.Exchange; import org.apache.camel.ExchangePattern; @@ -30,6 +29,7 @@ import org.junit.jupiter.api.Disabled; import org.junit.jupiter.api.Test; import org.springframework.boot.test.context.SpringBootTest; import org.springframework.context.annotation.Bean; +import org.springframework.context.annotation.Configuration; import org.springframework.test.annotation.DirtiesContext; import static org.junit.jupiter.api.Assertions.assertEquals; diff --git a/components-starter/camel-aws2-sqs-starter/src/test/java/org/apache/camel/component/aws2/sqs/SqsDeadletterTest.java b/components-starter/camel-aws2-sqs-starter/src/test/java/org/apache/camel/component/aws2/sqs/SqsDeadletterTest.java index a6d4a084526..22e319f6698 100644 --- a/components-starter/camel-aws2-sqs-starter/src/test/java/org/apache/camel/component/aws2/sqs/SqsDeadletterTest.java +++ b/components-starter/camel-aws2-sqs-starter/src/test/java/org/apache/camel/component/aws2/sqs/SqsDeadletterTest.java @@ -16,7 +16,6 @@ */ package org.apache.camel.component.aws2.sqs; -import org.apache.camel.Configuration; import org.apache.camel.EndpointInject; import org.apache.camel.Exchange; import org.apache.camel.ExchangePattern; @@ -30,6 +29,7 @@ import org.junit.jupiter.api.Disabled; import org.junit.jupiter.api.Test; import org.springframework.boot.test.context.SpringBootTest; import org.springframework.context.annotation.Bean; +import org.springframework.context.annotation.Configuration; import org.springframework.test.annotation.DirtiesContext; @DirtiesContext diff --git a/components-starter/camel-aws2-sqs-starter/src/test/java/org/apache/camel/component/aws2/sqs/SqsOperationsTest.java b/components-starter/camel-aws2-sqs-starter/src/test/java/org/apache/camel/component/aws2/sqs/SqsOperationsTest.java index a7cf07455fd..539a7ed484a 100644 --- a/components-starter/camel-aws2-sqs-starter/src/test/java/org/apache/camel/component/aws2/sqs/SqsOperationsTest.java +++ b/components-starter/camel-aws2-sqs-starter/src/test/java/org/apache/camel/component/aws2/sqs/SqsOperationsTest.java @@ -16,7 +16,6 @@ */ package org.apache.camel.component.aws2.sqs; -import org.apache.camel.Configuration; import org.apache.camel.Exchange; import org.apache.camel.builder.RouteBuilder; import org.apache.camel.spring.boot.CamelAutoConfiguration; @@ -31,6 +30,7 @@ import org.junit.jupiter.api.Disabled; import org.junit.jupiter.api.Test; import org.springframework.boot.test.context.SpringBootTest; import org.springframework.context.annotation.Bean; +import org.springframework.context.annotation.Configuration; import org.springframework.test.annotation.DirtiesContext; import org.testcontainers.shaded.org.apache.commons.lang.RandomStringUtils; import software.amazon.awssdk.services.sqs.SqsClient; diff --git a/components-starter/camel-aws2-sqs-starter/src/test/java/org/apache/camel/component/aws2/sqs/SqsProducerAutoCreateQueueTest.java b/components-starter/camel-aws2-sqs-starter/src/test/java/org/apache/camel/component/aws2/sqs/SqsProducerAutoCreateQueueTest.java index 3844a1d3f75..acceb7c66c6 100644 --- a/components-starter/camel-aws2-sqs-starter/src/test/java/org/apache/camel/component/aws2/sqs/SqsProducerAutoCreateQueueTest.java +++ b/components-starter/camel-aws2-sqs-starter/src/test/java/org/apache/camel/component/aws2/sqs/SqsProducerAutoCreateQueueTest.java @@ -16,7 +16,6 @@ */ package org.apache.camel.component.aws2.sqs; -import org.apache.camel.Configuration; import org.apache.camel.EndpointInject; import org.apache.camel.Exchange; import org.apache.camel.ExchangePattern; @@ -32,6 +31,7 @@ import org.junit.jupiter.api.Disabled; import org.junit.jupiter.api.Test; import org.springframework.boot.test.context.SpringBootTest; import org.springframework.context.annotation.Bean; +import org.springframework.context.annotation.Configuration; import org.springframework.test.annotation.DirtiesContext; import software.amazon.awssdk.services.sqs.SqsClient; import software.amazon.awssdk.services.sqs.model.CreateQueueRequest;