This is an automated email from the ASF dual-hosted git repository.
rcordier pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/james-project.git
commit f9421a09aba6200b4ccb6aa8fe652512a832fbab
Author: Benoit Tellier <btell...@linagora.com>
AuthorDate: Thu Jan 16 10:36:36 2020 +0700
[REFACTORING] Guava Preconditions should use String formatting
---
.../apache/james/backends/es/ElasticSearchConfiguration.java | 11 ++++++-----
core/src/main/java/org/apache/james/core/Domain.java | 2 +-
core/src/main/java/org/apache/james/core/Username.java | 2 +-
.../src/main/java/org/apache/james/mailbox/events/Group.java | 2 +-
.../main/java/org/apache/james/mailbox/model/MailboxACL.java | 4 ++--
.../org/apache/james/vault/dto/query/QueryTranslator.java | 2 +-
.../mailbox/store/quota/DefaultUserQuotaRootResolver.java | 4 ++--
.../apache/james/blob/objectstorage/swift/Credentials.java | 5 ++---
.../org/apache/james/blob/objectstorage/swift/DomainId.java | 5 ++---
.../org/apache/james/blob/objectstorage/swift/DomainName.java | 5 ++---
.../org/apache/james/blob/objectstorage/swift/HeaderName.java | 5 ++---
.../org/apache/james/blob/objectstorage/swift/Project.java | 5 ++---
.../apache/james/blob/objectstorage/swift/ProjectName.java | 2 +-
.../org/apache/james/blob/objectstorage/swift/Region.java | 5 ++---
.../org/apache/james/blob/objectstorage/swift/TenantName.java | 5 ++---
.../org/apache/james/blob/objectstorage/swift/UserName.java | 5 ++---
.../swift/SwiftKeystone2ConfigurationReader.java | 8 ++++----
.../swift/SwiftKeystone3ConfigurationReader.java | 8 ++++----
.../objectstorage/swift/SwiftTmpAuthConfigurationReader.java | 8 ++++----
.../james/adapter/mailbox/MailboxManagerManagement.java | 4 ++--
.../java/org/apache/james/rrt/api/RecipientRewriteTable.java | 2 +-
.../james/rrt/cassandra/CassandraRecipientRewriteTable.java | 2 +-
.../apache/james/transport/mailets/WithStorageDirective.java | 2 +-
.../apache/james/mailrepository/api/MailRepositoryUrl.java | 3 ++-
.../jmap/draft/methods/integration/cucumber/UserStepdefs.java | 2 +-
.../configuration/CassandraMailQueueViewConfiguration.java | 7 ++++---
.../java/org/apache/james/linshare/client/LinshareAPI.java | 2 +-
27 files changed, 56 insertions(+), 61 deletions(-)
diff --git
a/backends-common/elasticsearch/src/main/java/org/apache/james/backends/es/ElasticSearchConfiguration.java
b/backends-common/elasticsearch/src/main/java/org/apache/james/backends/es/ElasticSearchConfiguration.java
index 16727ea..8f520d6 100644
---
a/backends-common/elasticsearch/src/main/java/org/apache/james/backends/es/ElasticSearchConfiguration.java
+++
b/backends-common/elasticsearch/src/main/java/org/apache/james/backends/es/ElasticSearchConfiguration.java
@@ -154,12 +154,13 @@ public class ElasticSearchConfiguration {
private final char[] password;
private SSLTrustStore(String filePath, String password) {
- Preconditions.checkNotNull(filePath,
- ELASTICSEARCH_HTTPS_TRUST_STORE_PATH + " cannot be null
when " + ELASTICSEARCH_HTTPS_TRUST_STORE_PASSWORD + " is specified");
+ Preconditions.checkNotNull(filePath, "%s cannot be null when
%s is specified",
+ ELASTICSEARCH_HTTPS_TRUST_STORE_PATH,
ELASTICSEARCH_HTTPS_TRUST_STORE_PASSWORD);
Preconditions.checkNotNull(password,
- ELASTICSEARCH_HTTPS_TRUST_STORE_PASSWORD + " cannot be
null when " + ELASTICSEARCH_HTTPS_TRUST_STORE_PATH + " is specified");
+ "%s cannot be null when %s is specified",
+ ELASTICSEARCH_HTTPS_TRUST_STORE_PASSWORD,
ELASTICSEARCH_HTTPS_TRUST_STORE_PATH);
Preconditions.checkArgument(Files.exists(Paths.get(filePath)),
- String.format("the file '%s' from property '%s' doesn't
exist", filePath, ELASTICSEARCH_HTTPS_TRUST_STORE_PATH));
+ "the file '%s' from property '%s' doesn't exist",
filePath, ELASTICSEARCH_HTTPS_TRUST_STORE_PATH);
this.file = new File(filePath);
this.password = password.toCharArray();
@@ -258,7 +259,7 @@ public class ElasticSearchConfiguration {
Preconditions.checkNotNull(strategy);
Preconditions.checkNotNull(trustStore);
Preconditions.checkNotNull(hostNameVerifier);
- Preconditions.checkArgument(strategy != OVERRIDE ||
trustStore.isPresent(), OVERRIDE.name() + " strategy requires trustStore to be
present");
+ Preconditions.checkArgument(strategy != OVERRIDE ||
trustStore.isPresent(), "%s strategy requires trustStore to be present",
OVERRIDE.name());
this.strategy = strategy;
this.trustStore = trustStore;
diff --git a/core/src/main/java/org/apache/james/core/Domain.java
b/core/src/main/java/org/apache/james/core/Domain.java
index 2be5e13..f4f1e37 100644
--- a/core/src/main/java/org/apache/james/core/Domain.java
+++ b/core/src/main/java/org/apache/james/core/Domain.java
@@ -42,7 +42,7 @@ public class Domain implements Serializable {
Preconditions.checkArgument(!domain.isEmpty() && !domain.contains("@")
&& !domain.contains("/"),
"Domain can not be empty nor contain `@` nor `/`");
Preconditions.checkArgument(domain.length() <= MAXIMUM_DOMAIN_LENGTH,
- "Domain name length should not exceed " + MAXIMUM_DOMAIN_LENGTH +
" characters");
+ "Domain name length should not exceed %s characters",
MAXIMUM_DOMAIN_LENGTH);
return new Domain(domain);
}
diff --git a/core/src/main/java/org/apache/james/core/Username.java
b/core/src/main/java/org/apache/james/core/Username.java
index ee5d846..63cd8a7 100644
--- a/core/src/main/java/org/apache/james/core/Username.java
+++ b/core/src/main/java/org/apache/james/core/Username.java
@@ -38,7 +38,7 @@ public class Username {
public static Username of(String username) {
Preconditions.checkArgument(!Strings.isNullOrEmpty(username),
"username should not be null or empty");
Preconditions.checkArgument(username.length() <=
MAXIMUM_MAIL_ADDRESS_LENGTH,
- String.format("username length should not be longer than %d
characters", MAXIMUM_MAIL_ADDRESS_LENGTH));
+ "username length should not be longer than %s characters",
MAXIMUM_MAIL_ADDRESS_LENGTH);
List<String> parts =
ImmutableList.copyOf(Splitter.on('@').split(username));
switch (parts.size()) {
diff --git
a/mailbox/api/src/main/java/org/apache/james/mailbox/events/Group.java
b/mailbox/api/src/main/java/org/apache/james/mailbox/events/Group.java
index 8135d13..9fd2edf 100644
--- a/mailbox/api/src/main/java/org/apache/james/mailbox/events/Group.java
+++ b/mailbox/api/src/main/java/org/apache/james/mailbox/events/Group.java
@@ -48,7 +48,7 @@ public class Group {
}
private static Group instantiateGroup(Class<?> aClass) throws
InstantiationException, IllegalAccessException {
- Preconditions.checkArgument(Group.class.isAssignableFrom(aClass), "The
supplied class is not a group: " + aClass.getName());
+ Preconditions.checkArgument(Group.class.isAssignableFrom(aClass), "The
supplied class is not a group: %s", aClass.getName());
return (Group) aClass.newInstance();
}
diff --git
a/mailbox/api/src/main/java/org/apache/james/mailbox/model/MailboxACL.java
b/mailbox/api/src/main/java/org/apache/james/mailbox/model/MailboxACL.java
index 17378f0..120eef7 100644
--- a/mailbox/api/src/main/java/org/apache/james/mailbox/model/MailboxACL.java
+++ b/mailbox/api/src/main/java/org/apache/james/mailbox/model/MailboxACL.java
@@ -414,8 +414,8 @@ public class MailboxACL {
}
public EntryKey(String name, NameType nameType, boolean negative) {
- Preconditions.checkNotNull(name, "Provide a name for this " +
getClass().getName());
- Preconditions.checkNotNull(nameType, "Provide a nameType for this
" + getClass().getName());
+ Preconditions.checkNotNull(name, "Provide a name for this %s",
getClass().getName());
+ Preconditions.checkNotNull(nameType, "Provide a nameType for this
%s", getClass().getName());
this.name = name;
this.nameType = nameType;
diff --git
a/mailbox/plugin/deleted-messages-vault/src/main/java/org/apache/james/vault/dto/query/QueryTranslator.java
b/mailbox/plugin/deleted-messages-vault/src/main/java/org/apache/james/vault/dto/query/QueryTranslator.java
index cfc9c26..ea1bdaf 100644
---
a/mailbox/plugin/deleted-messages-vault/src/main/java/org/apache/james/vault/dto/query/QueryTranslator.java
+++
b/mailbox/plugin/deleted-messages-vault/src/main/java/org/apache/james/vault/dto/query/QueryTranslator.java
@@ -218,7 +218,7 @@ public class QueryTranslator {
}
Query translate(QueryDTO queryDTO) throws QueryTranslatorException {
-
Preconditions.checkArgument(combinatorIsValid(queryDTO.getCombinator()),
"combinator '" + queryDTO.getCombinator() + "' is not yet handled");
+
Preconditions.checkArgument(combinatorIsValid(queryDTO.getCombinator()),
"combinator '%s' is not yet handled", queryDTO.getCombinator());
Preconditions.checkArgument(queryDTO.getCriteria().stream().allMatch(this::isCriterion),
"nested query structure is not yet handled");
return Query.and(queryDTO.getCriteria().stream()
diff --git
a/mailbox/store/src/main/java/org/apache/james/mailbox/store/quota/DefaultUserQuotaRootResolver.java
b/mailbox/store/src/main/java/org/apache/james/mailbox/store/quota/DefaultUserQuotaRootResolver.java
index c501f5e..9c29ac4 100644
---
a/mailbox/store/src/main/java/org/apache/james/mailbox/store/quota/DefaultUserQuotaRootResolver.java
+++
b/mailbox/store/src/main/java/org/apache/james/mailbox/store/quota/DefaultUserQuotaRootResolver.java
@@ -81,10 +81,10 @@ public class DefaultUserQuotaRootResolver implements
UserQuotaRootResolver {
@Override
public QuotaRoot getQuotaRoot(MailboxPath mailboxPath) {
-
Preconditions.checkArgument(!mailboxPath.getNamespace().contains(SEPARATOR),
"Namespace should not contain " + SEPARATOR);
+
Preconditions.checkArgument(!mailboxPath.getNamespace().contains(SEPARATOR),
"Namespace should not contain %s", SEPARATOR);
return Optional.ofNullable(mailboxPath.getUser())
.map(user -> {
-
Preconditions.checkArgument(!mailboxPath.getUser().asString().contains(SEPARATOR),
"Username should not contain " + SEPARATOR);
+
Preconditions.checkArgument(!mailboxPath.getUser().asString().contains(SEPARATOR),
"Username should not contain %s", SEPARATOR);
return mailboxPath.getUser();
})
.map(user -> QuotaRoot.quotaRoot(mailboxPath.getNamespace() +
SEPARATOR + user.asString(), user.getDomainPart()))
diff --git
a/server/blob/blob-objectstorage/src/main/java/org/apache/james/blob/objectstorage/swift/Credentials.java
b/server/blob/blob-objectstorage/src/main/java/org/apache/james/blob/objectstorage/swift/Credentials.java
index 2e4bde0..d7a6df1 100644
---
a/server/blob/blob-objectstorage/src/main/java/org/apache/james/blob/objectstorage/swift/Credentials.java
+++
b/server/blob/blob-objectstorage/src/main/java/org/apache/james/blob/objectstorage/swift/Credentials.java
@@ -32,9 +32,8 @@ public final class Credentials {
private final String credentials;
private Credentials(String value) {
- Preconditions.checkArgument(
- !Strings.isNullOrEmpty(value),
- this.getClass().getSimpleName() + " cannot be null or empty");
+ Preconditions.checkArgument(!Strings.isNullOrEmpty(value),
+ "%s cannot be null or empty", this.getClass().getSimpleName());
this.credentials = value;
}
diff --git
a/server/blob/blob-objectstorage/src/main/java/org/apache/james/blob/objectstorage/swift/DomainId.java
b/server/blob/blob-objectstorage/src/main/java/org/apache/james/blob/objectstorage/swift/DomainId.java
index 1ec6d47..6459eb2 100644
---
a/server/blob/blob-objectstorage/src/main/java/org/apache/james/blob/objectstorage/swift/DomainId.java
+++
b/server/blob/blob-objectstorage/src/main/java/org/apache/james/blob/objectstorage/swift/DomainId.java
@@ -32,9 +32,8 @@ public final class DomainId {
private final String value;
private DomainId(String value) {
- Preconditions.checkArgument(
- !Strings.isNullOrEmpty(value),
- this.getClass().getSimpleName() + " cannot be null or empty");
+ Preconditions.checkArgument(!Strings.isNullOrEmpty(value),
+ "%s cannot be null or empty", this.getClass().getSimpleName());
this.value = value;
}
diff --git
a/server/blob/blob-objectstorage/src/main/java/org/apache/james/blob/objectstorage/swift/DomainName.java
b/server/blob/blob-objectstorage/src/main/java/org/apache/james/blob/objectstorage/swift/DomainName.java
index f08faea..92680f2 100644
---
a/server/blob/blob-objectstorage/src/main/java/org/apache/james/blob/objectstorage/swift/DomainName.java
+++
b/server/blob/blob-objectstorage/src/main/java/org/apache/james/blob/objectstorage/swift/DomainName.java
@@ -32,9 +32,8 @@ public final class DomainName {
private final String value;
private DomainName(String value) {
- Preconditions.checkArgument(
- !Strings.isNullOrEmpty(value),
- this.getClass().getSimpleName() + " cannot be null or empty");
+ Preconditions.checkArgument(!Strings.isNullOrEmpty(value),
+ "%s cannot be null or empty", this.getClass().getSimpleName());
this.value = value;
}
diff --git
a/server/blob/blob-objectstorage/src/main/java/org/apache/james/blob/objectstorage/swift/HeaderName.java
b/server/blob/blob-objectstorage/src/main/java/org/apache/james/blob/objectstorage/swift/HeaderName.java
index 03e0df1..90f10fd 100644
---
a/server/blob/blob-objectstorage/src/main/java/org/apache/james/blob/objectstorage/swift/HeaderName.java
+++
b/server/blob/blob-objectstorage/src/main/java/org/apache/james/blob/objectstorage/swift/HeaderName.java
@@ -28,9 +28,8 @@ public class HeaderName {
private final String value;
protected HeaderName(String value) {
- Preconditions.checkArgument(
- !Strings.isNullOrEmpty(value),
- this.getClass().getSimpleName() + " cannot be null or empty");
+ Preconditions.checkArgument(!Strings.isNullOrEmpty(value),
+ "%s cannot be null or empty", this.getClass().getSimpleName());
this.value = value;
}
diff --git
a/server/blob/blob-objectstorage/src/main/java/org/apache/james/blob/objectstorage/swift/Project.java
b/server/blob/blob-objectstorage/src/main/java/org/apache/james/blob/objectstorage/swift/Project.java
index 435fced..ca296ed 100644
---
a/server/blob/blob-objectstorage/src/main/java/org/apache/james/blob/objectstorage/swift/Project.java
+++
b/server/blob/blob-objectstorage/src/main/java/org/apache/james/blob/objectstorage/swift/Project.java
@@ -43,9 +43,8 @@ public final class Project {
private final Optional<DomainId> domainId;
private Project(ProjectName name, Optional<DomainName> domainName,
Optional<DomainId> domainId) {
- Preconditions.checkArgument(
- name != null,
- this.getClass().getSimpleName() + "name cannot be null or empty");
+ Preconditions.checkArgument(name != null,
+ "%s cannot be null or empty", this.getClass().getSimpleName());
this.domainName = domainName;
this.name = name;
this.domainId = domainId;
diff --git
a/server/blob/blob-objectstorage/src/main/java/org/apache/james/blob/objectstorage/swift/ProjectName.java
b/server/blob/blob-objectstorage/src/main/java/org/apache/james/blob/objectstorage/swift/ProjectName.java
index 2241cb2..23858ff 100644
---
a/server/blob/blob-objectstorage/src/main/java/org/apache/james/blob/objectstorage/swift/ProjectName.java
+++
b/server/blob/blob-objectstorage/src/main/java/org/apache/james/blob/objectstorage/swift/ProjectName.java
@@ -34,7 +34,7 @@ public final class ProjectName {
private ProjectName(String value) {
Preconditions.checkArgument(
!Strings.isNullOrEmpty(value),
- this.getClass().getSimpleName() + " cannot be null or empty");
+ "%s cannot be null or empty", this.getClass().getSimpleName());
this.value = value;
}
diff --git
a/server/blob/blob-objectstorage/src/main/java/org/apache/james/blob/objectstorage/swift/Region.java
b/server/blob/blob-objectstorage/src/main/java/org/apache/james/blob/objectstorage/swift/Region.java
index 0f3f418..31cfc5d 100644
---
a/server/blob/blob-objectstorage/src/main/java/org/apache/james/blob/objectstorage/swift/Region.java
+++
b/server/blob/blob-objectstorage/src/main/java/org/apache/james/blob/objectstorage/swift/Region.java
@@ -32,9 +32,8 @@ public final class Region {
private final String region;
private Region(String value) {
- Preconditions.checkArgument(
- !Strings.isNullOrEmpty(value),
- this.getClass().getSimpleName() + " cannot be null or empty");
+ Preconditions.checkArgument(!Strings.isNullOrEmpty(value),
+ "%s cannot be null or empty", this.getClass().getSimpleName());
this.region = value;
}
diff --git
a/server/blob/blob-objectstorage/src/main/java/org/apache/james/blob/objectstorage/swift/TenantName.java
b/server/blob/blob-objectstorage/src/main/java/org/apache/james/blob/objectstorage/swift/TenantName.java
index 0ce4fc2..eac4b86 100644
---
a/server/blob/blob-objectstorage/src/main/java/org/apache/james/blob/objectstorage/swift/TenantName.java
+++
b/server/blob/blob-objectstorage/src/main/java/org/apache/james/blob/objectstorage/swift/TenantName.java
@@ -32,9 +32,8 @@ public final class TenantName {
private final String value;
private TenantName(String value) {
- Preconditions.checkArgument(
- !Strings.isNullOrEmpty(value),
- this.getClass().getSimpleName() + " cannot be null or empty");
+ Preconditions.checkArgument(!Strings.isNullOrEmpty(value),
+ "%s cannot be null or empty", this.getClass().getSimpleName());
this.value = value;
}
diff --git
a/server/blob/blob-objectstorage/src/main/java/org/apache/james/blob/objectstorage/swift/UserName.java
b/server/blob/blob-objectstorage/src/main/java/org/apache/james/blob/objectstorage/swift/UserName.java
index 3cce24e..7834c68 100644
---
a/server/blob/blob-objectstorage/src/main/java/org/apache/james/blob/objectstorage/swift/UserName.java
+++
b/server/blob/blob-objectstorage/src/main/java/org/apache/james/blob/objectstorage/swift/UserName.java
@@ -32,9 +32,8 @@ public final class UserName {
private final String value;
private UserName(String value) {
- Preconditions.checkArgument(
- !Strings.isNullOrEmpty(value),
- this.getClass().getSimpleName() + " cannot be null or empty");
+ Preconditions.checkArgument(!Strings.isNullOrEmpty(value),
+ "%s cannot be null or empty", this.getClass().getSimpleName());
this.value = value;
}
diff --git
a/server/container/guice/blob-objectstorage-guice/src/main/java/org/apache/james/modules/objectstorage/swift/SwiftKeystone2ConfigurationReader.java
b/server/container/guice/blob-objectstorage-guice/src/main/java/org/apache/james/modules/objectstorage/swift/SwiftKeystone2ConfigurationReader.java
index 33de89b..4a20bca 100644
---
a/server/container/guice/blob-objectstorage-guice/src/main/java/org/apache/james/modules/objectstorage/swift/SwiftKeystone2ConfigurationReader.java
+++
b/server/container/guice/blob-objectstorage-guice/src/main/java/org/apache/james/modules/objectstorage/swift/SwiftKeystone2ConfigurationReader.java
@@ -46,13 +46,13 @@ public class SwiftKeystone2ConfigurationReader implements
SwiftConfiguration {
String tenantNameStr =
configuration.getString(OBJECTSTORAGE_SWIFT_KEYSTONE_2_TENANTNAME, null);
Preconditions.checkArgument(endpointStr != null,
- OBJECTSTORAGE_SWIFT_ENDPOINT + " is a mandatory configuration
value");
+ "%s is a mandatory configuration value",
OBJECTSTORAGE_SWIFT_ENDPOINT);
Preconditions.checkArgument(crendentialsStr != null,
- OBJECTSTORAGE_SWIFT_CREDENTIALS + " is a mandatory configuration
value");
+ "%s is a mandatory configuration value",
OBJECTSTORAGE_SWIFT_CREDENTIALS);
Preconditions.checkArgument(userNameStr != null,
- OBJECTSTORAGE_SWIFT_KEYSTONE_2_USERNAME + " is a mandatory
configuration value");
+ "%s is a mandatory configuration value",
OBJECTSTORAGE_SWIFT_KEYSTONE_2_USERNAME);
Preconditions.checkArgument(tenantNameStr != null,
- OBJECTSTORAGE_SWIFT_KEYSTONE_2_TENANTNAME + " is a mandatory
configuration value");
+ "%s is a mandatory configuration value",
OBJECTSTORAGE_SWIFT_KEYSTONE_2_TENANTNAME);
URI endpoint = URI.create(endpointStr);
Credentials credentials = Credentials.of(crendentialsStr);
diff --git
a/server/container/guice/blob-objectstorage-guice/src/main/java/org/apache/james/modules/objectstorage/swift/SwiftKeystone3ConfigurationReader.java
b/server/container/guice/blob-objectstorage-guice/src/main/java/org/apache/james/modules/objectstorage/swift/SwiftKeystone3ConfigurationReader.java
index ca2eb65..60632f3 100644
---
a/server/container/guice/blob-objectstorage-guice/src/main/java/org/apache/james/modules/objectstorage/swift/SwiftKeystone3ConfigurationReader.java
+++
b/server/container/guice/blob-objectstorage-guice/src/main/java/org/apache/james/modules/objectstorage/swift/SwiftKeystone3ConfigurationReader.java
@@ -66,9 +66,9 @@ public class SwiftKeystone3ConfigurationReader implements
SwiftConfiguration {
String crendentialsStr =
configuration.getString(OBJECTSTORAGE_SWIFT_CREDENTIALS, null);
Preconditions.checkArgument(endpointStr != null,
- OBJECTSTORAGE_SWIFT_ENDPOINT + " is a mandatory configuration
value");
+ "%s is a mandatory configuration value",
OBJECTSTORAGE_SWIFT_ENDPOINT);
Preconditions.checkArgument(crendentialsStr != null,
- OBJECTSTORAGE_SWIFT_CREDENTIALS + " is a mandatory configuration
value");
+ "%s is a mandatory configuration value",
OBJECTSTORAGE_SWIFT_CREDENTIALS);
URI endpoint = URI.create(endpointStr);
Credentials credentials = Credentials.of(crendentialsStr);
@@ -100,9 +100,9 @@ public class SwiftKeystone3ConfigurationReader implements
SwiftConfiguration {
String domainNameStr =
configuration.getString(OBJECTSTORAGE_SWIFT_KEYSTONE_3_USER_DOMAIN, null);
Preconditions.checkArgument(userNameStr != null,
- OBJECTSTORAGE_SWIFT_KEYSTONE_3_USER_NAME + " is a mandatory
configuration value");
+ "%s is a mandatory configuration value",
OBJECTSTORAGE_SWIFT_KEYSTONE_3_USER_NAME);
Preconditions.checkArgument(domainNameStr != null,
- OBJECTSTORAGE_SWIFT_KEYSTONE_3_USER_DOMAIN + " is a mandatory
configuration value");
+ "%s is a mandatory configuration value",
OBJECTSTORAGE_SWIFT_KEYSTONE_3_USER_DOMAIN);
UserName userName =
UserName.of(userNameStr);
diff --git
a/server/container/guice/blob-objectstorage-guice/src/main/java/org/apache/james/modules/objectstorage/swift/SwiftTmpAuthConfigurationReader.java
b/server/container/guice/blob-objectstorage-guice/src/main/java/org/apache/james/modules/objectstorage/swift/SwiftTmpAuthConfigurationReader.java
index b21e0c1..4701ed3 100644
---
a/server/container/guice/blob-objectstorage-guice/src/main/java/org/apache/james/modules/objectstorage/swift/SwiftTmpAuthConfigurationReader.java
+++
b/server/container/guice/blob-objectstorage-guice/src/main/java/org/apache/james/modules/objectstorage/swift/SwiftTmpAuthConfigurationReader.java
@@ -52,13 +52,13 @@ public class SwiftTmpAuthConfigurationReader implements
SwiftConfiguration {
String tenantNameStr =
configuration.getString(OBJECTSTORAGE_SWIFT_TEMPAUTH_TENANTNAME, null);
Preconditions.checkArgument(endpointStr != null,
- OBJECTSTORAGE_SWIFT_ENDPOINT + " is a mandatory configuration
value");
+ "%s is a mandatory configuration value",
OBJECTSTORAGE_SWIFT_ENDPOINT);
Preconditions.checkArgument(crendentialsStr != null,
- OBJECTSTORAGE_SWIFT_CREDENTIALS + " is a mandatory configuration
value");
+ "%s is a mandatory configuration value",
OBJECTSTORAGE_SWIFT_CREDENTIALS);
Preconditions.checkArgument(userNameStr != null,
- OBJECTSTORAGE_SWIFT_TEMPAUTH_USERNAME + " is a mandatory
configuration value");
+ "%s is a mandatory configuration value",
OBJECTSTORAGE_SWIFT_TEMPAUTH_USERNAME);
Preconditions.checkArgument(tenantNameStr != null,
- OBJECTSTORAGE_SWIFT_TEMPAUTH_TENANTNAME + " is a mandatory
configuration value");
+ "%s is a mandatory configuration value",
OBJECTSTORAGE_SWIFT_TEMPAUTH_TENANTNAME);
URI endpoint = URI.create(endpointStr);
Credentials credentials = Credentials.of(crendentialsStr);
diff --git
a/server/container/mailbox-jmx/src/main/java/org/apache/james/adapter/mailbox/MailboxManagerManagement.java
b/server/container/mailbox-jmx/src/main/java/org/apache/james/adapter/mailbox/MailboxManagerManagement.java
index cbbaa73..435397d 100644
---
a/server/container/mailbox-jmx/src/main/java/org/apache/james/adapter/mailbox/MailboxManagerManagement.java
+++
b/server/container/mailbox-jmx/src/main/java/org/apache/james/adapter/mailbox/MailboxManagerManagement.java
@@ -215,7 +215,7 @@ public class MailboxManagerManagement extends StandardMBean
implements MailboxMa
}
private void checkString(String argument, String role) {
- Preconditions.checkNotNull(argument, "Provided " + role + " should not
be null.");
- Preconditions.checkArgument(!argument.equals(""), "Provided " + role +
" should not be empty.");
+ Preconditions.checkNotNull(argument, "Provided %s should not be
null.", role);
+ Preconditions.checkArgument(!argument.equals(""), "Provided %s should
not be empty.", role);
}
}
\ No newline at end of file
diff --git
a/server/data/data-api/src/main/java/org/apache/james/rrt/api/RecipientRewriteTable.java
b/server/data/data-api/src/main/java/org/apache/james/rrt/api/RecipientRewriteTable.java
index 9de41fe..3f9b339 100644
---
a/server/data/data-api/src/main/java/org/apache/james/rrt/api/RecipientRewriteTable.java
+++
b/server/data/data-api/src/main/java/org/apache/james/rrt/api/RecipientRewriteTable.java
@@ -116,7 +116,7 @@ public interface RecipientRewriteTable {
default Stream<MappingSource> listSources(Mapping mapping) throws
RecipientRewriteTableException {
Preconditions.checkArgument(listSourcesSupportedType.contains(mapping.getType()),
- String.format("Not supported mapping of type %s",
mapping.getType()));
+ "Not supported mapping of type %s", mapping.getType());
return getAllMappings()
.entrySet().stream()
diff --git
a/server/data/data-cassandra/src/main/java/org/apache/james/rrt/cassandra/CassandraRecipientRewriteTable.java
b/server/data/data-cassandra/src/main/java/org/apache/james/rrt/cassandra/CassandraRecipientRewriteTable.java
index d554b13..5b751a3 100644
---
a/server/data/data-cassandra/src/main/java/org/apache/james/rrt/cassandra/CassandraRecipientRewriteTable.java
+++
b/server/data/data-cassandra/src/main/java/org/apache/james/rrt/cassandra/CassandraRecipientRewriteTable.java
@@ -96,7 +96,7 @@ public class CassandraRecipientRewriteTable extends
AbstractRecipientRewriteTabl
@Override
public Stream<MappingSource> listSources(Mapping mapping) throws
RecipientRewriteTableException {
Preconditions.checkArgument(listSourcesSupportedType.contains(mapping.getType()),
- String.format("Not supported mapping of type %s",
mapping.getType()));
+ "Not supported mapping of type %s", mapping.getType());
SchemaVersion schemaVersion =
cassandraSchemaVersionDAO.getCurrentSchemaVersion()
.block()
diff --git
a/server/mailet/mailets/src/main/java/org/apache/james/transport/mailets/WithStorageDirective.java
b/server/mailet/mailets/src/main/java/org/apache/james/transport/mailets/WithStorageDirective.java
index 4d112a5..0bfc866 100644
---
a/server/mailet/mailets/src/main/java/org/apache/james/transport/mailets/WithStorageDirective.java
+++
b/server/mailet/mailets/src/main/java/org/apache/james/transport/mailets/WithStorageDirective.java
@@ -69,7 +69,7 @@ public class WithStorageDirective extends GenericMailet {
private String validateMailetConfiguration(String initParameterName) {
String initParameterValue = getInitParameter(initParameterName);
- Preconditions.checkState(!Strings.isNullOrEmpty(initParameterValue),
"You need to specify " + initParameterName);
+ Preconditions.checkState(!Strings.isNullOrEmpty(initParameterValue),
"You need to specify %s", initParameterName);
return initParameterValue;
}
diff --git
a/server/mailrepository/mailrepository-api/src/main/java/org/apache/james/mailrepository/api/MailRepositoryUrl.java
b/server/mailrepository/mailrepository-api/src/main/java/org/apache/james/mailrepository/api/MailRepositoryUrl.java
index ae00938..55d75b1 100644
---
a/server/mailrepository/mailrepository-api/src/main/java/org/apache/james/mailrepository/api/MailRepositoryUrl.java
+++
b/server/mailrepository/mailrepository-api/src/main/java/org/apache/james/mailrepository/api/MailRepositoryUrl.java
@@ -43,7 +43,8 @@ public class MailRepositoryUrl {
public static MailRepositoryUrl from(String url) {
Preconditions.checkNotNull(url);
- Preconditions.checkArgument(url.contains(PROTOCOL_SEPARATOR), "The
expected format is: <protocol> \"" + PROTOCOL_SEPARATOR + "\" <path>");
+ Preconditions.checkArgument(url.contains(PROTOCOL_SEPARATOR),
+ "The expected format is: <protocol> \"%s\" <path>",
PROTOCOL_SEPARATOR);
List<String> urlParts =
Splitter.on(PROTOCOL_SEPARATOR).splitToList(url);
diff --git
a/server/protocols/jmap-draft-integration-testing/jmap-draft-integration-testing-common/src/test/java/org/apache/james/jmap/draft/methods/integration/cucumber/UserStepdefs.java
b/server/protocols/jmap-draft-integration-testing/jmap-draft-integration-testing-common/src/test/java/org/apache/james/jmap/draft/methods/integration/cucumber/UserStepdefs.java
index 6321753..5615ee2 100644
---
a/server/protocols/jmap-draft-integration-testing/jmap-draft-integration-testing-common/src/test/java/org/apache/james/jmap/draft/methods/integration/cucumber/UserStepdefs.java
+++
b/server/protocols/jmap-draft-integration-testing/jmap-draft-integration-testing-common/src/test/java/org/apache/james/jmap/draft/methods/integration/cucumber/UserStepdefs.java
@@ -124,7 +124,7 @@ public class UserStepdefs {
public AccessToken authenticate(String username) {
return tokenByUser.computeIfAbsent(username, (user) -> {
String password = passwordByUser.get(user);
- Preconditions.checkState(password != null, "unknown user " + user);
+ Preconditions.checkState(password != null, "unknown user %s",
user);
return authenticateJamesUser(baseUri(mainStepdefs.jmapServer),
Username.of(user), password);
});
diff --git
a/server/queue/queue-rabbitmq/src/main/java/org/apache/james/queue/rabbitmq/view/cassandra/configuration/CassandraMailQueueViewConfiguration.java
b/server/queue/queue-rabbitmq/src/main/java/org/apache/james/queue/rabbitmq/view/cassandra/configuration/CassandraMailQueueViewConfiguration.java
index 95e6540..2e7bea4 100644
---
a/server/queue/queue-rabbitmq/src/main/java/org/apache/james/queue/rabbitmq/view/cassandra/configuration/CassandraMailQueueViewConfiguration.java
+++
b/server/queue/queue-rabbitmq/src/main/java/org/apache/james/queue/rabbitmq/view/cassandra/configuration/CassandraMailQueueViewConfiguration.java
@@ -135,13 +135,14 @@ public class CassandraMailQueueViewConfiguration {
Preconditions.checkArgument(
configurationUpdate.getSliceWindow().compareTo(getSliceWindow())
<= 0
&& currentSliceWindowInSecond % updateSliceWindowInSecond == 0,
- "update 'sliceWindow'(" + configurationUpdate.getSliceWindow() +
") have to be less than and divide the previous sliceWindow: "
- + getSliceWindow());
+ "update 'sliceWindow'(%s) have to be less than and divide the
previous sliceWindow: %s",
+ configurationUpdate.getSliceWindow(), getSliceWindow());
}
private void
validateConfigurationChangeForBuckets(CassandraMailQueueViewConfiguration
configurationUpdate) {
Preconditions.checkArgument(configurationUpdate.getBucketCount() >=
getBucketCount(),
- "can not set 'bucketCount'(" +
configurationUpdate.getBucketCount() + ") to be less than the current one: " +
getBucketCount());
+ "can not set 'bucketCount'(%s) to be less than the current one:
%s",
+ configurationUpdate.getBucketCount(), getBucketCount());
}
@Override
diff --git
a/third-party/linshare/src/main/java/org/apache/james/linshare/client/LinshareAPI.java
b/third-party/linshare/src/main/java/org/apache/james/linshare/client/LinshareAPI.java
index 400c9cd..7c1a3d2 100644
---
a/third-party/linshare/src/main/java/org/apache/james/linshare/client/LinshareAPI.java
+++
b/third-party/linshare/src/main/java/org/apache/james/linshare/client/LinshareAPI.java
@@ -86,7 +86,7 @@ public interface LinshareAPI {
default Document uploadDocument(File file) {
Preconditions.checkNotNull(file);
- Preconditions.checkArgument(file.exists(), "File to upload does not
exist: " + file.getAbsolutePath());
+ Preconditions.checkArgument(file.exists(), "File to upload does not
exist: %s", file.getAbsolutePath());
return uploadDocument(file, file.length());
}
---------------------------------------------------------------------
To unsubscribe, e-mail: server-dev-unsubscr...@james.apache.org
For additional commands, e-mail: server-dev-h...@james.apache.org
