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 ro...@apache.org on 2018/01/10 10:14:05 UTC
[05/53] [abbrv] james-project git commit: JAMES-2277 use a single
annotation per line
JAMES-2277 use a single annotation per line
Project: http://git-wip-us.apache.org/repos/asf/james-project/repo
Commit: http://git-wip-us.apache.org/repos/asf/james-project/commit/152d33a4
Tree: http://git-wip-us.apache.org/repos/asf/james-project/tree/152d33a4
Diff: http://git-wip-us.apache.org/repos/asf/james-project/diff/152d33a4
Branch: refs/heads/master
Commit: 152d33a4439526957124205c9c49aec9ca3306ca
Parents: a9f462d
Author: Matthieu Baechler <ma...@apache.org>
Authored: Fri Dec 22 16:31:47 2017 +0100
Committer: Matthieu Baechler <ma...@apache.org>
Committed: Tue Jan 9 15:16:02 2018 +0100
----------------------------------------------------------------------
.../apache/james/modules/mailbox/CassandraMailboxModule.java | 4 +++-
.../james/modules/mailbox/ElasticSearchMailboxModule.java | 6 ++++--
.../java/org/apache/james/modules/CommonServicesModule.java | 7 +++++--
.../org/apache/james/modules/mailbox/JPAMailboxModule.java | 4 +++-
.../org/apache/james/modules/mailbox/MemoryMailboxModule.java | 4 +++-
.../james/jmap/methods/SetMessagesCreationProcessor.java | 3 ++-
6 files changed, 20 insertions(+), 8 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/james-project/blob/152d33a4/server/container/guice/cassandra-guice/src/main/java/org/apache/james/modules/mailbox/CassandraMailboxModule.java
----------------------------------------------------------------------
diff --git a/server/container/guice/cassandra-guice/src/main/java/org/apache/james/modules/mailbox/CassandraMailboxModule.java b/server/container/guice/cassandra-guice/src/main/java/org/apache/james/modules/mailbox/CassandraMailboxModule.java
index 18789c6..66650f7 100644
--- a/server/container/guice/cassandra-guice/src/main/java/org/apache/james/modules/mailbox/CassandraMailboxModule.java
+++ b/server/container/guice/cassandra-guice/src/main/java/org/apache/james/modules/mailbox/CassandraMailboxModule.java
@@ -157,7 +157,9 @@ public class CassandraMailboxModule extends AbstractModule {
Multibinder.newSetBinder(binder(), MailboxManagerDefinition.class).addBinding().to(CassandraMailboxManagerDefinition.class);
}
- @Provides @Named(Names.MAILBOXMANAGER_NAME) @Singleton
+ @Provides
+ @Named(Names.MAILBOXMANAGER_NAME)
+ @Singleton
public MailboxManager provideMailboxManager(CassandraMailboxManager cassandraMailboxManager, ListeningCurrentQuotaUpdater quotaUpdater,
QuotaManager quotaManager, QuotaRootResolver quotaRootResolver, BatchSizes batchSizes) throws MailboxException {
cassandraMailboxManager.setQuotaUpdater(quotaUpdater);
http://git-wip-us.apache.org/repos/asf/james-project/blob/152d33a4/server/container/guice/cassandra-guice/src/main/java/org/apache/james/modules/mailbox/ElasticSearchMailboxModule.java
----------------------------------------------------------------------
diff --git a/server/container/guice/cassandra-guice/src/main/java/org/apache/james/modules/mailbox/ElasticSearchMailboxModule.java b/server/container/guice/cassandra-guice/src/main/java/org/apache/james/modules/mailbox/ElasticSearchMailboxModule.java
index 5286def..485f008 100644
--- a/server/container/guice/cassandra-guice/src/main/java/org/apache/james/modules/mailbox/ElasticSearchMailboxModule.java
+++ b/server/container/guice/cassandra-guice/src/main/java/org/apache/james/modules/mailbox/ElasticSearchMailboxModule.java
@@ -83,12 +83,14 @@ public class ElasticSearchMailboxModule extends AbstractModule {
return configuration.getIndexName();
}
- @Provides @Named(ElasticSearchConstants.READ_ALIAS)
+ @Provides
+ @Named(ElasticSearchConstants.READ_ALIAS)
protected AliasName provideReadAliasName(ElasticSearchConfiguration configuration) {
return configuration.getReadAliasName();
}
- @Provides @Named(ElasticSearchConstants.WRITE_ALIAS)
+ @Provides
+ @Named(ElasticSearchConstants.WRITE_ALIAS)
protected AliasName provideWriteAliasName(ElasticSearchConfiguration configuration) {
return configuration.getWriteAliasName();
}
http://git-wip-us.apache.org/repos/asf/james-project/blob/152d33a4/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 f6f72ba..aa44802 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
@@ -65,12 +65,15 @@ public class CommonServicesModule extends AbstractModule {
Multibinder.newSetBinder(binder(), GuiceProbe.class).addBinding().to(DataProbeImpl.class);
}
- @Provides @Singleton @Named(CONFIGURATION_PATH)
+ @Provides
+ @Singleton
+ @Named(CONFIGURATION_PATH)
public String configurationPath() {
return FileSystem.FILE_PROTOCOL_AND_CONF;
}
- @Provides @Singleton
+ @Provides
+ @Singleton
public JamesDirectoriesProvider directories() throws MissingArgumentException {
String rootDirectory = Optional
.ofNullable(System.getProperty("working.directory"))
http://git-wip-us.apache.org/repos/asf/james-project/blob/152d33a4/server/container/guice/jpa-guice/src/main/java/org/apache/james/modules/mailbox/JPAMailboxModule.java
----------------------------------------------------------------------
diff --git a/server/container/guice/jpa-guice/src/main/java/org/apache/james/modules/mailbox/JPAMailboxModule.java b/server/container/guice/jpa-guice/src/main/java/org/apache/james/modules/mailbox/JPAMailboxModule.java
index 43f337d..d904678 100644
--- a/server/container/guice/jpa-guice/src/main/java/org/apache/james/modules/mailbox/JPAMailboxModule.java
+++ b/server/container/guice/jpa-guice/src/main/java/org/apache/james/modules/mailbox/JPAMailboxModule.java
@@ -104,7 +104,9 @@ public class JPAMailboxModule extends AbstractModule {
Multibinder.newSetBinder(binder(), MailboxManagerDefinition.class).addBinding().to(JPAMailboxManagerDefinition.class);
}
- @Provides @Named(Names.MAILBOXMANAGER_NAME) @Singleton
+ @Provides
+ @Named(Names.MAILBOXMANAGER_NAME)
+ @Singleton
public MailboxManager provideMailboxManager(OpenJPAMailboxManager jpaMailboxManager) throws MailboxException {
jpaMailboxManager.init();
return jpaMailboxManager;
http://git-wip-us.apache.org/repos/asf/james-project/blob/152d33a4/server/container/guice/memory-guice/src/main/java/org/apache/james/modules/mailbox/MemoryMailboxModule.java
----------------------------------------------------------------------
diff --git a/server/container/guice/memory-guice/src/main/java/org/apache/james/modules/mailbox/MemoryMailboxModule.java b/server/container/guice/memory-guice/src/main/java/org/apache/james/modules/mailbox/MemoryMailboxModule.java
index 32349e8..de9b544 100644
--- a/server/container/guice/memory-guice/src/main/java/org/apache/james/modules/mailbox/MemoryMailboxModule.java
+++ b/server/container/guice/memory-guice/src/main/java/org/apache/james/modules/mailbox/MemoryMailboxModule.java
@@ -123,7 +123,9 @@ public class MemoryMailboxModule extends AbstractModule {
.to(MemoryMailboxManagerDefinition.class);
}
- @Provides @Named(Names.MAILBOXMANAGER_NAME) @Singleton
+ @Provides
+ @Named(Names.MAILBOXMANAGER_NAME)
+ @Singleton
public MailboxManager provideMailboxManager(InMemoryMailboxManager mailboxManager, ListeningCurrentQuotaUpdater quotaUpdater,
QuotaManager quotaManager, QuotaRootResolver quotaRootResolver) throws MailboxException {
mailboxManager.setQuotaRootResolver(quotaRootResolver);
http://git-wip-us.apache.org/repos/asf/james-project/blob/152d33a4/server/protocols/jmap/src/main/java/org/apache/james/jmap/methods/SetMessagesCreationProcessor.java
----------------------------------------------------------------------
diff --git a/server/protocols/jmap/src/main/java/org/apache/james/jmap/methods/SetMessagesCreationProcessor.java b/server/protocols/jmap/src/main/java/org/apache/james/jmap/methods/SetMessagesCreationProcessor.java
index 2f510f8..26a50bc 100644
--- a/server/protocols/jmap/src/main/java/org/apache/james/jmap/methods/SetMessagesCreationProcessor.java
+++ b/server/protocols/jmap/src/main/java/org/apache/james/jmap/methods/SetMessagesCreationProcessor.java
@@ -82,7 +82,8 @@ public class SetMessagesCreationProcessor implements SetMessagesProcessor {
private final MessageAppender messageAppender;
private final MessageSender messageSender;
- @VisibleForTesting @Inject
+ @VisibleForTesting
+ @Inject
SetMessagesCreationProcessor(MessageFactory messageFactory,
SystemMailboxesProvider systemMailboxesProvider,
AttachmentChecker attachmentChecker,
---------------------------------------------------------------------
To unsubscribe, e-mail: server-dev-unsubscribe@james.apache.org
For additional commands, e-mail: server-dev-help@james.apache.org