Repository: james-project Updated Branches: refs/heads/master e71a7cd5a -> 3dd21e359
MAILBOX-266 Fixing compilation warnings related to deprecated usages of guava Project: http://git-wip-us.apache.org/repos/asf/james-project/repo Commit: http://git-wip-us.apache.org/repos/asf/james-project/commit/3dd21e35 Tree: http://git-wip-us.apache.org/repos/asf/james-project/tree/3dd21e35 Diff: http://git-wip-us.apache.org/repos/asf/james-project/diff/3dd21e35 Branch: refs/heads/master Commit: 3dd21e359fd5d6ce20b86b50ba2a862a7f23434a Parents: e71a7cd Author: Fabien Vignon <[email protected]> Authored: Thu Apr 14 11:38:12 2016 +0200 Committer: Matthieu Baechler <[email protected]> Committed: Tue Apr 19 16:31:08 2016 +0200 ---------------------------------------------------------------------- .../org/apache/james/karaf/features/KarafLiveTestSupport.java | 2 +- .../src/main/java/org/apache/james/jmap/model/MessageId.java | 5 +++-- 2 files changed, 4 insertions(+), 3 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/james-project/blob/3dd21e35/server/karaf/integration/src/test/java/org/apache/james/karaf/features/KarafLiveTestSupport.java ---------------------------------------------------------------------- diff --git a/server/karaf/integration/src/test/java/org/apache/james/karaf/features/KarafLiveTestSupport.java b/server/karaf/integration/src/test/java/org/apache/james/karaf/features/KarafLiveTestSupport.java index c9f4715..79682b4 100644 --- a/server/karaf/integration/src/test/java/org/apache/james/karaf/features/KarafLiveTestSupport.java +++ b/server/karaf/integration/src/test/java/org/apache/james/karaf/features/KarafLiveTestSupport.java @@ -120,7 +120,7 @@ public class KarafLiveTestSupport { final ServiceTracker tracker = new ServiceTracker(bundleContext, clazz, null); tracker.open(true); try { - final Stopwatch stopwatch = new Stopwatch().start(); + final Stopwatch stopwatch = Stopwatch.createStarted(); final int expectedCount = 1; while (true) { http://git-wip-us.apache.org/repos/asf/james-project/blob/3dd21e35/server/protocols/jmap/src/main/java/org/apache/james/jmap/model/MessageId.java ---------------------------------------------------------------------- diff --git a/server/protocols/jmap/src/main/java/org/apache/james/jmap/model/MessageId.java b/server/protocols/jmap/src/main/java/org/apache/james/jmap/model/MessageId.java index 1a93291..40e00f9 100644 --- a/server/protocols/jmap/src/main/java/org/apache/james/jmap/model/MessageId.java +++ b/server/protocols/jmap/src/main/java/org/apache/james/jmap/model/MessageId.java @@ -29,6 +29,7 @@ import com.fasterxml.jackson.annotation.JsonCreator; import com.fasterxml.jackson.annotation.JsonValue; import com.google.common.annotations.VisibleForTesting; import com.google.common.base.Joiner; +import com.google.common.base.MoreObjects; import com.google.common.base.Splitter; public class MessageId { @@ -93,8 +94,8 @@ public class MessageId { @Override public String toString() { - return com.google.common.base.Objects - .toStringHelper(getClass()) + return MoreObjects + .toStringHelper(this) .add("username", username) .add("mailboxPath", mailboxPath) .add("uid", uid) --------------------------------------------------------------------- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
