Fix checkstyles errors
Project: http://git-wip-us.apache.org/repos/asf/james-project/repo Commit: http://git-wip-us.apache.org/repos/asf/james-project/commit/259d628a Tree: http://git-wip-us.apache.org/repos/asf/james-project/tree/259d628a Diff: http://git-wip-us.apache.org/repos/asf/james-project/diff/259d628a Branch: refs/heads/master Commit: 259d628add4ea8e05c506a3d268ac2f3585ff2d4 Parents: bc23029 Author: Raphael Ouazana <[email protected]> Authored: Thu Nov 15 16:26:04 2018 +0100 Committer: Benoit Tellier <[email protected]> Committed: Fri Nov 16 16:57:39 2018 +0700 ---------------------------------------------------------------------- .../utils/CassandraHealthCheckTest.java | 6 +- .../es/ClientProviderImplConnectionTest.java | 12 ++-- .../backends/es/ClientProviderImplTest.java | 4 +- .../java/org/apache/mailet/AttributeValue.java | 2 +- .../org/apache/mailet/AttributeValueTest.java | 58 +++++++++++--------- .../org/apache/mailet/ContractMailTest.java | 13 ++--- .../transport/matchers/SenderDomainIsTest.java | 4 +- .../lib/SieveRepositoryManagementTest.java | 12 ++-- .../memory/MemoryGetMessageListMethodTest.java | 4 +- .../webadmin/routes/HealthCheckRoutesTest.java | 2 +- 10 files changed, 60 insertions(+), 57 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/james-project/blob/259d628a/backends-common/cassandra/src/test/java/org/apache/james/backends/cassandra/utils/CassandraHealthCheckTest.java ---------------------------------------------------------------------- diff --git a/backends-common/cassandra/src/test/java/org/apache/james/backends/cassandra/utils/CassandraHealthCheckTest.java b/backends-common/cassandra/src/test/java/org/apache/james/backends/cassandra/utils/CassandraHealthCheckTest.java index 7ea8ae6..edff790 100644 --- a/backends-common/cassandra/src/test/java/org/apache/james/backends/cassandra/utils/CassandraHealthCheckTest.java +++ b/backends-common/cassandra/src/test/java/org/apache/james/backends/cassandra/utils/CassandraHealthCheckTest.java @@ -19,6 +19,8 @@ package org.apache.james.backends.cassandra.utils; +import static org.assertj.core.api.Assertions.assertThat; + import org.apache.james.backends.cassandra.CassandraCluster; import org.apache.james.backends.cassandra.DockerCassandraExtension; import org.apache.james.backends.cassandra.components.CassandraModule; @@ -27,8 +29,6 @@ import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.extension.ExtendWith; -import static org.assertj.core.api.Assertions.assertThat; - @ExtendWith(DockerCassandraExtension.class) public class CassandraHealthCheckTest { @@ -49,7 +49,7 @@ public class CassandraHealthCheckTest { @Test void checkShouldReturnUnhealthyWhenCassandraIsNotRunning(DockerCassandraExtension.DockerCassandra cassandraServer) { - try{ + try { cassandraServer.getContainer().pause(); Result check = healthCheck.check(); http://git-wip-us.apache.org/repos/asf/james-project/blob/259d628a/backends-common/elasticsearch/src/test/java/org/apache/james/backends/es/ClientProviderImplConnectionTest.java ---------------------------------------------------------------------- diff --git a/backends-common/elasticsearch/src/test/java/org/apache/james/backends/es/ClientProviderImplConnectionTest.java b/backends-common/elasticsearch/src/test/java/org/apache/james/backends/es/ClientProviderImplConnectionTest.java index 56f950d..ec3adf9 100644 --- a/backends-common/elasticsearch/src/test/java/org/apache/james/backends/es/ClientProviderImplConnectionTest.java +++ b/backends-common/elasticsearch/src/test/java/org/apache/james/backends/es/ClientProviderImplConnectionTest.java @@ -63,9 +63,9 @@ public class ClientProviderImplConnectionTest { .pollInterval(5, TimeUnit.SECONDS) .until(() -> isConnected( ClientProviderImpl.fromHostsString( - es1.getContainerIp() + ":" + ES_APPLICATIVE_PORT + "," - + es2.getContainerIp() + ":" + ES_APPLICATIVE_PORT - , Optional.empty()))); + es1.getContainerIp() + ":" + ES_APPLICATIVE_PORT + "," + + es2.getContainerIp() + ":" + ES_APPLICATIVE_PORT, + Optional.empty()))); } @Test @@ -77,9 +77,9 @@ public class ClientProviderImplConnectionTest { .pollInterval(5, TimeUnit.SECONDS) .until(() -> isConnected( ClientProviderImpl.fromHostsString( - es1.getContainerIp() + ":" + ES_APPLICATIVE_PORT + "," - + es2.getContainerIp() + ":" + ES_APPLICATIVE_PORT - , Optional.empty()))); + es1.getContainerIp() + ":" + ES_APPLICATIVE_PORT + "," + + es2.getContainerIp() + ":" + ES_APPLICATIVE_PORT, + Optional.empty()))); } private boolean isConnected(ClientProvider clientProvider) { http://git-wip-us.apache.org/repos/asf/james-project/blob/259d628a/backends-common/elasticsearch/src/test/java/org/apache/james/backends/es/ClientProviderImplTest.java ---------------------------------------------------------------------- diff --git a/backends-common/elasticsearch/src/test/java/org/apache/james/backends/es/ClientProviderImplTest.java b/backends-common/elasticsearch/src/test/java/org/apache/james/backends/es/ClientProviderImplTest.java index a901199..dac6ce3 100644 --- a/backends-common/elasticsearch/src/test/java/org/apache/james/backends/es/ClientProviderImplTest.java +++ b/backends-common/elasticsearch/src/test/java/org/apache/james/backends/es/ClientProviderImplTest.java @@ -22,11 +22,11 @@ package org.apache.james.backends.es; import static org.assertj.core.api.Assertions.assertThat; import static org.assertj.core.api.Assertions.assertThatThrownBy; +import java.util.Optional; + import org.elasticsearch.common.settings.Settings; import org.junit.Test; -import java.util.Optional; - public class ClientProviderImplTest { @Test http://git-wip-us.apache.org/repos/asf/james-project/blob/259d628a/mailet/api/src/main/java/org/apache/mailet/AttributeValue.java ---------------------------------------------------------------------- diff --git a/mailet/api/src/main/java/org/apache/mailet/AttributeValue.java b/mailet/api/src/main/java/org/apache/mailet/AttributeValue.java index d550d84..c3213fc 100644 --- a/mailet/api/src/main/java/org/apache/mailet/AttributeValue.java +++ b/mailet/api/src/main/java/org/apache/mailet/AttributeValue.java @@ -153,7 +153,7 @@ public class AttributeValue<T> { return of((URL) value); } if (value instanceof Optional) { - return of((Optional) value); + return of((Optional<?>) value); } if (value instanceof Serializable) { return ofSerializable((Serializable) value); http://git-wip-us.apache.org/repos/asf/james-project/blob/259d628a/mailet/api/src/test/java/org/apache/mailet/AttributeValueTest.java ---------------------------------------------------------------------- diff --git a/mailet/api/src/test/java/org/apache/mailet/AttributeValueTest.java b/mailet/api/src/test/java/org/apache/mailet/AttributeValueTest.java index c8bbc86..ebbfee8 100644 --- a/mailet/api/src/test/java/org/apache/mailet/AttributeValueTest.java +++ b/mailet/api/src/test/java/org/apache/mailet/AttributeValueTest.java @@ -51,8 +51,8 @@ class AttributeValueTest { @Test void ofShouldThrowAnExceptionOnNullValue() { - assertThatNullPointerException(). - isThrownBy(() -> AttributeValue.of((String) null)); + assertThatNullPointerException() + .isThrownBy(() -> AttributeValue.of((String) null)); } @Nested @@ -79,8 +79,8 @@ class AttributeValueTest { @Test void nullStringShouldThrowAnException() { - assertThatNullPointerException(). - isThrownBy(() -> AttributeValue.of((String) null)); + assertThatNullPointerException() + .isThrownBy(() -> AttributeValue.of((String) null)); } @Test @@ -123,8 +123,8 @@ class AttributeValueTest { @Test void nullBooleanShouldThrowAnException() { - assertThatNullPointerException(). - isThrownBy(() -> AttributeValue.of((Boolean) null)); + assertThatNullPointerException() + .isThrownBy(() -> AttributeValue.of((Boolean) null)); } @Test @@ -157,8 +157,8 @@ class AttributeValueTest { @Test void nullIntShouldThrowAnException() { - assertThatNullPointerException(). - isThrownBy(() -> AttributeValue.of((Integer) null)); + assertThatNullPointerException() + .isThrownBy(() -> AttributeValue.of((Integer) null)); } @Test @@ -201,6 +201,7 @@ class AttributeValueTest { assertThat(actual).isEqualTo(expected); } + @Test void longShouldBeSerializedAndBackForLongMaxValue() { AttributeValue<Long> expected = AttributeValue.of(Long.MAX_VALUE); @@ -213,8 +214,8 @@ class AttributeValueTest { @Test void nullLongShouldThrowAnException() { - assertThatNullPointerException(). - isThrownBy(() -> AttributeValue.of((Long) null)); + assertThatNullPointerException() + .isThrownBy(() -> AttributeValue.of((Long) null)); } @Test @@ -253,8 +254,8 @@ class AttributeValueTest { @Test void nullFloatShouldThrowAnException() { - assertThatNullPointerException(). - isThrownBy(() -> AttributeValue.of((Float) null)); + assertThatNullPointerException() + .isThrownBy(() -> AttributeValue.of((Float) null)); } @Test @@ -290,6 +291,7 @@ class AttributeValueTest { assertThat(actual).isEqualTo(expected); } + @Test void doubleShouldBeSerializedAndBackForMaxValue() { AttributeValue<Double> expected = AttributeValue.of(Double.MAX_VALUE); @@ -302,8 +304,8 @@ class AttributeValueTest { @Test void nullDoubleShouldThrowAnException() { - assertThatNullPointerException(). - isThrownBy(() -> AttributeValue.of((Double) null)); + assertThatNullPointerException() + .isThrownBy(() -> AttributeValue.of((Double) null)); } @Test @@ -365,8 +367,8 @@ class AttributeValueTest { @Test void nullURLShouldThrowAnException() { - assertThatNullPointerException(). - isThrownBy(() -> AttributeValue.of((URL) null)); + assertThatNullPointerException() + .isThrownBy(() -> AttributeValue.of((URL) null)); } @Test @@ -405,8 +407,8 @@ class AttributeValueTest { @Test void nullMessageIdDtoShouldThrowAnException() { - assertThatNullPointerException(). - isThrownBy(() -> AttributeValue.of((MessageIdDto) null)); + assertThatNullPointerException() + .isThrownBy(() -> AttributeValue.of((MessageIdDto) null)); } @Test @@ -429,8 +431,8 @@ class AttributeValueTest { class ListSerialization { @Test void nullStringListShouldThrowAnException() { - assertThatNullPointerException(). - isThrownBy(() -> AttributeValue.ofAny((List<String>) null)); + assertThatNullPointerException() + .isThrownBy(() -> AttributeValue.ofAny((List<String>) null)); } @Test @@ -480,10 +482,11 @@ class AttributeValueTest { @Nested class MapSerialization { + @SuppressWarnings({ "rawtypes", "unchecked" }) @Test void nullMapShouldThrowAnException() { - assertThatNullPointerException(). - isThrownBy(() -> AttributeValue.of((Map) null)); + assertThatNullPointerException() + .isThrownBy(() -> AttributeValue.of((Map) null)); } @Test @@ -534,10 +537,11 @@ class AttributeValueTest { @Nested class OptionalSerialization { + @SuppressWarnings({ "unchecked", "rawtypes" }) @Test void nullMapShouldThrowAnException() { - assertThatNullPointerException(). - isThrownBy(() -> AttributeValue.of((Optional) null)); + assertThatNullPointerException() + .isThrownBy(() -> AttributeValue.of((Optional) null)); } @Test @@ -598,8 +602,8 @@ class AttributeValueTest { @Test void nullSerializableShouldThrowAnException() { - assertThatNullPointerException(). - isThrownBy(() -> AttributeValue.ofSerializable((java.io.Serializable) null)); + assertThatNullPointerException() + .isThrownBy(() -> AttributeValue.ofSerializable((java.io.Serializable) null)); } @Test @@ -620,7 +624,7 @@ class AttributeValueTest { @Test void fromJsonStringShouldThrowOnBrokenJson() { - assertThatThrownBy(() ->AttributeValue.fromJsonString("{\"serializer\":\"StringSerializer\",\"value\": \"Missing closing bracket\"")) + assertThatThrownBy(() -> AttributeValue.fromJsonString("{\"serializer\":\"StringSerializer\",\"value\": \"Missing closing bracket\"")) .isInstanceOf(JsonEOFException.class); } http://git-wip-us.apache.org/repos/asf/james-project/blob/259d628a/mailet/api/src/test/java/org/apache/mailet/ContractMailTest.java ---------------------------------------------------------------------- diff --git a/mailet/api/src/test/java/org/apache/mailet/ContractMailTest.java b/mailet/api/src/test/java/org/apache/mailet/ContractMailTest.java index 77da3bc..8e1f562 100644 --- a/mailet/api/src/test/java/org/apache/mailet/ContractMailTest.java +++ b/mailet/api/src/test/java/org/apache/mailet/ContractMailTest.java @@ -19,7 +19,6 @@ package org.apache.mailet; - import static org.assertj.core.api.Assertions.assertThat; import java.io.Serializable; @@ -32,11 +31,11 @@ import org.junit.jupiter.api.Test; import com.google.common.collect.ImmutableMap; public abstract class ContractMailTest { - private final static AttributeName ATTRIBUTE_NAME_1 = AttributeName.of("name1"); - private final static AttributeName ATTRIBUTE_NAME_2 = AttributeName.of("name2"); - private final static Attribute ATTRIBUTE_1 = new Attribute(ATTRIBUTE_NAME_1, AttributeValue.of(true)); - private final static Attribute ATTRIBUTE_2 = new Attribute(ATTRIBUTE_NAME_2, AttributeValue.of("value2")); - private final static Attribute ATTRIBUTE_1_BIS = new Attribute(ATTRIBUTE_NAME_1, AttributeValue.of("value1")); + private static final AttributeName ATTRIBUTE_NAME_1 = AttributeName.of("name1"); + private static final AttributeName ATTRIBUTE_NAME_2 = AttributeName.of("name2"); + private static final Attribute ATTRIBUTE_1 = new Attribute(ATTRIBUTE_NAME_1, AttributeValue.of(true)); + private static final Attribute ATTRIBUTE_2 = new Attribute(ATTRIBUTE_NAME_2, AttributeValue.of("value2")); + private static final Attribute ATTRIBUTE_1_BIS = new Attribute(ATTRIBUTE_NAME_1, AttributeValue.of("value1")); private static final String VALUE = "value"; private static final String KEY = "key"; private static final String NEW_VALUE = "newValue"; @@ -151,7 +150,7 @@ public abstract class ContractMailTest { } } - @SuppressWarnings("deprecated") + @SuppressWarnings("deprecation") @Nested public class DeprecatedtedAttributes { @Test http://git-wip-us.apache.org/repos/asf/james-project/blob/259d628a/mailet/standard/src/test/java/org/apache/james/transport/matchers/SenderDomainIsTest.java ---------------------------------------------------------------------- diff --git a/mailet/standard/src/test/java/org/apache/james/transport/matchers/SenderDomainIsTest.java b/mailet/standard/src/test/java/org/apache/james/transport/matchers/SenderDomainIsTest.java index dfa2cb4..c74a741 100644 --- a/mailet/standard/src/test/java/org/apache/james/transport/matchers/SenderDomainIsTest.java +++ b/mailet/standard/src/test/java/org/apache/james/transport/matchers/SenderDomainIsTest.java @@ -111,8 +111,8 @@ class SenderDomainIsTest { void initShouldThrowWhenEmptyCondition() { assertThatThrownBy(() -> matcher.init(FakeMatcherConfig.builder() - .matcherName("SenderDomainIs"). - build())) + .matcherName("SenderDomainIs") + .build())) .isInstanceOf(NullPointerException.class); } http://git-wip-us.apache.org/repos/asf/james-project/blob/259d628a/server/data/data-library/src/test/java/org/apache/james/sieverepository/lib/SieveRepositoryManagementTest.java ---------------------------------------------------------------------- diff --git a/server/data/data-library/src/test/java/org/apache/james/sieverepository/lib/SieveRepositoryManagementTest.java b/server/data/data-library/src/test/java/org/apache/james/sieverepository/lib/SieveRepositoryManagementTest.java index e74b660..0f80edc 100644 --- a/server/data/data-library/src/test/java/org/apache/james/sieverepository/lib/SieveRepositoryManagementTest.java +++ b/server/data/data-library/src/test/java/org/apache/james/sieverepository/lib/SieveRepositoryManagementTest.java @@ -18,6 +18,12 @@ ****************************************************************/ package org.apache.james.sieverepository.lib; +import static org.mockito.Mockito.times; +import static org.mockito.Mockito.verify; + +import java.net.URL; +import java.nio.charset.StandardCharsets; + import org.apache.commons.io.IOUtils; import org.apache.james.core.User; import org.apache.james.sieverepository.api.ScriptContent; @@ -28,12 +34,6 @@ import org.junit.Test; import org.mockito.Mock; import org.mockito.MockitoAnnotations; -import java.net.URL; -import java.nio.charset.StandardCharsets; - -import static org.mockito.Mockito.times; -import static org.mockito.Mockito.verify; - public class SieveRepositoryManagementTest { @Mock http://git-wip-us.apache.org/repos/asf/james-project/blob/259d628a/server/protocols/jmap-integration-testing/memory-jmap-integration-testing/src/test/java/org/apache/james/jmap/memory/MemoryGetMessageListMethodTest.java ---------------------------------------------------------------------- diff --git a/server/protocols/jmap-integration-testing/memory-jmap-integration-testing/src/test/java/org/apache/james/jmap/memory/MemoryGetMessageListMethodTest.java b/server/protocols/jmap-integration-testing/memory-jmap-integration-testing/src/test/java/org/apache/james/jmap/memory/MemoryGetMessageListMethodTest.java index 630f9a4..5871e88 100644 --- a/server/protocols/jmap-integration-testing/memory-jmap-integration-testing/src/test/java/org/apache/james/jmap/memory/MemoryGetMessageListMethodTest.java +++ b/server/protocols/jmap-integration-testing/memory-jmap-integration-testing/src/test/java/org/apache/james/jmap/memory/MemoryGetMessageListMethodTest.java @@ -19,6 +19,8 @@ package org.apache.james.jmap.memory; +import java.io.IOException; + import org.apache.james.GuiceJamesServer; import org.apache.james.MemoryJmapTestRule; import org.apache.james.jmap.methods.integration.GetMessageListMethodTest; @@ -27,8 +29,6 @@ import org.junit.Ignore; import org.junit.Rule; import org.junit.Test; -import java.io.IOException; - public class MemoryGetMessageListMethodTest extends GetMessageListMethodTest { @Rule http://git-wip-us.apache.org/repos/asf/james-project/blob/259d628a/server/protocols/webadmin/webadmin-core/src/test/java/org/apache/james/webadmin/routes/HealthCheckRoutesTest.java ---------------------------------------------------------------------- diff --git a/server/protocols/webadmin/webadmin-core/src/test/java/org/apache/james/webadmin/routes/HealthCheckRoutesTest.java b/server/protocols/webadmin/webadmin-core/src/test/java/org/apache/james/webadmin/routes/HealthCheckRoutesTest.java index 2396bc8..084efcf 100644 --- a/server/protocols/webadmin/webadmin-core/src/test/java/org/apache/james/webadmin/routes/HealthCheckRoutesTest.java +++ b/server/protocols/webadmin/webadmin-core/src/test/java/org/apache/james/webadmin/routes/HealthCheckRoutesTest.java @@ -23,8 +23,8 @@ import static io.restassured.RestAssured.given; import static io.restassured.RestAssured.when; import static net.javacrumbs.jsonunit.assertj.JsonAssertions.assertThatJson; import static org.apache.james.webadmin.WebAdminServer.NO_CONFIGURATION; -import static org.hamcrest.Matchers.hasSize; import static org.hamcrest.Matchers.equalTo; +import static org.hamcrest.Matchers.hasSize; import static org.hamcrest.Matchers.is; import static org.hamcrest.Matchers.nullValue; --------------------------------------------------------------------- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
