You are viewing a plain text version of this content. The canonical link for it is here.
Posted to server-dev@james.apache.org by bt...@apache.org on 2019/05/30 07:22:12 UTC
[james-project] 01/19: Checkstyle fixes
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 eb9d8d302784868fa9cfc91b04299faf2098686d
Author: Raphael Ouazana <ra...@linagora.com>
AuthorDate: Fri May 24 17:35:23 2019 +0200
Checkstyle fixes
---
.../java/org/apache/james/backends/es/NodeMappingFactoryTest.java | 2 +-
.../imapmailbox/external/james/JamesDeploymentValidationTest.java | 1 -
.../imapmailbox/external/james/host/docker/CliProvisioningAPI.java | 6 +++---
.../java/org/apache/james/jmap/methods/GetMailboxesMethodTest.java | 1 +
.../test/java/org/apache/james/jmap/model/MailboxFactoryTest.java | 2 --
.../james/webadmin/integration/EventDeadLettersIntegrationTest.java | 4 ++--
.../test/java/org/apache/james/webadmin/routes/TasksRoutesTest.java | 1 -
.../java/org/apache/james/webadmin/routes/DomainsRoutesTest.java | 2 +-
.../src/test/java/org/apache/james/task/MemoryTaskManagerTest.java | 1 +
.../java/org/apache/james/task/MemoryTaskManagerWorkerTest.java | 1 +
10 files changed, 10 insertions(+), 11 deletions(-)
diff --git a/backends-common/elasticsearch/src/test/java/org/apache/james/backends/es/NodeMappingFactoryTest.java b/backends-common/elasticsearch/src/test/java/org/apache/james/backends/es/NodeMappingFactoryTest.java
index 6ffa45b..dd24ddd 100644
--- a/backends-common/elasticsearch/src/test/java/org/apache/james/backends/es/NodeMappingFactoryTest.java
+++ b/backends-common/elasticsearch/src/test/java/org/apache/james/backends/es/NodeMappingFactoryTest.java
@@ -63,7 +63,7 @@ public class NodeMappingFactoryTest {
elasticSearch.awaitForElasticSearch();
- assertThatCode(() ->NodeMappingFactory.applyMapping(clientProvider.get(),
+ assertThatCode(() -> NodeMappingFactory.applyMapping(clientProvider.get(),
INDEX_NAME,
getOtherMappingsSources()))
.doesNotThrowAnyException();
diff --git a/mpt/impl/imap-mailbox/external-james/src/test/java/org/apache/james/mpt/imapmailbox/external/james/JamesDeploymentValidationTest.java b/mpt/impl/imap-mailbox/external-james/src/test/java/org/apache/james/mpt/imapmailbox/external/james/JamesDeploymentValidationTest.java
index 5afc1ee..af766be 100644
--- a/mpt/impl/imap-mailbox/external-james/src/test/java/org/apache/james/mpt/imapmailbox/external/james/JamesDeploymentValidationTest.java
+++ b/mpt/impl/imap-mailbox/external-james/src/test/java/org/apache/james/mpt/imapmailbox/external/james/JamesDeploymentValidationTest.java
@@ -32,7 +32,6 @@ import com.google.inject.Injector;
public class JamesDeploymentValidationTest extends DeploymentValidation {
- private final String USER_ADDRESS = USER + "@" + DOMAIN;
private ImapHostSystem system;
private SmtpHostSystem smtpHostSystem;
private final ExternalJamesConfiguration configuration = new ExternalJamesConfigurationEnvironnementVariables();
diff --git a/mpt/impl/imap-mailbox/external-james/src/test/java/org/apache/james/mpt/imapmailbox/external/james/host/docker/CliProvisioningAPI.java b/mpt/impl/imap-mailbox/external-james/src/test/java/org/apache/james/mpt/imapmailbox/external/james/host/docker/CliProvisioningAPI.java
index b3aa138..3e6411a 100644
--- a/mpt/impl/imap-mailbox/external-james/src/test/java/org/apache/james/mpt/imapmailbox/external/james/host/docker/CliProvisioningAPI.java
+++ b/mpt/impl/imap-mailbox/external-james/src/test/java/org/apache/james/mpt/imapmailbox/external/james/host/docker/CliProvisioningAPI.java
@@ -21,11 +21,11 @@ package org.apache.james.mpt.imapmailbox.external.james.host.docker;
import java.io.IOException;
import org.apache.commons.lang3.ArrayUtils;
+import org.apache.commons.lang3.StringUtils;
import org.apache.james.mpt.imapmailbox.external.james.ProvisioningException;
import org.apache.james.mpt.imapmailbox.external.james.host.ProvisioningAPI;
import org.apache.james.util.docker.DockerGenericContainer;
import org.testcontainers.containers.Container;
-import org.testcontainers.shaded.org.apache.commons.lang.StringUtils;
import com.google.common.collect.ImmutableList;
@@ -39,8 +39,8 @@ public class CliProvisioningAPI implements ProvisioningAPI {
private final DockerGenericContainer container;
private final String[] cmd;
- private final static String[] jarCmd = {"java", "-jar", "/root/james-cli.jar"};
- private final static String[] hostAndPort = {"-h", "127.0.0.1", "-p", "9999"};
+ private static final String[] jarCmd = {"java", "-jar", "/root/james-cli.jar"};
+ private static final String[] hostAndPort = {"-h", "127.0.0.1", "-p", "9999"};
public CliProvisioningAPI(CliType cliType, DockerGenericContainer container) throws InterruptedException, ProvisioningException, IOException, IllegalArgumentException {
this.container = container;
diff --git a/server/protocols/jmap/src/test/java/org/apache/james/jmap/methods/GetMailboxesMethodTest.java b/server/protocols/jmap/src/test/java/org/apache/james/jmap/methods/GetMailboxesMethodTest.java
index 8a20c6c..e5c2c31 100644
--- a/server/protocols/jmap/src/test/java/org/apache/james/jmap/methods/GetMailboxesMethodTest.java
+++ b/server/protocols/jmap/src/test/java/org/apache/james/jmap/methods/GetMailboxesMethodTest.java
@@ -68,6 +68,7 @@ public class GetMailboxesMethodTest {
private QuotaRootResolver quotaRootResolver;
private QuotaManager quotaManager;
+
@Before
public void setup() throws Exception {
clientId = ClientId.of("#0");
diff --git a/server/protocols/jmap/src/test/java/org/apache/james/jmap/model/MailboxFactoryTest.java b/server/protocols/jmap/src/test/java/org/apache/james/jmap/model/MailboxFactoryTest.java
index cdbaa54..34e8e34 100644
--- a/server/protocols/jmap/src/test/java/org/apache/james/jmap/model/MailboxFactoryTest.java
+++ b/server/protocols/jmap/src/test/java/org/apache/james/jmap/model/MailboxFactoryTest.java
@@ -24,8 +24,6 @@ import java.util.Optional;
import org.apache.james.jmap.model.mailbox.Mailbox;
import org.apache.james.jmap.model.mailbox.MailboxNamespace;
-import org.apache.james.jmap.utils.quotas.DefaultQuotaLoader;
-import org.apache.james.jmap.utils.quotas.QuotaLoader;
import org.apache.james.mailbox.MailboxSession;
import org.apache.james.mailbox.inmemory.InMemoryId;
import org.apache.james.mailbox.inmemory.manager.InMemoryIntegrationResources;
diff --git a/server/protocols/webadmin-integration-test/src/test/java/org/apache/james/webadmin/integration/EventDeadLettersIntegrationTest.java b/server/protocols/webadmin-integration-test/src/test/java/org/apache/james/webadmin/integration/EventDeadLettersIntegrationTest.java
index 3bffb93..1b15988 100644
--- a/server/protocols/webadmin-integration-test/src/test/java/org/apache/james/webadmin/integration/EventDeadLettersIntegrationTest.java
+++ b/server/protocols/webadmin-integration-test/src/test/java/org/apache/james/webadmin/integration/EventDeadLettersIntegrationTest.java
@@ -67,8 +67,8 @@ public class EventDeadLettersIntegrationTest {
public static class RetryEventsListenerGroup extends Group {}
- public class RetryEventsListener implements MailboxListener.GroupMailboxListener {
- final Group GROUP = new RetryEventsListenerGroup();
+ public static class RetryEventsListener implements MailboxListener.GroupMailboxListener {
+ static final Group GROUP = new RetryEventsListenerGroup();
private int retriesBeforeSuccess;
private Map<Event.EventId, Integer> retries;
diff --git a/server/protocols/webadmin/webadmin-core/src/test/java/org/apache/james/webadmin/routes/TasksRoutesTest.java b/server/protocols/webadmin/webadmin-core/src/test/java/org/apache/james/webadmin/routes/TasksRoutesTest.java
index 825a41a..39947c0 100644
--- a/server/protocols/webadmin/webadmin-core/src/test/java/org/apache/james/webadmin/routes/TasksRoutesTest.java
+++ b/server/protocols/webadmin/webadmin-core/src/test/java/org/apache/james/webadmin/routes/TasksRoutesTest.java
@@ -26,7 +26,6 @@ import static org.apache.james.webadmin.WebAdminServer.NO_CONFIGURATION;
import static org.hamcrest.Matchers.empty;
import static org.hamcrest.Matchers.hasSize;
import static org.hamcrest.Matchers.is;
-import static org.hamcrest.Matchers.isIn;
import static org.hamcrest.Matchers.isOneOf;
import static org.hamcrest.Matchers.not;
diff --git a/server/protocols/webadmin/webadmin-data/src/test/java/org/apache/james/webadmin/routes/DomainsRoutesTest.java b/server/protocols/webadmin/webadmin-data/src/test/java/org/apache/james/webadmin/routes/DomainsRoutesTest.java
index e68ddc3..7be1f92 100644
--- a/server/protocols/webadmin/webadmin-data/src/test/java/org/apache/james/webadmin/routes/DomainsRoutesTest.java
+++ b/server/protocols/webadmin/webadmin-data/src/test/java/org/apache/james/webadmin/routes/DomainsRoutesTest.java
@@ -265,7 +265,7 @@ class DomainsRoutesTest {
}
@Nested
- class DomainAlias{
+ class DomainAlias {
@Test
void getAliasesShouldReturnNotFoundWhenDomainDoesNotExist() {
when()
diff --git a/server/task/src/test/java/org/apache/james/task/MemoryTaskManagerTest.java b/server/task/src/test/java/org/apache/james/task/MemoryTaskManagerTest.java
index 7b87080..aea861b 100644
--- a/server/task/src/test/java/org/apache/james/task/MemoryTaskManagerTest.java
+++ b/server/task/src/test/java/org/apache/james/task/MemoryTaskManagerTest.java
@@ -117,6 +117,7 @@ public class MemoryTaskManagerTest {
}
assertThat(memoryTaskManager.getExecutionDetails(id).getStatus()).isEqualTo(TaskManager.Status.COMPLETED);
}
+
@Test
public void failedTaskShouldNotBeCancelled() {
TaskId id = memoryTaskManager.submit(() -> Task.Result.PARTIAL);
diff --git a/server/task/src/test/java/org/apache/james/task/MemoryTaskManagerWorkerTest.java b/server/task/src/test/java/org/apache/james/task/MemoryTaskManagerWorkerTest.java
index 48d22fd..034cdbd 100644
--- a/server/task/src/test/java/org/apache/james/task/MemoryTaskManagerWorkerTest.java
+++ b/server/task/src/test/java/org/apache/james/task/MemoryTaskManagerWorkerTest.java
@@ -90,6 +90,7 @@ public class MemoryTaskManagerWorkerTest {
assertThat(idToDetails.get(id).getStatus()).isEqualTo(TaskManager.Status.IN_PROGRESS);
latch.countDown();
}
+
@Test
public void theWorkerShouldNotRunATaskRequestedForCancellation() {
TaskId id = TaskId.generateTaskId();
---------------------------------------------------------------------
To unsubscribe, e-mail: server-dev-unsubscribe@james.apache.org
For additional commands, e-mail: server-dev-help@james.apache.org