You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@camel.apache.org by or...@apache.org on 2021/01/14 15:06:03 UTC
[camel] branch master updated: Marked the camel testcontainers
components as deprecated (#4883)
This is an automated email from the ASF dual-hosted git repository.
orpiske pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/camel.git
The following commit(s) were added to refs/heads/master by this push:
new d36793d Marked the camel testcontainers components as deprecated (#4883)
d36793d is described below
commit d36793d64d8d798d3c36003a938e5f3e981f526b
Author: Otavio Rodolfo Piske <or...@users.noreply.github.com>
AuthorDate: Thu Jan 14 16:05:38 2021 +0100
Marked the camel testcontainers components as deprecated (#4883)
---
.../camel/test/testcontainers/junit5/ContainerAwareTestSupport.java | 5 +++++
.../test/testcontainers/junit5/ContainerPropertiesFunction.java | 5 +++++
.../org/apache/camel/test/testcontainers/junit5/Containers.java | 5 +++++
.../main/java/org/apache/camel/test/testcontainers/junit5/Wait.java | 5 +++++
.../test/testcontainers/junit5/ContainerAwareTestSupportIT.java | 1 +
.../spring/junit5/ContainerAwareSpringTestSupport.java | 6 ++++++
.../spring/junit5/ContainerAwareSpringTestSupportIT.java | 1 +
.../test/testcontainers/spring/ContainerAwareSpringTestSupport.java | 5 +++++
.../testcontainers/spring/ContainerAwareSpringTestSupportIT.java | 1 +
.../apache/camel/test/testcontainers/ContainerAwareTestSupport.java | 5 +++++
.../camel/test/testcontainers/ContainerPropertiesFunction.java | 5 +++++
.../main/java/org/apache/camel/test/testcontainers/Containers.java | 5 +++++
.../src/main/java/org/apache/camel/test/testcontainers/Wait.java | 5 +++++
.../camel/test/testcontainers/ContainerAwareTestSupportIT.java | 1 +
14 files changed, 55 insertions(+)
diff --git a/components/camel-testcontainers-junit5/src/main/java/org/apache/camel/test/testcontainers/junit5/ContainerAwareTestSupport.java b/components/camel-testcontainers-junit5/src/main/java/org/apache/camel/test/testcontainers/junit5/ContainerAwareTestSupport.java
index 924e83c..a80ad80 100644
--- a/components/camel-testcontainers-junit5/src/main/java/org/apache/camel/test/testcontainers/junit5/ContainerAwareTestSupport.java
+++ b/components/camel-testcontainers-junit5/src/main/java/org/apache/camel/test/testcontainers/junit5/ContainerAwareTestSupport.java
@@ -27,6 +27,11 @@ import org.apache.camel.test.junit5.CamelTestSupport;
import org.testcontainers.containers.GenericContainer;
import org.testcontainers.containers.Network;
+/**
+ * Tests using this component should switch the test-infra. Please check the test-infra module for details and
+ * conversion procedures.
+ */
+@Deprecated
public class ContainerAwareTestSupport extends CamelTestSupport {
private List<GenericContainer<?>> containers = new CopyOnWriteArrayList<>();
diff --git a/components/camel-testcontainers-junit5/src/main/java/org/apache/camel/test/testcontainers/junit5/ContainerPropertiesFunction.java b/components/camel-testcontainers-junit5/src/main/java/org/apache/camel/test/testcontainers/junit5/ContainerPropertiesFunction.java
index aa6cdda..c13a635 100644
--- a/components/camel-testcontainers-junit5/src/main/java/org/apache/camel/test/testcontainers/junit5/ContainerPropertiesFunction.java
+++ b/components/camel-testcontainers-junit5/src/main/java/org/apache/camel/test/testcontainers/junit5/ContainerPropertiesFunction.java
@@ -23,6 +23,11 @@ import org.apache.camel.util.ObjectHelper;
import org.apache.camel.util.StringHelper;
import org.testcontainers.containers.GenericContainer;
+/**
+ * Tests using this component should switch the test-infra. Please check the test-infra module for details and
+ * conversion procedures.
+ */
+@Deprecated
public class ContainerPropertiesFunction implements PropertiesFunction {
private final List<GenericContainer<?>> containers;
diff --git a/components/camel-testcontainers-junit5/src/main/java/org/apache/camel/test/testcontainers/junit5/Containers.java b/components/camel-testcontainers-junit5/src/main/java/org/apache/camel/test/testcontainers/junit5/Containers.java
index 2c2464a..32c3fd8 100644
--- a/components/camel-testcontainers-junit5/src/main/java/org/apache/camel/test/testcontainers/junit5/Containers.java
+++ b/components/camel-testcontainers-junit5/src/main/java/org/apache/camel/test/testcontainers/junit5/Containers.java
@@ -29,6 +29,11 @@ import org.testcontainers.containers.output.Slf4jLogConsumer;
import static java.util.stream.Collectors.joining;
+/**
+ * Tests using this component should switch the test-infra. Please check the test-infra module for details and
+ * conversion procedures.
+ */
+@Deprecated
public final class Containers {
private static final Logger LOGGER = LoggerFactory.getLogger(Containers.class);
diff --git a/components/camel-testcontainers-junit5/src/main/java/org/apache/camel/test/testcontainers/junit5/Wait.java b/components/camel-testcontainers-junit5/src/main/java/org/apache/camel/test/testcontainers/junit5/Wait.java
index 574cf27..e24feaa 100644
--- a/components/camel-testcontainers-junit5/src/main/java/org/apache/camel/test/testcontainers/junit5/Wait.java
+++ b/components/camel-testcontainers-junit5/src/main/java/org/apache/camel/test/testcontainers/junit5/Wait.java
@@ -29,6 +29,11 @@ import org.testcontainers.containers.wait.strategy.AbstractWaitStrategy;
import org.testcontainers.containers.wait.strategy.WaitStrategy;
import org.testcontainers.utility.LogUtils;
+/**
+ * Tests using this component should switch the test-infra. Please check the test-infra module for details and
+ * conversion procedures.
+ */
+@Deprecated
public class Wait extends org.testcontainers.containers.wait.strategy.Wait {
/**
* Convenience method to return a WaitStrategy for log messages using a predicate.
diff --git a/components/camel-testcontainers-junit5/src/test/java/org/apache/camel/test/testcontainers/junit5/ContainerAwareTestSupportIT.java b/components/camel-testcontainers-junit5/src/test/java/org/apache/camel/test/testcontainers/junit5/ContainerAwareTestSupportIT.java
index 7715042..ebf4254 100644
--- a/components/camel-testcontainers-junit5/src/test/java/org/apache/camel/test/testcontainers/junit5/ContainerAwareTestSupportIT.java
+++ b/components/camel-testcontainers-junit5/src/test/java/org/apache/camel/test/testcontainers/junit5/ContainerAwareTestSupportIT.java
@@ -20,6 +20,7 @@ import org.assertj.core.api.Assertions;
import org.junit.jupiter.api.Test;
import org.testcontainers.containers.GenericContainer;
+@SuppressWarnings("deprecation")
public class ContainerAwareTestSupportIT extends ContainerAwareTestSupport {
@Test
public void testPropertyPlaceholders() {
diff --git a/components/camel-testcontainers-spring-junit5/src/main/java/org/apache/camel/test/testcontainers/spring/junit5/ContainerAwareSpringTestSupport.java b/components/camel-testcontainers-spring-junit5/src/main/java/org/apache/camel/test/testcontainers/spring/junit5/ContainerAwareSpringTestSupport.java
index 528694d..15fb6426 100644
--- a/components/camel-testcontainers-spring-junit5/src/main/java/org/apache/camel/test/testcontainers/spring/junit5/ContainerAwareSpringTestSupport.java
+++ b/components/camel-testcontainers-spring-junit5/src/main/java/org/apache/camel/test/testcontainers/spring/junit5/ContainerAwareSpringTestSupport.java
@@ -29,6 +29,12 @@ import org.apache.camel.test.testcontainers.junit5.Containers;
import org.testcontainers.containers.GenericContainer;
import org.testcontainers.containers.Network;
+/**
+ * Tests using this component should switch the test-infra. Please check the test-infra module for details and
+ * conversion procedures.
+ */
+@Deprecated
+@SuppressWarnings("deprecation")
public abstract class ContainerAwareSpringTestSupport extends CamelSpringTestSupport {
private List<GenericContainer<?>> containers = new CopyOnWriteArrayList<>();
diff --git a/components/camel-testcontainers-spring-junit5/src/test/java/org/apache/camel/test/testcontainers/spring/junit5/ContainerAwareSpringTestSupportIT.java b/components/camel-testcontainers-spring-junit5/src/test/java/org/apache/camel/test/testcontainers/spring/junit5/ContainerAwareSpringTestSupportIT.java
index ac99eb6..64901fb 100644
--- a/components/camel-testcontainers-spring-junit5/src/test/java/org/apache/camel/test/testcontainers/spring/junit5/ContainerAwareSpringTestSupportIT.java
+++ b/components/camel-testcontainers-spring-junit5/src/test/java/org/apache/camel/test/testcontainers/spring/junit5/ContainerAwareSpringTestSupportIT.java
@@ -23,6 +23,7 @@ import org.springframework.context.support.AbstractApplicationContext;
import org.springframework.context.support.ClassPathXmlApplicationContext;
import org.testcontainers.containers.GenericContainer;
+@SuppressWarnings("deprecation")
public class ContainerAwareSpringTestSupportIT extends ContainerAwareSpringTestSupport {
@Override
protected AbstractApplicationContext createApplicationContext() {
diff --git a/components/camel-testcontainers-spring/src/main/java/org/apache/camel/test/testcontainers/spring/ContainerAwareSpringTestSupport.java b/components/camel-testcontainers-spring/src/main/java/org/apache/camel/test/testcontainers/spring/ContainerAwareSpringTestSupport.java
index 0f5f801..587078c 100644
--- a/components/camel-testcontainers-spring/src/main/java/org/apache/camel/test/testcontainers/spring/ContainerAwareSpringTestSupport.java
+++ b/components/camel-testcontainers-spring/src/main/java/org/apache/camel/test/testcontainers/spring/ContainerAwareSpringTestSupport.java
@@ -29,6 +29,11 @@ import org.apache.camel.test.testcontainers.Containers;
import org.testcontainers.containers.GenericContainer;
import org.testcontainers.containers.Network;
+/**
+ * Tests using this component should switch the test-infra. Please check the test-infra module for details and
+ * conversion procedures.
+ */
+@Deprecated
public abstract class ContainerAwareSpringTestSupport extends CamelSpringTestSupport {
private List<GenericContainer<?>> containers = new CopyOnWriteArrayList<>();
diff --git a/components/camel-testcontainers-spring/src/test/java/org/apache/camel/test/testcontainers/spring/ContainerAwareSpringTestSupportIT.java b/components/camel-testcontainers-spring/src/test/java/org/apache/camel/test/testcontainers/spring/ContainerAwareSpringTestSupportIT.java
index af98887..ebe0265 100644
--- a/components/camel-testcontainers-spring/src/test/java/org/apache/camel/test/testcontainers/spring/ContainerAwareSpringTestSupportIT.java
+++ b/components/camel-testcontainers-spring/src/test/java/org/apache/camel/test/testcontainers/spring/ContainerAwareSpringTestSupportIT.java
@@ -23,6 +23,7 @@ import org.springframework.context.support.AbstractApplicationContext;
import org.springframework.context.support.ClassPathXmlApplicationContext;
import org.testcontainers.containers.GenericContainer;
+@SuppressWarnings("deprecation")
public class ContainerAwareSpringTestSupportIT extends ContainerAwareSpringTestSupport {
@Override
protected AbstractApplicationContext createApplicationContext() {
diff --git a/components/camel-testcontainers/src/main/java/org/apache/camel/test/testcontainers/ContainerAwareTestSupport.java b/components/camel-testcontainers/src/main/java/org/apache/camel/test/testcontainers/ContainerAwareTestSupport.java
index e398e9f..a433821 100644
--- a/components/camel-testcontainers/src/main/java/org/apache/camel/test/testcontainers/ContainerAwareTestSupport.java
+++ b/components/camel-testcontainers/src/main/java/org/apache/camel/test/testcontainers/ContainerAwareTestSupport.java
@@ -27,6 +27,11 @@ import org.apache.camel.test.junit4.CamelTestSupport;
import org.testcontainers.containers.GenericContainer;
import org.testcontainers.containers.Network;
+/**
+ * Tests using this component should switch the test-infra. Please check the test-infra module for details and
+ * conversion procedures.
+ */
+@Deprecated
public class ContainerAwareTestSupport extends CamelTestSupport {
private List<GenericContainer<?>> containers = new CopyOnWriteArrayList<>();
diff --git a/components/camel-testcontainers/src/main/java/org/apache/camel/test/testcontainers/ContainerPropertiesFunction.java b/components/camel-testcontainers/src/main/java/org/apache/camel/test/testcontainers/ContainerPropertiesFunction.java
index 962d8d0..ced1c4e 100644
--- a/components/camel-testcontainers/src/main/java/org/apache/camel/test/testcontainers/ContainerPropertiesFunction.java
+++ b/components/camel-testcontainers/src/main/java/org/apache/camel/test/testcontainers/ContainerPropertiesFunction.java
@@ -23,6 +23,11 @@ import org.apache.camel.util.ObjectHelper;
import org.apache.camel.util.StringHelper;
import org.testcontainers.containers.GenericContainer;
+/**
+ * Tests using this component should switch the test-infra. Please check the test-infra module for details and
+ * conversion procedures.
+ */
+@Deprecated
public class ContainerPropertiesFunction implements PropertiesFunction {
private final List<GenericContainer<?>> containers;
diff --git a/components/camel-testcontainers/src/main/java/org/apache/camel/test/testcontainers/Containers.java b/components/camel-testcontainers/src/main/java/org/apache/camel/test/testcontainers/Containers.java
index c6d6152..032092f 100644
--- a/components/camel-testcontainers/src/main/java/org/apache/camel/test/testcontainers/Containers.java
+++ b/components/camel-testcontainers/src/main/java/org/apache/camel/test/testcontainers/Containers.java
@@ -29,6 +29,11 @@ import org.testcontainers.containers.output.Slf4jLogConsumer;
import static java.util.stream.Collectors.joining;
+/**
+ * Tests using this component should switch the test-infra. Please check the test-infra module for details and
+ * conversion procedures.
+ */
+@Deprecated
public final class Containers {
private static final Logger LOGGER = LoggerFactory.getLogger(Containers.class);
diff --git a/components/camel-testcontainers/src/main/java/org/apache/camel/test/testcontainers/Wait.java b/components/camel-testcontainers/src/main/java/org/apache/camel/test/testcontainers/Wait.java
index 5d54371..49b4245 100644
--- a/components/camel-testcontainers/src/main/java/org/apache/camel/test/testcontainers/Wait.java
+++ b/components/camel-testcontainers/src/main/java/org/apache/camel/test/testcontainers/Wait.java
@@ -29,6 +29,11 @@ import org.testcontainers.containers.wait.strategy.AbstractWaitStrategy;
import org.testcontainers.containers.wait.strategy.WaitStrategy;
import org.testcontainers.utility.LogUtils;
+/**
+ * Tests using this component should switch the test-infra. Please check the test-infra module for details and
+ * conversion procedures.
+ */
+@Deprecated
public class Wait extends org.testcontainers.containers.wait.strategy.Wait {
/**
* Convenience method to return a WaitStrategy for log messages using a predicate.
diff --git a/components/camel-testcontainers/src/test/java/org/apache/camel/test/testcontainers/ContainerAwareTestSupportIT.java b/components/camel-testcontainers/src/test/java/org/apache/camel/test/testcontainers/ContainerAwareTestSupportIT.java
index 95847c4..230d840 100644
--- a/components/camel-testcontainers/src/test/java/org/apache/camel/test/testcontainers/ContainerAwareTestSupportIT.java
+++ b/components/camel-testcontainers/src/test/java/org/apache/camel/test/testcontainers/ContainerAwareTestSupportIT.java
@@ -20,6 +20,7 @@ import org.assertj.core.api.Assertions;
import org.junit.Test;
import org.testcontainers.containers.GenericContainer;
+@SuppressWarnings("deprecation")
public class ContainerAwareTestSupportIT extends ContainerAwareTestSupport {
@Test
public void testPropertyPlaceholders() throws Exception {