You are viewing a plain text version of this content. The canonical link for it is here.
Posted to server-dev@james.apache.org by bt...@apache.org on 2019/03/12 03:19:52 UTC

[james-project] 14/15: JAMES-2666 solve group deserialization issue with event dead letters routes

This is an automated email from the ASF dual-hosted git repository.

btellier pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/james-project.git

commit 2fcc843e29f182d0a0977addb61939b80504f811
Author: Rene Cordier <rc...@linagora.com>
AuthorDate: Fri Mar 8 17:58:03 2019 +0700

    JAMES-2666 solve group deserialization issue with event dead letters routes
---
 .../api/src/test/java/org/apache/james/mailbox/util/EventCollector.java | 2 +-
 .../apache/james/mailbox/caching/CacheInvalidatingMailboxListener.java  | 2 +-
 .../apache/james/mailbox/cassandra/MailboxOperationLoggingListener.java | 2 +-
 .../elasticsearch/events/ElasticSearchListeningMessageSearchIndex.java  | 2 +-
 .../mailbox/quota/mailing/listeners/QuotaThresholdCrossingListener.java | 2 +-
 .../search/elasticsearch/events/ElasticSearchQuotaMailboxListener.java  | 2 +-
 .../org/apache/james/mailbox/spamassassin/SpamAssassinListener.java     | 2 +-
 .../org/apache/james/mailbox/store/event/MailboxAnnotationListener.java | 2 +-
 .../apache/james/mailbox/store/quota/ListeningCurrentQuotaUpdater.java  | 2 +-
 .../org/apache/james/mailbox/store/search/LazyMessageSearchIndex.java   | 2 +-
 .../test/java/org/apache/james/modules/mailbox/NoopMailboxListener.java | 2 +-
 .../java/org/apache/james/jmap/event/PropagateLookupRightListener.java  | 2 +-
 12 files changed, 12 insertions(+), 12 deletions(-)

