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 2017/08/18 02:48:09 UTC
[1/8] james-project git commit: JAMES-2107 _ is a reserved identifier,
replace it with 'ignored'
Repository: james-project
Updated Branches:
refs/heads/master dcca8fcc8 -> 88f43f1b9
JAMES-2107 _ is a reserved identifier, replace it with 'ignored'
Project: http://git-wip-us.apache.org/repos/asf/james-project/repo
Commit: http://git-wip-us.apache.org/repos/asf/james-project/commit/b803a56d
Tree: http://git-wip-us.apache.org/repos/asf/james-project/tree/b803a56d
Diff: http://git-wip-us.apache.org/repos/asf/james-project/diff/b803a56d
Branch: refs/heads/master
Commit: b803a56d6b4bbace91041e186ae02989fab0934e
Parents: dcca8fc
Author: Matthieu Baechler <ma...@apache.org>
Authored: Wed Aug 16 15:30:22 2017 +0200
Committer: Matthieu Baechler <ma...@apache.org>
Committed: Thu Aug 17 13:22:26 2017 +0200
----------------------------------------------------------------------
.../org/apache/james/imap/processor/AuthenticateProcessor.java | 2 +-
.../apache/james/protocols/smtp/core/esmtp/AuthCmdHandler.java | 2 +-
.../src/main/java/org/apache/james/core/MimeMessageUtil.java | 4 ++--
.../apache/james/transport/matchers/AbstractStorageQuota.java | 2 +-
.../main/java/org/apache/james/fetchmail/MessageProcessor.java | 2 +-
5 files changed, 6 insertions(+), 6 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/james-project/blob/b803a56d/protocols/imap/src/main/java/org/apache/james/imap/processor/AuthenticateProcessor.java
----------------------------------------------------------------------
diff --git a/protocols/imap/src/main/java/org/apache/james/imap/processor/AuthenticateProcessor.java b/protocols/imap/src/main/java/org/apache/james/imap/processor/AuthenticateProcessor.java
index f50ace2..4dabacc 100644
--- a/protocols/imap/src/main/java/org/apache/james/imap/processor/AuthenticateProcessor.java
+++ b/protocols/imap/src/main/java/org/apache/james/imap/processor/AuthenticateProcessor.java
@@ -116,7 +116,7 @@ public class AuthenticateProcessor extends AbstractAuthProcessor<AuthenticateReq
token2 = authTokenizer.nextToken(); // Authentication Identity
try {
return delegation(token1, token2, authTokenizer.nextToken());
- } catch (java.util.NoSuchElementException _) {
+ } catch (java.util.NoSuchElementException ignored) {
// If we got here, this is what happened. RFC 2595
// says that "the client may leave the authorization
// identity empty to indicate that it is the same as
http://git-wip-us.apache.org/repos/asf/james-project/blob/b803a56d/protocols/smtp/src/main/java/org/apache/james/protocols/smtp/core/esmtp/AuthCmdHandler.java
----------------------------------------------------------------------
diff --git a/protocols/smtp/src/main/java/org/apache/james/protocols/smtp/core/esmtp/AuthCmdHandler.java b/protocols/smtp/src/main/java/org/apache/james/protocols/smtp/core/esmtp/AuthCmdHandler.java
index 9ebf858..340567d 100644
--- a/protocols/smtp/src/main/java/org/apache/james/protocols/smtp/core/esmtp/AuthCmdHandler.java
+++ b/protocols/smtp/src/main/java/org/apache/james/protocols/smtp/core/esmtp/AuthCmdHandler.java
@@ -262,7 +262,7 @@ public class AuthCmdHandler
try {
pass = authTokenizer.nextToken(); // Password
}
- catch (java.util.NoSuchElementException _) {
+ catch (java.util.NoSuchElementException ignored) {
// If we got here, this is what happened. RFC 2595
// says that "the client may leave the authorization
// identity empty to indicate that it is the same as
http://git-wip-us.apache.org/repos/asf/james-project/blob/b803a56d/server/container/core/src/main/java/org/apache/james/core/MimeMessageUtil.java
----------------------------------------------------------------------
diff --git a/server/container/core/src/main/java/org/apache/james/core/MimeMessageUtil.java b/server/container/core/src/main/java/org/apache/james/core/MimeMessageUtil.java
index 7836f18..fc7b8e7 100644
--- a/server/container/core/src/main/java/org/apache/james/core/MimeMessageUtil.java
+++ b/server/container/core/src/main/java/org/apache/james/core/MimeMessageUtil.java
@@ -156,7 +156,7 @@ public class MimeMessageUtil {
try {
bis = message.getRawInputStream();
bos = bodyOs;
- } catch (javax.mail.MessagingException _) {
+ } catch (javax.mail.MessagingException ignored) {
throw udte;
}
} catch (javax.mail.MessagingException me) {
@@ -174,7 +174,7 @@ public class MimeMessageUtil {
try {
bis = message.getRawInputStream();
bos = bodyOs;
- } catch (javax.mail.MessagingException _) {
+ } catch (javax.mail.MessagingException ignored) {
throw me;
}
}
http://git-wip-us.apache.org/repos/asf/james-project/blob/b803a56d/server/mailet/mailets/src/main/java/org/apache/james/transport/matchers/AbstractStorageQuota.java
----------------------------------------------------------------------
diff --git a/server/mailet/mailets/src/main/java/org/apache/james/transport/matchers/AbstractStorageQuota.java b/server/mailet/mailets/src/main/java/org/apache/james/transport/matchers/AbstractStorageQuota.java
index 3b6aea8..6b00796 100755
--- a/server/mailet/mailets/src/main/java/org/apache/james/transport/matchers/AbstractStorageQuota.java
+++ b/server/mailet/mailets/src/main/java/org/apache/james/transport/matchers/AbstractStorageQuota.java
@@ -106,7 +106,7 @@ abstract public class AbstractStorageQuota extends AbstractQuotaMatcher {
* the recipient to check
*/
@Override
- protected long getUsed(MailAddress recipient, Mail _) throws MessagingException {
+ protected long getUsed(MailAddress recipient, Mail ignored) throws MessagingException {
long size = 0;
MailboxSession session;
try {
http://git-wip-us.apache.org/repos/asf/james-project/blob/b803a56d/server/protocols/fetchmail/src/main/java/org/apache/james/fetchmail/MessageProcessor.java
----------------------------------------------------------------------
diff --git a/server/protocols/fetchmail/src/main/java/org/apache/james/fetchmail/MessageProcessor.java b/server/protocols/fetchmail/src/main/java/org/apache/james/fetchmail/MessageProcessor.java
index a5f3472..4410e5b 100644
--- a/server/protocols/fetchmail/src/main/java/org/apache/james/fetchmail/MessageProcessor.java
+++ b/server/protocols/fetchmail/src/main/java/org/apache/james/fetchmail/MessageProcessor.java
@@ -657,7 +657,7 @@ public class MessageProcessor extends ProcessorAbstract {
try {
from = ((InternetAddress) getMessageIn().getFrom()[0]).getAddress().trim();
setDefaultSenderLocalPart(false);
- } catch (Exception _) {
+ } catch (Exception ignored) {
from = getDefaultLocalPart();
setDefaultSenderLocalPart(true);
StringBuilder buffer = new StringBuilder(32);
---------------------------------------------------------------------
To unsubscribe, e-mail: server-dev-unsubscribe@james.apache.org
For additional commands, e-mail: server-dev-help@james.apache.org
[3/8] james-project git commit: JAMES-2107 remove some trivial
warnings
Posted by bt...@apache.org.
JAMES-2107 remove some trivial warnings
Project: http://git-wip-us.apache.org/repos/asf/james-project/repo
Commit: http://git-wip-us.apache.org/repos/asf/james-project/commit/a1b4ac95
Tree: http://git-wip-us.apache.org/repos/asf/james-project/tree/a1b4ac95
Diff: http://git-wip-us.apache.org/repos/asf/james-project/diff/a1b4ac95
Branch: refs/heads/master
Commit: a1b4ac953e72d5d2335bda43b509a34c24d7f389
Parents: b803a56
Author: Matthieu Baechler <ma...@apache.org>
Authored: Wed Aug 16 15:32:52 2017 +0200
Committer: Matthieu Baechler <ma...@apache.org>
Committed: Thu Aug 17 13:27:12 2017 +0200
----------------------------------------------------------------------
.../mailbox/cassandra/mail/migration/V1ToV2MigrationTest.java | 1 -
.../org/apache/james/mailbox/jpa/mail/JPAMessageMapper.java | 1 -
.../apache/james/mailbox/inmemory/InMemoryMessageIdManager.java | 1 -
.../org/apache/james/mailbox/store/StoreMailboxManager.java | 1 -
.../org/apache/james/mailbox/store/StoreMessageManager.java | 1 -
.../store/event/distributed/DistantMailboxPathRegisterTest.java | 1 -
.../org/apache/james/transport/mailets/ICalendarParser.java | 1 -
.../apache/james/transport/mailets/utils/MimeMessageUtils.java | 5 +++--
.../main/java/org/apache/james/imap/api/ImapConfiguration.java | 2 --
.../domainlist/lib/AbstractDomainListPrivateMethodsTest.java | 1 -
.../webadmin/integration/WebAdminServerIntegrationTest.java | 4 ----
11 files changed, 3 insertions(+), 16 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/james-project/blob/a1b4ac95/mailbox/cassandra/src/test/java/org/apache/james/mailbox/cassandra/mail/migration/V1ToV2MigrationTest.java
----------------------------------------------------------------------
diff --git a/mailbox/cassandra/src/test/java/org/apache/james/mailbox/cassandra/mail/migration/V1ToV2MigrationTest.java b/mailbox/cassandra/src/test/java/org/apache/james/mailbox/cassandra/mail/migration/V1ToV2MigrationTest.java
index 8cce8fc..6b0edea 100644
--- a/mailbox/cassandra/src/test/java/org/apache/james/mailbox/cassandra/mail/migration/V1ToV2MigrationTest.java
+++ b/mailbox/cassandra/src/test/java/org/apache/james/mailbox/cassandra/mail/migration/V1ToV2MigrationTest.java
@@ -24,7 +24,6 @@ import java.util.Date;
import java.util.List;
import java.util.Optional;
import java.util.concurrent.TimeUnit;
-import java.util.stream.Collectors;
import java.util.stream.Stream;
import javax.mail.Flags;
http://git-wip-us.apache.org/repos/asf/james-project/blob/a1b4ac95/mailbox/jpa/src/main/java/org/apache/james/mailbox/jpa/mail/JPAMessageMapper.java
----------------------------------------------------------------------
diff --git a/mailbox/jpa/src/main/java/org/apache/james/mailbox/jpa/mail/JPAMessageMapper.java b/mailbox/jpa/src/main/java/org/apache/james/mailbox/jpa/mail/JPAMessageMapper.java
index 70341e6..81fb757 100644
--- a/mailbox/jpa/src/main/java/org/apache/james/mailbox/jpa/mail/JPAMessageMapper.java
+++ b/mailbox/jpa/src/main/java/org/apache/james/mailbox/jpa/mail/JPAMessageMapper.java
@@ -55,7 +55,6 @@ import org.apache.james.mailbox.store.mail.model.MailboxMessage;
import org.apache.james.mailbox.store.mail.utils.ApplicableFlagCalculator;
import org.apache.openjpa.persistence.ArgumentException;
-import com.google.common.base.Function;
import com.google.common.base.Optional;
import com.google.common.collect.ImmutableList;
import com.google.common.collect.Iterators;
http://git-wip-us.apache.org/repos/asf/james-project/blob/a1b4ac95/mailbox/memory/src/main/java/org/apache/james/mailbox/inmemory/InMemoryMessageIdManager.java
----------------------------------------------------------------------
diff --git a/mailbox/memory/src/main/java/org/apache/james/mailbox/inmemory/InMemoryMessageIdManager.java b/mailbox/memory/src/main/java/org/apache/james/mailbox/inmemory/InMemoryMessageIdManager.java
index 896ebb9..da4c730 100644
--- a/mailbox/memory/src/main/java/org/apache/james/mailbox/inmemory/InMemoryMessageIdManager.java
+++ b/mailbox/memory/src/main/java/org/apache/james/mailbox/inmemory/InMemoryMessageIdManager.java
@@ -42,7 +42,6 @@ import org.apache.james.mailbox.model.MessageRange;
import org.apache.james.mailbox.model.MessageResult;
import org.apache.james.mailbox.model.MessageResult.FetchGroup;
-import com.google.common.base.Function;
import com.google.common.base.Optional;
import com.google.common.base.Predicate;
import com.google.common.collect.FluentIterable;
http://git-wip-us.apache.org/repos/asf/james-project/blob/a1b4ac95/mailbox/store/src/main/java/org/apache/james/mailbox/store/StoreMailboxManager.java
----------------------------------------------------------------------
diff --git a/mailbox/store/src/main/java/org/apache/james/mailbox/store/StoreMailboxManager.java b/mailbox/store/src/main/java/org/apache/james/mailbox/store/StoreMailboxManager.java
index aab9340..4220bcb 100644
--- a/mailbox/store/src/main/java/org/apache/james/mailbox/store/StoreMailboxManager.java
+++ b/mailbox/store/src/main/java/org/apache/james/mailbox/store/StoreMailboxManager.java
@@ -85,7 +85,6 @@ import org.slf4j.Logger;
import com.github.steveash.guavate.Guavate;
import com.google.common.base.Optional;
-import com.google.common.base.Predicate;
import com.google.common.collect.FluentIterable;
import com.google.common.collect.Iterables;
http://git-wip-us.apache.org/repos/asf/james-project/blob/a1b4ac95/mailbox/store/src/main/java/org/apache/james/mailbox/store/StoreMessageManager.java
----------------------------------------------------------------------
diff --git a/mailbox/store/src/main/java/org/apache/james/mailbox/store/StoreMessageManager.java b/mailbox/store/src/main/java/org/apache/james/mailbox/store/StoreMessageManager.java
index 7ff5509..5d3259e 100644
--- a/mailbox/store/src/main/java/org/apache/james/mailbox/store/StoreMessageManager.java
+++ b/mailbox/store/src/main/java/org/apache/james/mailbox/store/StoreMessageManager.java
@@ -94,7 +94,6 @@ import org.apache.james.util.IteratorWrapper;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
-import com.google.common.base.Predicate;
import com.google.common.collect.FluentIterable;
import com.google.common.collect.ImmutableList;
import com.google.common.collect.ImmutableMap;
http://git-wip-us.apache.org/repos/asf/james-project/blob/a1b4ac95/mailbox/store/src/test/java/org/apache/james/mailbox/store/event/distributed/DistantMailboxPathRegisterTest.java
----------------------------------------------------------------------
diff --git a/mailbox/store/src/test/java/org/apache/james/mailbox/store/event/distributed/DistantMailboxPathRegisterTest.java b/mailbox/store/src/test/java/org/apache/james/mailbox/store/event/distributed/DistantMailboxPathRegisterTest.java
index 896e9c3..2dc9308 100644
--- a/mailbox/store/src/test/java/org/apache/james/mailbox/store/event/distributed/DistantMailboxPathRegisterTest.java
+++ b/mailbox/store/src/test/java/org/apache/james/mailbox/store/event/distributed/DistantMailboxPathRegisterTest.java
@@ -28,7 +28,6 @@ import static org.mockito.Mockito.verify;
import static org.mockito.Mockito.verifyNoMoreInteractions;
import static org.mockito.Mockito.when;
-import java.util.HashSet;
import java.util.Set;
import java.util.concurrent.ExecutorService;
import java.util.concurrent.Executors;
http://git-wip-us.apache.org/repos/asf/james-project/blob/a1b4ac95/mailet/icalendar/src/main/java/org/apache/james/transport/mailets/ICalendarParser.java
----------------------------------------------------------------------
diff --git a/mailet/icalendar/src/main/java/org/apache/james/transport/mailets/ICalendarParser.java b/mailet/icalendar/src/main/java/org/apache/james/transport/mailets/ICalendarParser.java
index 24c866e..374bad4 100644
--- a/mailet/icalendar/src/main/java/org/apache/james/transport/mailets/ICalendarParser.java
+++ b/mailet/icalendar/src/main/java/org/apache/james/transport/mailets/ICalendarParser.java
@@ -38,7 +38,6 @@ import net.fortuna.ical4j.data.CalendarBuilder;
import net.fortuna.ical4j.data.ParserException;
import net.fortuna.ical4j.model.Calendar;
import net.fortuna.ical4j.util.CompatibilityHints;
-import net.fortuna.ical4j.util.Configurator;
/**
* <p>
http://git-wip-us.apache.org/repos/asf/james-project/blob/a1b4ac95/mailet/standard/src/main/java/org/apache/james/transport/mailets/utils/MimeMessageUtils.java
----------------------------------------------------------------------
diff --git a/mailet/standard/src/main/java/org/apache/james/transport/mailets/utils/MimeMessageUtils.java b/mailet/standard/src/main/java/org/apache/james/transport/mailets/utils/MimeMessageUtils.java
index caea2fa..5ae1360 100644
--- a/mailet/standard/src/main/java/org/apache/james/transport/mailets/utils/MimeMessageUtils.java
+++ b/mailet/standard/src/main/java/org/apache/james/transport/mailets/utils/MimeMessageUtils.java
@@ -89,8 +89,9 @@ public class MimeMessageUtils {
public List<Header> toHeaderList() throws MessagingException {
ImmutableList.Builder<Header> headers = ImmutableList.builder();
- Enumeration allHeaders = message.getAllHeaders();
- for (@SuppressWarnings("unchecked") Enumeration<Header> e = allHeaders; e.hasMoreElements();) {
+ @SuppressWarnings("unchecked")
+ Enumeration<Header> allHeaders = message.getAllHeaders();
+ for (Enumeration<Header> e = allHeaders; e.hasMoreElements();) {
headers.add(e.nextElement());
}
return headers.build();
http://git-wip-us.apache.org/repos/asf/james-project/blob/a1b4ac95/protocols/imap/src/main/java/org/apache/james/imap/api/ImapConfiguration.java
----------------------------------------------------------------------
diff --git a/protocols/imap/src/main/java/org/apache/james/imap/api/ImapConfiguration.java b/protocols/imap/src/main/java/org/apache/james/imap/api/ImapConfiguration.java
index 0ee015f..3ef0a13 100644
--- a/protocols/imap/src/main/java/org/apache/james/imap/api/ImapConfiguration.java
+++ b/protocols/imap/src/main/java/org/apache/james/imap/api/ImapConfiguration.java
@@ -23,12 +23,10 @@ import java.util.concurrent.TimeUnit;
import org.apache.commons.lang.StringUtils;
-import com.google.common.base.Function;
import com.google.common.base.MoreObjects;
import com.google.common.base.Objects;
import com.google.common.base.Optional;
import com.google.common.base.Preconditions;
-import com.google.common.base.Predicate;
import com.google.common.collect.FluentIterable;
import com.google.common.collect.ImmutableSet;
http://git-wip-us.apache.org/repos/asf/james-project/blob/a1b4ac95/server/data/data-library/src/test/java/org/apache/james/domainlist/lib/AbstractDomainListPrivateMethodsTest.java
----------------------------------------------------------------------
diff --git a/server/data/data-library/src/test/java/org/apache/james/domainlist/lib/AbstractDomainListPrivateMethodsTest.java b/server/data/data-library/src/test/java/org/apache/james/domainlist/lib/AbstractDomainListPrivateMethodsTest.java
index 86137dc..555d75b 100644
--- a/server/data/data-library/src/test/java/org/apache/james/domainlist/lib/AbstractDomainListPrivateMethodsTest.java
+++ b/server/data/data-library/src/test/java/org/apache/james/domainlist/lib/AbstractDomainListPrivateMethodsTest.java
@@ -22,7 +22,6 @@ package org.apache.james.domainlist.lib;
import static org.assertj.core.api.Assertions.assertThat;
import static org.mockito.Matchers.any;
import static org.mockito.Mockito.mock;
-import static org.mockito.Mockito.verifyNoMoreInteractions;
import static org.mockito.Mockito.verifyZeroInteractions;
import static org.mockito.Mockito.when;
http://git-wip-us.apache.org/repos/asf/james-project/blob/a1b4ac95/server/protocols/webadmin-integration-test/src/test/java/org/apache/james/webadmin/integration/WebAdminServerIntegrationTest.java
----------------------------------------------------------------------
diff --git a/server/protocols/webadmin-integration-test/src/test/java/org/apache/james/webadmin/integration/WebAdminServerIntegrationTest.java b/server/protocols/webadmin-integration-test/src/test/java/org/apache/james/webadmin/integration/WebAdminServerIntegrationTest.java
index 4a1205d..eba71f8 100644
--- a/server/protocols/webadmin-integration-test/src/test/java/org/apache/james/webadmin/integration/WebAdminServerIntegrationTest.java
+++ b/server/protocols/webadmin-integration-test/src/test/java/org/apache/james/webadmin/integration/WebAdminServerIntegrationTest.java
@@ -24,11 +24,8 @@ import static com.jayway.restassured.config.EncoderConfig.encoderConfig;
import static com.jayway.restassured.config.RestAssuredConfig.newConfig;
import static org.apache.james.webadmin.Constants.SEPARATOR;
import static org.assertj.core.api.Assertions.assertThat;
-import static org.hamcrest.Matchers.contains;
import static org.hamcrest.Matchers.containsString;
import static org.hamcrest.Matchers.is;
-import static org.hamcrest.Matchers.notNullValue;
-import static org.hamcrest.Matchers.stringContainsInOrder;
import org.apache.james.CassandraJmapTestRule;
import org.apache.james.GuiceJamesServer;
@@ -41,7 +38,6 @@ import org.apache.james.webadmin.routes.DomainRoutes;
import org.apache.james.webadmin.routes.UserMailboxesRoutes;
import org.apache.james.webadmin.routes.UserRoutes;
import org.apache.james.webadmin.swagger.routes.SwaggerRoutes;
-
import org.junit.After;
import org.junit.Before;
import org.junit.Rule;
---------------------------------------------------------------------
To unsubscribe, e-mail: server-dev-unsubscribe@james.apache.org
For additional commands, e-mail: server-dev-help@james.apache.org
[8/8] james-project git commit: JAMES-2107 MailboxAnnotationKey
equality should be commutative but is not
Posted by bt...@apache.org.
JAMES-2107 MailboxAnnotationKey equality should be commutative but is not
Assertj changed internally and revealed a commutative issue
that needs to be fixed in MailboxAnnotationKey
Project: http://git-wip-us.apache.org/repos/asf/james-project/repo
Commit: http://git-wip-us.apache.org/repos/asf/james-project/commit/88f43f1b
Tree: http://git-wip-us.apache.org/repos/asf/james-project/tree/88f43f1b
Diff: http://git-wip-us.apache.org/repos/asf/james-project/diff/88f43f1b
Branch: refs/heads/master
Commit: 88f43f1b94ce211c5363be816a781fa622802181
Parents: e71db87
Author: Matthieu Baechler <ma...@apache.org>
Authored: Wed Aug 16 18:34:50 2017 +0200
Committer: benwa <bt...@linagora.com>
Committed: Fri Aug 18 09:47:51 2017 +0700
----------------------------------------------------------------------
.../org/apache/james/mailbox/model/MailboxAnnotationKey.java | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/james-project/blob/88f43f1b/mailbox/api/src/main/java/org/apache/james/mailbox/model/MailboxAnnotationKey.java
----------------------------------------------------------------------
diff --git a/mailbox/api/src/main/java/org/apache/james/mailbox/model/MailboxAnnotationKey.java b/mailbox/api/src/main/java/org/apache/james/mailbox/model/MailboxAnnotationKey.java
index b251765..f5932d9 100644
--- a/mailbox/api/src/main/java/org/apache/james/mailbox/model/MailboxAnnotationKey.java
+++ b/mailbox/api/src/main/java/org/apache/james/mailbox/model/MailboxAnnotationKey.java
@@ -109,7 +109,7 @@ public class MailboxAnnotationKey {
public boolean equals(Object obj) {
if (obj instanceof MailboxAnnotationKey) {
MailboxAnnotationKey anotherKey = (MailboxAnnotationKey)obj;
- return Objects.equal(anotherKey.asString(), key);
+ return Objects.equal(anotherKey.asString(), asString());
} else {
return false;
}
@@ -117,6 +117,6 @@ public class MailboxAnnotationKey {
@Override
public int hashCode() {
- return Objects.hashCode(key);
+ return Objects.hashCode(asString());
}
}
\ No newline at end of file
---------------------------------------------------------------------
To unsubscribe, e-mail: server-dev-unsubscribe@james.apache.org
For additional commands, e-mail: server-dev-help@james.apache.org
[5/8] james-project git commit: JAMES-2107 fix warnings about assertj
generic arrays and errors on generic streams
Posted by bt...@apache.org.
JAMES-2107 fix warnings about assertj generic arrays and errors on generic streams
Project: http://git-wip-us.apache.org/repos/asf/james-project/repo
Commit: http://git-wip-us.apache.org/repos/asf/james-project/commit/2f7eba12
Tree: http://git-wip-us.apache.org/repos/asf/james-project/tree/2f7eba12
Diff: http://git-wip-us.apache.org/repos/asf/james-project/diff/2f7eba12
Branch: refs/heads/master
Commit: 2f7eba1273df167c250baeaa3f94d46287aa2c9c
Parents: b87f9fc
Author: Matthieu Baechler <ma...@apache.org>
Authored: Wed Aug 16 15:57:51 2017 +0200
Committer: Matthieu Baechler <ma...@apache.org>
Committed: Thu Aug 17 13:27:29 2017 +0200
----------------------------------------------------------------------
backends-common/pom.xml | 3 +-
.../cassandra/mail/utils/DataChunkerTest.java | 44 +++++-------------
mailbox/pom.xml | 3 +-
.../store/search/CombinedComparatorTest.java | 12 -----
mailet/pom.xml | 7 ++-
mpt/pom.xml | 3 +-
protocols/pom.xml | 3 +-
.../apache/james/utils/ConfigurablesTest.java | 1 -
server/pom.xml | 3 +-
.../jmap/methods/GetMessagesMethodTest.java | 47 ++++++++------------
10 files changed, 37 insertions(+), 89 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/james-project/blob/2f7eba12/backends-common/pom.xml
----------------------------------------------------------------------
diff --git a/backends-common/pom.xml b/backends-common/pom.xml
index e4a2b3c..40f093d 100644
--- a/backends-common/pom.xml
+++ b/backends-common/pom.xml
@@ -34,7 +34,6 @@
<inceptionYear>2015</inceptionYear>
<properties>
- <assertj.version>3.2.0</assertj.version>
<junit.version>4.11</junit.version>
<slf4j.version>1.7.25</slf4j.version>
</properties>
@@ -70,7 +69,7 @@
<dependency>
<groupId>org.assertj</groupId>
<artifactId>assertj-core</artifactId>
- <version>${assertj.version}</version>
+ <version>3.8.0</version>
</dependency>
<dependency>
<groupId>org.slf4j</groupId>
http://git-wip-us.apache.org/repos/asf/james-project/blob/2f7eba12/mailbox/cassandra/src/test/java/org/apache/james/mailbox/cassandra/mail/utils/DataChunkerTest.java
----------------------------------------------------------------------
diff --git a/mailbox/cassandra/src/test/java/org/apache/james/mailbox/cassandra/mail/utils/DataChunkerTest.java b/mailbox/cassandra/src/test/java/org/apache/james/mailbox/cassandra/mail/utils/DataChunkerTest.java
index ccb5e4f..3d237a5 100644
--- a/mailbox/cassandra/src/test/java/org/apache/james/mailbox/cassandra/mail/utils/DataChunkerTest.java
+++ b/mailbox/cassandra/src/test/java/org/apache/james/mailbox/cassandra/mail/utils/DataChunkerTest.java
@@ -21,24 +21,16 @@ package org.apache.james.mailbox.cassandra.mail.utils;
import static org.assertj.core.api.Assertions.assertThat;
-import java.io.IOException;
import java.nio.ByteBuffer;
-import java.util.Arrays;
-import java.util.List;
import java.util.stream.Stream;
-import org.apache.commons.io.IOUtils;
-import org.apache.commons.lang3.ArrayUtils;
import org.apache.commons.lang3.tuple.Pair;
import org.junit.Before;
import org.junit.Rule;
import org.junit.Test;
import org.junit.rules.ExpectedException;
-import com.fasterxml.jackson.databind.util.ByteBufferBackedInputStream;
-import com.github.steveash.guavate.Guavate;
import com.google.common.base.Charsets;
-import com.google.common.base.Throwables;
import com.google.common.collect.ImmutableList;
import com.google.common.primitives.Bytes;
@@ -82,8 +74,9 @@ public class DataChunkerTest {
@Test
public void chunkShouldReturnOneEmptyArrayWhenInputEmpty() {
Stream<Pair<Integer, ByteBuffer>> chunks = testee.chunk(new byte[0], CHUNK_SIZE);
- assertThat(toArraysWithPosition(chunks))
- .containsOnly(Pair.of(0, ImmutableList.of()));
+ ByteBuffer emptyBuffer = ByteBuffer.wrap(new byte[0]);
+ assertThat(chunks)
+ .containsOnlyElementsOf(ImmutableList.of(Pair.of(0, emptyBuffer)));
}
@Test
@@ -92,8 +85,8 @@ public class DataChunkerTest {
Stream<Pair<Integer, ByteBuffer>> chunks = testee.chunk(data, CHUNK_SIZE);
- assertThat(toArraysWithPosition(chunks))
- .containsOnly(Pair.of(0, ImmutableList.copyOf(ArrayUtils.toObject(data))));
+ assertThat(chunks)
+ .containsOnlyElementsOf(ImmutableList.of(Pair.of(0, ByteBuffer.wrap(data))));
}
@Test
@@ -103,8 +96,8 @@ public class DataChunkerTest {
Stream<Pair<Integer, ByteBuffer>> chunks = testee.chunk(data, CHUNK_SIZE);
- assertThat(toArraysWithPosition(chunks))
- .containsOnly(Pair.of(0, ImmutableList.copyOf(ArrayUtils.toObject(data))));
+ assertThat(chunks)
+ .containsOnlyElementsOf(ImmutableList.of(Pair.of(0, ByteBuffer.wrap(data))));
}
@Test
@@ -115,25 +108,10 @@ public class DataChunkerTest {
Stream<Pair<Integer, ByteBuffer>> chunks = testee.chunk(data, CHUNK_SIZE);
- assertThat(toArraysWithPosition(chunks))
- .containsOnly(
- Pair.of(0, ImmutableList.copyOf(ArrayUtils.toObject(part1))),
- Pair.of(1, ImmutableList.copyOf(ArrayUtils.toObject(part2))));
- }
-
- private ImmutableList<Pair<Integer, List<Byte>>> toArraysWithPosition(Stream<Pair<Integer, ByteBuffer>> chunks) {
- return chunks
- .map(this::toByteArrayPair)
- .collect(Guavate.toImmutableList());
- }
-
- private Pair<Integer, List<Byte>> toByteArrayPair(Pair<Integer, ByteBuffer> pair) {
- try {
- Byte[] bytes = ArrayUtils.toObject(IOUtils.toByteArray(new ByteBufferBackedInputStream(pair.getRight())));
- return Pair.of(pair.getKey(), Arrays.asList(bytes));
- } catch (IOException e) {
- throw Throwables.propagate(e);
- }
+ assertThat(chunks)
+ .containsOnlyElementsOf(ImmutableList.of(
+ Pair.of(0, ByteBuffer.wrap(part1)),
+ Pair.of(1, ByteBuffer.wrap(part2))));
}
}
http://git-wip-us.apache.org/repos/asf/james-project/blob/2f7eba12/mailbox/pom.xml
----------------------------------------------------------------------
diff --git a/mailbox/pom.xml b/mailbox/pom.xml
index ffacd09..3a5e5cd 100644
--- a/mailbox/pom.xml
+++ b/mailbox/pom.xml
@@ -106,7 +106,6 @@
<guava.version>18.0</guava.version>
<jackson-databinding.version>2.6.3</jackson-databinding.version>
<cassandra-unit.version>2.1.9.2</cassandra-unit.version>
- <assertj.version>3.2.0</assertj.version>
<logback.version>1.1.7</logback.version>
</properties>
@@ -484,7 +483,7 @@
<dependency>
<groupId>org.assertj</groupId>
<artifactId>assertj-core</artifactId>
- <version>${assertj.version}</version>
+ <version>3.8.0</version>
</dependency>
<!--
END Testing
http://git-wip-us.apache.org/repos/asf/james-project/blob/2f7eba12/mailbox/store/src/test/java/org/apache/james/mailbox/store/search/CombinedComparatorTest.java
----------------------------------------------------------------------
diff --git a/mailbox/store/src/test/java/org/apache/james/mailbox/store/search/CombinedComparatorTest.java b/mailbox/store/src/test/java/org/apache/james/mailbox/store/search/CombinedComparatorTest.java
index 8376687..9277646 100644
--- a/mailbox/store/src/test/java/org/apache/james/mailbox/store/search/CombinedComparatorTest.java
+++ b/mailbox/store/src/test/java/org/apache/james/mailbox/store/search/CombinedComparatorTest.java
@@ -61,84 +61,72 @@ public class CombinedComparatorTest {
}
@Test
- @SuppressWarnings("unchecked")
public void createShouldConvertInternalDate() {
assertThat(CombinedComparator.create(ImmutableList.of(new Sort(SortClause.Arrival))).getComparators())
.containsOnly(InternalDateComparator.INTERNALDATE);
}
@Test
- @SuppressWarnings("unchecked")
public void createShouldConvertCc() {
assertThat(CombinedComparator.create(ImmutableList.of(new Sort(SortClause.MailboxCc))).getComparators())
.containsOnly(HeaderMailboxComparator.CC_COMPARATOR);
}
@Test
- @SuppressWarnings("unchecked")
public void createShouldConvertFrom() {
assertThat(CombinedComparator.create(ImmutableList.of(new Sort(SortClause.MailboxFrom))).getComparators())
.containsOnly(HeaderMailboxComparator.FROM_COMPARATOR);
}
@Test
- @SuppressWarnings("unchecked")
public void createShouldConvertTo() {
assertThat(CombinedComparator.create(ImmutableList.of(new Sort(SortClause.MailboxTo))).getComparators())
.containsOnly(HeaderMailboxComparator.TO_COMPARATOR);
}
@Test
- @SuppressWarnings("unchecked")
public void createShouldConvertSize() {
assertThat(CombinedComparator.create(ImmutableList.of(new Sort(SortClause.Size))).getComparators())
.containsOnly(SizeComparator.SIZE);
}
@Test
- @SuppressWarnings("unchecked")
public void createShouldConvertBaseSubject() {
assertThat(CombinedComparator.create(ImmutableList.of(new Sort(SortClause.BaseSubject))).getComparators())
.containsOnly(BaseSubjectComparator.BASESUBJECT);
}
@Test
- @SuppressWarnings("unchecked")
public void createShouldConvertUid() {
assertThat(CombinedComparator.create(ImmutableList.of(new Sort(SortClause.Uid))).getComparators())
.containsOnly(UidComparator.UID);
}
@Test
- @SuppressWarnings("unchecked")
public void createShouldConvertSentDate() {
assertThat(CombinedComparator.create(ImmutableList.of(new Sort(SortClause.SentDate))).getComparators())
.containsOnly(SentDateComparator.SENTDATE);
}
@Test
- @SuppressWarnings("unchecked")
public void createShouldConvertDisplayTo() {
assertThat(CombinedComparator.create(ImmutableList.of(new Sort(SortClause.DisplayTo))).getComparators())
.containsOnly(HeaderDisplayComparator.TO_COMPARATOR);
}
@Test
- @SuppressWarnings("unchecked")
public void createShouldConvertDisplayFrom() {
assertThat(CombinedComparator.create(ImmutableList.of(new Sort(SortClause.DisplayFrom))).getComparators())
.containsOnly(HeaderDisplayComparator.FROM_COMPARATOR);
}
@Test
- @SuppressWarnings("unchecked")
public void createShouldConvertId() {
assertThat(CombinedComparator.create(ImmutableList.of(new Sort(SortClause.Id))).getComparators())
.containsOnly(MessageIdComparator.MESSAGE_ID_COMPARATOR);
}
@Test
- @SuppressWarnings("unchecked")
public void createShouldReverse() {
assertThat(CombinedComparator.create(ImmutableList.of(new Sort(SortClause.DisplayFrom, Order.REVERSE))).getComparators())
.containsOnly(new ReverseComparator(HeaderDisplayComparator.FROM_COMPARATOR));
http://git-wip-us.apache.org/repos/asf/james-project/blob/2f7eba12/mailet/pom.xml
----------------------------------------------------------------------
diff --git a/mailet/pom.xml b/mailet/pom.xml
index 1106b35..6bc33e4 100644
--- a/mailet/pom.xml
+++ b/mailet/pom.xml
@@ -54,8 +54,6 @@
<maven-reporting-api.version>3.0</maven-reporting-api.version>
<mime4j.version>0.8.1</mime4j.version>
<qdox.version>1.12.1</qdox.version>
- <assertj.version>3.3.0</assertj.version>
- <assertj-guava.version>3.1.0</assertj-guava.version>
<slf4j.version>1.7.25</slf4j.version>
<jackson-data.version>2.6.3</jackson-data.version>
<ical4j.version>2.0.2</ical4j.version>
@@ -186,13 +184,14 @@
<dependency>
<groupId>org.assertj</groupId>
<artifactId>assertj-core</artifactId>
- <version>${assertj.version}</version>
+ <version>3.8.0</version>
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.assertj</groupId>
<artifactId>assertj-guava</artifactId>
- <version>${assertj-guava.version}</version>
+ <version>3.1.0</version>
+ <scope>test</scope>
</dependency>
<dependency>
<groupId>com.thoughtworks.qdox</groupId>
http://git-wip-us.apache.org/repos/asf/james-project/blob/2f7eba12/mpt/pom.xml
----------------------------------------------------------------------
diff --git a/mpt/pom.xml b/mpt/pom.xml
index 38b088f..d17ff93 100644
--- a/mpt/pom.xml
+++ b/mpt/pom.xml
@@ -65,7 +65,6 @@
<log4j.version>1.2.16</log4j.version>
<lucene-core.version>3.6.0</lucene-core.version>
<slf4j.version>1.7.25</slf4j.version>
- <assertj.version>3.2.0</assertj.version>
<logback.version>1.1.7</logback.version>
</properties>
@@ -446,7 +445,7 @@
<dependency>
<groupId>org.assertj</groupId>
<artifactId>assertj-core</artifactId>
- <version>${assertj.version}</version>
+ <version>3.8.0</version>
</dependency>
<dependency>
<groupId>org.jmock</groupId>
http://git-wip-us.apache.org/repos/asf/james-project/blob/2f7eba12/protocols/pom.xml
----------------------------------------------------------------------
diff --git a/protocols/pom.xml b/protocols/pom.xml
index d996f0a..35f4000 100644
--- a/protocols/pom.xml
+++ b/protocols/pom.xml
@@ -59,7 +59,6 @@
<slf4j.version>1.7.25</slf4j.version>
<jsieve.version>0.7</jsieve.version>
<mockito-core.version>1.9.0</mockito-core.version>
- <assertj.version>3.2.0</assertj.version>
</properties>
<dependencyManagement>
@@ -274,7 +273,7 @@
<dependency>
<groupId>org.assertj</groupId>
<artifactId>assertj-core</artifactId>
- <version>${assertj.version}</version>
+ <version>3.8.0</version>
</dependency>
<dependency>
<groupId>org.assertj</groupId>
http://git-wip-us.apache.org/repos/asf/james-project/blob/2f7eba12/server/container/guice/guice-common/src/test/java/org/apache/james/utils/ConfigurablesTest.java
----------------------------------------------------------------------
diff --git a/server/container/guice/guice-common/src/test/java/org/apache/james/utils/ConfigurablesTest.java b/server/container/guice/guice-common/src/test/java/org/apache/james/utils/ConfigurablesTest.java
index 97db32b..d1c9bce 100644
--- a/server/container/guice/guice-common/src/test/java/org/apache/james/utils/ConfigurablesTest.java
+++ b/server/container/guice/guice-common/src/test/java/org/apache/james/utils/ConfigurablesTest.java
@@ -45,7 +45,6 @@ public class ConfigurablesTest {
}
@Test
- @SuppressWarnings("unchecked")
public void configurablesShouldKeepTheAddedElementsOrder() {
sut.add(MyConfigurable.class);
sut.add(MyConfigurable2.class);
http://git-wip-us.apache.org/repos/asf/james-project/blob/2f7eba12/server/pom.xml
----------------------------------------------------------------------
diff --git a/server/pom.xml b/server/pom.xml
index 0ae235f..5bc1db0 100644
--- a/server/pom.xml
+++ b/server/pom.xml
@@ -183,7 +183,6 @@
<jetty.version>9.3.5.v20151012</jetty.version>
<cassandra-unit.version>2.1.9.2</cassandra-unit.version>
<assertj-guava.version>3.1.0</assertj-guava.version>
- <assertj.version>3.3.0</assertj.version>
<testcontainers-version>1.3.1</testcontainers-version>
<guavate.version>1.0.0</guavate.version>
<metrics.version>3.2.1</metrics.version>
@@ -1191,7 +1190,7 @@
<dependency>
<groupId>org.assertj</groupId>
<artifactId>assertj-core</artifactId>
- <version>${assertj.version}</version>
+ <version>3.8.0</version>
</dependency>
<dependency>
<groupId>org.assertj</groupId>
http://git-wip-us.apache.org/repos/asf/james-project/blob/2f7eba12/server/protocols/jmap/src/test/java/org/apache/james/jmap/methods/GetMessagesMethodTest.java
----------------------------------------------------------------------
diff --git a/server/protocols/jmap/src/test/java/org/apache/james/jmap/methods/GetMessagesMethodTest.java b/server/protocols/jmap/src/test/java/org/apache/james/jmap/methods/GetMessagesMethodTest.java
index c8de63a..c403251 100644
--- a/server/protocols/jmap/src/test/java/org/apache/james/jmap/methods/GetMessagesMethodTest.java
+++ b/server/protocols/jmap/src/test/java/org/apache/james/jmap/methods/GetMessagesMethodTest.java
@@ -32,10 +32,10 @@ import java.util.Map;
import java.util.Optional;
import java.util.Set;
import java.util.stream.Collectors;
-import java.util.stream.Stream;
import javax.mail.Flags;
+import com.google.common.collect.ImmutableSet;
import org.apache.commons.lang.NotImplementedException;
import org.apache.james.jmap.model.ClientId;
import org.apache.james.jmap.model.GetMessagesRequest;
@@ -120,7 +120,7 @@ public class GetMessagesMethodTest {
private MailboxPath inboxPath;
private MailboxPath customMailboxPath;
private ClientId clientId;
-
+
@Before
public void setup() throws Exception {
clientId = ClientId.of("#0");
@@ -235,11 +235,9 @@ public class GetMessagesMethodTest {
List<JmapResponse> result = testee.process(request, clientId, session).collect(Collectors.toList());
- assertThat(result).hasSize(1)
- .extracting(JmapResponse::getProperties)
- .flatExtracting(Optional::get)
- .asList()
- .containsOnly(MessageProperty.id);
+ assertThat(result).hasSize(1);
+ assertThat(result.get(0).getProperties())
+ .isEqualTo(Optional.of(ImmutableSet.of(MessageProperty.id)));
}
@Test
@@ -253,12 +251,10 @@ public class GetMessagesMethodTest {
.ids(ImmutableList.of(message1.getMessageId()))
.build();
- Stream<JmapResponse> result = testee.process(request, clientId, session);
- assertThat(result).hasSize(1)
- .extracting(JmapResponse::getProperties)
- .flatExtracting(Optional::get)
- .asList()
- .containsOnlyElementsOf(MessageProperty.allOutputProperties());
+ List<JmapResponse> result = testee.process(request, clientId, session).collect(Collectors.toList());
+ assertThat(result).hasSize(1);
+ assertThat(result.get(0).getProperties())
+ .isEqualTo(Optional.of(MessageProperty.allOutputProperties()));
}
@Test
@@ -276,11 +272,9 @@ public class GetMessagesMethodTest {
Set<MessageProperty> expected = Sets.newHashSet(MessageProperty.id, MessageProperty.subject);
List<JmapResponse> result = testee.process(request, clientId, session).collect(Collectors.toList());
- assertThat(result).hasSize(1)
- .extracting(JmapResponse::getProperties)
- .flatExtracting(Optional::get)
- .asList()
- .containsOnlyElementsOf(expected);
+ assertThat(result).hasSize(1);
+ assertThat(result.get(0).getProperties())
+ .isEqualTo(Optional.of(expected));
}
@Test
@@ -299,11 +293,9 @@ public class GetMessagesMethodTest {
List<JmapResponse> result = testee.process(request, clientId, session).collect(Collectors.toList());
- assertThat(result).hasSize(1)
- .extracting(JmapResponse::getProperties)
- .flatExtracting(Optional::get)
- .asList()
- .containsOnlyElementsOf(expected);
+ assertThat(result).hasSize(1);
+ assertThat(result.get(0).getProperties())
+ .isEqualTo(Optional.of(expected));
}
@Test
@@ -411,12 +403,9 @@ public class GetMessagesMethodTest {
List<JmapResponse> result = testee.process(request, clientId, session).collect(Collectors.toList());
- assertThat(result)
- .hasSize(1)
- .extracting(JmapResponse::getProperties)
- .flatExtracting(Optional::get)
- .asList()
- .containsOnlyElementsOf(expected);
+ assertThat(result).hasSize(1);
+ assertThat(result.get(0).getProperties())
+ .isEqualTo(Optional.of(expected));
}
@Test
---------------------------------------------------------------------
To unsubscribe, e-mail: server-dev-unsubscribe@james.apache.org
For additional commands, e-mail: server-dev-help@james.apache.org
[6/8] james-project git commit: JAMES-2107 fix warning about Logger
API and varargs
Posted by bt...@apache.org.
JAMES-2107 fix warning about Logger API and varargs
Project: http://git-wip-us.apache.org/repos/asf/james-project/repo
Commit: http://git-wip-us.apache.org/repos/asf/james-project/commit/8d35995a
Tree: http://git-wip-us.apache.org/repos/asf/james-project/tree/8d35995a
Diff: http://git-wip-us.apache.org/repos/asf/james-project/diff/8d35995a
Branch: refs/heads/master
Commit: 8d35995a130543d09d424bed715ecefa255cc5c1
Parents: 2f7eba1
Author: Matthieu Baechler <ma...@apache.org>
Authored: Wed Aug 16 16:44:31 2017 +0200
Committer: Matthieu Baechler <ma...@apache.org>
Committed: Thu Aug 17 13:27:29 2017 +0200
----------------------------------------------------------------------
.../org/apache/james/mpt/log/SilentLog.java | 20 ++++++++++----------
.../apache/james/mpt/log/VerboseConsoleLog.java | 20 ++++++++++----------
.../james/imap/decode/parser/MockLogger.java | 20 ++++++++++----------
3 files changed, 30 insertions(+), 30 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/james-project/blob/8d35995a/mpt/core/src/main/java/org/apache/james/mpt/log/SilentLog.java
----------------------------------------------------------------------
diff --git a/mpt/core/src/main/java/org/apache/james/mpt/log/SilentLog.java b/mpt/core/src/main/java/org/apache/james/mpt/log/SilentLog.java
index b4a79b4..fe973c2 100644
--- a/mpt/core/src/main/java/org/apache/james/mpt/log/SilentLog.java
+++ b/mpt/core/src/main/java/org/apache/james/mpt/log/SilentLog.java
@@ -108,7 +108,7 @@ final class SilentLog implements Logger {
public void trace(String format, Object arg1, Object arg2) {
}
- public void trace(String format, Object[] argArray) {
+ public void trace(String format, Object... argArray) {
}
public void trace(String msg, Throwable t) {
@@ -127,7 +127,7 @@ final class SilentLog implements Logger {
public void trace(Marker marker, String format, Object arg1, Object arg2) {
}
- public void trace(Marker marker, String format, Object[] argArray) {
+ public void trace(Marker marker, String format, Object... argArray) {
}
public void trace(Marker marker, String msg, Throwable t) {
@@ -142,7 +142,7 @@ final class SilentLog implements Logger {
public void debug(String format, Object arg1, Object arg2) {
}
- public void debug(String format, Object[] argArray) {
+ public void debug(String format, Object... argArray) {
}
public void debug(String msg, Throwable t) {
@@ -161,7 +161,7 @@ final class SilentLog implements Logger {
public void debug(Marker marker, String format, Object arg1, Object arg2) {
}
- public void debug(Marker marker, String format, Object[] argArray) {
+ public void debug(Marker marker, String format, Object... argArray) {
}
public void debug(Marker marker, String msg, Throwable t) {
@@ -176,7 +176,7 @@ final class SilentLog implements Logger {
public void info(String format, Object arg1, Object arg2) {
}
- public void info(String format, Object[] argArray) {
+ public void info(String format, Object... argArray) {
}
public void info(String msg, Throwable t) {
@@ -195,7 +195,7 @@ final class SilentLog implements Logger {
public void info(Marker marker, String format, Object arg1, Object arg2) {
}
- public void info(Marker marker, String format, Object[] argArray) {
+ public void info(Marker marker, String format, Object... argArray) {
}
public void info(Marker marker, String msg, Throwable t) {
@@ -207,7 +207,7 @@ final class SilentLog implements Logger {
public void warn(String format, Object arg) {
}
- public void warn(String format, Object[] argArray) {
+ public void warn(String format, Object... argArray) {
}
public void warn(String format, Object arg1, Object arg2) {
@@ -229,7 +229,7 @@ final class SilentLog implements Logger {
public void warn(Marker marker, String format, Object arg1, Object arg2) {
}
- public void warn(Marker marker, String format, Object[] argArray) {
+ public void warn(Marker marker, String format, Object... argArray) {
}
public void warn(Marker marker, String msg, Throwable t) {
@@ -244,7 +244,7 @@ final class SilentLog implements Logger {
public void error(String format, Object arg1, Object arg2) {
}
- public void error(String format, Object[] argArray) {
+ public void error(String format, Object... argArray) {
}
public void error(String msg, Throwable t) {
@@ -263,7 +263,7 @@ final class SilentLog implements Logger {
public void error(Marker marker, String format, Object arg1, Object arg2) {
}
- public void error(Marker marker, String format, Object[] argArray) {
+ public void error(Marker marker, String format, Object... argArray) {
}
public void error(Marker marker, String msg, Throwable t) {
http://git-wip-us.apache.org/repos/asf/james-project/blob/8d35995a/mpt/core/src/main/java/org/apache/james/mpt/log/VerboseConsoleLog.java
----------------------------------------------------------------------
diff --git a/mpt/core/src/main/java/org/apache/james/mpt/log/VerboseConsoleLog.java b/mpt/core/src/main/java/org/apache/james/mpt/log/VerboseConsoleLog.java
index f339a3c..b93bf76 100644
--- a/mpt/core/src/main/java/org/apache/james/mpt/log/VerboseConsoleLog.java
+++ b/mpt/core/src/main/java/org/apache/james/mpt/log/VerboseConsoleLog.java
@@ -43,7 +43,7 @@ public class VerboseConsoleLog implements Logger {
SysPrint(format, arg1, arg2);
}
- public void trace(String format, Object[] argArray) {
+ public void trace(String format, Object... argArray) {
SysPrint(format, argArray);
}
@@ -67,7 +67,7 @@ public class VerboseConsoleLog implements Logger {
SysPrint(marker, format, arg1, arg2);
}
- public void trace(Marker marker, String format, Object[] argArray) {
+ public void trace(Marker marker, String format, Object... argArray) {
SysPrint(marker, format, argArray);
}
@@ -91,7 +91,7 @@ public class VerboseConsoleLog implements Logger {
SysPrint(format, arg1, arg2);
}
- public void debug(String format, Object[] argArray) {
+ public void debug(String format, Object... argArray) {
SysPrint(format, argArray);
}
@@ -115,7 +115,7 @@ public class VerboseConsoleLog implements Logger {
SysPrint(marker, format, arg1, arg2);
}
- public void debug(Marker marker, String format, Object[] argArray) {
+ public void debug(Marker marker, String format, Object... argArray) {
SysPrint(marker, format, argArray);
}
@@ -139,7 +139,7 @@ public class VerboseConsoleLog implements Logger {
SysPrint(format, arg1, arg2);
}
- public void info(String format, Object[] argArray) {
+ public void info(String format, Object... argArray) {
SysPrint(format, argArray);
}
@@ -163,7 +163,7 @@ public class VerboseConsoleLog implements Logger {
SysPrint(marker, format, arg1, arg2);
}
- public void info(Marker marker, String format, Object[] argArray) {
+ public void info(Marker marker, String format, Object... argArray) {
SysPrint(marker, format, argArray);
}
@@ -183,7 +183,7 @@ public class VerboseConsoleLog implements Logger {
SysPrint(format, arg);
}
- public void warn(String format, Object[] argArray) {
+ public void warn(String format, Object... argArray) {
SysPrint(format, argArray);
}
@@ -210,7 +210,7 @@ public class VerboseConsoleLog implements Logger {
SysPrint(marker, format, arg1, arg2);
}
- public void warn(Marker marker, String format, Object[] argArray) {
+ public void warn(Marker marker, String format, Object... argArray) {
SysPrint(marker, format, argArray);
}
@@ -234,7 +234,7 @@ public class VerboseConsoleLog implements Logger {
SysPrint(format, arg1, arg2);
}
- public void error(String format, Object[] argArray) {
+ public void error(String format, Object... argArray) {
SysPrint(format, argArray);
}
@@ -258,7 +258,7 @@ public class VerboseConsoleLog implements Logger {
SysPrint(marker, format, arg1, arg2);
}
- public void error(Marker marker, String format, Object[] argArray) {
+ public void error(Marker marker, String format, Object... argArray) {
SysPrint(marker, format, argArray);
}
http://git-wip-us.apache.org/repos/asf/james-project/blob/8d35995a/protocols/imap/src/test/java/org/apache/james/imap/decode/parser/MockLogger.java
----------------------------------------------------------------------
diff --git a/protocols/imap/src/test/java/org/apache/james/imap/decode/parser/MockLogger.java b/protocols/imap/src/test/java/org/apache/james/imap/decode/parser/MockLogger.java
index 716172f..ea9e752 100644
--- a/protocols/imap/src/test/java/org/apache/james/imap/decode/parser/MockLogger.java
+++ b/protocols/imap/src/test/java/org/apache/james/imap/decode/parser/MockLogger.java
@@ -34,7 +34,7 @@ final class MockLogger implements Logger {
public void debug(Marker arg0, String arg1, Object arg2) {
}
- public void debug(Marker arg0, String arg1, Object[] arg2) {
+ public void debug(Marker arg0, String arg1, Object... arg2) {
}
public void debug(Marker arg0, String arg1, Throwable arg2) {
@@ -49,7 +49,7 @@ final class MockLogger implements Logger {
public void debug(String arg0, Object arg1) {
}
- public void debug(String arg0, Object[] arg1) {
+ public void debug(String arg0, Object... arg1) {
}
public void debug(String arg0, Throwable arg1) {
@@ -64,7 +64,7 @@ final class MockLogger implements Logger {
public void error(Marker arg0, String arg1, Object arg2) {
}
- public void error(Marker arg0, String arg1, Object[] arg2) {
+ public void error(Marker arg0, String arg1, Object... arg2) {
}
public void error(Marker arg0, String arg1, Throwable arg2) {
@@ -79,7 +79,7 @@ final class MockLogger implements Logger {
public void error(String arg0, Object arg1) {
}
- public void error(String arg0, Object[] arg1) {
+ public void error(String arg0, Object... arg1) {
}
public void error(String arg0, Throwable arg1) {
@@ -98,7 +98,7 @@ final class MockLogger implements Logger {
public void info(Marker arg0, String arg1, Object arg2) {
}
- public void info(Marker arg0, String arg1, Object[] arg2) {
+ public void info(Marker arg0, String arg1, Object... arg2) {
}
public void info(Marker arg0, String arg1, Throwable arg2) {
@@ -113,7 +113,7 @@ final class MockLogger implements Logger {
public void info(String arg0, Object arg1) {
}
- public void info(String arg0, Object[] arg1) {
+ public void info(String arg0, Object... arg1) {
}
public void info(String arg0, Throwable arg1) {
@@ -168,7 +168,7 @@ final class MockLogger implements Logger {
public void trace(Marker arg0, String arg1, Object arg2) {
}
- public void trace(Marker arg0, String arg1, Object[] arg2) {
+ public void trace(Marker arg0, String arg1, Object... arg2) {
}
public void trace(Marker arg0, String arg1, Throwable arg2) {
@@ -183,7 +183,7 @@ final class MockLogger implements Logger {
public void trace(String arg0, Object arg1) {
}
- public void trace(String arg0, Object[] arg1) {
+ public void trace(String arg0, Object... arg1) {
}
public void trace(String arg0, Throwable arg1) {
@@ -198,7 +198,7 @@ final class MockLogger implements Logger {
public void warn(Marker arg0, String arg1, Object arg2) {
}
- public void warn(Marker arg0, String arg1, Object[] arg2) {
+ public void warn(Marker arg0, String arg1, Object... arg2) {
}
public void warn(Marker arg0, String arg1, Throwable arg2) {
@@ -213,7 +213,7 @@ final class MockLogger implements Logger {
public void warn(String arg0, Object arg1) {
}
- public void warn(String arg0, Object[] arg1) {
+ public void warn(String arg0, Object... arg1) {
}
public void warn(String arg0, Throwable arg1) {
---------------------------------------------------------------------
To unsubscribe, e-mail: server-dev-unsubscribe@james.apache.org
For additional commands, e-mail: server-dev-help@james.apache.org
[2/8] james-project git commit: JAMES-2107 fix assertj deprecations
Posted by bt...@apache.org.
JAMES-2107 fix assertj deprecations
Project: http://git-wip-us.apache.org/repos/asf/james-project/repo
Commit: http://git-wip-us.apache.org/repos/asf/james-project/commit/3bd12ae6
Tree: http://git-wip-us.apache.org/repos/asf/james-project/tree/3bd12ae6
Diff: http://git-wip-us.apache.org/repos/asf/james-project/diff/3bd12ae6
Branch: refs/heads/master
Commit: 3bd12ae60cc5c5d11bf34f2f93409fb2667582e6
Parents: a1b4ac9
Author: Matthieu Baechler <ma...@apache.org>
Authored: Wed Aug 16 15:34:04 2017 +0200
Committer: Matthieu Baechler <ma...@apache.org>
Committed: Thu Aug 17 13:27:12 2017 +0200
----------------------------------------------------------------------
.../mailbox/store/AbstractMailboxManagerAttachmentTest.java | 6 +++---
.../james/mailbox/store/mail/model/impl/MessageParserTest.java | 2 +-
.../apache/james/core/MimeMessageInputStreamSourceTest.java | 4 ++--
3 files changed, 6 insertions(+), 6 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/james-project/blob/3bd12ae6/mailbox/store/src/test/java/org/apache/james/mailbox/store/AbstractMailboxManagerAttachmentTest.java
----------------------------------------------------------------------
diff --git a/mailbox/store/src/test/java/org/apache/james/mailbox/store/AbstractMailboxManagerAttachmentTest.java b/mailbox/store/src/test/java/org/apache/james/mailbox/store/AbstractMailboxManagerAttachmentTest.java
index 4c809fc..899e6f1 100644
--- a/mailbox/store/src/test/java/org/apache/james/mailbox/store/AbstractMailboxManagerAttachmentTest.java
+++ b/mailbox/store/src/test/java/org/apache/james/mailbox/store/AbstractMailboxManagerAttachmentTest.java
@@ -131,7 +131,7 @@ public abstract class AbstractMailboxManagerAttachmentTest {
List<MessageAttachment> attachments = messages.next().getAttachments();
assertThat(attachments).hasSize(1);
assertThat(attachmentMapper.getAttachment(attachments.get(0).getAttachmentId()).getStream())
- .hasContentEqualTo(ClassLoader.getSystemResourceAsStream("eml/gimp.png"));
+ .hasSameContentAs(ClassLoader.getSystemResourceAsStream("eml/gimp.png"));
}
@Test
@@ -154,9 +154,9 @@ public abstract class AbstractMailboxManagerAttachmentTest {
List<MessageAttachment> attachments = messages.next().getAttachments();
assertThat(attachments).hasSize(2);
assertThat(attachmentMapper.getAttachment(attachments.get(0).getAttachmentId()).getStream())
- .hasContentEqualTo(ClassLoader.getSystemResourceAsStream("eml/4037_014.jpg"));
+ .hasSameContentAs(ClassLoader.getSystemResourceAsStream("eml/4037_014.jpg"));
assertThat(attachmentMapper.getAttachment(attachments.get(1).getAttachmentId()).getStream())
- .hasContentEqualTo(ClassLoader.getSystemResourceAsStream("eml/4037_015.jpg"));
+ .hasSameContentAs(ClassLoader.getSystemResourceAsStream("eml/4037_015.jpg"));
}
@Test
http://git-wip-us.apache.org/repos/asf/james-project/blob/3bd12ae6/mailbox/store/src/test/java/org/apache/james/mailbox/store/mail/model/impl/MessageParserTest.java
----------------------------------------------------------------------
diff --git a/mailbox/store/src/test/java/org/apache/james/mailbox/store/mail/model/impl/MessageParserTest.java b/mailbox/store/src/test/java/org/apache/james/mailbox/store/mail/model/impl/MessageParserTest.java
index ceb3df9..cc2b8ce 100644
--- a/mailbox/store/src/test/java/org/apache/james/mailbox/store/mail/model/impl/MessageParserTest.java
+++ b/mailbox/store/src/test/java/org/apache/james/mailbox/store/mail/model/impl/MessageParserTest.java
@@ -138,7 +138,7 @@ public class MessageParserTest {
List<MessageAttachment> attachments = testee.retrieveAttachments(ClassLoader.getSystemResourceAsStream("eml/oneAttachmentAndSomeTextInlined.eml"));
Attachment attachment = attachments.get(0).getAttachment();
- assertThat(attachment.getStream()).hasContentEqualTo(ClassLoader.getSystemResourceAsStream("eml/gimp.png"));
+ assertThat(attachment.getStream()).hasSameContentAs(ClassLoader.getSystemResourceAsStream("eml/gimp.png"));
}
@Test
http://git-wip-us.apache.org/repos/asf/james-project/blob/3bd12ae6/server/container/core/src/test/java/org/apache/james/core/MimeMessageInputStreamSourceTest.java
----------------------------------------------------------------------
diff --git a/server/container/core/src/test/java/org/apache/james/core/MimeMessageInputStreamSourceTest.java b/server/container/core/src/test/java/org/apache/james/core/MimeMessageInputStreamSourceTest.java
index a6f18cb..c62f107 100644
--- a/server/container/core/src/test/java/org/apache/james/core/MimeMessageInputStreamSourceTest.java
+++ b/server/container/core/src/test/java/org/apache/james/core/MimeMessageInputStreamSourceTest.java
@@ -42,13 +42,13 @@ public class MimeMessageInputStreamSourceTest {
@Test
public void streamWith1MBytesShouldBeReadable() throws MessagingException, IOException {
testee = new MimeMessageInputStreamSource("myKey", new ZeroedInputStream(_1M));
- assertThat(testee.getInputStream()).hasContentEqualTo(new ZeroedInputStream(_1M));
+ assertThat(testee.getInputStream()).hasSameContentAs(new ZeroedInputStream(_1M));
}
@Test
public void streamWith10KBytesShouldBeReadable() throws MessagingException, IOException {
testee = new MimeMessageInputStreamSource("myKey", new ZeroedInputStream(_10KB));
- assertThat(testee.getInputStream()).hasContentEqualTo(new ZeroedInputStream(_10KB));
+ assertThat(testee.getInputStream()).hasSameContentAs(new ZeroedInputStream(_10KB));
}
@Test
---------------------------------------------------------------------
To unsubscribe, e-mail: server-dev-unsubscribe@james.apache.org
For additional commands, e-mail: server-dev-help@james.apache.org
[4/8] james-project git commit: JAMES-2107 fix Camel deprecations
Posted by bt...@apache.org.
JAMES-2107 fix Camel deprecations
Project: http://git-wip-us.apache.org/repos/asf/james-project/repo
Commit: http://git-wip-us.apache.org/repos/asf/james-project/commit/b87f9fcb
Tree: http://git-wip-us.apache.org/repos/asf/james-project/tree/b87f9fcb
Diff: http://git-wip-us.apache.org/repos/asf/james-project/diff/b87f9fcb
Branch: refs/heads/master
Commit: b87f9fcb68d9e6a77dfcce36dffadc42c8175a1f
Parents: 3bd12ae
Author: Matthieu Baechler <ma...@apache.org>
Authored: Wed Aug 16 15:36:11 2017 +0200
Committer: Matthieu Baechler <ma...@apache.org>
Committed: Thu Aug 17 13:27:12 2017 +0200
----------------------------------------------------------------------
.../mailetcontainer/impl/camel/MatcherSplitter.java | 12 ++++++------
1 file changed, 6 insertions(+), 6 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/james-project/blob/b87f9fcb/server/mailet/mailetcontainer-camel/src/main/java/org/apache/james/mailetcontainer/impl/camel/MatcherSplitter.java
----------------------------------------------------------------------
diff --git a/server/mailet/mailetcontainer-camel/src/main/java/org/apache/james/mailetcontainer/impl/camel/MatcherSplitter.java b/server/mailet/mailetcontainer-camel/src/main/java/org/apache/james/mailetcontainer/impl/camel/MatcherSplitter.java
index 77c3dcd..2b34c4e 100644
--- a/server/mailet/mailetcontainer-camel/src/main/java/org/apache/james/mailetcontainer/impl/camel/MatcherSplitter.java
+++ b/server/mailet/mailetcontainer-camel/src/main/java/org/apache/james/mailetcontainer/impl/camel/MatcherSplitter.java
@@ -27,9 +27,9 @@ import java.util.Locale;
import javax.mail.MessagingException;
import org.apache.camel.Body;
+import org.apache.camel.ExchangeProperty;
import org.apache.camel.Handler;
import org.apache.camel.InOnly;
-import org.apache.camel.Property;
import org.apache.james.core.MailImpl;
import org.apache.james.mailetcontainer.impl.ProcessorUtil;
import org.apache.james.mailetcontainer.lib.AbstractStateMailetProcessor.MailetProcessorListener;
@@ -74,11 +74,11 @@ public class MatcherSplitter {
* @throws MessagingException
*/
@Handler
- public List<Mail> split(@Property(MATCHER_PROPERTY) Matcher matcher,
- @Property(ON_MATCH_EXCEPTION_PROPERTY) String onMatchException,
- @Property(LOGGER_PROPERTY) Logger logger,
- @Property(MAILETCONTAINER_PROPERTY) CamelMailetProcessor container,
- @Property(METRIC_FACTORY) MetricFactory metricFactory,
+ public List<Mail> split(@ExchangeProperty(MATCHER_PROPERTY) Matcher matcher,
+ @ExchangeProperty(ON_MATCH_EXCEPTION_PROPERTY) String onMatchException,
+ @ExchangeProperty(LOGGER_PROPERTY) Logger logger,
+ @ExchangeProperty(MAILETCONTAINER_PROPERTY) CamelMailetProcessor container,
+ @ExchangeProperty(METRIC_FACTORY) MetricFactory metricFactory,
@Body Mail mail) throws MessagingException {
Collection<MailAddress> matchedRcpts = null;
Collection<MailAddress> origRcpts = new ArrayList<>(mail.getRecipients());
---------------------------------------------------------------------
To unsubscribe, e-mail: server-dev-unsubscribe@james.apache.org
For additional commands, e-mail: server-dev-help@james.apache.org
[7/8] james-project git commit: JAMES-2107 finally remove usage of
com.sun.* packages
Posted by bt...@apache.org.
JAMES-2107 finally remove usage of com.sun.* packages
Project: http://git-wip-us.apache.org/repos/asf/james-project/repo
Commit: http://git-wip-us.apache.org/repos/asf/james-project/commit/e71db878
Tree: http://git-wip-us.apache.org/repos/asf/james-project/tree/e71db878
Diff: http://git-wip-us.apache.org/repos/asf/james-project/diff/e71db878
Branch: refs/heads/master
Commit: e71db87813c6d05a55b6943ffc02590dde15f2cd
Parents: 8d35995
Author: Matthieu Baechler <ma...@apache.org>
Authored: Wed Aug 16 17:52:34 2017 +0200
Committer: benwa <bt...@linagora.com>
Committed: Fri Aug 18 09:47:47 2017 +0700
----------------------------------------------------------------------
server/container/core/pom.xml | 5 +++
server/container/filesystem-api/pom.xml | 5 +++
.../filesystem/api/AbstractFileSystemTest.java | 38 ++++++--------------
server/container/spring/pom.xml | 7 +++-
server/pom.xml | 12 ++++++-
.../integration/cucumber/UploadStepdefs.java | 12 ++++++-
server/protocols/webadmin/webadmin-core/pom.xml | 1 -
7 files changed, 48 insertions(+), 32 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/james-project/blob/e71db878/server/container/core/pom.xml
----------------------------------------------------------------------
diff --git a/server/container/core/pom.xml b/server/container/core/pom.xml
index a0b315e..636a30b 100644
--- a/server/container/core/pom.xml
+++ b/server/container/core/pom.xml
@@ -66,6 +66,11 @@
<artifactId>guava</artifactId>
</dependency>
<dependency>
+ <groupId>com.sparkjava</groupId>
+ <artifactId>spark-core</artifactId>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
<groupId>commons-io</groupId>
<artifactId>commons-io</artifactId>
</dependency>
http://git-wip-us.apache.org/repos/asf/james-project/blob/e71db878/server/container/filesystem-api/pom.xml
----------------------------------------------------------------------
diff --git a/server/container/filesystem-api/pom.xml b/server/container/filesystem-api/pom.xml
index 9d69a2f..528d51c 100644
--- a/server/container/filesystem-api/pom.xml
+++ b/server/container/filesystem-api/pom.xml
@@ -34,6 +34,11 @@
<dependencies>
<dependency>
+ <groupId>com.sparkjava</groupId>
+ <artifactId>spark-core</artifactId>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
<groupId>commons-io</groupId>
<artifactId>commons-io</artifactId>
</dependency>
http://git-wip-us.apache.org/repos/asf/james-project/blob/e71db878/server/container/filesystem-api/src/test/java/org/apache/james/filesystem/api/AbstractFileSystemTest.java
----------------------------------------------------------------------
diff --git a/server/container/filesystem-api/src/test/java/org/apache/james/filesystem/api/AbstractFileSystemTest.java b/server/container/filesystem-api/src/test/java/org/apache/james/filesystem/api/AbstractFileSystemTest.java
index fe8e274..5dc5cf4 100644
--- a/server/container/filesystem-api/src/test/java/org/apache/james/filesystem/api/AbstractFileSystemTest.java
+++ b/server/container/filesystem-api/src/test/java/org/apache/james/filesystem/api/AbstractFileSystemTest.java
@@ -25,8 +25,6 @@ import java.io.File;
import java.io.FileNotFoundException;
import java.io.IOException;
import java.io.InputStream;
-import java.io.OutputStream;
-import java.net.InetSocketAddress;
import org.apache.commons.io.Charsets;
import org.apache.commons.io.FileUtils;
@@ -38,15 +36,15 @@ import org.junit.Test;
import org.junit.rules.TemporaryFolder;
import org.junit.runner.RunWith;
-import com.sun.net.httpserver.HttpExchange;
-import com.sun.net.httpserver.HttpHandler;
-import com.sun.net.httpserver.HttpServer;
-
import junitparams.JUnitParamsRunner;
import junitparams.Parameters;
+import spark.Request;
+import spark.Response;
+import spark.Service;
@RunWith(JUnitParamsRunner.class)
public abstract class AbstractFileSystemTest {
+ private static final int RANDOM_PORT = 0;
private static final String FAKE_DIRECTORY = "b7b73e3a-5234-11e5-87f2-9b171f273b49/";
private static final String FAKE_FILE = "d9091ae6-521f-11e5-b666-bb11fef67c2a";
private static final String EXISTING_CLASSPATH_FILE = "classpathTest.txt";
@@ -56,16 +54,16 @@ public abstract class AbstractFileSystemTest {
protected FileSystem fileSystem;
- private HttpServer httpServer;
+ private Service httpServer;
private File rootDirectory;
protected abstract FileSystem buildFileSystem(String configurationRootDirectory);
@Before
public void setUp() throws Exception {
- httpServer = HttpServer.create(new InetSocketAddress("localhost", 0), 0);
- httpServer.createContext("/", new SlashHandler());
- httpServer.start();
+ httpServer = Service.ignite().port(RANDOM_PORT);
+ httpServer.get("/", (Request request, Response response) -> "content");
+ httpServer.awaitInitialization();
rootDirectory = tmpFolder.getRoot();
createSubFolderWithAFileIn("conf", "conf.txt", "confcontent");
@@ -83,23 +81,7 @@ public abstract class AbstractFileSystemTest {
@After
public void tearDown() throws Exception {
- httpServer.stop(0);
- }
-
- private static class SlashHandler implements HttpHandler {
-
- @Override
- public void handle(HttpExchange exchange) throws IOException {
- if (exchange.getRequestURI().getPath().equals("/")) {
- String response = "content";
- exchange.sendResponseHeaders(200, response.length());
- OutputStream responseBody = exchange.getResponseBody();
- responseBody.write(response.getBytes());
- responseBody.close();
- } else {
- exchange.sendResponseHeaders(404, 0);
- }
- }
+ httpServer.stop();
}
@Test
@@ -213,7 +195,7 @@ public abstract class AbstractFileSystemTest {
}
private String replacePort(String url) {
- return url.replace("$PORT$", String.valueOf(httpServer.getAddress().getPort()));
+ return url.replace("$PORT$", String.valueOf(httpServer.port()));
}
public static class FileToCreateProvider {
http://git-wip-us.apache.org/repos/asf/james-project/blob/e71db878/server/container/spring/pom.xml
----------------------------------------------------------------------
diff --git a/server/container/spring/pom.xml b/server/container/spring/pom.xml
index 1be665a..995b481 100644
--- a/server/container/spring/pom.xml
+++ b/server/container/spring/pom.xml
@@ -143,10 +143,15 @@
</dependency>
<dependency>
<groupId>javax.servlet</groupId>
- <artifactId>servlet-api</artifactId>
+ <artifactId>javax.servlet-api</artifactId>
<scope>provided</scope>
</dependency>
<dependency>
+ <groupId>com.sparkjava</groupId>
+ <artifactId>spark-core</artifactId>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
<groupId>commons-configuration</groupId>
<artifactId>commons-configuration</artifactId>
</dependency>
http://git-wip-us.apache.org/repos/asf/james-project/blob/e71db878/server/pom.xml
----------------------------------------------------------------------
diff --git a/server/pom.xml b/server/pom.xml
index 5bc1db0..f4d8df4 100644
--- a/server/pom.xml
+++ b/server/pom.xml
@@ -180,7 +180,7 @@
<pax-logging-api.version>1.6.4</pax-logging-api.version>
<mockito-core.version>1.9.0</mockito-core.version>
<jackson-data.version>2.6.3</jackson-data.version>
- <jetty.version>9.3.5.v20151012</jetty.version>
+ <jetty.version>9.4.4.v20170414</jetty.version>
<cassandra-unit.version>2.1.9.2</cassandra-unit.version>
<assertj-guava.version>3.1.0</assertj-guava.version>
<testcontainers-version>1.3.1</testcontainers-version>
@@ -1096,6 +1096,11 @@
<version>${servlet-api.version}</version>
</dependency>
<dependency>
+ <groupId>javax.servlet</groupId>
+ <artifactId>javax.servlet-api</artifactId>
+ <version>3.1.0</version>
+ </dependency>
+ <dependency>
<groupId>commons-pool</groupId>
<artifactId>commons-pool</artifactId>
<version>${commons-pool.version}</version>
@@ -1630,6 +1635,11 @@
<version>2.6.0</version>
</dependency>
<dependency>
+ <groupId>com.sparkjava</groupId>
+ <artifactId>spark-core</artifactId>
+ <version>2.6.0</version>
+ </dependency>
+ <dependency>
<groupId>io.jsonwebtoken</groupId>
<artifactId>jjwt</artifactId>
<version>0.6.0</version>
http://git-wip-us.apache.org/repos/asf/james-project/blob/e71db878/server/protocols/jmap-integration-testing/jmap-integration-testing-common/src/test/java/org/apache/james/jmap/methods/integration/cucumber/UploadStepdefs.java
----------------------------------------------------------------------
diff --git a/server/protocols/jmap-integration-testing/jmap-integration-testing-common/src/test/java/org/apache/james/jmap/methods/integration/cucumber/UploadStepdefs.java b/server/protocols/jmap-integration-testing/jmap-integration-testing-common/src/test/java/org/apache/james/jmap/methods/integration/cucumber/UploadStepdefs.java
index 4c7d8a5..9ab258b 100644
--- a/server/protocols/jmap-integration-testing/jmap-integration-testing-common/src/test/java/org/apache/james/jmap/methods/integration/cucumber/UploadStepdefs.java
+++ b/server/protocols/jmap-integration-testing/jmap-integration-testing-common/src/test/java/org/apache/james/jmap/methods/integration/cucumber/UploadStepdefs.java
@@ -24,11 +24,13 @@ import static org.assertj.core.api.Assertions.assertThat;
import java.io.BufferedInputStream;
import java.net.URI;
import java.net.URISyntaxException;
+import java.util.Locale;
import java.util.concurrent.CountDownLatch;
import java.util.concurrent.Future;
import javax.inject.Inject;
+import com.google.common.base.CharMatcher;
import org.apache.http.Header;
import org.apache.http.HttpResponse;
import org.apache.http.client.fluent.Async;
@@ -175,13 +177,21 @@ public class UploadStepdefs {
@Then("^the user should receive a specified JSON content$")
public void jsonResponse() throws Exception {
- assertThat(response.getHeaders("Content-Type")).extracting(Header::getValue).containsExactly(org.apache.http.entity.ContentType.APPLICATION_JSON.toString());
+ assertThat(response.getHeaders("Content-Type"))
+ .extracting(header ->
+ normalizeContentType(header.getValue()))
+ .containsExactly(
+ normalizeContentType(org.apache.http.entity.ContentType.APPLICATION_JSON.toString()));
DocumentContext jsonPath = JsonPath.parse(response.getEntity().getContent());
assertThat(jsonPath.<String>read("blobId")).isEqualTo(_1M_ZEROED_FILE_BLOB_ID);
assertThat(jsonPath.<String>read("type")).isEqualTo("application/octet-stream");
assertThat(jsonPath.<Integer>read("size")).isEqualTo(_1M);
}
+ private String normalizeContentType(String input) {
+ return CharMatcher.WHITESPACE.removeFrom(input.toLowerCase(Locale.US));
+ }
+
@Then("^\"([^\"]*)\" should be able to retrieve the content$")
public void contentShouldBeRetrievable(String username) throws Exception {
AccessToken accessToken = userStepdefs.tokenByUser.get(username);
http://git-wip-us.apache.org/repos/asf/james-project/blob/e71db878/server/protocols/webadmin/webadmin-core/pom.xml
----------------------------------------------------------------------
diff --git a/server/protocols/webadmin/webadmin-core/pom.xml b/server/protocols/webadmin/webadmin-core/pom.xml
index 4537708..80a9c7f 100644
--- a/server/protocols/webadmin/webadmin-core/pom.xml
+++ b/server/protocols/webadmin/webadmin-core/pom.xml
@@ -73,7 +73,6 @@
<dependency>
<groupId>com.sparkjava</groupId>
<artifactId>spark-core</artifactId>
- <version>2.5.5</version>
</dependency>
<dependency>
<groupId>io.swagger</groupId>
---------------------------------------------------------------------
To unsubscribe, e-mail: server-dev-unsubscribe@james.apache.org
For additional commands, e-mail: server-dev-help@james.apache.org