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/05/20 09:40:05 UTC
[james-project] 08/09: JAMES-2765 Solve some IntelliJ warnings
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 2d4c2c3830b5955523c2e1a7b627dc8855eb4f7f
Author: Benoit Tellier <bt...@linagora.com>
AuthorDate: Sat May 18 16:42:04 2019 +0700
JAMES-2765 Solve some IntelliJ warnings
---
.../elasticsearch/ElasticSearchQuotaConfiguration.java | 3 +--
.../elasticsearch/ElasticSearchQuotaSearcher.java | 2 +-
.../ElasticSearchQuotaConfigurationTest.java | 17 ++++++++---------
.../ElasticSearchQuotaSearchTestSystemExtension.java | 2 +-
.../search/elasticsearch/json/QuotaRatioAsJsonTest.java | 16 ++++++++--------
5 files changed, 19 insertions(+), 21 deletions(-)
diff --git a/mailbox/plugin/quota-search-elasticsearch-v6/src/main/java/org/apache/james/quota/search/elasticsearch/ElasticSearchQuotaConfiguration.java b/mailbox/plugin/quota-search-elasticsearch-v6/src/main/java/org/apache/james/quota/search/elasticsearch/ElasticSearchQuotaConfiguration.java
index 53e6d9b..2c0e6a1 100644
--- a/mailbox/plugin/quota-search-elasticsearch-v6/src/main/java/org/apache/james/quota/search/elasticsearch/ElasticSearchQuotaConfiguration.java
+++ b/mailbox/plugin/quota-search-elasticsearch-v6/src/main/java/org/apache/james/quota/search/elasticsearch/ElasticSearchQuotaConfiguration.java
@@ -23,7 +23,6 @@ import java.util.Objects;
import java.util.Optional;
import org.apache.commons.configuration.Configuration;
-import org.apache.commons.configuration.ConfigurationException;
import org.apache.james.backends.es.v6.IndexName;
import org.apache.james.backends.es.v6.ReadAliasName;
import org.apache.james.backends.es.v6.WriteAliasName;
@@ -88,7 +87,7 @@ public class ElasticSearchQuotaConfiguration {
public static final ElasticSearchQuotaConfiguration DEFAULT_CONFIGURATION = builder().build();
- public static ElasticSearchQuotaConfiguration fromProperties(Configuration configuration) throws ConfigurationException {
+ public static ElasticSearchQuotaConfiguration fromProperties(Configuration configuration) {
return builder()
.indexQuotaRatioName(computeQuotaSearchIndexName(configuration))
.readAliasQuotaRatioName(computeQuotaSearchReadAlias(configuration))
diff --git a/mailbox/plugin/quota-search-elasticsearch-v6/src/main/java/org/apache/james/quota/search/elasticsearch/ElasticSearchQuotaSearcher.java b/mailbox/plugin/quota-search-elasticsearch-v6/src/main/java/org/apache/james/quota/search/elasticsearch/ElasticSearchQuotaSearcher.java
index 55ce6c9..80d2342 100644
--- a/mailbox/plugin/quota-search-elasticsearch-v6/src/main/java/org/apache/james/quota/search/elasticsearch/ElasticSearchQuotaSearcher.java
+++ b/mailbox/plugin/quota-search-elasticsearch-v6/src/main/java/org/apache/james/quota/search/elasticsearch/ElasticSearchQuotaSearcher.java
@@ -71,7 +71,7 @@ public class ElasticSearchQuotaSearcher implements QuotaSearcher {
.collect(Guavate.toImmutableList());
}
- public SearchRequest prepareSearch(QuotaQuery query) {
+ private SearchRequest prepareSearch(QuotaQuery query) {
SearchSourceBuilder sourceBuilder = new SearchSourceBuilder()
.query(quotaQueryConverter.from(query))
.sort(SortBuilders.fieldSort(USER)
diff --git a/mailbox/plugin/quota-search-elasticsearch-v6/src/test/java/org/apache/james/quota/search/elasticsearch/ElasticSearchQuotaConfigurationTest.java b/mailbox/plugin/quota-search-elasticsearch-v6/src/test/java/org/apache/james/quota/search/elasticsearch/ElasticSearchQuotaConfigurationTest.java
index 2027436..7966d8d 100644
--- a/mailbox/plugin/quota-search-elasticsearch-v6/src/test/java/org/apache/james/quota/search/elasticsearch/ElasticSearchQuotaConfigurationTest.java
+++ b/mailbox/plugin/quota-search-elasticsearch-v6/src/test/java/org/apache/james/quota/search/elasticsearch/ElasticSearchQuotaConfigurationTest.java
@@ -21,17 +21,16 @@ package org.apache.james.quota.search.elasticsearch;
import static org.assertj.core.api.Assertions.assertThat;
-import org.apache.commons.configuration.ConfigurationException;
import org.apache.commons.configuration.PropertiesConfiguration;
import org.apache.james.backends.es.v6.IndexName;
import org.apache.james.backends.es.v6.ReadAliasName;
import org.apache.james.backends.es.v6.WriteAliasName;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
-public class ElasticSearchQuotaConfigurationTest {
+class ElasticSearchQuotaConfigurationTest {
@Test
- public void getReadAliasQuotaRatioNameShouldReturnConfiguredValue() throws ConfigurationException {
+ void getReadAliasQuotaRatioNameShouldReturnConfiguredValue() {
PropertiesConfiguration configuration = new PropertiesConfiguration();
String name = "name";
configuration.addProperty("elasticsearch.alias.read.quota.ratio.name", name);
@@ -44,7 +43,7 @@ public class ElasticSearchQuotaConfigurationTest {
}
@Test
- public void getReadAliasQuotaRatioNameShouldReturnDefaultValueWhenMissing() throws ConfigurationException {
+ void getReadAliasQuotaRatioNameShouldReturnDefaultValueWhenMissing() {
PropertiesConfiguration configuration = new PropertiesConfiguration();
configuration.addProperty("elasticsearch.hosts", "127.0.0.1");
@@ -55,7 +54,7 @@ public class ElasticSearchQuotaConfigurationTest {
}
@Test
- public void getWriteAliasQuotaRatioNameShouldReturnConfiguredValue() throws ConfigurationException {
+ void getWriteAliasQuotaRatioNameShouldReturnConfiguredValue() {
PropertiesConfiguration configuration = new PropertiesConfiguration();
String name = "name";
configuration.addProperty("elasticsearch.alias.write.quota.ratio.name", name);
@@ -68,7 +67,7 @@ public class ElasticSearchQuotaConfigurationTest {
}
@Test
- public void getWriteAliasQuotaRatioNameShouldReturnDefaultValueWhenMissing() throws ConfigurationException {
+ void getWriteAliasQuotaRatioNameShouldReturnDefaultValueWhenMissing() {
PropertiesConfiguration configuration = new PropertiesConfiguration();
configuration.addProperty("elasticsearch.hosts", "127.0.0.1");
@@ -79,7 +78,7 @@ public class ElasticSearchQuotaConfigurationTest {
}
@Test
- public void getIndexQuotaRatioNameShouldReturnConfiguredValue() throws ConfigurationException {
+ void getIndexQuotaRatioNameShouldReturnConfiguredValue() {
PropertiesConfiguration configuration = new PropertiesConfiguration();
String name = "name";
configuration.addProperty("elasticsearch.index.quota.ratio.name", name);
@@ -92,7 +91,7 @@ public class ElasticSearchQuotaConfigurationTest {
}
@Test
- public void getIndexQuotaRatioNameShouldReturnDefaultValueWhenMissing() throws ConfigurationException {
+ void getIndexQuotaRatioNameShouldReturnDefaultValueWhenMissing() {
PropertiesConfiguration configuration = new PropertiesConfiguration();
configuration.addProperty("elasticsearch.hosts", "127.0.0.1");
diff --git a/mailbox/plugin/quota-search-elasticsearch-v6/src/test/java/org/apache/james/quota/search/elasticsearch/ElasticSearchQuotaSearchTestSystemExtension.java b/mailbox/plugin/quota-search-elasticsearch-v6/src/test/java/org/apache/james/quota/search/elasticsearch/ElasticSearchQuotaSearchTestSystemExtension.java
index a4194ca..054b845 100644
--- a/mailbox/plugin/quota-search-elasticsearch-v6/src/test/java/org/apache/james/quota/search/elasticsearch/ElasticSearchQuotaSearchTestSystemExtension.java
+++ b/mailbox/plugin/quota-search-elasticsearch-v6/src/test/java/org/apache/james/quota/search/elasticsearch/ElasticSearchQuotaSearchTestSystemExtension.java
@@ -93,7 +93,7 @@ public class ElasticSearchQuotaSearchTestSystemExtension implements ParameterRes
}
@Override
- public void beforeEach(ExtensionContext context) throws Exception {
+ public void beforeEach(ExtensionContext context) {
elasticSearch.start();
}
diff --git a/mailbox/plugin/quota-search-elasticsearch-v6/src/test/java/org/apache/james/quota/search/elasticsearch/json/QuotaRatioAsJsonTest.java b/mailbox/plugin/quota-search-elasticsearch-v6/src/test/java/org/apache/james/quota/search/elasticsearch/json/QuotaRatioAsJsonTest.java
index b2c6411..68ff7d9 100644
--- a/mailbox/plugin/quota-search-elasticsearch-v6/src/test/java/org/apache/james/quota/search/elasticsearch/json/QuotaRatioAsJsonTest.java
+++ b/mailbox/plugin/quota-search-elasticsearch-v6/src/test/java/org/apache/james/quota/search/elasticsearch/json/QuotaRatioAsJsonTest.java
@@ -31,7 +31,7 @@ import org.junit.jupiter.api.Test;
import nl.jqno.equalsverifier.EqualsVerifier;
-public class QuotaRatioAsJsonTest {
+class QuotaRatioAsJsonTest {
private static final Quota<QuotaSize> QUOTA_SIZE = Quota.<QuotaSize>builder()
.used(QuotaSize.size(15))
@@ -43,20 +43,20 @@ public class QuotaRatioAsJsonTest {
.build();
@Test
- public void shouldMatchBeanContract() {
+ void shouldMatchBeanContract() {
EqualsVerifier.forClass(QuotaRatioAsJson.class)
.verify();
}
@Test
- public void buildShouldThrownWhenUserIsNull() {
+ void buildShouldThrownWhenUserIsNull() {
assertThatThrownBy(() -> QuotaRatioAsJson.builder()
.build())
.isInstanceOf(IllegalStateException.class);
}
@Test
- public void buildShouldThrownWhenUserIsEmpty() {
+ void buildShouldThrownWhenUserIsEmpty() {
assertThatThrownBy(() -> QuotaRatioAsJson.builder()
.user("")
.build())
@@ -64,7 +64,7 @@ public class QuotaRatioAsJsonTest {
}
@Test
- public void buildShouldThrownWhenQuotaRatioIsNull() {
+ void buildShouldThrownWhenQuotaRatioIsNull() {
assertThatThrownBy(() -> QuotaRatioAsJson.builder()
.user("user")
.build())
@@ -72,7 +72,7 @@ public class QuotaRatioAsJsonTest {
}
@Test
- public void getDomainShouldReturnEmptyWhenNone() {
+ void getDomainShouldReturnEmptyWhenNone() {
QuotaRatioAsJson quotaRatioAsJson = QuotaRatioAsJson.builder()
.user("user")
.quotaRatio(QuotaRatio.from(QUOTA_SIZE, QUOTA_COUNT))
@@ -82,7 +82,7 @@ public class QuotaRatioAsJsonTest {
}
@Test
- public void getDomainShouldReturnTheDomainWhenGiven() {
+ void getDomainShouldReturnTheDomainWhenGiven() {
String domain = "domain";
QuotaRatioAsJson quotaRatioAsJson = QuotaRatioAsJson.builder()
.user("user")
@@ -94,7 +94,7 @@ public class QuotaRatioAsJsonTest {
}
@Test
- public void getMaxQuotaRatioShouldReturnTheMaxQuotaRatio() {
+ void getMaxQuotaRatioShouldReturnTheMaxQuotaRatio() {
String domain = "domain";
QuotaRatioAsJson quotaRatioAsJson = QuotaRatioAsJson.builder()
.user("user")
---------------------------------------------------------------------
To unsubscribe, e-mail: server-dev-unsubscribe@james.apache.org
For additional commands, e-mail: server-dev-help@james.apache.org