You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@camel.apache.org by ac...@apache.org on 2022/04/12 04:37:12 UTC
[camel-spring-boot] branch main updated: Change org.apache.camel.configuration -> org.springframework.context.annotation.Configuration - these tests are using the annotation class
This is an automated email from the ASF dual-hosted git repository.
acosentino 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 8621ba6a079 Change org.apache.camel.configuration -> org.springframework.context.annotation.Configuration - these tests are using the annotation class
8621ba6a079 is described below
commit 8621ba6a079cdee3cf4c95b480c11ee7c97016d6
Author: Tom Cunningham <tc...@redhat.com>
AuthorDate: Mon Apr 11 19:21:26 2022 -0400
Change org.apache.camel.configuration -> org.springframework.context.annotation.Configuration - these tests are using the annotation class
---
.../src/test/java/org/apache/camel/component/sql/BaseSql.java | 2 +-
.../org/apache/camel/component/sql/SqlConsumerDynamicParameterTest.java | 2 +-
.../apache/camel/component/sql/SqlProducerExpressionParameterTest.java | 2 +-
.../src/test/java/org/apache/camel/component/sql/SqlProducerInTest.java | 2 +-
.../java/org/apache/camel/component/sql/SqlTransactedRouteTest.java | 2 +-
.../sql/aggregation/JdbcAggregateRecoverDeadLetterChannelTest.java | 2 +-
.../component/sql/aggregation/JdbcAggregateSerializedHeadersTest.java | 2 +-
.../camel/component/sql/aggregation/JdbcAggregateStoreAsTextTest.java | 2 +-
.../component/sql/idempotent/CustomizedJdbcMessageIdRepositoryTest.java | 2 +-
.../component/sql/idempotent/JdbcCachedMessageIdRepositoryTest.java | 2 +-
.../camel/component/sql/idempotent/JdbcMessageIdRepositoryTest.java | 2 +-
11 files changed, 11 insertions(+), 11 deletions(-)
diff --git a/components-starter/camel-sql-starter/src/test/java/org/apache/camel/component/sql/BaseSql.java b/components-starter/camel-sql-starter/src/test/java/org/apache/camel/component/sql/BaseSql.java
index 02b8a5899db..eb1d16d50d3 100644
--- a/components-starter/camel-sql-starter/src/test/java/org/apache/camel/component/sql/BaseSql.java
+++ b/components-starter/camel-sql-starter/src/test/java/org/apache/camel/component/sql/BaseSql.java
@@ -17,12 +17,12 @@
package org.apache.camel.component.sql;
import org.apache.camel.CamelContext;
-import org.apache.camel.Configuration;
import org.apache.camel.ProducerTemplate;
import org.apache.camel.component.mock.MockEndpoint;
import org.springframework.beans.factory.DisposableBean;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.context.annotation.Bean;
+import org.springframework.context.annotation.Configuration;
import org.springframework.jdbc.datasource.embedded.EmbeddedDatabase;
import org.springframework.jdbc.datasource.embedded.EmbeddedDatabaseBuilder;
import org.springframework.jdbc.datasource.embedded.EmbeddedDatabaseType;
diff --git a/components-starter/camel-sql-starter/src/test/java/org/apache/camel/component/sql/SqlConsumerDynamicParameterTest.java b/components-starter/camel-sql-starter/src/test/java/org/apache/camel/component/sql/SqlConsumerDynamicParameterTest.java
index d889e110a29..2a70cddca18 100644
--- a/components-starter/camel-sql-starter/src/test/java/org/apache/camel/component/sql/SqlConsumerDynamicParameterTest.java
+++ b/components-starter/camel-sql-starter/src/test/java/org/apache/camel/component/sql/SqlConsumerDynamicParameterTest.java
@@ -16,7 +16,6 @@
*/
package org.apache.camel.component.sql;
-import org.apache.camel.Configuration;
import org.apache.camel.EndpointInject;
import org.apache.camel.Exchange;
import org.apache.camel.builder.RouteBuilder;
@@ -26,6 +25,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.jdbc.datasource.embedded.EmbeddedDatabaseType;
import org.springframework.test.annotation.DirtiesContext;
diff --git a/components-starter/camel-sql-starter/src/test/java/org/apache/camel/component/sql/SqlProducerExpressionParameterTest.java b/components-starter/camel-sql-starter/src/test/java/org/apache/camel/component/sql/SqlProducerExpressionParameterTest.java
index 02a99ba5d63..d79553a9d31 100644
--- a/components-starter/camel-sql-starter/src/test/java/org/apache/camel/component/sql/SqlProducerExpressionParameterTest.java
+++ b/components-starter/camel-sql-starter/src/test/java/org/apache/camel/component/sql/SqlProducerExpressionParameterTest.java
@@ -16,7 +16,6 @@
*/
package org.apache.camel.component.sql;
-import org.apache.camel.Configuration;
import org.apache.camel.EndpointInject;
import org.apache.camel.builder.RouteBuilder;
import org.apache.camel.component.mock.MockEndpoint;
@@ -26,6 +25,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.jdbc.datasource.embedded.EmbeddedDatabaseType;
import org.springframework.test.annotation.DirtiesContext;
diff --git a/components-starter/camel-sql-starter/src/test/java/org/apache/camel/component/sql/SqlProducerInTest.java b/components-starter/camel-sql-starter/src/test/java/org/apache/camel/component/sql/SqlProducerInTest.java
index 473853544e2..a8c79a85cd0 100644
--- a/components-starter/camel-sql-starter/src/test/java/org/apache/camel/component/sql/SqlProducerInTest.java
+++ b/components-starter/camel-sql-starter/src/test/java/org/apache/camel/component/sql/SqlProducerInTest.java
@@ -16,7 +16,6 @@
*/
package org.apache.camel.component.sql;
-import org.apache.camel.Configuration;
import org.apache.camel.EndpointInject;
import org.apache.camel.builder.RouteBuilder;
import org.apache.camel.component.mock.MockEndpoint;
@@ -25,6 +24,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.jdbc.datasource.embedded.EmbeddedDatabaseType;
import org.springframework.test.annotation.DirtiesContext;
diff --git a/components-starter/camel-sql-starter/src/test/java/org/apache/camel/component/sql/SqlTransactedRouteTest.java b/components-starter/camel-sql-starter/src/test/java/org/apache/camel/component/sql/SqlTransactedRouteTest.java
index 8bb911a2505..12bebd7a044 100644
--- a/components-starter/camel-sql-starter/src/test/java/org/apache/camel/component/sql/SqlTransactedRouteTest.java
+++ b/components-starter/camel-sql-starter/src/test/java/org/apache/camel/component/sql/SqlTransactedRouteTest.java
@@ -16,7 +16,6 @@
*/
package org.apache.camel.component.sql;
-import org.apache.camel.Configuration;
import org.apache.camel.Exchange;
import org.apache.camel.Processor;
import org.apache.camel.builder.RouteBuilder;
@@ -32,6 +31,7 @@ import org.junit.jupiter.api.Test;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.boot.test.context.SpringBootTest;
import org.springframework.context.annotation.Bean;
+import org.springframework.context.annotation.Configuration;
import org.springframework.jdbc.core.JdbcTemplate;
import org.springframework.jdbc.datasource.DataSourceTransactionManager;
import org.springframework.jdbc.datasource.embedded.EmbeddedDatabase;
diff --git a/components-starter/camel-sql-starter/src/test/java/org/apache/camel/component/sql/aggregation/JdbcAggregateRecoverDeadLetterChannelTest.java b/components-starter/camel-sql-starter/src/test/java/org/apache/camel/component/sql/aggregation/JdbcAggregateRecoverDeadLetterChannelTest.java
index bf2c62ec660..e088c1380dd 100644
--- a/components-starter/camel-sql-starter/src/test/java/org/apache/camel/component/sql/aggregation/JdbcAggregateRecoverDeadLetterChannelTest.java
+++ b/components-starter/camel-sql-starter/src/test/java/org/apache/camel/component/sql/aggregation/JdbcAggregateRecoverDeadLetterChannelTest.java
@@ -16,7 +16,6 @@
*/
package org.apache.camel.component.sql.aggregation;
-import org.apache.camel.Configuration;
import org.apache.camel.EndpointInject;
import org.apache.camel.Exchange;
import org.apache.camel.builder.RouteBuilder;
@@ -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.jdbc.datasource.DataSourceTransactionManager;
import org.springframework.test.annotation.DirtiesContext;
import org.springframework.transaction.PlatformTransactionManager;
diff --git a/components-starter/camel-sql-starter/src/test/java/org/apache/camel/component/sql/aggregation/JdbcAggregateSerializedHeadersTest.java b/components-starter/camel-sql-starter/src/test/java/org/apache/camel/component/sql/aggregation/JdbcAggregateSerializedHeadersTest.java
index b17c539fdd4..440dc311014 100644
--- a/components-starter/camel-sql-starter/src/test/java/org/apache/camel/component/sql/aggregation/JdbcAggregateSerializedHeadersTest.java
+++ b/components-starter/camel-sql-starter/src/test/java/org/apache/camel/component/sql/aggregation/JdbcAggregateSerializedHeadersTest.java
@@ -16,7 +16,6 @@
*/
package org.apache.camel.component.sql.aggregation;
-import org.apache.camel.Configuration;
import org.apache.camel.EndpointInject;
import org.apache.camel.builder.RouteBuilder;
import org.apache.camel.component.mock.MockEndpoint;
@@ -29,6 +28,7 @@ import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.springframework.boot.test.context.SpringBootTest;
import org.springframework.context.annotation.Bean;
+import org.springframework.context.annotation.Configuration;
import org.springframework.jdbc.datasource.DataSourceTransactionManager;
import org.springframework.jdbc.support.lob.AbstractLobHandler;
import org.springframework.jdbc.support.lob.DefaultLobHandler;
diff --git a/components-starter/camel-sql-starter/src/test/java/org/apache/camel/component/sql/aggregation/JdbcAggregateStoreAsTextTest.java b/components-starter/camel-sql-starter/src/test/java/org/apache/camel/component/sql/aggregation/JdbcAggregateStoreAsTextTest.java
index 9b5667a2321..4f333bdc838 100644
--- a/components-starter/camel-sql-starter/src/test/java/org/apache/camel/component/sql/aggregation/JdbcAggregateStoreAsTextTest.java
+++ b/components-starter/camel-sql-starter/src/test/java/org/apache/camel/component/sql/aggregation/JdbcAggregateStoreAsTextTest.java
@@ -16,7 +16,6 @@
*/
package org.apache.camel.component.sql.aggregation;
-import org.apache.camel.Configuration;
import org.apache.camel.EndpointInject;
import org.apache.camel.builder.RouteBuilder;
import org.apache.camel.component.mock.MockEndpoint;
@@ -29,6 +28,7 @@ import org.junit.jupiter.api.Test;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.boot.test.context.SpringBootTest;
import org.springframework.context.annotation.Bean;
+import org.springframework.context.annotation.Configuration;
import org.springframework.jdbc.core.JdbcTemplate;
import org.springframework.jdbc.datasource.DataSourceTransactionManager;
import org.springframework.test.annotation.DirtiesContext;
diff --git a/components-starter/camel-sql-starter/src/test/java/org/apache/camel/component/sql/idempotent/CustomizedJdbcMessageIdRepositoryTest.java b/components-starter/camel-sql-starter/src/test/java/org/apache/camel/component/sql/idempotent/CustomizedJdbcMessageIdRepositoryTest.java
index 457a80c3a2a..e97d129bbfd 100644
--- a/components-starter/camel-sql-starter/src/test/java/org/apache/camel/component/sql/idempotent/CustomizedJdbcMessageIdRepositoryTest.java
+++ b/components-starter/camel-sql-starter/src/test/java/org/apache/camel/component/sql/idempotent/CustomizedJdbcMessageIdRepositoryTest.java
@@ -16,7 +16,6 @@
*/
package org.apache.camel.component.sql.idempotent;
-import org.apache.camel.Configuration;
import org.apache.camel.EndpointInject;
import org.apache.camel.builder.RouteBuilder;
import org.apache.camel.component.mock.MockEndpoint;
@@ -29,6 +28,7 @@ import org.junit.jupiter.api.Test;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.boot.test.context.SpringBootTest;
import org.springframework.context.annotation.Bean;
+import org.springframework.context.annotation.Configuration;
import org.springframework.jdbc.core.JdbcTemplate;
import org.springframework.test.annotation.DirtiesContext;
diff --git a/components-starter/camel-sql-starter/src/test/java/org/apache/camel/component/sql/idempotent/JdbcCachedMessageIdRepositoryTest.java b/components-starter/camel-sql-starter/src/test/java/org/apache/camel/component/sql/idempotent/JdbcCachedMessageIdRepositoryTest.java
index 48638d4b977..7ca8e2f57d9 100644
--- a/components-starter/camel-sql-starter/src/test/java/org/apache/camel/component/sql/idempotent/JdbcCachedMessageIdRepositoryTest.java
+++ b/components-starter/camel-sql-starter/src/test/java/org/apache/camel/component/sql/idempotent/JdbcCachedMessageIdRepositoryTest.java
@@ -17,7 +17,6 @@
package org.apache.camel.component.sql.idempotent;
import org.apache.camel.CamelContext;
-import org.apache.camel.Configuration;
import org.apache.camel.EndpointInject;
import org.apache.camel.builder.RouteBuilder;
import org.apache.camel.component.mock.MockEndpoint;
@@ -31,6 +30,7 @@ import org.junit.jupiter.api.Test;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.boot.test.context.SpringBootTest;
import org.springframework.context.annotation.Bean;
+import org.springframework.context.annotation.Configuration;
import org.springframework.jdbc.core.JdbcTemplate;
import org.springframework.test.annotation.DirtiesContext;
diff --git a/components-starter/camel-sql-starter/src/test/java/org/apache/camel/component/sql/idempotent/JdbcMessageIdRepositoryTest.java b/components-starter/camel-sql-starter/src/test/java/org/apache/camel/component/sql/idempotent/JdbcMessageIdRepositoryTest.java
index 643a231b4ed..19b8f2335e4 100644
--- a/components-starter/camel-sql-starter/src/test/java/org/apache/camel/component/sql/idempotent/JdbcMessageIdRepositoryTest.java
+++ b/components-starter/camel-sql-starter/src/test/java/org/apache/camel/component/sql/idempotent/JdbcMessageIdRepositoryTest.java
@@ -16,7 +16,6 @@
*/
package org.apache.camel.component.sql.idempotent;
-import org.apache.camel.Configuration;
import org.apache.camel.EndpointInject;
import org.apache.camel.builder.RouteBuilder;
import org.apache.camel.component.mock.MockEndpoint;
@@ -29,6 +28,7 @@ import org.junit.jupiter.api.Test;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.boot.test.context.SpringBootTest;
import org.springframework.context.annotation.Bean;
+import org.springframework.context.annotation.Configuration;
import org.springframework.jdbc.core.JdbcTemplate;
import org.springframework.test.annotation.DirtiesContext;