You are viewing a plain text version of this content. The canonical link for it is here.
Posted to notifications@james.apache.org by bt...@apache.org on 2022/03/01 02:07:52 UTC
[james-project] 02/05: [SONAR] Run inspections for Backend projects
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 a27737eab3886c597dacb20855193407380dd7cd
Author: Benoit Tellier <bt...@linagora.com>
AuthorDate: Sun Feb 20 13:19:07 2022 +0700
[SONAR] Run inspections for Backend projects
---
.../backends/cassandra/init/ClusterFactory.java | 4 ++--
.../CassandraConsistenciesConfiguration.java | 3 ++-
.../init/configuration/ClusterConfiguration.java | 2 --
.../init/configuration/KeyspaceConfiguration.java | 5 ----
.../configuration/QueryLoggerConfiguration.java | 8 +++----
.../versions/CassandraSchemaVersionDAOTest.java | 4 +---
.../backends/es/v7/DeleteByQueryPerformer.java | 3 ---
.../james/backends/rabbitmq/QueueArguments.java | 2 +-
.../backends/rabbitmq/RabbitMQConfiguration.java | 28 +++++++++++-----------
.../backends/rabbitmq/RabbitMQManagementAPI.java | 4 ++--
10 files changed, 25 insertions(+), 38 deletions(-)
diff --git a/backends-common/cassandra/src/main/java/org/apache/james/backends/cassandra/init/ClusterFactory.java b/backends-common/cassandra/src/main/java/org/apache/james/backends/cassandra/init/ClusterFactory.java
index 3f0cb20..9a0f254 100644
--- a/backends-common/cassandra/src/main/java/org/apache/james/backends/cassandra/init/ClusterFactory.java
+++ b/backends-common/cassandra/src/main/java/org/apache/james/backends/cassandra/init/ClusterFactory.java
@@ -63,8 +63,8 @@ public class ClusterFactory {
Cluster cluster = clusterBuilder.build();
try {
- configuration.getQueryLoggerConfiguration().map(queryLoggerConfiguration ->
- cluster.register(queryLoggerConfiguration.getQueryLogger()));
+ configuration.getQueryLoggerConfiguration()
+ .ifPresent(queryLoggerConfiguration -> cluster.register(queryLoggerConfiguration.getQueryLogger()));
ensureContactable(cluster);
return cluster;
} catch (Exception e) {
diff --git a/backends-common/cassandra/src/main/java/org/apache/james/backends/cassandra/init/configuration/CassandraConsistenciesConfiguration.java b/backends-common/cassandra/src/main/java/org/apache/james/backends/cassandra/init/configuration/CassandraConsistenciesConfiguration.java
index a65620c..8c74cc1 100644
--- a/backends-common/cassandra/src/main/java/org/apache/james/backends/cassandra/init/configuration/CassandraConsistenciesConfiguration.java
+++ b/backends-common/cassandra/src/main/java/org/apache/james/backends/cassandra/init/configuration/CassandraConsistenciesConfiguration.java
@@ -55,8 +55,9 @@ public class CassandraConsistenciesConfiguration {
return ConsistencyLevel.SERIAL;
case "LOCAL_SERIAL":
return ConsistencyLevel.LOCAL_SERIAL;
+ default:
+ throw new IllegalArgumentException("'" + value + "' is not a value ConsistencyLevel");
}
- throw new IllegalArgumentException("'" + value + "' is not a value ConsistencyLevel");
}
public static CassandraConsistenciesConfiguration fromConfiguration(CassandraConfiguration configuration) {
diff --git a/backends-common/cassandra/src/main/java/org/apache/james/backends/cassandra/init/configuration/ClusterConfiguration.java b/backends-common/cassandra/src/main/java/org/apache/james/backends/cassandra/init/configuration/ClusterConfiguration.java
index 265fbb4..a39d376 100644
--- a/backends-common/cassandra/src/main/java/org/apache/james/backends/cassandra/init/configuration/ClusterConfiguration.java
+++ b/backends-common/cassandra/src/main/java/org/apache/james/backends/cassandra/init/configuration/ClusterConfiguration.java
@@ -206,8 +206,6 @@ public class ClusterConfiguration {
private static final int DEFAULT_CONNECT_TIMEOUT_MILLIS = 5000;
public static final int DEFAULT_CASSANDRA_PORT = 9042;
- private static final boolean DEFAULT_SSL = false;
-
public static Builder builder() {
return new Builder();
}
diff --git a/backends-common/cassandra/src/main/java/org/apache/james/backends/cassandra/init/configuration/KeyspaceConfiguration.java b/backends-common/cassandra/src/main/java/org/apache/james/backends/cassandra/init/configuration/KeyspaceConfiguration.java
index 3464336..62689a3 100644
--- a/backends-common/cassandra/src/main/java/org/apache/james/backends/cassandra/init/configuration/KeyspaceConfiguration.java
+++ b/backends-common/cassandra/src/main/java/org/apache/james/backends/cassandra/init/configuration/KeyspaceConfiguration.java
@@ -46,11 +46,6 @@ public class KeyspaceConfiguration {
}
}
- private static final String DEFAULT_KEYSPACE = "apache_james";
- private static final int DEFAULT_REPLICATION_FACTOR = 1;
-
- private static final boolean DEFAULT_SSL = false;
-
public static Builder.RequireKeyspace builder() {
return name -> replicationFactor -> durableWrites -> new KeyspaceConfiguration(name, replicationFactor, durableWrites);
}
diff --git a/backends-common/cassandra/src/main/java/org/apache/james/backends/cassandra/init/configuration/QueryLoggerConfiguration.java b/backends-common/cassandra/src/main/java/org/apache/james/backends/cassandra/init/configuration/QueryLoggerConfiguration.java
index 4478316..ee1f504 100644
--- a/backends-common/cassandra/src/main/java/org/apache/james/backends/cassandra/init/configuration/QueryLoggerConfiguration.java
+++ b/backends-common/cassandra/src/main/java/org/apache/james/backends/cassandra/init/configuration/QueryLoggerConfiguration.java
@@ -174,11 +174,9 @@ public class QueryLoggerConfiguration {
public QueryLogger getQueryLogger() {
QueryLogger.Builder builder = QueryLogger.builder();
- percentileTracker.map(percentileTracker ->
- slowQueryLatencyThresholdPercentile.map(slowQueryLatencyThresholdPercentile ->
- builder.withDynamicThreshold(percentileTracker, slowQueryLatencyThresholdPercentile)
- )
- );
+ percentileTracker.ifPresent(percentileTracker ->
+ slowQueryLatencyThresholdPercentile.ifPresent(slowQueryLatencyThresholdPercentile ->
+ builder.withDynamicThreshold(percentileTracker, slowQueryLatencyThresholdPercentile)));
constantThreshold.ifPresent(builder::withConstantThreshold);
constantThreshold.ifPresent(builder::withConstantThreshold);
diff --git a/backends-common/cassandra/src/test/java/org/apache/james/backends/cassandra/versions/CassandraSchemaVersionDAOTest.java b/backends-common/cassandra/src/test/java/org/apache/james/backends/cassandra/versions/CassandraSchemaVersionDAOTest.java
index edf7206..646c634 100644
--- a/backends-common/cassandra/src/test/java/org/apache/james/backends/cassandra/versions/CassandraSchemaVersionDAOTest.java
+++ b/backends-common/cassandra/src/test/java/org/apache/james/backends/cassandra/versions/CassandraSchemaVersionDAOTest.java
@@ -21,8 +21,6 @@ package org.apache.james.backends.cassandra.versions;
import static org.assertj.core.api.Assertions.assertThat;
-import java.util.Optional;
-
import org.apache.james.backends.cassandra.CassandraCluster;
import org.apache.james.backends.cassandra.CassandraClusterExtension;
import org.junit.jupiter.api.BeforeEach;
@@ -43,7 +41,7 @@ class CassandraSchemaVersionDAOTest {
@Test
void getCurrentSchemaVersionShouldReturnEmptyWhenTableIsEmpty() {
assertThat(testee.getCurrentSchemaVersion().block())
- .isEqualTo(Optional.empty());
+ .isEmpty();
}
@Test
diff --git a/backends-common/elasticsearch-v7/src/main/java/org/apache/james/backends/es/v7/DeleteByQueryPerformer.java b/backends-common/elasticsearch-v7/src/main/java/org/apache/james/backends/es/v7/DeleteByQueryPerformer.java
index dafec26..448c71b 100644
--- a/backends-common/elasticsearch-v7/src/main/java/org/apache/james/backends/es/v7/DeleteByQueryPerformer.java
+++ b/backends-common/elasticsearch-v7/src/main/java/org/apache/james/backends/es/v7/DeleteByQueryPerformer.java
@@ -23,8 +23,6 @@ import org.elasticsearch.client.RequestOptions;
import org.elasticsearch.index.query.QueryBuilder;
import org.elasticsearch.index.reindex.DeleteByQueryRequest;
-import com.google.common.annotations.VisibleForTesting;
-
import reactor.core.publisher.Mono;
public class DeleteByQueryPerformer {
@@ -32,7 +30,6 @@ public class DeleteByQueryPerformer {
private final ReactorElasticSearchClient client;
private final WriteAliasName aliasName;
- @VisibleForTesting
DeleteByQueryPerformer(ReactorElasticSearchClient client, WriteAliasName aliasName) {
this.client = client;
this.aliasName = aliasName;
diff --git a/backends-common/rabbitmq/src/main/java/org/apache/james/backends/rabbitmq/QueueArguments.java b/backends-common/rabbitmq/src/main/java/org/apache/james/backends/rabbitmq/QueueArguments.java
index ae2a958..2dd1c7c 100644
--- a/backends-common/rabbitmq/src/main/java/org/apache/james/backends/rabbitmq/QueueArguments.java
+++ b/backends-common/rabbitmq/src/main/java/org/apache/james/backends/rabbitmq/QueueArguments.java
@@ -40,7 +40,7 @@ public class QueueArguments {
}
}
- public static ImmutableMap<String, Object> NO_ARGUMENTS = ImmutableMap.of();
+ public static final ImmutableMap<String, Object> NO_ARGUMENTS = ImmutableMap.of();
public static Builder builder() {
return new Builder();
diff --git a/backends-common/rabbitmq/src/main/java/org/apache/james/backends/rabbitmq/RabbitMQConfiguration.java b/backends-common/rabbitmq/src/main/java/org/apache/james/backends/rabbitmq/RabbitMQConfiguration.java
index 94c500c..48588d4 100644
--- a/backends-common/rabbitmq/src/main/java/org/apache/james/backends/rabbitmq/RabbitMQConfiguration.java
+++ b/backends-common/rabbitmq/src/main/java/org/apache/james/backends/rabbitmq/RabbitMQConfiguration.java
@@ -290,20 +290,20 @@ public class RabbitMQConfiguration {
}
}
- private static String USE_SSL = "ssl.enabled";
- private static String HOSTS = "hosts";
- private static String USE_QUORUM_QUEUES = "quorum.queues.enable";
- private static String QUORUM_QUEUES_REPLICATION_FACTOR = "quorum.queues.replication.factor";
- private static String USE_SSL_MANAGEMENT = "ssl.management.enabled";
-
- private static String SSL_TRUST_STORE_PATH = "ssl.truststore";
- private static String SSL_TRUST_STORE_PASSWORD = "ssl.truststore.password";
- private static String SSL_VALIDATION_STRATEGY = "ssl.validation.strategy";
- private static String SSL_HOSTNAME_VERIFIER = "ssl.hostname.verifier";
-
- private static String SSL_KEY_STORE_PATH = "ssl.keystore";
- private static String SSL_KEY_STORE_PASSWORD = "ssl.keystore.password";
- private static String QUEUE_TTL = "notification.queue.ttl";
+ private static final String USE_SSL = "ssl.enabled";
+ private static final String HOSTS = "hosts";
+ private static final String USE_QUORUM_QUEUES = "quorum.queues.enable";
+ private static final String QUORUM_QUEUES_REPLICATION_FACTOR = "quorum.queues.replication.factor";
+ private static final String USE_SSL_MANAGEMENT = "ssl.management.enabled";
+
+ private static final String SSL_TRUST_STORE_PATH = "ssl.truststore";
+ private static final String SSL_TRUST_STORE_PASSWORD = "ssl.truststore.password";
+ private static final String SSL_VALIDATION_STRATEGY = "ssl.validation.strategy";
+ private static final String SSL_HOSTNAME_VERIFIER = "ssl.hostname.verifier";
+
+ private static final String SSL_KEY_STORE_PATH = "ssl.keystore";
+ private static final String SSL_KEY_STORE_PASSWORD = "ssl.keystore.password";
+ private static final String QUEUE_TTL = "notification.queue.ttl";
public static class ManagementCredentials {
diff --git a/backends-common/rabbitmq/src/main/java/org/apache/james/backends/rabbitmq/RabbitMQManagementAPI.java b/backends-common/rabbitmq/src/main/java/org/apache/james/backends/rabbitmq/RabbitMQManagementAPI.java
index 65f49dc..5661a4d 100644
--- a/backends-common/rabbitmq/src/main/java/org/apache/james/backends/rabbitmq/RabbitMQManagementAPI.java
+++ b/backends-common/rabbitmq/src/main/java/org/apache/james/backends/rabbitmq/RabbitMQManagementAPI.java
@@ -393,13 +393,13 @@ public interface RabbitMQManagementAPI {
.getSslConfiguration()
.getStrategy();
- final TrustStrategy TRUST_ALL = (x509Certificates, authType) -> true;
+ final TrustStrategy trustAll = (x509Certificates, authType) -> true;
switch (strategy) {
case DEFAULT:
break;
case IGNORE:
- sslContextBuilder.loadTrustMaterial(TRUST_ALL);
+ sslContextBuilder.loadTrustMaterial(trustAll);
break;
case OVERRIDE:
applyTrustStore(sslContextBuilder, configuration);
---------------------------------------------------------------------
To unsubscribe, e-mail: notifications-unsubscribe@james.apache.org
For additional commands, e-mail: notifications-help@james.apache.org