JAMES-2533 remove uses of shaded classes and add a checkstyle rule
Project: http://git-wip-us.apache.org/repos/asf/james-project/repo Commit: http://git-wip-us.apache.org/repos/asf/james-project/commit/9422eda0 Tree: http://git-wip-us.apache.org/repos/asf/james-project/tree/9422eda0 Diff: http://git-wip-us.apache.org/repos/asf/james-project/diff/9422eda0 Branch: refs/heads/master Commit: 9422eda08ac208e11c2e0852ca75006f3151697c Parents: 088bdd5 Author: Matthieu Baechler <matth...@apache.org> Authored: Fri Aug 24 15:51:31 2018 +0200 Committer: Antoine Duprat <adup...@linagora.com> Committed: Tue Aug 28 14:11:49 2018 +0200 ---------------------------------------------------------------------- .../backends/cassandra/ContainerLifecycleConfiguration.java | 3 ++- checkstyle.xml | 4 ++++ .../james/mailbox/backup/InternalDateExtraFieldTest.java | 7 +++---- .../org/apache/james/mailbox/backup/SizeExtraFieldTest.java | 7 +++---- .../org/apache/james/mailbox/backup/UidExtraFieldTest.java | 7 +++---- .../james/mailbox/backup/UidValidityExtraFieldTest.java | 7 +++---- .../cassandra/mail/CassandraAttachmentFallbackTest.java | 3 ++- .../org/apache/james/JamesServerWithRetryConnectionTest.java | 3 +-- .../CassandraEventSourcingDLPConfigurationStoreExtension.java | 3 ++- .../org/apache/james/dlp/eventsourcing/cassandra/DTOTest.java | 2 +- .../cassandra/CassandraMailRepositoryMailDAOTest.java | 3 ++- .../src/test/java/org/apache/james/jmap/MessageAppender.java | 3 ++- .../methods/integration/cucumber/StringListToFlagsTest.java | 3 ++- .../java/org/apache/james/smtpserver/ValidRcptMXTest.java | 3 ++- .../org/apache/james/queue/rabbitmq/RabbitMQClusterTest.java | 2 +- .../java/org/apache/james/queue/rabbitmq/RabbitMQTest.java | 2 +- .../org/apache/james/util/docker/SwarmGenericContainer.java | 2 +- 17 files changed, 35 insertions(+), 29 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/james-project/blob/9422eda0/backends-common/cassandra/src/test/java/org/apache/james/backends/cassandra/ContainerLifecycleConfiguration.java ---------------------------------------------------------------------- diff --git a/backends-common/cassandra/src/test/java/org/apache/james/backends/cassandra/ContainerLifecycleConfiguration.java b/backends-common/cassandra/src/test/java/org/apache/james/backends/cassandra/ContainerLifecycleConfiguration.java index d9592f9..208448c 100644 --- a/backends-common/cassandra/src/test/java/org/apache/james/backends/cassandra/ContainerLifecycleConfiguration.java +++ b/backends-common/cassandra/src/test/java/org/apache/james/backends/cassandra/ContainerLifecycleConfiguration.java @@ -24,7 +24,8 @@ import java.util.concurrent.atomic.AtomicInteger; import org.junit.rules.TestRule; import org.junit.runners.model.Statement; import org.testcontainers.containers.GenericContainer; -import org.testcontainers.shaded.com.google.common.base.Preconditions; + +import com.google.common.base.Preconditions; public class ContainerLifecycleConfiguration { http://git-wip-us.apache.org/repos/asf/james-project/blob/9422eda0/checkstyle.xml ---------------------------------------------------------------------- diff --git a/checkstyle.xml b/checkstyle.xml index 33ad5d8..3ff4a59 100644 --- a/checkstyle.xml +++ b/checkstyle.xml @@ -31,6 +31,10 @@ <property name="charset" value="UTF-8"/> <property name="fileExtensions" value="java, properties, xml"/> <module name="TreeWalker"> + <module name="IllegalImport"> + <property name="regexp" value="true"/> + <property name="illegalPkgs" value=".*\.shaded\..*" /> + </module> <module name="OuterTypeFilename"/> <module name="IllegalTokenText"> <property name="tokens" value="STRING_LITERAL, CHAR_LITERAL"/> http://git-wip-us.apache.org/repos/asf/james-project/blob/9422eda0/mailbox/backup/src/test/java/org/apache/james/mailbox/backup/InternalDateExtraFieldTest.java ---------------------------------------------------------------------- diff --git a/mailbox/backup/src/test/java/org/apache/james/mailbox/backup/InternalDateExtraFieldTest.java b/mailbox/backup/src/test/java/org/apache/james/mailbox/backup/InternalDateExtraFieldTest.java index 18c81bc..62cb26b 100644 --- a/mailbox/backup/src/test/java/org/apache/james/mailbox/backup/InternalDateExtraFieldTest.java +++ b/mailbox/backup/src/test/java/org/apache/james/mailbox/backup/InternalDateExtraFieldTest.java @@ -29,10 +29,9 @@ import java.util.zip.ZipException; import org.junit.jupiter.api.Nested; import org.junit.jupiter.api.Test; -import org.testcontainers.shaded.org.bouncycastle.util.Arrays; import com.google.common.base.Charsets; - +import com.google.common.primitives.Bytes; import nl.jqno.equalsverifier.EqualsVerifier; import nl.jqno.equalsverifier.Warning; @@ -214,7 +213,7 @@ public class InternalDateExtraFieldTest { void parseFromLocalFileDataShouldHandleOffset() throws Exception { InternalDateExtraField testee = new InternalDateExtraField(); - byte[] input = Arrays.concatenate(UNUSED, _123456789ABCDEF0_AS_LE_BYTE_ARRAY); + byte[] input = Bytes.concat(UNUSED, _123456789ABCDEF0_AS_LE_BYTE_ARRAY); testee.parseFromLocalFileData(input, 2, 8); assertThat(testee.getValue()) .contains(0x123456789ABCDEF0L); @@ -292,7 +291,7 @@ public class InternalDateExtraFieldTest { @Test void parseFromCentralDirectoryDataShouldHandleOffset() throws Exception { InternalDateExtraField testee = new InternalDateExtraField(); - byte[] input = Arrays.concatenate(UNUSED, _123456789ABCDEF0_AS_LE_BYTE_ARRAY); + byte[] input = Bytes.concat(UNUSED, _123456789ABCDEF0_AS_LE_BYTE_ARRAY); testee.parseFromCentralDirectoryData(input, 2, 8); assertThat(testee.getValue()) http://git-wip-us.apache.org/repos/asf/james-project/blob/9422eda0/mailbox/backup/src/test/java/org/apache/james/mailbox/backup/SizeExtraFieldTest.java ---------------------------------------------------------------------- diff --git a/mailbox/backup/src/test/java/org/apache/james/mailbox/backup/SizeExtraFieldTest.java b/mailbox/backup/src/test/java/org/apache/james/mailbox/backup/SizeExtraFieldTest.java index c2275bd..c05ec09 100644 --- a/mailbox/backup/src/test/java/org/apache/james/mailbox/backup/SizeExtraFieldTest.java +++ b/mailbox/backup/src/test/java/org/apache/james/mailbox/backup/SizeExtraFieldTest.java @@ -27,10 +27,9 @@ import java.util.zip.ZipException; import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.Test; -import org.testcontainers.shaded.org.bouncycastle.util.Arrays; import com.google.common.base.Charsets; - +import com.google.common.primitives.Bytes; import nl.jqno.equalsverifier.EqualsVerifier; import nl.jqno.equalsverifier.Warning; @@ -160,7 +159,7 @@ public class SizeExtraFieldTest { @Test void parseFromLocalFileDataShouldHandleOffset() throws Exception { - byte[] input = Arrays.concatenate(UNUSED, _123456789ABCDEF0_AS_LE_BYTE_ARRAY); + byte[] input = Bytes.concat(UNUSED, _123456789ABCDEF0_AS_LE_BYTE_ARRAY); testee.parseFromLocalFileData(input, 2, 8); assertThat(testee.getValue()) .contains(0x123456789ABCDEF0L); @@ -204,7 +203,7 @@ public class SizeExtraFieldTest { @Test void parseFromCentralDirectoryDataShouldHandleOffset() throws Exception { - byte[] input = Arrays.concatenate(UNUSED, _123456789ABCDEF0_AS_LE_BYTE_ARRAY); + byte[] input = Bytes.concat(UNUSED, _123456789ABCDEF0_AS_LE_BYTE_ARRAY); testee.parseFromCentralDirectoryData(input, 2, 8); assertThat(testee.getValue()) .contains(0x123456789ABCDEF0L); http://git-wip-us.apache.org/repos/asf/james-project/blob/9422eda0/mailbox/backup/src/test/java/org/apache/james/mailbox/backup/UidExtraFieldTest.java ---------------------------------------------------------------------- diff --git a/mailbox/backup/src/test/java/org/apache/james/mailbox/backup/UidExtraFieldTest.java b/mailbox/backup/src/test/java/org/apache/james/mailbox/backup/UidExtraFieldTest.java index 3514717..8067ee8 100644 --- a/mailbox/backup/src/test/java/org/apache/james/mailbox/backup/UidExtraFieldTest.java +++ b/mailbox/backup/src/test/java/org/apache/james/mailbox/backup/UidExtraFieldTest.java @@ -28,10 +28,9 @@ import java.util.zip.ZipException; import org.junit.jupiter.api.Nested; import org.junit.jupiter.api.Test; -import org.testcontainers.shaded.org.bouncycastle.util.Arrays; import com.google.common.base.Charsets; - +import com.google.common.primitives.Bytes; import nl.jqno.equalsverifier.EqualsVerifier; import nl.jqno.equalsverifier.Warning; @@ -195,7 +194,7 @@ public class UidExtraFieldTest { void parseFromLocalFileDataShouldHandleOffset() throws Exception { UidExtraField testee = new UidExtraField(); - byte[] input = Arrays.concatenate(UNUSED, _123456789ABCDEF0_AS_LE_BYTE_ARRAY); + byte[] input = Bytes.concat(UNUSED, _123456789ABCDEF0_AS_LE_BYTE_ARRAY); testee.parseFromLocalFileData(input, 2, 8); assertThat(testee.getValue()) .contains(0x123456789ABCDEF0L); @@ -254,7 +253,7 @@ public class UidExtraFieldTest { @Test void parseFromCentralDirectoryDataShouldHandleOffset() throws Exception { UidExtraField testee = new UidExtraField(); - byte[] input = Arrays.concatenate(UNUSED, _123456789ABCDEF0_AS_LE_BYTE_ARRAY); + byte[] input = Bytes.concat(UNUSED, _123456789ABCDEF0_AS_LE_BYTE_ARRAY); testee.parseFromCentralDirectoryData(input, 2, 8); assertThat(testee.getValue()) http://git-wip-us.apache.org/repos/asf/james-project/blob/9422eda0/mailbox/backup/src/test/java/org/apache/james/mailbox/backup/UidValidityExtraFieldTest.java ---------------------------------------------------------------------- diff --git a/mailbox/backup/src/test/java/org/apache/james/mailbox/backup/UidValidityExtraFieldTest.java b/mailbox/backup/src/test/java/org/apache/james/mailbox/backup/UidValidityExtraFieldTest.java index e9b312f..2ba8aed 100644 --- a/mailbox/backup/src/test/java/org/apache/james/mailbox/backup/UidValidityExtraFieldTest.java +++ b/mailbox/backup/src/test/java/org/apache/james/mailbox/backup/UidValidityExtraFieldTest.java @@ -28,10 +28,9 @@ import java.util.zip.ZipException; import org.junit.jupiter.api.Nested; import org.junit.jupiter.api.Test; -import org.testcontainers.shaded.org.bouncycastle.util.Arrays; import com.google.common.base.Charsets; - +import com.google.common.primitives.Bytes; import nl.jqno.equalsverifier.EqualsVerifier; import nl.jqno.equalsverifier.Warning; @@ -195,7 +194,7 @@ public class UidValidityExtraFieldTest { void parseFromLocalFileDataShouldHandleOffset() throws Exception { UidValidityExtraField testee = new UidValidityExtraField(); - byte[] input = Arrays.concatenate(UNUSED, _123456789ABCDEF0_AS_LE_BYTE_ARRAY); + byte[] input = Bytes.concat(UNUSED, _123456789ABCDEF0_AS_LE_BYTE_ARRAY); testee.parseFromLocalFileData(input, 2, 8); assertThat(testee.getValue()) .contains(0x123456789ABCDEF0L); @@ -254,7 +253,7 @@ public class UidValidityExtraFieldTest { @Test void parseFromCentralDirectoryDataShouldHandleOffset() throws Exception { UidValidityExtraField testee = new UidValidityExtraField(); - byte[] input = Arrays.concatenate(UNUSED, _123456789ABCDEF0_AS_LE_BYTE_ARRAY); + byte[] input = Bytes.concat(UNUSED, _123456789ABCDEF0_AS_LE_BYTE_ARRAY); testee.parseFromCentralDirectoryData(input, 2, 8); assertThat(testee.getValue()) http://git-wip-us.apache.org/repos/asf/james-project/blob/9422eda0/mailbox/cassandra/src/test/java/org/apache/james/mailbox/cassandra/mail/CassandraAttachmentFallbackTest.java ---------------------------------------------------------------------- diff --git a/mailbox/cassandra/src/test/java/org/apache/james/mailbox/cassandra/mail/CassandraAttachmentFallbackTest.java b/mailbox/cassandra/src/test/java/org/apache/james/mailbox/cassandra/mail/CassandraAttachmentFallbackTest.java index 5c15145..17257b6 100644 --- a/mailbox/cassandra/src/test/java/org/apache/james/mailbox/cassandra/mail/CassandraAttachmentFallbackTest.java +++ b/mailbox/cassandra/src/test/java/org/apache/james/mailbox/cassandra/mail/CassandraAttachmentFallbackTest.java @@ -44,7 +44,8 @@ import org.junit.Before; import org.junit.BeforeClass; import org.junit.ClassRule; import org.junit.Test; -import org.testcontainers.shaded.com.google.common.collect.ImmutableList; + +import com.google.common.collect.ImmutableList; public class CassandraAttachmentFallbackTest { public static final AttachmentId ATTACHMENT_ID_1 = AttachmentId.from("id1"); http://git-wip-us.apache.org/repos/asf/james-project/blob/9422eda0/server/container/guice/cassandra-guice/src/test/java/org/apache/james/JamesServerWithRetryConnectionTest.java ---------------------------------------------------------------------- diff --git a/server/container/guice/cassandra-guice/src/test/java/org/apache/james/JamesServerWithRetryConnectionTest.java b/server/container/guice/cassandra-guice/src/test/java/org/apache/james/JamesServerWithRetryConnectionTest.java index 73d5151..075c8a0 100644 --- a/server/container/guice/cassandra-guice/src/test/java/org/apache/james/JamesServerWithRetryConnectionTest.java +++ b/server/container/guice/cassandra-guice/src/test/java/org/apache/james/JamesServerWithRetryConnectionTest.java @@ -36,7 +36,6 @@ import org.junit.Before; import org.junit.ClassRule; import org.junit.Rule; import org.junit.Test; -import org.testcontainers.shaded.com.google.common.base.Throwables; public class JamesServerWithRetryConnectionTest { private static final long WAITING_TIME = TimeUnit.MILLISECONDS.convert(10, TimeUnit.SECONDS); @@ -102,7 +101,7 @@ public class JamesServerWithRetryConnectionTest { try { Thread.sleep(waitingTime); } catch (InterruptedException e) { - throw Throwables.propagate(e); + throw new RuntimeException(e); } action.execute(); }); http://git-wip-us.apache.org/repos/asf/james-project/blob/9422eda0/server/data/data-cassandra/src/test/java/org/apache/james/dlp/eventsourcing/cassandra/CassandraEventSourcingDLPConfigurationStoreExtension.java ---------------------------------------------------------------------- diff --git a/server/data/data-cassandra/src/test/java/org/apache/james/dlp/eventsourcing/cassandra/CassandraEventSourcingDLPConfigurationStoreExtension.java b/server/data/data-cassandra/src/test/java/org/apache/james/dlp/eventsourcing/cassandra/CassandraEventSourcingDLPConfigurationStoreExtension.java index 1f152d2..7cde47a 100644 --- a/server/data/data-cassandra/src/test/java/org/apache/james/dlp/eventsourcing/cassandra/CassandraEventSourcingDLPConfigurationStoreExtension.java +++ b/server/data/data-cassandra/src/test/java/org/apache/james/dlp/eventsourcing/cassandra/CassandraEventSourcingDLPConfigurationStoreExtension.java @@ -35,7 +35,8 @@ import org.junit.jupiter.api.extension.ExtensionContext; import org.junit.jupiter.api.extension.ParameterContext; import org.junit.jupiter.api.extension.ParameterResolutionException; import org.junit.jupiter.api.extension.ParameterResolver; -import org.testcontainers.shaded.com.google.common.collect.ImmutableSet; + +import com.google.common.collect.ImmutableSet; public class CassandraEventSourcingDLPConfigurationStoreExtension implements BeforeAllCallback, AfterAllCallback, AfterEachCallback, ParameterResolver { http://git-wip-us.apache.org/repos/asf/james-project/blob/9422eda0/server/data/data-cassandra/src/test/java/org/apache/james/dlp/eventsourcing/cassandra/DTOTest.java ---------------------------------------------------------------------- diff --git a/server/data/data-cassandra/src/test/java/org/apache/james/dlp/eventsourcing/cassandra/DTOTest.java b/server/data/data-cassandra/src/test/java/org/apache/james/dlp/eventsourcing/cassandra/DTOTest.java index ac82112..3357ba8 100644 --- a/server/data/data-cassandra/src/test/java/org/apache/james/dlp/eventsourcing/cassandra/DTOTest.java +++ b/server/data/data-cassandra/src/test/java/org/apache/james/dlp/eventsourcing/cassandra/DTOTest.java @@ -34,11 +34,11 @@ import org.apache.james.dlp.eventsourcing.events.ConfigurationItemsRemoved; import org.apache.james.eventsourcing.EventId; import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.Test; -import org.testcontainers.shaded.com.google.common.collect.ImmutableList; import com.fasterxml.jackson.annotation.JsonInclude; import com.fasterxml.jackson.databind.ObjectMapper; import com.fasterxml.jackson.datatype.jdk8.Jdk8Module; +import com.google.common.collect.ImmutableList; public class DTOTest { http://git-wip-us.apache.org/repos/asf/james-project/blob/9422eda0/server/mailrepository/mailrepository-cassandra/src/test/java/org/apache/james/mailrepository/cassandra/CassandraMailRepositoryMailDAOTest.java ---------------------------------------------------------------------- diff --git a/server/mailrepository/mailrepository-cassandra/src/test/java/org/apache/james/mailrepository/cassandra/CassandraMailRepositoryMailDAOTest.java b/server/mailrepository/mailrepository-cassandra/src/test/java/org/apache/james/mailrepository/cassandra/CassandraMailRepositoryMailDAOTest.java index 48b4aee..e0635bf 100644 --- a/server/mailrepository/mailrepository-cassandra/src/test/java/org/apache/james/mailrepository/cassandra/CassandraMailRepositoryMailDAOTest.java +++ b/server/mailrepository/mailrepository-cassandra/src/test/java/org/apache/james/mailrepository/cassandra/CassandraMailRepositoryMailDAOTest.java @@ -38,7 +38,8 @@ import org.junit.jupiter.api.BeforeAll; import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.extension.ExtendWith; -import org.testcontainers.shaded.com.google.common.collect.ImmutableList; + +import com.google.common.collect.ImmutableList; @ExtendWith(DockerCassandraExtension.class) public class CassandraMailRepositoryMailDAOTest { http://git-wip-us.apache.org/repos/asf/james-project/blob/9422eda0/server/protocols/jmap-integration-testing/jmap-integration-testing-common/src/test/java/org/apache/james/jmap/MessageAppender.java ---------------------------------------------------------------------- diff --git a/server/protocols/jmap-integration-testing/jmap-integration-testing-common/src/test/java/org/apache/james/jmap/MessageAppender.java b/server/protocols/jmap-integration-testing/jmap-integration-testing-common/src/test/java/org/apache/james/jmap/MessageAppender.java index cb78a6f..a1f3d13 100644 --- a/server/protocols/jmap-integration-testing/jmap-integration-testing-common/src/test/java/org/apache/james/jmap/MessageAppender.java +++ b/server/protocols/jmap-integration-testing/jmap-integration-testing-common/src/test/java/org/apache/james/jmap/MessageAppender.java @@ -30,7 +30,8 @@ import org.apache.james.mailbox.exception.MailboxException; import org.apache.james.mailbox.model.ComposedMessageId; import org.apache.james.mailbox.model.MailboxPath; import org.apache.james.mailbox.store.probe.MailboxProbe; -import org.testcontainers.shaded.com.google.common.collect.ImmutableList; + +import com.google.common.collect.ImmutableList; public class MessageAppender { http://git-wip-us.apache.org/repos/asf/james-project/blob/9422eda0/server/protocols/jmap-integration-testing/jmap-integration-testing-common/src/test/java/org/apache/james/jmap/methods/integration/cucumber/StringListToFlagsTest.java ---------------------------------------------------------------------- diff --git a/server/protocols/jmap-integration-testing/jmap-integration-testing-common/src/test/java/org/apache/james/jmap/methods/integration/cucumber/StringListToFlagsTest.java b/server/protocols/jmap-integration-testing/jmap-integration-testing-common/src/test/java/org/apache/james/jmap/methods/integration/cucumber/StringListToFlagsTest.java index 0f7ee58..f8b54c1 100644 --- a/server/protocols/jmap-integration-testing/jmap-integration-testing-common/src/test/java/org/apache/james/jmap/methods/integration/cucumber/StringListToFlagsTest.java +++ b/server/protocols/jmap-integration-testing/jmap-integration-testing-common/src/test/java/org/apache/james/jmap/methods/integration/cucumber/StringListToFlagsTest.java @@ -26,7 +26,8 @@ import javax.mail.Flags.Flag; import org.apache.james.jmap.model.Keyword; import org.junit.Test; -import org.testcontainers.shaded.com.google.common.collect.ImmutableList; + +import com.google.common.collect.ImmutableList; public class StringListToFlagsTest { @Test http://git-wip-us.apache.org/repos/asf/james-project/blob/9422eda0/server/protocols/protocols-smtp/src/test/java/org/apache/james/smtpserver/ValidRcptMXTest.java ---------------------------------------------------------------------- diff --git a/server/protocols/protocols-smtp/src/test/java/org/apache/james/smtpserver/ValidRcptMXTest.java b/server/protocols/protocols-smtp/src/test/java/org/apache/james/smtpserver/ValidRcptMXTest.java index a0605ec..fa4c09e 100644 --- a/server/protocols/protocols-smtp/src/test/java/org/apache/james/smtpserver/ValidRcptMXTest.java +++ b/server/protocols/protocols-smtp/src/test/java/org/apache/james/smtpserver/ValidRcptMXTest.java @@ -30,7 +30,8 @@ import org.apache.james.protocols.smtp.hook.HookReturnCode; import org.apache.james.protocols.smtp.utils.BaseFakeSMTPSession; import org.apache.james.smtpserver.fastfail.ValidRcptMX; import org.junit.Test; -import org.testcontainers.shaded.com.google.common.collect.ImmutableList; + +import com.google.common.collect.ImmutableList; public class ValidRcptMXTest { http://git-wip-us.apache.org/repos/asf/james-project/blob/9422eda0/server/queue/queue-rabbitmq/src/test/java/org/apache/james/queue/rabbitmq/RabbitMQClusterTest.java ---------------------------------------------------------------------- diff --git a/server/queue/queue-rabbitmq/src/test/java/org/apache/james/queue/rabbitmq/RabbitMQClusterTest.java b/server/queue/queue-rabbitmq/src/test/java/org/apache/james/queue/rabbitmq/RabbitMQClusterTest.java index f03b646..2f4dcb6 100644 --- a/server/queue/queue-rabbitmq/src/test/java/org/apache/james/queue/rabbitmq/RabbitMQClusterTest.java +++ b/server/queue/queue-rabbitmq/src/test/java/org/apache/james/queue/rabbitmq/RabbitMQClusterTest.java @@ -47,11 +47,11 @@ import org.junit.jupiter.api.Test; import org.junit.jupiter.api.extension.ExtendWith; import org.slf4j.Logger; import org.slf4j.LoggerFactory; -import org.testcontainers.shaded.com.google.common.collect.ImmutableMap; import com.github.fge.lambdas.Throwing; import com.github.steveash.guavate.Guavate; import com.google.common.collect.ImmutableList; +import com.google.common.collect.ImmutableMap; import com.rabbitmq.client.Address; import com.rabbitmq.client.Channel; import com.rabbitmq.client.Connection; http://git-wip-us.apache.org/repos/asf/james-project/blob/9422eda0/server/queue/queue-rabbitmq/src/test/java/org/apache/james/queue/rabbitmq/RabbitMQTest.java ---------------------------------------------------------------------- diff --git a/server/queue/queue-rabbitmq/src/test/java/org/apache/james/queue/rabbitmq/RabbitMQTest.java b/server/queue/queue-rabbitmq/src/test/java/org/apache/james/queue/rabbitmq/RabbitMQTest.java index b81035e..61d3aa5 100644 --- a/server/queue/queue-rabbitmq/src/test/java/org/apache/james/queue/rabbitmq/RabbitMQTest.java +++ b/server/queue/queue-rabbitmq/src/test/java/org/apache/james/queue/rabbitmq/RabbitMQTest.java @@ -42,11 +42,11 @@ import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.Nested; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.extension.ExtendWith; -import org.testcontainers.shaded.com.google.common.collect.ImmutableMap; import com.github.fge.lambdas.Throwing; import com.github.steveash.guavate.Guavate; import com.google.common.collect.ImmutableList; +import com.google.common.collect.ImmutableMap; import com.google.common.collect.Iterables; import com.rabbitmq.client.Channel; import com.rabbitmq.client.Connection; http://git-wip-us.apache.org/repos/asf/james-project/blob/9422eda0/server/testing/src/main/java/org/apache/james/util/docker/SwarmGenericContainer.java ---------------------------------------------------------------------- diff --git a/server/testing/src/main/java/org/apache/james/util/docker/SwarmGenericContainer.java b/server/testing/src/main/java/org/apache/james/util/docker/SwarmGenericContainer.java index 386eaa8..57fb9a5 100644 --- a/server/testing/src/main/java/org/apache/james/util/docker/SwarmGenericContainer.java +++ b/server/testing/src/main/java/org/apache/james/util/docker/SwarmGenericContainer.java @@ -35,10 +35,10 @@ import org.testcontainers.DockerClientFactory; import org.testcontainers.containers.GenericContainer; import org.testcontainers.containers.wait.strategy.WaitStrategy; import org.testcontainers.images.builder.ImageFromDockerfile; -import org.testcontainers.shaded.com.google.common.collect.ImmutableList; import com.github.dockerjava.api.command.InspectContainerResponse; import com.google.common.base.Strings; +import com.google.common.collect.ImmutableList; public class SwarmGenericContainer implements TestRule { private static final Logger LOGGER = LoggerFactory.getLogger(SwarmGenericContainer.class); --------------------------------------------------------------------- To unsubscribe, e-mail: server-dev-unsubscr...@james.apache.org For additional commands, e-mail: server-dev-h...@james.apache.org