This is an automated email from the ASF dual-hosted git repository.
rcordier pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/james-project.git
commit 75a33906184472087a89799974646f7cced19f6f
Author: Gautier DI FOLCO <gdifo...@linagora.com>
AuthorDate: Tue Jul 28 14:27:53 2020 +0200
[Refactoring] Drop java warnings
---
.../org/apache/james/mailbox/MessageManager.java | 1 +
.../org/apache/james/mailbox/events/Group.java | 5 +++--
.../elasticsearch/json/IndexableMessageTest.java | 15 +++----------
.../mailbox/tools/jpa/migrator/JpaMigrator.java | 2 +-
.../main/java/org/apache/mailet/HostAddress.java | 1 +
.../main/java/org/apache/mailet/MailetContext.java | 2 ++
.../main/java/org/apache/mailet/Serializer.java | 2 +-
.../java/org/apache/james/transport/InitJCE.java | 5 +++--
.../org/apache/james/transport/KeyStoreHolder.java | 3 ++-
.../org/apache/james/transport/SMIMEKeyHolder.java | 3 ++-
.../james/mailet/DefaultDescriptorsExtractor.java | 2 +-
.../apache/mailet/base/test/FakeMailContext.java | 5 +++++
.../library/inetnetwork/InetNetworkBuilder.java | 2 +-
.../mailetcontainer/api/mock/MockMailetLoader.java | 2 +-
.../api/mock/MockMatcherLoader.java | 2 +-
.../integration/GetMailboxesMethodTest.java | 10 ++++-----
.../integration/SetMailboxesMethodTest.java | 10 ++++-----
.../methods/integration/SetMessagesMethodTest.java | 25 +++++++++++-----------
.../james/webadmin/routes/TasksRoutesTest.java | 4 ++--
.../routes/MailRepositoriesRoutesTest.java | 12 +++++------
20 files changed, 59 insertions(+), 54 deletions(-)
diff --git
a/mailbox/api/src/main/java/org/apache/james/mailbox/MessageManager.java
b/mailbox/api/src/main/java/org/apache/james/mailbox/MessageManager.java
index 88c0476..6a8ab49 100644
--- a/mailbox/api/src/main/java/org/apache/james/mailbox/MessageManager.java
+++ b/mailbox/api/src/main/java/org/apache/james/mailbox/MessageManager.java
@@ -97,6 +97,7 @@ public interface MessageManager {
* @deprecated use
* {@link #getMetaData(boolean, MailboxSession,
MailboxMetaData.FetchGroup)}
*/
+ @Deprecated
boolean isModSeqPermanent(MailboxSession session);
/**
diff --git
a/mailbox/api/src/main/java/org/apache/james/mailbox/events/Group.java
b/mailbox/api/src/main/java/org/apache/james/mailbox/events/Group.java
index 9fd2edf..ee3d049 100644
--- a/mailbox/api/src/main/java/org/apache/james/mailbox/events/Group.java
+++ b/mailbox/api/src/main/java/org/apache/james/mailbox/events/Group.java
@@ -19,6 +19,7 @@
package org.apache.james.mailbox.events;
+import java.lang.reflect.InvocationTargetException;
import java.util.Objects;
import com.google.common.base.Preconditions;
@@ -47,9 +48,9 @@ public class Group {
}
}
- private static Group instantiateGroup(Class<?> aClass) throws
InstantiationException, IllegalAccessException {
+ private static Group instantiateGroup(Class<?> aClass) throws
InstantiationException, IllegalAccessException, NoSuchMethodException,
InvocationTargetException {
Preconditions.checkArgument(Group.class.isAssignableFrom(aClass), "The
supplied class is not a group: %s", aClass.getName());
- return (Group) aClass.newInstance();
+ return (Group) aClass.getDeclaredConstructor().newInstance();
}
public String asString() {
diff --git
a/mailbox/elasticsearch/src/test/java/org/apache/james/mailbox/elasticsearch/json/IndexableMessageTest.java
b/mailbox/elasticsearch/src/test/java/org/apache/james/mailbox/elasticsearch/json/IndexableMessageTest.java
index 12270ca..801ac5f 100644
---
a/mailbox/elasticsearch/src/test/java/org/apache/james/mailbox/elasticsearch/json/IndexableMessageTest.java
+++
b/mailbox/elasticsearch/src/test/java/org/apache/james/mailbox/elasticsearch/json/IndexableMessageTest.java
@@ -470,19 +470,10 @@ class IndexableMessageTest {
.build();
// Then
+ String NO_TEXTUAL_BODY = "The textual body is not present";
assertThat(indexableMessage.getAttachments())
- .extracting(new TextualBodyExtractor())
- .contains("first attachment content",
TextualBodyExtractor.NO_TEXTUAL_BODY, "third attachment content");
- }
-
- static class TextualBodyExtractor implements Extractor<MimePart, String> {
-
- static final String NO_TEXTUAL_BODY = "The textual body is not
present";
-
- @Override
- public String extract(MimePart input) {
- return input.getTextualBody().orElse(NO_TEXTUAL_BODY);
- }
+ .extracting(input ->
input.getTextualBody().orElse(NO_TEXTUAL_BODY))
+ .contains("first attachment content", NO_TEXTUAL_BODY, "third
attachment content");
}
@Test
diff --git
a/mailbox/tools/jpa-migrator/src/main/java/org/apache/james/mailbox/tools/jpa/migrator/JpaMigrator.java
b/mailbox/tools/jpa-migrator/src/main/java/org/apache/james/mailbox/tools/jpa/migrator/JpaMigrator.java
index 20ec314..51a39f6 100644
---
a/mailbox/tools/jpa-migrator/src/main/java/org/apache/james/mailbox/tools/jpa/migrator/JpaMigrator.java
+++
b/mailbox/tools/jpa-migrator/src/main/java/org/apache/james/mailbox/tools/jpa/migrator/JpaMigrator.java
@@ -59,7 +59,7 @@ public class JpaMigrator {
EntityManager em = factory.createEntityManager();
for (String jira: jiras) {
- JpaMigrateCommand jiraJpaMigratable = (JpaMigrateCommand)
Class.forName(JPA_MIGRATION_COMMAND_PACKAGE + "." + jira.toUpperCase(Locale.US)
+ JpaMigrateCommand.class.getSimpleName()).newInstance();
+ JpaMigrateCommand jiraJpaMigratable = (JpaMigrateCommand)
Class.forName(JPA_MIGRATION_COMMAND_PACKAGE + "." + jira.toUpperCase(Locale.US)
+
JpaMigrateCommand.class.getSimpleName()).getDeclaredConstructor().newInstance();
LOGGER.info("Now executing {} migration", jira);
em.getTransaction().begin();
jiraJpaMigratable.migrate(em);
diff --git a/mailet/api/src/main/java/org/apache/mailet/HostAddress.java
b/mailet/api/src/main/java/org/apache/mailet/HostAddress.java
index 638cb14..fd2e2fb 100644
--- a/mailet/api/src/main/java/org/apache/mailet/HostAddress.java
+++ b/mailet/api/src/main/java/org/apache/mailet/HostAddress.java
@@ -27,6 +27,7 @@ package org.apache.mailet;
* @since Mailet API v2.3
* @deprecated
*/
+@Deprecated
public class HostAddress extends javax.mail.URLName {
private final String hostname;
diff --git a/mailet/api/src/main/java/org/apache/mailet/MailetContext.java
b/mailet/api/src/main/java/org/apache/mailet/MailetContext.java
index 1afd9c5..18e29fc 100644
--- a/mailet/api/src/main/java/org/apache/mailet/MailetContext.java
+++ b/mailet/api/src/main/java/org/apache/mailet/MailetContext.java
@@ -272,6 +272,7 @@ public interface MailetContext {
* @return the sorted mail-handling hostnames for the domain
* @deprecated use the generic dnsLookup method
*/
+ @Deprecated
Collection<String> getMailServers(Domain domain);
/**
@@ -288,6 +289,7 @@ public interface MailetContext {
* @since Mailet API v2.3
* @deprecated use the generic dnsLookup method
*/
+ @Deprecated
Iterator<HostAddress> getSMTPHostAddresses(Domain domain);
/**
diff --git a/mailet/api/src/main/java/org/apache/mailet/Serializer.java
b/mailet/api/src/main/java/org/apache/mailet/Serializer.java
index f03abf7..7d8203b 100644
--- a/mailet/api/src/main/java/org/apache/mailet/Serializer.java
+++ b/mailet/api/src/main/java/org/apache/mailet/Serializer.java
@@ -327,7 +327,7 @@ public interface Serializer<T> {
try {
Class<?> deserializerClass = Class.forName(serializer);
if
(ArbitrarySerializable.Deserializer.class.isAssignableFrom(deserializerClass)) {
- ArbitrarySerializable.Deserializer<T> deserializer =
(ArbitrarySerializable.Deserializer<T>) deserializerClass.newInstance();
+ ArbitrarySerializable.Deserializer<T> deserializer =
(ArbitrarySerializable.Deserializer<T>)
deserializerClass.getDeclaredConstructor().newInstance();
return deserializer.deserialize(new
ArbitrarySerializable.Serializable<>(value,
(Class<ArbitrarySerializable.Deserializer<T>>) deserializerClass));
}
} catch (Exception e) {
diff --git
a/mailet/crypto/src/main/java/org/apache/james/transport/InitJCE.java
b/mailet/crypto/src/main/java/org/apache/james/transport/InitJCE.java
index eaa1d06..26e62b6 100644
--- a/mailet/crypto/src/main/java/org/apache/james/transport/InitJCE.java
+++ b/mailet/crypto/src/main/java/org/apache/james/transport/InitJCE.java
@@ -21,6 +21,7 @@
package org.apache.james.transport;
+import java.lang.reflect.InvocationTargetException;
import java.security.Provider;
import java.security.Security;
@@ -49,10 +50,10 @@ public class InitJCE {
* distribution. It can be downloaded and installed by the user if she
needs
* it.
*/
- public static void init() throws InstantiationException,
IllegalAccessException, ClassNotFoundException {
+ public static void init() throws InstantiationException,
IllegalAccessException, ClassNotFoundException, NoSuchMethodException,
InvocationTargetException {
if (!initialized) {
String bouncyCastleProviderClassName =
"org.bouncycastle.jce.provider.BouncyCastleProvider";
-
Security.addProvider((Provider)Class.forName(bouncyCastleProviderClassName).newInstance());
+
Security.addProvider((Provider)Class.forName(bouncyCastleProviderClassName).getDeclaredConstructor().newInstance());
MailcapCommandMap mailcap = (MailcapCommandMap)
CommandMap.getDefaultCommandMap();
diff --git
a/mailet/crypto/src/main/java/org/apache/james/transport/KeyStoreHolder.java
b/mailet/crypto/src/main/java/org/apache/james/transport/KeyStoreHolder.java
index 4d99712..ae00e3d 100644
--- a/mailet/crypto/src/main/java/org/apache/james/transport/KeyStoreHolder.java
+++ b/mailet/crypto/src/main/java/org/apache/james/transport/KeyStoreHolder.java
@@ -25,6 +25,7 @@ import java.io.BufferedInputStream;
import java.io.File;
import java.io.FileInputStream;
import java.io.IOException;
+import java.lang.reflect.InvocationTargetException;
import java.security.GeneralSecurityException;
import java.security.InvalidAlgorithmParameterException;
import java.security.KeyStore;
@@ -89,7 +90,7 @@ public class KeyStoreHolder {
try {
InitJCE.init();
- } catch (InstantiationException | IllegalAccessException |
ClassNotFoundException e) {
+ } catch (InstantiationException | IllegalAccessException |
ClassNotFoundException | InvocationTargetException | NoSuchMethodException e) {
NoSuchProviderException ex = new NoSuchProviderException("Error
during cryptography provider initialization. Has bcprov-jdkxx-yyy.jar been
copied in the lib directory or installed in the system?");
ex.initCause(e);
throw ex;
diff --git
a/mailet/crypto/src/main/java/org/apache/james/transport/SMIMEKeyHolder.java
b/mailet/crypto/src/main/java/org/apache/james/transport/SMIMEKeyHolder.java
index c594c4d..25f8ffa 100644
--- a/mailet/crypto/src/main/java/org/apache/james/transport/SMIMEKeyHolder.java
+++ b/mailet/crypto/src/main/java/org/apache/james/transport/SMIMEKeyHolder.java
@@ -24,6 +24,7 @@ package org.apache.james.transport;
import java.io.BufferedInputStream;
import java.io.FileInputStream;
import java.io.IOException;
+import java.lang.reflect.InvocationTargetException;
import java.security.InvalidAlgorithmParameterException;
import java.security.KeyStore;
import java.security.KeyStoreException;
@@ -116,7 +117,7 @@ public class SMIMEKeyHolder implements KeyHolder {
try {
InitJCE.init();
- } catch (InstantiationException | IllegalAccessException |
ClassNotFoundException e) {
+ } catch (InstantiationException | IllegalAccessException |
ClassNotFoundException | InvocationTargetException | NoSuchMethodException e) {
NoSuchProviderException ex = new NoSuchProviderException("Error
during cryptography provider initialization. Has bcprov-jdkxx-yyy.jar been
copied in the lib directory or installed in the system?");
ex.initCause(e);
throw ex;
diff --git
a/mailet/mailetdocs-maven-plugin/src/main/java/org/apache/james/mailet/DefaultDescriptorsExtractor.java
b/mailet/mailetdocs-maven-plugin/src/main/java/org/apache/james/mailet/DefaultDescriptorsExtractor.java
index c927e7b..b78ac1d 100644
---
a/mailet/mailetdocs-maven-plugin/src/main/java/org/apache/james/mailet/DefaultDescriptorsExtractor.java
+++
b/mailet/mailetdocs-maven-plugin/src/main/java/org/apache/james/mailet/DefaultDescriptorsExtractor.java
@@ -171,7 +171,7 @@ public class DefaultDescriptorsExtractor {
private Optional<String> fetchInfo(Log log, String nameOfClass, Class<?>
klass, String infoMethodName, Type type) {
try {
- final Object instance = klass.newInstance();
+ final Object instance =
klass.getDeclaredConstructor().newInstance();
final String info = (String)
klass.getMethod(infoMethodName).invoke(instance);
if (info != null && info.length() > 0) {
return Optional.of(info);
diff --git
a/mailet/test/src/main/java/org/apache/mailet/base/test/FakeMailContext.java
b/mailet/test/src/main/java/org/apache/mailet/base/test/FakeMailContext.java
index 2f59236..91ed587 100644
--- a/mailet/test/src/main/java/org/apache/mailet/base/test/FakeMailContext.java
+++ b/mailet/test/src/main/java/org/apache/mailet/base/test/FakeMailContext.java
@@ -403,6 +403,7 @@ public class FakeMailContext implements MailetContext {
/**
* @deprecated use the generic dnsLookup method
*/
+ @Deprecated
@Override
public Collection<String> getMailServers(Domain host) {
return null; // trivial implementation
@@ -450,6 +451,7 @@ public class FakeMailContext implements MailetContext {
/**
* @deprecated use {@link #isLocalEmail(MailAddress)} instead
*/
+ @Deprecated
@Override
public boolean isLocalUser(String userAccount) {
return false; // trivial implementation
@@ -463,6 +465,7 @@ public class FakeMailContext implements MailetContext {
/**
* @deprecated use {@link #log(LogLevel level, String message)}
*/
+ @Deprecated
@Override
public void log(String message) {
System.out.println(message);
@@ -471,6 +474,7 @@ public class FakeMailContext implements MailetContext {
/**
* @deprecated use {@link #log(LogLevel level, String message, Throwable
t)}
*/
+ @Deprecated
@Override
public void log(String message, Throwable t) {
System.out.println(message);
@@ -548,6 +552,7 @@ public class FakeMailContext implements MailetContext {
/**
* @deprecated use the generic dnsLookup method
*/
+ @Deprecated
@Override
public Iterator<HostAddress> getSMTPHostAddresses(Domain domainName) {
return null; // trivial implementation
diff --git
a/server/dns-service/dnsservice-library/src/main/java/org/apache/james/dnsservice/library/inetnetwork/InetNetworkBuilder.java
b/server/dns-service/dnsservice-library/src/main/java/org/apache/james/dnsservice/library/inetnetwork/InetNetworkBuilder.java
index 66d2101..3aae037 100644
---
a/server/dns-service/dnsservice-library/src/main/java/org/apache/james/dnsservice/library/inetnetwork/InetNetworkBuilder.java
+++
b/server/dns-service/dnsservice-library/src/main/java/org/apache/james/dnsservice/library/inetnetwork/InetNetworkBuilder.java
@@ -158,7 +158,7 @@ public class InetNetworkBuilder {
netspec += "/32768";
}
- return new Inet6Network(dnsService.getByName(netspec.substring(0,
netspec.indexOf('/'))), new Integer(netspec.substring(netspec.indexOf('/') +
1)));
+ return new Inet6Network(dnsService.getByName(netspec.substring(0,
netspec.indexOf('/'))), Integer.valueOf(netspec.substring(netspec.indexOf('/')
+ 1)));
}
/**
diff --git
a/server/mailet/mailetcontainer-api/src/test/java/org/apache/james/mailetcontainer/api/mock/MockMailetLoader.java
b/server/mailet/mailetcontainer-api/src/test/java/org/apache/james/mailetcontainer/api/mock/MockMailetLoader.java
index 06b9502..7705297 100644
---
a/server/mailet/mailetcontainer-api/src/test/java/org/apache/james/mailetcontainer/api/mock/MockMailetLoader.java
+++
b/server/mailet/mailetcontainer-api/src/test/java/org/apache/james/mailetcontainer/api/mock/MockMailetLoader.java
@@ -32,7 +32,7 @@ public class MockMailetLoader implements MailetLoader {
try {
Class<Mailet> clazz = (Class<Mailet>)
Thread.currentThread().getContextClassLoader().loadClass(
config.getMailetName());
- Mailet m = clazz.newInstance();
+ Mailet m = clazz.getDeclaredConstructor().newInstance();
m.init(config);
return m;
} catch (Exception e) {
diff --git
a/server/mailet/mailetcontainer-api/src/test/java/org/apache/james/mailetcontainer/api/mock/MockMatcherLoader.java
b/server/mailet/mailetcontainer-api/src/test/java/org/apache/james/mailetcontainer/api/mock/MockMatcherLoader.java
index 6523252..9a6ceaf 100644
---
a/server/mailet/mailetcontainer-api/src/test/java/org/apache/james/mailetcontainer/api/mock/MockMatcherLoader.java
+++
b/server/mailet/mailetcontainer-api/src/test/java/org/apache/james/mailetcontainer/api/mock/MockMatcherLoader.java
@@ -33,7 +33,7 @@ public class MockMatcherLoader implements MatcherLoader {
try {
Class<Matcher> clazz = (Class<Matcher>)
Thread.currentThread().getContextClassLoader().loadClass(
config.getMatcherName());
- Matcher m = clazz.newInstance();
+ Matcher m = clazz.getDeclaredConstructor().newInstance();
m.init(config);
return m;
} catch (Exception e) {
diff --git
a/server/protocols/jmap-draft-integration-testing/jmap-draft-integration-testing-common/src/test/java/org/apache/james/jmap/draft/methods/integration/GetMailboxesMethodTest.java
b/server/protocols/jmap-draft-integration-testing/jmap-draft-integration-testing-common/src/test/java/org/apache/james/jmap/draft/methods/integration/GetMailboxesMethodTest.java
index 1ad34be..769357f 100644
---
a/server/protocols/jmap-draft-integration-testing/jmap-draft-integration-testing-common/src/test/java/org/apache/james/jmap/draft/methods/integration/GetMailboxesMethodTest.java
+++
b/server/protocols/jmap-draft-integration-testing/jmap-draft-integration-testing-common/src/test/java/org/apache/james/jmap/draft/methods/integration/GetMailboxesMethodTest.java
@@ -36,6 +36,7 @@ import static org.apache.james.jmap.JmapURIBuilder.baseUri;
import static org.assertj.core.api.Assertions.assertThat;
import static org.hamcrest.Matchers.containsString;
import static org.hamcrest.Matchers.empty;
+import static org.hamcrest.Matchers.emptyOrNullString;
import static org.hamcrest.Matchers.equalTo;
import static org.hamcrest.Matchers.hasEntry;
import static org.hamcrest.Matchers.hasItem;
@@ -43,7 +44,6 @@ import static org.hamcrest.Matchers.hasItems;
import static org.hamcrest.Matchers.hasKey;
import static org.hamcrest.Matchers.hasSize;
import static org.hamcrest.Matchers.is;
-import static org.hamcrest.Matchers.isEmptyOrNullString;
import static org.hamcrest.Matchers.not;
import static org.hamcrest.Matchers.nullValue;
@@ -444,7 +444,7 @@ public abstract class GetMailboxesMethodTest {
.then()
.statusCode(200)
.body(NAME, equalTo("mailboxes"))
- .body(FIRST_MAILBOX + ".id", not(isEmptyOrNullString()))
+ .body(FIRST_MAILBOX + ".id", not(is(emptyOrNullString())))
.body(FIRST_MAILBOX + ".name", nullValue())
.body(FIRST_MAILBOX + ".parentId", nullValue())
.body(FIRST_MAILBOX + ".role", nullValue())
@@ -473,7 +473,7 @@ public abstract class GetMailboxesMethodTest {
.then()
.statusCode(200)
.body(NAME, equalTo("mailboxes"))
- .body(FIRST_MAILBOX + ".id", not(isEmptyOrNullString()))
+ .body(FIRST_MAILBOX + ".id", not(is(emptyOrNullString())))
.body(FIRST_MAILBOX + ".name", nullValue());
}
@@ -489,7 +489,7 @@ public abstract class GetMailboxesMethodTest {
.then()
.statusCode(200)
.body(NAME, equalTo("mailboxes"))
- .body(FIRST_MAILBOX + ".id", not(isEmptyOrNullString()))
+ .body(FIRST_MAILBOX + ".id", not(is(emptyOrNullString())))
.body(FIRST_MAILBOX + ".name", nullValue());
}
@@ -736,7 +736,7 @@ public abstract class GetMailboxesMethodTest {
.body(NAME, equalTo("mailboxes"))
.body(ARGUMENTS + ".list", hasSize(1))
.body(FIRST_MAILBOX + ".namespace.type",
equalTo(MailboxNamespace.Type.Personal.toString()))
- .body(FIRST_MAILBOX + ".namespace.owner", isEmptyOrNullString());
+ .body(FIRST_MAILBOX + ".namespace.owner", is(emptyOrNullString()));
}
diff --git
a/server/protocols/jmap-draft-integration-testing/jmap-draft-integration-testing-common/src/test/java/org/apache/james/jmap/draft/methods/integration/SetMailboxesMethodTest.java
b/server/protocols/jmap-draft-integration-testing/jmap-draft-integration-testing-common/src/test/java/org/apache/james/jmap/draft/methods/integration/SetMailboxesMethodTest.java
index a2c824c..b2d0de0 100644
---
a/server/protocols/jmap-draft-integration-testing/jmap-draft-integration-testing-common/src/test/java/org/apache/james/jmap/draft/methods/integration/SetMailboxesMethodTest.java
+++
b/server/protocols/jmap-draft-integration-testing/jmap-draft-integration-testing-common/src/test/java/org/apache/james/jmap/draft/methods/integration/SetMailboxesMethodTest.java
@@ -34,12 +34,12 @@ import static org.hamcrest.Matchers.contains;
import static org.hamcrest.Matchers.containsInAnyOrder;
import static org.hamcrest.Matchers.containsString;
import static org.hamcrest.Matchers.equalTo;
+import static org.hamcrest.Matchers.emptyOrNullString;
import static org.hamcrest.Matchers.hasEntry;
import static org.hamcrest.Matchers.hasItem;
import static org.hamcrest.Matchers.hasKey;
import static org.hamcrest.Matchers.hasSize;
import static org.hamcrest.Matchers.is;
-import static org.hamcrest.Matchers.isEmptyOrNullString;
import static org.hamcrest.Matchers.not;
import static org.hamcrest.Matchers.nullValue;
import static org.hamcrest.collection.IsMapWithSize.aMapWithSize;
@@ -892,10 +892,10 @@ public abstract class SetMailboxesMethodTest {
.body(NAME, equalTo("mailboxesSet"))
.body(ARGUMENTS + ".created", aMapWithSize(2))
.body(ARGUMENTS + ".created", hasEntry(equalTo("create-id00"),
Matchers.allOf(
- hasEntry(equalTo("parentId"), isEmptyOrNullString()),
+ hasEntry(equalTo("parentId"), is(emptyOrNullString())),
hasEntry(equalTo("name"), equalTo("parent")))))
.body(ARGUMENTS + ".created", hasEntry(equalTo("create-id01"),
Matchers.allOf(
- hasEntry(equalTo("parentId"), not(isEmptyOrNullString())),
+ hasEntry(equalTo("parentId"),
not(is(emptyOrNullString()))),
hasEntry(equalTo("name"), equalTo("child")))));
}
@@ -929,10 +929,10 @@ public abstract class SetMailboxesMethodTest {
.body(NAME, equalTo("mailboxesSet"))
.body(ARGUMENTS + ".created", aMapWithSize(2))
.body(ARGUMENTS + ".created", hasEntry(equalTo("create-id00"),
Matchers.allOf(
- hasEntry(equalTo("parentId"), isEmptyOrNullString()),
+ hasEntry(equalTo("parentId"), is(emptyOrNullString())),
hasEntry(equalTo("name"), equalTo("parent")))))
.body(ARGUMENTS + ".created", hasEntry(equalTo("create-id01"),
Matchers.allOf(
- hasEntry(equalTo("parentId"), not(isEmptyOrNullString())),
+ hasEntry(equalTo("parentId"),
not(is(emptyOrNullString()))),
hasEntry(equalTo("name"), equalTo("child")))));
}
diff --git
a/server/protocols/jmap-draft-integration-testing/jmap-draft-integration-testing-common/src/test/java/org/apache/james/jmap/draft/methods/integration/SetMessagesMethodTest.java
b/server/protocols/jmap-draft-integration-testing/jmap-draft-integration-testing-common/src/test/java/org/apache/james/jmap/draft/methods/integration/SetMessagesMethodTest.java
index 4f1d9ac..988df1f 100644
---
a/server/protocols/jmap-draft-integration-testing/jmap-draft-integration-testing-common/src/test/java/org/apache/james/jmap/draft/methods/integration/SetMessagesMethodTest.java
+++
b/server/protocols/jmap-draft-integration-testing/jmap-draft-integration-testing-common/src/test/java/org/apache/james/jmap/draft/methods/integration/SetMessagesMethodTest.java
@@ -49,12 +49,13 @@ import static org.hamcrest.Matchers.contains;
import static org.hamcrest.Matchers.containsInAnyOrder;
import static org.hamcrest.Matchers.containsString;
import static org.hamcrest.Matchers.empty;
+import static org.hamcrest.Matchers.emptyOrNullString;
import static org.hamcrest.Matchers.endsWith;
import static org.hamcrest.Matchers.equalTo;
import static org.hamcrest.Matchers.hasEntry;
import static org.hamcrest.Matchers.hasKey;
import static org.hamcrest.Matchers.hasSize;
-import static org.hamcrest.Matchers.isEmptyOrNullString;
+import static org.hamcrest.Matchers.is;
import static org.hamcrest.Matchers.not;
import static org.hamcrest.collection.IsMapWithSize.aMapWithSize;
import static org.hamcrest.collection.IsMapWithSize.anEmptyMap;
@@ -246,7 +247,7 @@ public abstract class SetMessagesMethodTest {
.body(ARGUMENTS + ".notDestroyed",
hasEntry(equalTo(unknownMailboxMessageId), Matchers.allOf(
hasEntry("type", "notFound"),
hasEntry("description", "The message " +
unknownMailboxMessageId + " can't be found"),
- hasEntry(equalTo("properties"), isEmptyOrNullString())))
+ hasEntry(equalTo("properties"), is(emptyOrNullString()))))
);
}
@@ -268,7 +269,7 @@ public abstract class SetMessagesMethodTest {
.body(ARGUMENTS + ".notDestroyed", hasEntry(equalTo(messageId),
Matchers.allOf(
hasEntry("type", "notFound"),
hasEntry("description", "The message " + messageId + " can't
be found"),
- hasEntry(equalTo("properties"), isEmptyOrNullString())))
+ hasEntry(equalTo("properties"), is(emptyOrNullString()))))
);
}
@@ -1009,10 +1010,10 @@ public abstract class SetMessagesMethodTest {
.body(ARGUMENTS + ".created", aMapWithSize(1))
// assert server-set attributes are returned
.body(ARGUMENTS + ".created", hasEntry(equalTo(messageCreationId),
Matchers.allOf(
- hasEntry(equalTo("id"), not(isEmptyOrNullString())),
- hasEntry(equalTo("blobId"), not(isEmptyOrNullString())),
- hasEntry(equalTo("threadId"), not(isEmptyOrNullString())),
- hasEntry(equalTo("size"), not(isEmptyOrNullString()))
+ hasEntry(equalTo("id"), not(is(emptyOrNullString()))),
+ hasEntry(equalTo("blobId"), not(is(emptyOrNullString()))),
+ hasEntry(equalTo("threadId"), not(is(emptyOrNullString()))),
+ hasEntry(equalTo("size"), not(is(emptyOrNullString())))
)))
// assert that message FLAGS are all unset
.body(ARGUMENTS + ".created", hasEntry(equalTo(messageCreationId),
Matchers.allOf(
@@ -4574,7 +4575,7 @@ public abstract class SetMessagesMethodTest {
.body(NAME, equalTo("messages"))
.body(ARGUMENTS + ".list", hasSize(1))
.body(firstMessage + ".textBody", equalTo("Test body, plain text
version"))
- .body(firstMessage + ".htmlBody", isEmptyOrNullString())
+ .body(firstMessage + ".htmlBody", is(emptyOrNullString()))
.body(firstMessage + ".attachments", hasSize(1))
.body(firstAttachment + ".type", equalTo("text/html;
charset=UTF-8"))
.body(firstAttachment + ".size", equalTo((int)
uploadedAttachment.getSize()))
@@ -4658,8 +4659,8 @@ public abstract class SetMessagesMethodTest {
.log().ifValidationFails()
.body(NAME, equalTo("messages"))
.body(ARGUMENTS + ".list", hasSize(1))
- .body(firstMessage + ".textBody", isEmptyOrNullString())
- .body(firstMessage + ".htmlBody", isEmptyOrNullString())
+ .body(firstMessage + ".textBody", is(emptyOrNullString()))
+ .body(firstMessage + ".htmlBody", is(emptyOrNullString()))
.body(firstMessage + ".attachments", hasSize(1))
.body(firstAttachment + ".type", equalTo("text/plain;
charset=UTF-8"))
.body(firstAttachment + ".size", equalTo((int)
uploadedAttachment.getSize()))
@@ -4784,7 +4785,7 @@ public abstract class SetMessagesMethodTest {
private Matcher<Map<? extends String, ? extends String>>
allHeadersMatcher(ImmutableList<String> expectedHeaders) {
return Matchers.allOf(expectedHeaders.stream()
- .map((String header) -> hasEntry(equalTo(header),
not(isEmptyOrNullString())))
+ .map((String header) -> hasEntry(equalTo(header),
not(is(emptyOrNullString()))))
.collect(Collectors.toList()));
}
@@ -5713,7 +5714,7 @@ public abstract class SetMessagesMethodTest {
.body(ARGUMENTS + ".list", hasSize(1))
.body(message + ".attachments", hasSize(1))
.body(firstAttachment + ".type", equalTo("text/calendar;
method=REPLY; charset=UTF-8"))
- .body(firstAttachment + ".blobId", not(isEmptyOrNullString()));
+ .body(firstAttachment + ".blobId", not(is(emptyOrNullString())));
}
@Test
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 acf53f7..e56539e 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,9 +26,9 @@ import static org.hamcrest.Matchers.containsString;
import static org.hamcrest.Matchers.empty;
import static org.hamcrest.Matchers.hasSize;
import static org.hamcrest.Matchers.is;
-import static org.hamcrest.Matchers.isOneOf;
import static org.hamcrest.Matchers.not;
import static org.hamcrest.Matchers.nullValue;
+import static org.hamcrest.Matchers.oneOf;
import java.util.UUID;
import java.util.concurrent.CountDownLatch;
@@ -344,7 +344,7 @@ class TasksRoutesTest {
.get("/" + taskId.getValue())
.then()
.statusCode(HttpStatus.OK_200)
- .body("status", isOneOf("canceledRequested", "canceled"));
+ .body("status", is(oneOf("canceledRequested", "canceled")));
inProgressLatch.countDown();
when()
diff --git
a/server/protocols/webadmin/webadmin-mailrepository/src/test/java/org/apache/james/webadmin/routes/MailRepositoriesRoutesTest.java
b/server/protocols/webadmin/webadmin-mailrepository/src/test/java/org/apache/james/webadmin/routes/MailRepositoriesRoutesTest.java
index 1ad92ec..7416bd0 100644
---
a/server/protocols/webadmin/webadmin-mailrepository/src/test/java/org/apache/james/webadmin/routes/MailRepositoriesRoutesTest.java
+++
b/server/protocols/webadmin/webadmin-mailrepository/src/test/java/org/apache/james/webadmin/routes/MailRepositoriesRoutesTest.java
@@ -28,10 +28,10 @@ import static
net.javacrumbs.jsonunit.core.Option.IGNORING_EXTRA_FIELDS;
import static org.assertj.core.api.Assertions.assertThat;
import static org.hamcrest.Matchers.contains;
import static org.hamcrest.Matchers.containsInAnyOrder;
+import static org.hamcrest.Matchers.emptyOrNullString;
import static org.hamcrest.Matchers.equalTo;
import static org.hamcrest.Matchers.hasSize;
import static org.hamcrest.Matchers.is;
-import static org.hamcrest.Matchers.isEmptyOrNullString;
import static org.hamcrest.Matchers.notNullValue;
import static org.hamcrest.Matchers.nullValue;
@@ -846,9 +846,9 @@ public class MailRepositoriesRoutesTest {
.then()
.statusCode(HttpStatus.OK_200)
.body("name", is(NAME_1))
- .body("sender", isEmptyOrNullString())
- .body("state", isEmptyOrNullString())
- .body("error", isEmptyOrNullString())
+ .body("sender", is(emptyOrNullString()))
+ .body("state", is(emptyOrNullString()))
+ .body("error", is(emptyOrNullString()))
.body("recipients", hasSize(0));
}
@@ -1126,7 +1126,7 @@ public class MailRepositoriesRoutesTest {
.body("additionalInformation.repositoryPath",
is(PATH_MY_REPO.asString()))
.body("additionalInformation.initialCount", is(2))
.body("additionalInformation.remainingCount", is(0))
- .body("additionalInformation.targetProcessor",
isEmptyOrNullString())
+ .body("additionalInformation.targetProcessor",
is(emptyOrNullString()))
.body("additionalInformation.targetQueue",
is(MailQueueFactory.SPOOL.asString()))
.body("startedDate", is(notNullValue()))
.body("submitDate", is(notNullValue()))
@@ -1492,7 +1492,7 @@ public class MailRepositoriesRoutesTest {
.body("type", is(ReprocessingOneMailTask.TYPE.asString()))
.body("additionalInformation.repositoryPath",
is(PATH_MY_REPO.asString()))
.body("additionalInformation.mailKey", is(NAME_1))
- .body("additionalInformation.targetProcessor",
isEmptyOrNullString())
+ .body("additionalInformation.targetProcessor",
is(emptyOrNullString()))
.body("additionalInformation.targetQueue",
is(MailQueueFactory.SPOOL.asString()))
.body("startedDate", is(notNullValue()))
.body("submitDate", is(notNullValue()))
---------------------------------------------------------------------
To unsubscribe, e-mail: server-dev-unsubscr...@james.apache.org
For additional commands, e-mail: server-dev-h...@james.apache.org
