This is an automated email from the ASF dual-hosted git repository. btellier pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/james-project.git
commit ab1a174c690e85a8cb2e38faf89c9419cf3e36df Author: Benoit Tellier <[email protected]> AuthorDate: Tue Jul 28 16:58:51 2020 +0700 [REFACTORING] Default methods for GuiceModuleTestRule This allows a quick audit of which class implements which methods --- .../modules/objectstorage/aws/s3/DockerAwsS3TestRule.java | 4 ---- .../modules/objectstorage/swift/DockerSwiftTestRule.java | 4 ---- .../src/test/java/org/apache/james/DockerCassandraRule.java | 4 ---- .../src/test/java/org/apache/james/DockerLdapRule.java | 4 ---- .../java/org/apache/james/modules/DockerRabbitMQRule.java | 4 ---- .../src/test/java/org/apache/james/GuiceModuleTestRule.java | 8 ++++++-- .../test/java/org/apache/james/TempFilesystemTestRule.java | 12 ------------ 7 files changed, 6 insertions(+), 34 deletions(-) diff --git a/server/container/guice/blob-objectstorage-guice/src/test/java/org/apache/james/modules/objectstorage/aws/s3/DockerAwsS3TestRule.java b/server/container/guice/blob-objectstorage-guice/src/test/java/org/apache/james/modules/objectstorage/aws/s3/DockerAwsS3TestRule.java index 097de25..9690b46 100644 --- a/server/container/guice/blob-objectstorage-guice/src/test/java/org/apache/james/modules/objectstorage/aws/s3/DockerAwsS3TestRule.java +++ b/server/container/guice/blob-objectstorage-guice/src/test/java/org/apache/james/modules/objectstorage/aws/s3/DockerAwsS3TestRule.java @@ -82,10 +82,6 @@ public class DockerAwsS3TestRule implements GuiceModuleTestRule { } @Override - public void await() { - } - - @Override public Module getModule() { BucketName defaultBucketName = BucketName.of(UUID.randomUUID().toString()); AwsS3AuthConfiguration authConfiguration = AwsS3AuthConfiguration.builder() diff --git a/server/container/guice/blob-objectstorage-guice/src/test/java/org/apache/james/modules/objectstorage/swift/DockerSwiftTestRule.java b/server/container/guice/blob-objectstorage-guice/src/test/java/org/apache/james/modules/objectstorage/swift/DockerSwiftTestRule.java index bc3ffde..520d828 100644 --- a/server/container/guice/blob-objectstorage-guice/src/test/java/org/apache/james/modules/objectstorage/swift/DockerSwiftTestRule.java +++ b/server/container/guice/blob-objectstorage-guice/src/test/java/org/apache/james/modules/objectstorage/swift/DockerSwiftTestRule.java @@ -76,10 +76,6 @@ public class DockerSwiftTestRule implements GuiceModuleTestRule { } @Override - public void await() { - } - - @Override public Module getModule() { SwiftKeystone2ObjectStorage.Configuration authConfiguration = SwiftKeystone2ObjectStorage.configBuilder() .credentials(Credentials.of("demo")) diff --git a/server/container/guice/cassandra-guice/src/test/java/org/apache/james/DockerCassandraRule.java b/server/container/guice/cassandra-guice/src/test/java/org/apache/james/DockerCassandraRule.java index 6ed7d39..27c5463 100644 --- a/server/container/guice/cassandra-guice/src/test/java/org/apache/james/DockerCassandraRule.java +++ b/server/container/guice/cassandra-guice/src/test/java/org/apache/james/DockerCassandraRule.java @@ -42,10 +42,6 @@ public class DockerCassandraRule implements GuiceModuleTestRule { } @Override - public void await() { - } - - @Override public Module getModule() { return Modules.combine(binder -> binder.bind(ClusterConfiguration.class) .toInstance(DockerCassandra.configurationBuilder(cassandraContainer.getHost()) diff --git a/server/container/guice/cassandra-ldap-guice/src/test/java/org/apache/james/DockerLdapRule.java b/server/container/guice/cassandra-ldap-guice/src/test/java/org/apache/james/DockerLdapRule.java index 4a397cb..0c96b67 100644 --- a/server/container/guice/cassandra-ldap-guice/src/test/java/org/apache/james/DockerLdapRule.java +++ b/server/container/guice/cassandra-ldap-guice/src/test/java/org/apache/james/DockerLdapRule.java @@ -36,10 +36,6 @@ public class DockerLdapRule implements GuiceModuleTestRule { } @Override - public void await() { - } - - @Override public Statement apply(Statement statement, Description description) { return statement; } diff --git a/server/container/guice/cassandra-rabbitmq-guice/src/test/java/org/apache/james/modules/DockerRabbitMQRule.java b/server/container/guice/cassandra-rabbitmq-guice/src/test/java/org/apache/james/modules/DockerRabbitMQRule.java index b107e2c..7834db7 100644 --- a/server/container/guice/cassandra-rabbitmq-guice/src/test/java/org/apache/james/modules/DockerRabbitMQRule.java +++ b/server/container/guice/cassandra-rabbitmq-guice/src/test/java/org/apache/james/modules/DockerRabbitMQRule.java @@ -43,10 +43,6 @@ public class DockerRabbitMQRule implements GuiceModuleTestRule { } @Override - public void await() { - } - - @Override public Module getModule() { return Modules.combine((binder) -> { try { diff --git a/server/container/guice/guice-common/src/test/java/org/apache/james/GuiceModuleTestRule.java b/server/container/guice/guice-common/src/test/java/org/apache/james/GuiceModuleTestRule.java index ca586c4..098d597 100644 --- a/server/container/guice/guice-common/src/test/java/org/apache/james/GuiceModuleTestRule.java +++ b/server/container/guice/guice-common/src/test/java/org/apache/james/GuiceModuleTestRule.java @@ -24,7 +24,11 @@ import org.junit.rules.TestRule; import com.google.inject.Module; public interface GuiceModuleTestRule extends TestRule { - Module getModule(); + default Module getModule() { + return binder -> { }; + } - void await(); + default void await() { + + } } \ No newline at end of file diff --git a/server/container/guice/guice-common/src/test/java/org/apache/james/TempFilesystemTestRule.java b/server/container/guice/guice-common/src/test/java/org/apache/james/TempFilesystemTestRule.java index 54d5c12..8ee7908 100644 --- a/server/container/guice/guice-common/src/test/java/org/apache/james/TempFilesystemTestRule.java +++ b/server/container/guice/guice-common/src/test/java/org/apache/james/TempFilesystemTestRule.java @@ -23,8 +23,6 @@ import org.junit.rules.TemporaryFolder; import org.junit.runner.Description; import org.junit.runners.model.Statement; -import com.google.inject.Module; - public class TempFilesystemTestRule implements GuiceModuleTestRule { private final TemporaryFolder temporaryFolder; @@ -41,14 +39,4 @@ public class TempFilesystemTestRule implements GuiceModuleTestRule { public Statement apply(Statement base, Description description) { return temporaryFolder.apply(base, description); } - - @Override - public Module getModule() { - return binder -> { }; - } - - @Override - public void await() { - } - } --------------------------------------------------------------------- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
