Repository: james-project Updated Branches: refs/heads/master b0cb406c8 -> 3197701ca
JAMES-2340 Rely on generic listener registration for SpamAssassinListener Project: http://git-wip-us.apache.org/repos/asf/james-project/repo Commit: http://git-wip-us.apache.org/repos/asf/james-project/commit/fa7bd969 Tree: http://git-wip-us.apache.org/repos/asf/james-project/tree/fa7bd969 Diff: http://git-wip-us.apache.org/repos/asf/james-project/diff/fa7bd969 Branch: refs/heads/master Commit: fa7bd969365e006a3ea46453445834cf34ad8747 Parents: b0cb406 Author: benwa <[email protected]> Authored: Tue Mar 27 11:15:42 2018 +0700 Committer: benwa <[email protected]> Committed: Wed Mar 28 09:43:47 2018 +0700 ---------------------------------------------------------------------- .../SpamAssassinListenerModule.java | 40 +------------------- .../modules/mailbox/DefaultEventModule.java | 3 +- 2 files changed, 4 insertions(+), 39 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/james-project/blob/fa7bd969/server/container/guice/mailbox-plugin-spamassassin/src/main/java/org/apache/james/modules/spamassassin/SpamAssassinListenerModule.java ---------------------------------------------------------------------- diff --git a/server/container/guice/mailbox-plugin-spamassassin/src/main/java/org/apache/james/modules/spamassassin/SpamAssassinListenerModule.java b/server/container/guice/mailbox-plugin-spamassassin/src/main/java/org/apache/james/modules/spamassassin/SpamAssassinListenerModule.java index 8a49b24..8f0550f 100644 --- a/server/container/guice/mailbox-plugin-spamassassin/src/main/java/org/apache/james/modules/spamassassin/SpamAssassinListenerModule.java +++ b/server/container/guice/mailbox-plugin-spamassassin/src/main/java/org/apache/james/modules/spamassassin/SpamAssassinListenerModule.java @@ -20,27 +20,19 @@ package org.apache.james.modules.spamassassin; import java.io.FileNotFoundException; -import java.util.List; import javax.inject.Singleton; import org.apache.commons.configuration.ConfigurationException; import org.apache.commons.configuration.PropertiesConfiguration; -import org.apache.james.lifecycle.api.Configurable; -import org.apache.james.mailbox.MailboxSession; -import org.apache.james.mailbox.exception.MailboxException; +import org.apache.james.mailbox.MailboxListener; import org.apache.james.mailbox.spamassassin.SpamAssassinConfiguration; import org.apache.james.mailbox.spamassassin.SpamAssassinListener; -import org.apache.james.mailbox.store.StoreMailboxManager; -import org.apache.james.utils.ConfigurationPerformer; import org.apache.james.utils.PropertiesProvider; import org.slf4j.Logger; import org.slf4j.LoggerFactory; -import com.google.common.base.Throwables; -import com.google.common.collect.ImmutableList; import com.google.inject.AbstractModule; -import com.google.inject.Inject; import com.google.inject.Provides; import com.google.inject.Scopes; import com.google.inject.multibindings.Multibinder; @@ -54,35 +46,7 @@ public class SpamAssassinListenerModule extends AbstractModule { protected void configure() { bind(SpamAssassinListener.class).in(Scopes.SINGLETON); - Multibinder.newSetBinder(binder(), ConfigurationPerformer.class).addBinding().to(SpamAssassinListenerConfigurationPerformer.class); - } - - @Singleton - public static class SpamAssassinListenerConfigurationPerformer implements ConfigurationPerformer { - private final SpamAssassinListener spamAssassinListener; - private final StoreMailboxManager storeMailboxManager; - - @Inject - public SpamAssassinListenerConfigurationPerformer(SpamAssassinListener spamAssassinListener, - StoreMailboxManager storeMailboxManager) { - this.spamAssassinListener = spamAssassinListener; - this.storeMailboxManager = storeMailboxManager; - } - - @Override - public void initModule() { - try { - MailboxSession session = null; - storeMailboxManager.addGlobalListener(spamAssassinListener, session); - } catch (MailboxException e) { - Throwables.propagate(e); - } - } - - @Override - public List<Class<? extends Configurable>> forClasses() { - return ImmutableList.of(); - } + Multibinder.newSetBinder(binder(), MailboxListener.class).addBinding().to(SpamAssassinListener.class); } @Provides http://git-wip-us.apache.org/repos/asf/james-project/blob/fa7bd969/server/container/guice/mailbox/src/main/java/org/apache/james/modules/mailbox/DefaultEventModule.java ---------------------------------------------------------------------- diff --git a/server/container/guice/mailbox/src/main/java/org/apache/james/modules/mailbox/DefaultEventModule.java b/server/container/guice/mailbox/src/main/java/org/apache/james/modules/mailbox/DefaultEventModule.java index 3e7f303..e515a1f 100644 --- a/server/container/guice/mailbox/src/main/java/org/apache/james/modules/mailbox/DefaultEventModule.java +++ b/server/container/guice/mailbox/src/main/java/org/apache/james/modules/mailbox/DefaultEventModule.java @@ -22,6 +22,8 @@ package org.apache.james.modules.mailbox; import java.util.List; import java.util.Set; +import javax.inject.Named; + import org.apache.james.lifecycle.api.Configurable; import org.apache.james.mailbox.MailboxListener; import org.apache.james.mailbox.MailboxManager; @@ -42,7 +44,6 @@ import com.google.inject.Inject; import com.google.inject.Scopes; import com.google.inject.Singleton; import com.google.inject.multibindings.Multibinder; -import com.google.inject.name.Named; public class DefaultEventModule extends AbstractModule { --------------------------------------------------------------------- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
