JAMES-1741 Chained statements not always works eg : bind(FileSystem.class).to(FileSystemImpl.class).in(Scopes.SINGLETON);
Project: http://git-wip-us.apache.org/repos/asf/james-project/repo Commit: http://git-wip-us.apache.org/repos/asf/james-project/commit/04b8c3e2 Tree: http://git-wip-us.apache.org/repos/asf/james-project/tree/04b8c3e2 Diff: http://git-wip-us.apache.org/repos/asf/james-project/diff/04b8c3e2 Branch: refs/heads/master Commit: 04b8c3e2b17690cbd4207c8fd5615d2a84e97f74 Parents: 8d89508 Author: Benoit Tellier <[email protected]> Authored: Fri May 20 13:46:47 2016 +0700 Committer: Benoit Tellier <[email protected]> Committed: Fri May 20 19:04:10 2016 +0700 ---------------------------------------------------------------------- .../org/apache/james/jmap/JMAPCommonModule.java | 16 ++++++++++------ .../java/org/apache/james/jmap/MethodsModule.java | 7 +++++-- .../apache/james/modules/CommonServicesModule.java | 4 +++- .../james/modules/server/MemoryMailQueueModule.java | 8 +++++--- 4 files changed, 23 insertions(+), 12 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/james-project/blob/04b8c3e2/server/container/guice/guice-common/src/main/java/org/apache/james/jmap/JMAPCommonModule.java ---------------------------------------------------------------------- diff --git a/server/container/guice/guice-common/src/main/java/org/apache/james/jmap/JMAPCommonModule.java b/server/container/guice/guice-common/src/main/java/org/apache/james/jmap/JMAPCommonModule.java index df546e7..78958c4 100644 --- a/server/container/guice/guice-common/src/main/java/org/apache/james/jmap/JMAPCommonModule.java +++ b/server/container/guice/guice-common/src/main/java/org/apache/james/jmap/JMAPCommonModule.java @@ -47,17 +47,21 @@ public class JMAPCommonModule extends AbstractModule { @Override protected void configure() { - bind(SignatureHandler.class).to(JamesSignatureHandler.class).in(Scopes.SINGLETON); - bind(ZonedDateTimeProvider.class).to(DefaultZonedDateTimeProvider.class).in(Scopes.SINGLETON); - bind(ContinuationTokenManager.class).to(SignedContinuationTokenManager.class).in(Scopes.SINGLETON); + bind(JamesSignatureHandler.class).in(Scopes.SINGLETON); + bind(DefaultZonedDateTimeProvider.class).in(Scopes.SINGLETON); + bind(SignedContinuationTokenManager.class).in(Scopes.SINGLETON); + bind(AccessTokenManagerImpl.class).in(Scopes.SINGLETON); bind(MailSpool.class).in(Scopes.SINGLETON); bind(MailFactory.class).in(Scopes.SINGLETON); bind(AutomaticallySentMailDetectorImpl.class).in(Scopes.SINGLETON); - bindConstant().annotatedWith(Names.named(AccessTokenRepository.TOKEN_EXPIRATION_IN_MS)).to(DEFAULT_TOKEN_EXPIRATION_IN_MS); - bind(AccessTokenManager.class).to(AccessTokenManagerImpl.class).in(Scopes.SINGLETON); - + bind(SignatureHandler.class).to(JamesSignatureHandler.class); + bind(ZonedDateTimeProvider.class).to(DefaultZonedDateTimeProvider.class); + bind(ContinuationTokenManager.class).to(SignedContinuationTokenManager.class); bind(AutomaticallySentMailDetector.class).to(AutomaticallySentMailDetectorImpl.class); + + bindConstant().annotatedWith(Names.named(AccessTokenRepository.TOKEN_EXPIRATION_IN_MS)).to(DEFAULT_TOKEN_EXPIRATION_IN_MS); + bind(AccessTokenManager.class).to(AccessTokenManagerImpl.class); } @Provides http://git-wip-us.apache.org/repos/asf/james-project/blob/04b8c3e2/server/container/guice/guice-common/src/main/java/org/apache/james/jmap/MethodsModule.java ---------------------------------------------------------------------- diff --git a/server/container/guice/guice-common/src/main/java/org/apache/james/jmap/MethodsModule.java b/server/container/guice/guice-common/src/main/java/org/apache/james/jmap/MethodsModule.java index 710ff2c..9feb897 100644 --- a/server/container/guice/guice-common/src/main/java/org/apache/james/jmap/MethodsModule.java +++ b/server/container/guice/guice-common/src/main/java/org/apache/james/jmap/MethodsModule.java @@ -50,10 +50,13 @@ public class MethodsModule extends AbstractModule { @Override protected void configure() { - bind(JmapRequestParser.class).to(JmapRequestParserImpl.class).in(Scopes.SINGLETON); - bind(JmapResponseWriter.class).to(JmapResponseWriterImpl.class).in(Scopes.SINGLETON); + bind(JmapRequestParserImpl.class).in(Scopes.SINGLETON); + bind(JmapResponseWriterImpl.class).in(Scopes.SINGLETON); bind(ObjectMapperFactory.class).in(Scopes.SINGLETON); + bind(JmapRequestParser.class).to(JmapRequestParserImpl.class); + bind(JmapResponseWriter.class).to(JmapResponseWriterImpl.class); + bindConstant().annotatedWith(Names.named(GetMessageListMethod.MAXIMUM_LIMIT)).to(GetMessageListMethod.DEFAULT_MAXIMUM_LIMIT); Multibinder<Method> methods = Multibinder.newSetBinder(binder(), Method.class); http://git-wip-us.apache.org/repos/asf/james-project/blob/04b8c3e2/server/container/guice/guice-common/src/main/java/org/apache/james/modules/CommonServicesModule.java ---------------------------------------------------------------------- diff --git a/server/container/guice/guice-common/src/main/java/org/apache/james/modules/CommonServicesModule.java b/server/container/guice/guice-common/src/main/java/org/apache/james/modules/CommonServicesModule.java index fea8fcd..5bd78d3 100644 --- a/server/container/guice/guice-common/src/main/java/org/apache/james/modules/CommonServicesModule.java +++ b/server/container/guice/guice-common/src/main/java/org/apache/james/modules/CommonServicesModule.java @@ -56,8 +56,10 @@ public class CommonServicesModule extends AbstractModule { install(new DNSServiceModule()); install(new AsyncTasksExecutorModule()); - bind(FileSystem.class).to(FileSystemImpl.class).in(Scopes.SINGLETON); + bind(FileSystemImpl.class).in(Scopes.SINGLETON); bind(GuiceServerProbe.class).in(Scopes.SINGLETON); + + bind(FileSystem.class).to(FileSystemImpl.class); } @Provides @Singleton @Named(CONFIGURATION_PATH) http://git-wip-us.apache.org/repos/asf/james-project/blob/04b8c3e2/server/container/guice/memory-guice/src/main/java/org/apache/james/modules/server/MemoryMailQueueModule.java ---------------------------------------------------------------------- diff --git a/server/container/guice/memory-guice/src/main/java/org/apache/james/modules/server/MemoryMailQueueModule.java b/server/container/guice/memory-guice/src/main/java/org/apache/james/modules/server/MemoryMailQueueModule.java index 1e9c5b1..1b7aa48 100644 --- a/server/container/guice/memory-guice/src/main/java/org/apache/james/modules/server/MemoryMailQueueModule.java +++ b/server/container/guice/memory-guice/src/main/java/org/apache/james/modules/server/MemoryMailQueueModule.java @@ -25,13 +25,15 @@ import org.apache.james.queue.api.MailQueueItemDecoratorFactory; import com.google.inject.AbstractModule; import com.google.inject.Scopes; -import com.google.inject.Singleton; public class MemoryMailQueueModule extends AbstractModule { @Override protected void configure() { - bind(MailQueueFactory.class).to(MemoryMailQueueFactory.class).in(Scopes.SINGLETON); - bind(MailQueueItemDecoratorFactory.class).to(PostDequeueDecoratorFactory.class).in(Singleton.class); + bind(MemoryMailQueueFactory.class).in(Scopes.SINGLETON); + bind(PostDequeueDecoratorFactory.class).in(Scopes.SINGLETON); + + bind(MailQueueFactory.class).to(MemoryMailQueueFactory.class); + bind(MailQueueItemDecoratorFactory.class).to(PostDequeueDecoratorFactory.class); } } --------------------------------------------------------------------- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