diff --git a/mailbox/api/src/test/java/org/apache/james/mailbox/util/EventCollector.java b/mailbox/api/src/test/java/org/apache/james/mailbox/util/EventCollector.java
index 392cc95..58908c4 100644
--- a/mailbox/api/src/test/java/org/apache/james/mailbox/util/EventCollector.java
+++ b/mailbox/api/src/test/java/org/apache/james/mailbox/util/EventCollector.java
@@ -27,7 +27,7 @@ import org.apache.james.mailbox.events.Group;
 import org.apache.james.mailbox.events.MailboxListener;
 
 public class EventCollector implements MailboxListener.GroupMailboxListener {
-    private static class EventCollectorGroup extends Group {}
+    public static class EventCollectorGroup extends Group {}
 
     private static final Group GROUP = new EventCollectorGroup();
 
diff --git a/mailbox/caching/src/main/java/org/apache/james/mailbox/caching/CacheInvalidatingMailboxListener.java b/mailbox/caching/src/main/java/org/apache/james/mailbox/caching/CacheInvalidatingMailboxListener.java
index 7e39cc0..d911604 100644
--- a/mailbox/caching/src/main/java/org/apache/james/mailbox/caching/CacheInvalidatingMailboxListener.java
+++ b/mailbox/caching/src/main/java/org/apache/james/mailbox/caching/CacheInvalidatingMailboxListener.java
@@ -13,7 +13,7 @@ import org.slf4j.LoggerFactory;
  *
  */
 public class CacheInvalidatingMailboxListener implements MailboxListener.GroupMailboxListener {
-    private static class CacheInvalidatingMailboxListenerGroup extends Group {}
+    public static class CacheInvalidatingMailboxListenerGroup extends Group {}
 
     private static final Logger LOGGER = LoggerFactory.getLogger(CacheInvalidatingMailboxListener.class);
     private static final Group GROUP = new CacheInvalidatingMailboxListenerGroup();
diff --git a/mailbox/cassandra/src/main/java/org/apache/james/mailbox/cassandra/MailboxOperationLoggingListener.java b/mailbox/cassandra/src/main/java/org/apache/james/mailbox/cassandra/MailboxOperationLoggingListener.java
index 26537a3..7e98f07 100644
--- a/mailbox/cassandra/src/main/java/org/apache/james/mailbox/cassandra/MailboxOperationLoggingListener.java
+++ b/mailbox/cassandra/src/main/java/org/apache/james/mailbox/cassandra/MailboxOperationLoggingListener.java
@@ -33,7 +33,7 @@ import org.apache.james.mailbox.events.MailboxListener;
  * This class logs mailboxes writes in order to give context to analyse ghost mailbox bug.
  */
 public class MailboxOperationLoggingListener implements MailboxListener.GroupMailboxListener {
-    private static class MailboxOperationLoggingListenerGroup extends Group {}
+    public static class MailboxOperationLoggingListenerGroup extends Group {}
 
     public static final String ADDED = "Added";
     public static final String REMOVED = "Removed";
diff --git a/mailbox/elasticsearch/src/main/java/org/apache/james/mailbox/elasticsearch/events/ElasticSearchListeningMessageSearchIndex.java b/mailbox/elasticsearch/src/main/java/org/apache/james/mailbox/elasticsearch/events/ElasticSearchListeningMessageSearchIndex.java
index f0df750..9b7e29d 100644
--- a/mailbox/elasticsearch/src/main/java/org/apache/james/mailbox/elasticsearch/events/ElasticSearchListeningMessageSearchIndex.java
+++ b/mailbox/elasticsearch/src/main/java/org/apache/james/mailbox/elasticsearch/events/ElasticSearchListeningMessageSearchIndex.java
@@ -60,7 +60,7 @@ import com.google.common.base.Preconditions;
 import com.google.common.collect.ImmutableList;
 
 public class ElasticSearchListeningMessageSearchIndex extends ListeningMessageSearchIndex {
-    private static class ElasticSearchListeningMessageSearchIndexGroup extends Group {}
+    public static class ElasticSearchListeningMessageSearchIndexGroup extends Group {}
 
     private static final Logger LOGGER = LoggerFactory.getLogger(ElasticSearchListeningMessageSearchIndex.class);
     private static final String ID_SEPARATOR = ":";
diff --git a/mailbox/plugin/quota-mailing/src/main/java/org/apache/james/mailbox/quota/mailing/listeners/QuotaThresholdCrossingListener.java b/mailbox/plugin/quota-mailing/src/main/java/org/apache/james/mailbox/quota/mailing/listeners/QuotaThresholdCrossingListener.java
index c19e834..aa8adc6 100644
--- a/mailbox/plugin/quota-mailing/src/main/java/org/apache/james/mailbox/quota/mailing/listeners/QuotaThresholdCrossingListener.java
+++ b/mailbox/plugin/quota-mailing/src/main/java/org/apache/james/mailbox/quota/mailing/listeners/QuotaThresholdCrossingListener.java
@@ -41,7 +41,7 @@ import org.apache.mailet.MailetContext;
 import com.google.common.collect.ImmutableSet;
 
 public class QuotaThresholdCrossingListener implements MailboxListener.GroupMailboxListener {
-    private static class QuotaThresholdCrossingListenerGroup extends Group {}
+    public static class QuotaThresholdCrossingListenerGroup extends Group {}
 
     private static final Group GROUP = new QuotaThresholdCrossingListenerGroup();
 
diff --git a/mailbox/plugin/quota-search-elasticsearch/src/main/java/org/apache/james/quota/search/elasticsearch/events/ElasticSearchQuotaMailboxListener.java b/mailbox/plugin/quota-search-elasticsearch/src/main/java/org/apache/james/quota/search/elasticsearch/events/ElasticSearchQuotaMailboxListener.java
index 0f167a3..d58ca2e 100644
--- a/mailbox/plugin/quota-search-elasticsearch/src/main/java/org/apache/james/quota/search/elasticsearch/events/ElasticSearchQuotaMailboxListener.java
+++ b/mailbox/plugin/quota-search-elasticsearch/src/main/java/org/apache/james/quota/search/elasticsearch/events/ElasticSearchQuotaMailboxListener.java
@@ -32,7 +32,7 @@ import org.apache.james.quota.search.elasticsearch.json.QuotaRatioToElasticSearc
 import com.fasterxml.jackson.core.JsonProcessingException;
 
 public class ElasticSearchQuotaMailboxListener implements MailboxListener.GroupMailboxListener {
-    private static class ElasticSearchQuotaMailboxListenerGroup extends Group {}
+    public static class ElasticSearchQuotaMailboxListenerGroup extends Group {}
 
     private static final Group GROUP = new ElasticSearchQuotaMailboxListenerGroup();
 
diff --git a/mailbox/plugin/spamassassin/src/main/java/org/apache/james/mailbox/spamassassin/SpamAssassinListener.java b/mailbox/plugin/spamassassin/src/main/java/org/apache/james/mailbox/spamassassin/SpamAssassinListener.java
index b50ecba..78bddc9 100644
--- a/mailbox/plugin/spamassassin/src/main/java/org/apache/james/mailbox/spamassassin/SpamAssassinListener.java
+++ b/mailbox/plugin/spamassassin/src/main/java/org/apache/james/mailbox/spamassassin/SpamAssassinListener.java
@@ -50,7 +50,7 @@ import com.google.common.annotations.VisibleForTesting;
 import com.google.common.collect.ImmutableList;
 
 public class SpamAssassinListener implements SpamEventListener {
-    private static class SpamAssassinListenerGroup extends Group {}
+    public static class SpamAssassinListenerGroup extends Group {}
 
     private static final Logger LOGGER = LoggerFactory.getLogger(SpamAssassinListener.class);
     private static final int LIMIT = 1;
diff --git a/mailbox/store/src/main/java/org/apache/james/mailbox/store/event/MailboxAnnotationListener.java b/mailbox/store/src/main/java/org/apache/james/mailbox/store/event/MailboxAnnotationListener.java
index 1b38e37..4fa8696 100644
--- a/mailbox/store/src/main/java/org/apache/james/mailbox/store/event/MailboxAnnotationListener.java
+++ b/mailbox/store/src/main/java/org/apache/james/mailbox/store/event/MailboxAnnotationListener.java
@@ -34,7 +34,7 @@ import org.apache.james.mailbox.store.SessionProvider;
 import org.apache.james.mailbox.store.mail.AnnotationMapper;
 
 public class MailboxAnnotationListener implements MailboxListener.GroupMailboxListener {
-    private static final class MailboxAnnotationListenerGroup extends Group {}
+    public static final class MailboxAnnotationListenerGroup extends Group {}
 
     private static final Group GROUP = new MailboxAnnotationListenerGroup();
 
diff --git a/mailbox/store/src/main/java/org/apache/james/mailbox/store/quota/ListeningCurrentQuotaUpdater.java b/mailbox/store/src/main/java/org/apache/james/mailbox/store/quota/ListeningCurrentQuotaUpdater.java
index 79bb030..8196958 100644
--- a/mailbox/store/src/main/java/org/apache/james/mailbox/store/quota/ListeningCurrentQuotaUpdater.java
+++ b/mailbox/store/src/main/java/org/apache/james/mailbox/store/quota/ListeningCurrentQuotaUpdater.java
@@ -36,7 +36,7 @@ import org.apache.james.mailbox.store.event.EventFactory;
 import com.google.common.collect.ImmutableSet;
 
 public class ListeningCurrentQuotaUpdater implements MailboxListener.GroupMailboxListener, QuotaUpdater {
-    private static class ListeningCurrentQuotaUpdaterGroup extends Group {}
+    public static class ListeningCurrentQuotaUpdaterGroup extends Group {}
 
     public static final Group GROUP = new ListeningCurrentQuotaUpdaterGroup();
     private static final ImmutableSet<RegistrationKey> NO_REGISTRATION_KEYS = ImmutableSet.of();
diff --git a/mailbox/store/src/main/java/org/apache/james/mailbox/store/search/LazyMessageSearchIndex.java b/mailbox/store/src/main/java/org/apache/james/mailbox/store/search/LazyMessageSearchIndex.java
index 8ab47bf..0567fb9 100644
--- a/mailbox/store/src/main/java/org/apache/james/mailbox/store/search/LazyMessageSearchIndex.java
+++ b/mailbox/store/src/main/java/org/apache/james/mailbox/store/search/LazyMessageSearchIndex.java
@@ -56,7 +56,7 @@ import com.google.common.base.Preconditions;
  *
  */
 public class LazyMessageSearchIndex extends ListeningMessageSearchIndex {
-    private static class LazyMessageSearchIndexGroup extends Group {}
+    public static class LazyMessageSearchIndexGroup extends Group {}
 
     private static final Logger LOGGER = LoggerFactory.getLogger(LazyMessageSearchIndex.class);
     private static final Group GROUP = new LazyMessageSearchIndexGroup();
diff --git a/server/container/guice/mailbox/src/test/java/org/apache/james/modules/mailbox/NoopMailboxListener.java b/server/container/guice/mailbox/src/test/java/org/apache/james/modules/mailbox/NoopMailboxListener.java
index 0fea4d6..7c97c37 100644
--- a/server/container/guice/mailbox/src/test/java/org/apache/james/modules/mailbox/NoopMailboxListener.java
+++ b/server/container/guice/mailbox/src/test/java/org/apache/james/modules/mailbox/NoopMailboxListener.java
@@ -23,7 +23,7 @@ import org.apache.james.mailbox.events.Group;
 import org.apache.james.mailbox.events.MailboxListener;
 
 public class NoopMailboxListener implements MailboxListener.GroupMailboxListener {
-    private static class NoopMailboxListenerGroup extends Group {}
+    public static class NoopMailboxListenerGroup extends Group {}
 
     static final Group GROUP = new NoopMailboxListenerGroup();
 
diff --git a/server/protocols/jmap/src/main/java/org/apache/james/jmap/event/PropagateLookupRightListener.java b/server/protocols/jmap/src/main/java/org/apache/james/jmap/event/PropagateLookupRightListener.java
index 64a906c..96ee12d 100644
--- a/server/protocols/jmap/src/main/java/org/apache/james/jmap/event/PropagateLookupRightListener.java
+++ b/server/protocols/jmap/src/main/java/org/apache/james/jmap/event/PropagateLookupRightListener.java
@@ -39,7 +39,7 @@ import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
 public class PropagateLookupRightListener implements MailboxListener.GroupMailboxListener {
-    private static class PropagateLookupRightListenerGroup extends Group {}
+    public static class PropagateLookupRightListenerGroup extends Group {}
 
     private static final Logger LOGGER = LoggerFactory.getLogger(PropagateLookupRightListener.class);
     private static final Group GROUP = new PropagateLookupRightListenerGroup();


---------------------------------------------------------------------
To unsubscribe, e-mail: server-dev-unsubscribe@james.apache.org
For additional commands, e-mail: server-dev-help@james.apache.org