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 ro...@apache.org on 2018/01/10 10:14:41 UTC
[41/53] [abbrv] james-project git commit: JAMES-2277 fix missing
vertical spacing
http://git-wip-us.apache.org/repos/asf/james-project/blob/0c39fda1/server/container/util-java8/src/test/java/org/apache/james/util/docker/SwarmGenericContainer.java
----------------------------------------------------------------------
diff --git a/server/container/util-java8/src/test/java/org/apache/james/util/docker/SwarmGenericContainer.java b/server/container/util-java8/src/test/java/org/apache/james/util/docker/SwarmGenericContainer.java
index 0114a4e..20c66dd 100644
--- a/server/container/util-java8/src/test/java/org/apache/james/util/docker/SwarmGenericContainer.java
+++ b/server/container/util-java8/src/test/java/org/apache/james/util/docker/SwarmGenericContainer.java
@@ -63,6 +63,7 @@ public class SwarmGenericContainer implements TestRule {
logAndCheckSkipTest(e);
}
}
+
private void logAndCheckSkipTest(IllegalStateException e) {
LOGGER.error("Cannot initial a docker container", e);
if (e.getMessage().startsWith(NO_DOCKER_ENVIRONMENT)) {
http://git-wip-us.apache.org/repos/asf/james-project/blob/0c39fda1/server/container/util/src/test/java/org/apache/james/util/retry/naming/NamingExceptionRetryHandlerTest.java
----------------------------------------------------------------------
diff --git a/server/container/util/src/test/java/org/apache/james/util/retry/naming/NamingExceptionRetryHandlerTest.java b/server/container/util/src/test/java/org/apache/james/util/retry/naming/NamingExceptionRetryHandlerTest.java
index 36360c0..a399690 100644
--- a/server/container/util/src/test/java/org/apache/james/util/retry/naming/NamingExceptionRetryHandlerTest.java
+++ b/server/container/util/src/test/java/org/apache/james/util/retry/naming/NamingExceptionRetryHandlerTest.java
@@ -24,11 +24,12 @@ import javax.naming.NamingException;
import org.apache.james.util.retry.api.ExceptionRetryingProxy;
import org.apache.james.util.retry.api.RetryHandler;
import org.apache.james.util.retry.api.RetrySchedule;
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertTrue;
import org.junit.Before;
import org.junit.Test;
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertTrue;
+
/**
* <code>ExceptionRetryHandlerTest</code>
*/
http://git-wip-us.apache.org/repos/asf/james-project/blob/0c39fda1/server/data/data-file/src/test/java/org/apache/james/sieverepository/file/SieveFileRepositoryTest.java
----------------------------------------------------------------------
diff --git a/server/data/data-file/src/test/java/org/apache/james/sieverepository/file/SieveFileRepositoryTest.java b/server/data/data-file/src/test/java/org/apache/james/sieverepository/file/SieveFileRepositoryTest.java
index fa92742..e906a00 100644
--- a/server/data/data-file/src/test/java/org/apache/james/sieverepository/file/SieveFileRepositoryTest.java
+++ b/server/data/data-file/src/test/java/org/apache/james/sieverepository/file/SieveFileRepositoryTest.java
@@ -27,9 +27,11 @@ public class SieveFileRepositoryTest extends AbstractSieveRepositoryTest {
public File getBasedir() throws FileNotFoundException {
return new File(System.getProperty("java.io.tmpdir"));
}
+
public InputStream getResource(String url) throws IOException {
return new FileInputStream(getFile(url));
}
+
public File getFile(String fileURL) throws FileNotFoundException {
return new File(getBasedir(), fileURL.substring(FileSystem.FILE_PROTOCOL.length()));
}
http://git-wip-us.apache.org/repos/asf/james-project/blob/0c39fda1/server/data/data-library/src/main/java/org/apache/james/repository/file/AbstractFileRepository.java
----------------------------------------------------------------------
diff --git a/server/data/data-library/src/main/java/org/apache/james/repository/file/AbstractFileRepository.java b/server/data/data-library/src/main/java/org/apache/james/repository/file/AbstractFileRepository.java
index 15aeecf..bd8a81c 100644
--- a/server/data/data-library/src/main/java/org/apache/james/repository/file/AbstractFileRepository.java
+++ b/server/data/data-library/src/main/java/org/apache/james/repository/file/AbstractFileRepository.java
@@ -257,6 +257,7 @@ public abstract class AbstractFileRepository implements Repository, Configurable
throw new RuntimeException("Exception caught while removing" + " an object: " + e);
}
}
+
/**
*
* Indicates if the given key is associated to a contained object
http://git-wip-us.apache.org/repos/asf/james-project/blob/0c39fda1/server/dns-service/dnsservice-api/src/test/java/org/apache/james/dnsservice/api/AbstractDNSServiceTest.java
----------------------------------------------------------------------
diff --git a/server/dns-service/dnsservice-api/src/test/java/org/apache/james/dnsservice/api/AbstractDNSServiceTest.java b/server/dns-service/dnsservice-api/src/test/java/org/apache/james/dnsservice/api/AbstractDNSServiceTest.java
index 1748064..b017862 100644
--- a/server/dns-service/dnsservice-api/src/test/java/org/apache/james/dnsservice/api/AbstractDNSServiceTest.java
+++ b/server/dns-service/dnsservice-api/src/test/java/org/apache/james/dnsservice/api/AbstractDNSServiceTest.java
@@ -20,8 +20,6 @@ package org.apache.james.dnsservice.api;
import com.google.common.collect.ImmutableList;
import org.apache.james.dnsservice.api.mock.MockDNSService;
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertTrue;
import org.junit.Ignore;
import org.junit.Test;
@@ -29,6 +27,10 @@ import java.net.InetAddress;
import java.net.UnknownHostException;
import java.util.Collection;
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertTrue;
+
+
/**
* Basic tests for AbstractDNSServer. The goal is to verify that the interface
* remains constants and that the built platform has access to the Internet.
http://git-wip-us.apache.org/repos/asf/james-project/blob/0c39fda1/server/dns-service/dnsservice-library/src/test/java/org/apache/james/dnsservice/library/inetnetwork/InetNetworkBuilderTest.java
----------------------------------------------------------------------
diff --git a/server/dns-service/dnsservice-library/src/test/java/org/apache/james/dnsservice/library/inetnetwork/InetNetworkBuilderTest.java b/server/dns-service/dnsservice-library/src/test/java/org/apache/james/dnsservice/library/inetnetwork/InetNetworkBuilderTest.java
index f1fd315..170ee34 100644
--- a/server/dns-service/dnsservice-library/src/test/java/org/apache/james/dnsservice/library/inetnetwork/InetNetworkBuilderTest.java
+++ b/server/dns-service/dnsservice-library/src/test/java/org/apache/james/dnsservice/library/inetnetwork/InetNetworkBuilderTest.java
@@ -21,9 +21,10 @@ package org.apache.james.dnsservice.library.inetnetwork;
import java.net.UnknownHostException;
import org.apache.james.dnsservice.api.mock.DNSFixture;
import org.apache.james.dnsservice.library.inetnetwork.model.InetNetwork;
-import static org.junit.Assert.assertEquals;
import org.junit.Test;
+import static org.junit.Assert.assertEquals;
+
/**
* Test the InetNetworkBuilder.
*/
http://git-wip-us.apache.org/repos/asf/james-project/blob/0c39fda1/server/dns-service/dnsservice-library/src/test/java/org/apache/james/dnsservice/library/inetnetwork/model/InetNetworkTest.java
----------------------------------------------------------------------
diff --git a/server/dns-service/dnsservice-library/src/test/java/org/apache/james/dnsservice/library/inetnetwork/model/InetNetworkTest.java b/server/dns-service/dnsservice-library/src/test/java/org/apache/james/dnsservice/library/inetnetwork/model/InetNetworkTest.java
index 30c7508..2fa35ee 100644
--- a/server/dns-service/dnsservice-library/src/test/java/org/apache/james/dnsservice/library/inetnetwork/model/InetNetworkTest.java
+++ b/server/dns-service/dnsservice-library/src/test/java/org/apache/james/dnsservice/library/inetnetwork/model/InetNetworkTest.java
@@ -23,9 +23,10 @@ import java.net.Inet6Address;
import java.net.InetAddress;
import java.net.UnknownHostException;
import java.util.StringTokenizer;
+import org.junit.Test;
+
import static org.junit.Assert.assertEquals;
import static org.junit.Assert.assertTrue;
-import org.junit.Test;
/**
* Test the InetNetwork class with various IPv4 and IPv6 network specification.
http://git-wip-us.apache.org/repos/asf/james-project/blob/0c39fda1/server/dns-service/dnsservice-library/src/test/java/org/apache/james/dnsservice/library/netmatcher/NetMatcherTest.java
----------------------------------------------------------------------
diff --git a/server/dns-service/dnsservice-library/src/test/java/org/apache/james/dnsservice/library/netmatcher/NetMatcherTest.java b/server/dns-service/dnsservice-library/src/test/java/org/apache/james/dnsservice/library/netmatcher/NetMatcherTest.java
index 1dbc3af..82449b9 100644
--- a/server/dns-service/dnsservice-library/src/test/java/org/apache/james/dnsservice/library/netmatcher/NetMatcherTest.java
+++ b/server/dns-service/dnsservice-library/src/test/java/org/apache/james/dnsservice/library/netmatcher/NetMatcherTest.java
@@ -20,9 +20,10 @@ package org.apache.james.dnsservice.library.netmatcher;
import java.net.UnknownHostException;
import org.apache.james.dnsservice.api.mock.DNSFixture;
-import static org.junit.Assert.assertEquals;
import org.junit.Test;
+import static org.junit.Assert.assertEquals;
+
/**
* Test the NetMatcher class with various IPv4 and IPv6 parameters.
*
http://git-wip-us.apache.org/repos/asf/james-project/blob/0c39fda1/server/mailet/mailetcontainer-camel/src/test/java/org/apache/james/mailetcontainer/lib/AbstractStateMailetProcessorTest.java
----------------------------------------------------------------------
diff --git a/server/mailet/mailetcontainer-camel/src/test/java/org/apache/james/mailetcontainer/lib/AbstractStateMailetProcessorTest.java b/server/mailet/mailetcontainer-camel/src/test/java/org/apache/james/mailetcontainer/lib/AbstractStateMailetProcessorTest.java
index 3a275b2..0f47864 100644
--- a/server/mailet/mailetcontainer-camel/src/test/java/org/apache/james/mailetcontainer/lib/AbstractStateMailetProcessorTest.java
+++ b/server/mailet/mailetcontainer-camel/src/test/java/org/apache/james/mailetcontainer/lib/AbstractStateMailetProcessorTest.java
@@ -43,6 +43,7 @@ import org.apache.mailet.Mailet;
import org.apache.mailet.Matcher;
import org.junit.Test;
+
public abstract class AbstractStateMailetProcessorTest {
protected abstract AbstractStateMailetProcessor createProcessor(HierarchicalConfiguration configuration) throws
http://git-wip-us.apache.org/repos/asf/james-project/blob/0c39fda1/server/mailet/mailets/src/main/java/org/apache/james/transport/mailets/jsieve/SieveMailAdapter.java
----------------------------------------------------------------------
diff --git a/server/mailet/mailets/src/main/java/org/apache/james/transport/mailets/jsieve/SieveMailAdapter.java b/server/mailet/mailets/src/main/java/org/apache/james/transport/mailets/jsieve/SieveMailAdapter.java
index 7ba7f2d..9ab6c70 100644
--- a/server/mailet/mailets/src/main/java/org/apache/james/transport/mailets/jsieve/SieveMailAdapter.java
+++ b/server/mailet/mailets/src/main/java/org/apache/james/transport/mailets/jsieve/SieveMailAdapter.java
@@ -125,11 +125,7 @@ public class SieveMailAdapter implements MailAdapter, EnvelopeAccessors, ActionC
{
return getMail().getMessage();
}
- /**
- * Returns the List of actions.
- *
- * @return List
- */
+
public List<Action> getActions()
{
List<Action> actions = null;
@@ -140,36 +136,22 @@ public class SieveMailAdapter implements MailAdapter, EnvelopeAccessors, ActionC
}
return actions;
}
- /**
- * Returns a new List of actions.
- *
- * @return List
- */
+
protected List<Action> computeActions()
{
return new ArrayList<>();
}
- /**
- * Returns the List of actions.
- *
- * @return List
- */
+
private List<Action> getActionsBasic()
{
return fieldActions;
}
- /**
- * Adds an Action.
- *
- * @param action The action to set
- */
+
public void addAction(Action action)
{
getActions().add(action);
}
- /**
- * @see org.apache.jsieve.mail.MailAdapter#executeActions()
- */
+
public void executeActions() throws SieveException
{
final List<Action> actions = getActions();
@@ -185,11 +167,7 @@ public class SieveMailAdapter implements MailAdapter, EnvelopeAccessors, ActionC
}
}
}
- /**
- * Sets the actions.
- *
- * @param actions The actions to set
- */
+
protected void setActions(List<Action> actions)
{
fieldActions = actions;
@@ -278,11 +256,8 @@ public class SieveMailAdapter implements MailAdapter, EnvelopeAccessors, ActionC
}
return envelopes;
}
- /**
- * @see org.apache.jsieve.mail.optional.EnvelopeAccessors#getEnvelope(String)
- */
- public List<String> getEnvelope(String name) throws SieveMailException
- {
+
+ public List<String> getEnvelope(String name) throws SieveMailException {
List<String> values = new ArrayList<>(1);
String value = getEnvelopes().get(name);
if (null != value) {
http://git-wip-us.apache.org/repos/asf/james-project/blob/0c39fda1/server/mailet/mailets/src/main/java/org/apache/james/transport/mailets/redirect/RedirectNotify.java
----------------------------------------------------------------------
diff --git a/server/mailet/mailets/src/main/java/org/apache/james/transport/mailets/redirect/RedirectNotify.java b/server/mailet/mailets/src/main/java/org/apache/james/transport/mailets/redirect/RedirectNotify.java
index 50bcded..682beb1 100644
--- a/server/mailet/mailets/src/main/java/org/apache/james/transport/mailets/redirect/RedirectNotify.java
+++ b/server/mailet/mailets/src/main/java/org/apache/james/transport/mailets/redirect/RedirectNotify.java
@@ -146,6 +146,7 @@ public interface RedirectNotify extends Mailet, MailetConfig {
@Deprecated
void log(String message);
+
@Deprecated
void log(String message, Throwable t);
http://git-wip-us.apache.org/repos/asf/james-project/blob/0c39fda1/server/protocols/jmap-integration-testing/jmap-integration-testing-common/src/test/java/org/apache/james/jmap/UserProvisionningConcurrencyTest.java
----------------------------------------------------------------------
diff --git a/server/protocols/jmap-integration-testing/jmap-integration-testing-common/src/test/java/org/apache/james/jmap/UserProvisionningConcurrencyTest.java b/server/protocols/jmap-integration-testing/jmap-integration-testing-common/src/test/java/org/apache/james/jmap/UserProvisionningConcurrencyTest.java
index 17e10ef..e1a22e1 100644
--- a/server/protocols/jmap-integration-testing/jmap-integration-testing-common/src/test/java/org/apache/james/jmap/UserProvisionningConcurrencyTest.java
+++ b/server/protocols/jmap-integration-testing/jmap-integration-testing-common/src/test/java/org/apache/james/jmap/UserProvisionningConcurrencyTest.java
@@ -49,6 +49,7 @@ public abstract class UserProvisionningConcurrencyTest {
private static final String DOMAIN = "mydomain.tld";
private static final String USER = "myuser@" + DOMAIN;
private static final String PASSWORD = "secret";
+
protected abstract GuiceJamesServer createJmapServer();
private GuiceJamesServer jmapServer;
http://git-wip-us.apache.org/repos/asf/james-project/blob/0c39fda1/server/protocols/jmap-integration-testing/jmap-integration-testing-common/src/test/java/org/apache/james/jmap/methods/integration/SetMessagesMethodTest.java
----------------------------------------------------------------------
diff --git a/server/protocols/jmap-integration-testing/jmap-integration-testing-common/src/test/java/org/apache/james/jmap/methods/integration/SetMessagesMethodTest.java b/server/protocols/jmap-integration-testing/jmap-integration-testing-common/src/test/java/org/apache/james/jmap/methods/integration/SetMessagesMethodTest.java
index 31f617d..c4e3510 100644
--- a/server/protocols/jmap-integration-testing/jmap-integration-testing-common/src/test/java/org/apache/james/jmap/methods/integration/SetMessagesMethodTest.java
+++ b/server/protocols/jmap-integration-testing/jmap-integration-testing-common/src/test/java/org/apache/james/jmap/methods/integration/SetMessagesMethodTest.java
@@ -4166,6 +4166,7 @@ public abstract class SetMessagesMethodTest {
.body(firstAttachment + ".type", equalTo("text/html"))
.body(firstAttachment + ".size", equalTo((int) attachment.getSize()));
}
+
@Test
public void attachmentAndEmptyBodyShouldBeRetrievedWhenChainingSetMessagesAndGetMessagesWithTextAttachmentWithoutMailBody() throws Exception {
Attachment attachment = Attachment.builder()
@@ -4235,6 +4236,7 @@ public abstract class SetMessagesMethodTest {
.body(firstAttachment + ".type", equalTo("text/plain"))
.body(firstAttachment + ".size", equalTo((int) attachment.getSize()));
}
+
@Test
public void setMessagesShouldVerifyHeaderOfMessageInInbox() throws Exception {
String toUsername = "username1@" + USERS_DOMAIN;
http://git-wip-us.apache.org/repos/asf/james-project/blob/0c39fda1/server/protocols/jmap-integration-testing/jmap-integration-testing-common/src/test/java/org/apache/james/jmap/methods/integration/cucumber/MainStepdefs.java
----------------------------------------------------------------------
diff --git a/server/protocols/jmap-integration-testing/jmap-integration-testing-common/src/test/java/org/apache/james/jmap/methods/integration/cucumber/MainStepdefs.java b/server/protocols/jmap-integration-testing/jmap-integration-testing-common/src/test/java/org/apache/james/jmap/methods/integration/cucumber/MainStepdefs.java
index 79c102e..f055598 100644
--- a/server/protocols/jmap-integration-testing/jmap-integration-testing-common/src/test/java/org/apache/james/jmap/methods/integration/cucumber/MainStepdefs.java
+++ b/server/protocols/jmap-integration-testing/jmap-integration-testing-common/src/test/java/org/apache/james/jmap/methods/integration/cucumber/MainStepdefs.java
@@ -85,6 +85,7 @@ public class MainStepdefs {
.getMailbox(namespace, username, mailbox)
.getMailboxId();
}
+
public String getMailboxIds(String username, List<String> mailboxes) {
return Joiner.on("\",\"")
.join(getMailboxIdsList(username, mailboxes.stream()));
http://git-wip-us.apache.org/repos/asf/james-project/blob/0c39fda1/server/protocols/jmap/src/main/java/org/apache/james/jmap/methods/Validator.java
----------------------------------------------------------------------
diff --git a/server/protocols/jmap/src/main/java/org/apache/james/jmap/methods/Validator.java b/server/protocols/jmap/src/main/java/org/apache/james/jmap/methods/Validator.java
index 6e2f20a..78638fb 100644
--- a/server/protocols/jmap/src/main/java/org/apache/james/jmap/methods/Validator.java
+++ b/server/protocols/jmap/src/main/java/org/apache/james/jmap/methods/Validator.java
@@ -23,5 +23,6 @@ import java.util.Set;
public interface Validator<T> {
boolean isValid(T item);
+
Set<ValidationResult> validate(T item);
}
http://git-wip-us.apache.org/repos/asf/james-project/blob/0c39fda1/server/protocols/jmap/src/test/java/org/apache/james/jmap/methods/JmapResponseWriterImplTest.java
----------------------------------------------------------------------
diff --git a/server/protocols/jmap/src/test/java/org/apache/james/jmap/methods/JmapResponseWriterImplTest.java b/server/protocols/jmap/src/test/java/org/apache/james/jmap/methods/JmapResponseWriterImplTest.java
index af2e5a4..a91df15 100644
--- a/server/protocols/jmap/src/test/java/org/apache/james/jmap/methods/JmapResponseWriterImplTest.java
+++ b/server/protocols/jmap/src/test/java/org/apache/james/jmap/methods/JmapResponseWriterImplTest.java
@@ -195,11 +195,13 @@ public class JmapResponseWriterImplTest {
private static class Foo {
public String id;
public String name;
+
public Foo(String id, String name) {
this.id = id;
this.name = name;
}
}
+
public List<Foo> list;
}
http://git-wip-us.apache.org/repos/asf/james-project/blob/0c39fda1/server/protocols/jmap/src/test/java/org/apache/james/jmap/utils/MailboxUtilsTest.java
----------------------------------------------------------------------
diff --git a/server/protocols/jmap/src/test/java/org/apache/james/jmap/utils/MailboxUtilsTest.java b/server/protocols/jmap/src/test/java/org/apache/james/jmap/utils/MailboxUtilsTest.java
index 1d162d1..b94f89b 100644
--- a/server/protocols/jmap/src/test/java/org/apache/james/jmap/utils/MailboxUtilsTest.java
+++ b/server/protocols/jmap/src/test/java/org/apache/james/jmap/utils/MailboxUtilsTest.java
@@ -44,6 +44,7 @@ public class MailboxUtilsTest {
mailboxSession = mailboxManager.login(user, "pass");
sut = new MailboxUtils(mailboxManager);
}
+
@Test
public void hasChildrenShouldReturnFalseWhenNoChild() throws Exception {
MailboxPath mailboxPath = MailboxPath.forUser(user, "myBox");
http://git-wip-us.apache.org/repos/asf/james-project/blob/0c39fda1/server/protocols/protocols-library/src/main/java/org/apache/james/protocols/lib/jmx/AbstractCommandHandlerResultJMXMonitor.java
----------------------------------------------------------------------
diff --git a/server/protocols/protocols-library/src/main/java/org/apache/james/protocols/lib/jmx/AbstractCommandHandlerResultJMXMonitor.java b/server/protocols/protocols-library/src/main/java/org/apache/james/protocols/lib/jmx/AbstractCommandHandlerResultJMXMonitor.java
index 4631990..8d4492f 100644
--- a/server/protocols/protocols-library/src/main/java/org/apache/james/protocols/lib/jmx/AbstractCommandHandlerResultJMXMonitor.java
+++ b/server/protocols/protocols-library/src/main/java/org/apache/james/protocols/lib/jmx/AbstractCommandHandlerResultJMXMonitor.java
@@ -105,8 +105,8 @@ public abstract class AbstractCommandHandlerResultJMXMonitor<S extends ProtocolS
@Override
public void init(Configuration config) throws ConfigurationException {
this.jmxName = config.getString("jmxName", getDefaultJMXName());
-
}
+
protected abstract String getDefaultJMXName();
protected String getJMXName() {
http://git-wip-us.apache.org/repos/asf/james-project/blob/0c39fda1/server/protocols/protocols-library/src/test/java/org/apache/james/protocols/lib/mock/MockProtocolHandlerLoader.java
----------------------------------------------------------------------
diff --git a/server/protocols/protocols-library/src/test/java/org/apache/james/protocols/lib/mock/MockProtocolHandlerLoader.java b/server/protocols/protocols-library/src/test/java/org/apache/james/protocols/lib/mock/MockProtocolHandlerLoader.java
index 510a672..4c5b5d9 100644
--- a/server/protocols/protocols-library/src/test/java/org/apache/james/protocols/lib/mock/MockProtocolHandlerLoader.java
+++ b/server/protocols/protocols-library/src/test/java/org/apache/james/protocols/lib/mock/MockProtocolHandlerLoader.java
@@ -148,6 +148,7 @@ public class MockProtocolHandlerLoader implements ProtocolHandlerLoader {
}
}
}
+
private boolean isInit(Method method) {
return method.getName().equals("init")
&& method.getParameterTypes().length == 1
http://git-wip-us.apache.org/repos/asf/james-project/blob/0c39fda1/server/protocols/protocols-smtp/src/test/java/org/apache/james/smtpserver/POP3BeforeSMTPHandlerTest.java
----------------------------------------------------------------------
diff --git a/server/protocols/protocols-smtp/src/test/java/org/apache/james/smtpserver/POP3BeforeSMTPHandlerTest.java b/server/protocols/protocols-smtp/src/test/java/org/apache/james/smtpserver/POP3BeforeSMTPHandlerTest.java
index 554e3ca..ef663fa 100644
--- a/server/protocols/protocols-smtp/src/test/java/org/apache/james/smtpserver/POP3BeforeSMTPHandlerTest.java
+++ b/server/protocols/protocols-smtp/src/test/java/org/apache/james/smtpserver/POP3BeforeSMTPHandlerTest.java
@@ -22,9 +22,10 @@ import java.net.InetSocketAddress;
import org.apache.james.protocols.lib.POP3BeforeSMTPHelper;
import org.apache.james.protocols.smtp.SMTPSession;
import org.apache.james.protocols.smtp.utils.BaseFakeSMTPSession;
+import org.junit.Test;
+
import static org.junit.Assert.assertFalse;
import static org.junit.Assert.assertTrue;
-import org.junit.Test;
public class POP3BeforeSMTPHandlerTest {
http://git-wip-us.apache.org/repos/asf/james-project/blob/0c39fda1/server/protocols/protocols-smtp/src/test/java/org/apache/james/smtpserver/SetMimeHeaderHandlerTest.java
----------------------------------------------------------------------
diff --git a/server/protocols/protocols-smtp/src/test/java/org/apache/james/smtpserver/SetMimeHeaderHandlerTest.java b/server/protocols/protocols-smtp/src/test/java/org/apache/james/smtpserver/SetMimeHeaderHandlerTest.java
index de0ac32..ab6c2c0 100644
--- a/server/protocols/protocols-smtp/src/test/java/org/apache/james/smtpserver/SetMimeHeaderHandlerTest.java
+++ b/server/protocols/protocols-smtp/src/test/java/org/apache/james/smtpserver/SetMimeHeaderHandlerTest.java
@@ -23,10 +23,11 @@ import javax.mail.internet.MimeMessage;
import org.apache.james.protocols.smtp.SMTPSession;
import org.apache.james.protocols.smtp.utils.BaseFakeSMTPSession;
import org.apache.mailet.Mail;
-import static org.junit.Assert.assertEquals;
import org.junit.Before;
import org.junit.Test;
+import static org.junit.Assert.assertEquals;
+
public class SetMimeHeaderHandlerTest {
private SMTPSession mockedSMTPSession;
http://git-wip-us.apache.org/repos/asf/james-project/blob/0c39fda1/server/protocols/protocols-smtp/src/test/java/org/apache/james/smtpserver/ValidRcptHandlerTest.java
----------------------------------------------------------------------
diff --git a/server/protocols/protocols-smtp/src/test/java/org/apache/james/smtpserver/ValidRcptHandlerTest.java b/server/protocols/protocols-smtp/src/test/java/org/apache/james/smtpserver/ValidRcptHandlerTest.java
index de8fb36..be88337 100644
--- a/server/protocols/protocols-smtp/src/test/java/org/apache/james/smtpserver/ValidRcptHandlerTest.java
+++ b/server/protocols/protocols-smtp/src/test/java/org/apache/james/smtpserver/ValidRcptHandlerTest.java
@@ -80,6 +80,7 @@ public class ValidRcptHandlerTest {
public boolean isRelayingAllowed() {
return relayingAllowed;
}
+
private final HashMap<String, Object> sstate = new HashMap<>();
private final HashMap<String, Object> connectionState = new HashMap<>();
http://git-wip-us.apache.org/repos/asf/james-project/blob/0c39fda1/server/protocols/webadmin/webadmin-core/src/main/java/org/apache/james/webadmin/WebAdminConfiguration.java
----------------------------------------------------------------------
diff --git a/server/protocols/webadmin/webadmin-core/src/main/java/org/apache/james/webadmin/WebAdminConfiguration.java b/server/protocols/webadmin/webadmin-core/src/main/java/org/apache/james/webadmin/WebAdminConfiguration.java
index 45d0e18..e57aed2 100644
--- a/server/protocols/webadmin/webadmin-core/src/main/java/org/apache/james/webadmin/WebAdminConfiguration.java
+++ b/server/protocols/webadmin/webadmin-core/src/main/java/org/apache/james/webadmin/WebAdminConfiguration.java
@@ -67,6 +67,7 @@ public class WebAdminConfiguration {
this.enabled = Optional.of(isEnabled);
return this;
}
+
public Builder enabled() {
return enable(true);
}
---------------------------------------------------------------------
To unsubscribe, e-mail: server-dev-unsubscribe@james.apache.org
For additional commands, e-mail: server-dev-help@james.apache.org