You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@druid.apache.org by gi...@apache.org on 2019/06/23 22:42:26 UTC
[incubator-druid] branch master updated: Spotbugs: Enable
MS_SHOULD_BE_FINAL (#7946)
This is an automated email from the ASF dual-hosted git repository.
gian pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/incubator-druid.git
The following commit(s) were added to refs/heads/master by this push:
new 82b248c Spotbugs: Enable MS_SHOULD_BE_FINAL (#7946)
82b248c is described below
commit 82b248cc1778d24b6f37864e113d8c77250d0cdf
Author: Fokko Driesprong <fo...@driesprong.frl>
AuthorDate: Mon Jun 24 00:42:18 2019 +0200
Spotbugs: Enable MS_SHOULD_BE_FINAL (#7946)
---
codestyle/spotbugs-exclude.xml | 1 -
.../apache/druid/common/config/NullHandling.java | 2 +-
.../druid/guice/BloomFilterSerializersModule.java | 2 +-
.../query/expressions/BloomFilterExprMacro.java | 2 +-
.../input/parquet/ParquetExtensionsModule.java | 8 +++---
.../testing/utils/AbstractTestQueryHelper.java | 2 +-
.../org/apache/druid/testing/utils/RetryUtil.java | 4 +--
.../main/java/org/apache/druid/query/Result.java | 2 +-
.../query/topn/AlphaNumericTopNMetricSpec.java | 2 +-
.../java/org/apache/druid/segment/IndexIO.java | 2 +-
.../druid/server/security/AuthorizationUtils.java | 30 ++++++----------------
.../java/org/apache/druid/cli/CliOverlord.java | 2 +-
.../druid/cli/RouterJettyServerInitializer.java | 4 +--
.../apache/druid/sql/calcite/rule/DruidRules.java | 10 ++++----
14 files changed, 29 insertions(+), 44 deletions(-)
diff --git a/codestyle/spotbugs-exclude.xml b/codestyle/spotbugs-exclude.xml
index 749053a..5db5945 100644
--- a/codestyle/spotbugs-exclude.xml
+++ b/codestyle/spotbugs-exclude.xml
@@ -60,7 +60,6 @@
<Bug pattern="MS_MUTABLE_COLLECTION_PKGPROTECT"/>
<Bug pattern="MS_OOI_PKGPROTECT"/>
<Bug pattern="MS_PKGPROTECT"/>
- <Bug pattern="MS_SHOULD_BE_FINAL"/>
<Bug pattern="NP_EQUALS_SHOULD_HANDLE_NULL_ARGUMENT"/>
<Bug pattern="NP_GUARANTEED_DEREF"/>
<Bug pattern="NP_LOAD_OF_KNOWN_NULL_VALUE"/>
diff --git a/core/src/main/java/org/apache/druid/common/config/NullHandling.java b/core/src/main/java/org/apache/druid/common/config/NullHandling.java
index dd74c1f..71ac2bd 100644
--- a/core/src/main/java/org/apache/druid/common/config/NullHandling.java
+++ b/core/src/main/java/org/apache/druid/common/config/NullHandling.java
@@ -31,7 +31,7 @@ import javax.annotation.Nullable;
*/
public class NullHandling
{
- public static String NULL_HANDLING_CONFIG_STRING = "druid.generic.useDefaultValueForNull";
+ public static final String NULL_HANDLING_CONFIG_STRING = "druid.generic.useDefaultValueForNull";
/**
* use these values to ensure that {@link NullHandling#defaultDoubleValue()},
diff --git a/extensions-core/druid-bloom-filter/src/main/java/org/apache/druid/guice/BloomFilterSerializersModule.java b/extensions-core/druid-bloom-filter/src/main/java/org/apache/druid/guice/BloomFilterSerializersModule.java
index 0ac4f72..b213301 100644
--- a/extensions-core/druid-bloom-filter/src/main/java/org/apache/druid/guice/BloomFilterSerializersModule.java
+++ b/extensions-core/druid-bloom-filter/src/main/java/org/apache/druid/guice/BloomFilterSerializersModule.java
@@ -40,7 +40,7 @@ import java.io.IOException;
public class BloomFilterSerializersModule extends SimpleModule
{
- public static String BLOOM_FILTER_TYPE_NAME = "bloom";
+ public static final String BLOOM_FILTER_TYPE_NAME = "bloom";
public BloomFilterSerializersModule()
{
diff --git a/extensions-core/druid-bloom-filter/src/main/java/org/apache/druid/query/expressions/BloomFilterExprMacro.java b/extensions-core/druid-bloom-filter/src/main/java/org/apache/druid/query/expressions/BloomFilterExprMacro.java
index 4328a58..829df48 100644
--- a/extensions-core/druid-bloom-filter/src/main/java/org/apache/druid/query/expressions/BloomFilterExprMacro.java
+++ b/extensions-core/druid-bloom-filter/src/main/java/org/apache/druid/query/expressions/BloomFilterExprMacro.java
@@ -34,7 +34,7 @@ import java.util.List;
public class BloomFilterExprMacro implements ExprMacroTable.ExprMacro
{
- public static String FN_NAME = "bloom_filter_test";
+ public static final String FN_NAME = "bloom_filter_test";
@Override
public String name()
diff --git a/extensions-core/parquet-extensions/src/main/java/org/apache/druid/data/input/parquet/ParquetExtensionsModule.java b/extensions-core/parquet-extensions/src/main/java/org/apache/druid/data/input/parquet/ParquetExtensionsModule.java
index 096cf20..f87aacb 100644
--- a/extensions-core/parquet-extensions/src/main/java/org/apache/druid/data/input/parquet/ParquetExtensionsModule.java
+++ b/extensions-core/parquet-extensions/src/main/java/org/apache/druid/data/input/parquet/ParquetExtensionsModule.java
@@ -33,10 +33,10 @@ import java.util.List;
public class ParquetExtensionsModule implements DruidModule
{
- public static String PARQUET_SIMPLE_INPUT_PARSER_TYPE = "parquet";
- public static String PARQUET_SIMPLE_PARSE_SPEC_TYPE = "parquet";
- public static String PARQUET_AVRO_INPUT_PARSER_TYPE = "parquet-avro";
- public static String PARQUET_AVRO_PARSE_SPEC_TYPE = "avro";
+ public static final String PARQUET_SIMPLE_INPUT_PARSER_TYPE = "parquet";
+ public static final String PARQUET_SIMPLE_PARSE_SPEC_TYPE = "parquet";
+ public static final String PARQUET_AVRO_INPUT_PARSER_TYPE = "parquet-avro";
+ public static final String PARQUET_AVRO_PARSE_SPEC_TYPE = "avro";
@Override
public List<? extends Module> getJacksonModules()
diff --git a/integration-tests/src/main/java/org/apache/druid/testing/utils/AbstractTestQueryHelper.java b/integration-tests/src/main/java/org/apache/druid/testing/utils/AbstractTestQueryHelper.java
index 5c3c164..d677af9 100644
--- a/integration-tests/src/main/java/org/apache/druid/testing/utils/AbstractTestQueryHelper.java
+++ b/integration-tests/src/main/java/org/apache/druid/testing/utils/AbstractTestQueryHelper.java
@@ -38,7 +38,7 @@ import java.util.Map;
public abstract class AbstractTestQueryHelper<QueryResultType extends AbstractQueryWithResults>
{
- public static Logger LOG = new Logger(TestQueryHelper.class);
+ public static final Logger LOG = new Logger(TestQueryHelper.class);
private final AbstractQueryResourceTestClient queryClient;
private final ObjectMapper jsonMapper;
protected final String broker;
diff --git a/integration-tests/src/main/java/org/apache/druid/testing/utils/RetryUtil.java b/integration-tests/src/main/java/org/apache/druid/testing/utils/RetryUtil.java
index 798e5ed..49336f9 100644
--- a/integration-tests/src/main/java/org/apache/druid/testing/utils/RetryUtil.java
+++ b/integration-tests/src/main/java/org/apache/druid/testing/utils/RetryUtil.java
@@ -30,9 +30,9 @@ public class RetryUtil
private static final Logger LOG = new Logger(RetryUtil.class);
- public static int DEFAULT_RETRY_COUNT = 30;
+ public static final int DEFAULT_RETRY_COUNT = 30;
- public static long DEFAULT_RETRY_SLEEP = TimeUnit.SECONDS.toMillis(10);
+ public static final long DEFAULT_RETRY_SLEEP = TimeUnit.SECONDS.toMillis(10);
public static void retryUntilTrue(Callable<Boolean> callable, String task)
{
diff --git a/processing/src/main/java/org/apache/druid/query/Result.java b/processing/src/main/java/org/apache/druid/query/Result.java
index 9ec75ad..728a193 100644
--- a/processing/src/main/java/org/apache/druid/query/Result.java
+++ b/processing/src/main/java/org/apache/druid/query/Result.java
@@ -34,7 +34,7 @@ import java.util.function.Function;
@PublicApi
public class Result<T> implements Comparable<Result<T>>
{
- public static String MISSING_SEGMENTS_KEY = "missingSegments";
+ public static final String MISSING_SEGMENTS_KEY = "missingSegments";
@Nullable
private final DateTime timestamp;
diff --git a/processing/src/main/java/org/apache/druid/query/topn/AlphaNumericTopNMetricSpec.java b/processing/src/main/java/org/apache/druid/query/topn/AlphaNumericTopNMetricSpec.java
index 02532f3..b281a96 100644
--- a/processing/src/main/java/org/apache/druid/query/topn/AlphaNumericTopNMetricSpec.java
+++ b/processing/src/main/java/org/apache/druid/query/topn/AlphaNumericTopNMetricSpec.java
@@ -34,7 +34,7 @@ public class AlphaNumericTopNMetricSpec extends LexicographicTopNMetricSpec
{
private static final byte CACHE_TYPE_ID = 0x2;
- protected static Comparator<String> comparator = StringComparators.ALPHANUMERIC;
+ protected static final Comparator<String> comparator = StringComparators.ALPHANUMERIC;
@JsonCreator
public AlphaNumericTopNMetricSpec(
diff --git a/processing/src/main/java/org/apache/druid/segment/IndexIO.java b/processing/src/main/java/org/apache/druid/segment/IndexIO.java
index 2293991..a625713 100644
--- a/processing/src/main/java/org/apache/druid/segment/IndexIO.java
+++ b/processing/src/main/java/org/apache/druid/segment/IndexIO.java
@@ -84,7 +84,7 @@ public class IndexIO
public static final byte V8_VERSION = 0x8;
public static final byte V9_VERSION = 0x9;
public static final int CURRENT_VERSION_ID = V9_VERSION;
- public static BitmapSerdeFactory LEGACY_FACTORY = new BitmapSerde.LegacyBitmapSerdeFactory();
+ public static final BitmapSerdeFactory LEGACY_FACTORY = new BitmapSerde.LegacyBitmapSerdeFactory();
public static final ByteOrder BYTE_ORDER = ByteOrder.nativeOrder();
diff --git a/server/src/main/java/org/apache/druid/server/security/AuthorizationUtils.java b/server/src/main/java/org/apache/druid/server/security/AuthorizationUtils.java
index 56a6f53..afb62eb 100644
--- a/server/src/main/java/org/apache/druid/server/security/AuthorizationUtils.java
+++ b/server/src/main/java/org/apache/druid/server/security/AuthorizationUtils.java
@@ -360,31 +360,17 @@ public class AuthorizationUtils
* Function for the common pattern of generating a resource-action for reading from a datasource, using the
* datasource name.
*/
- public static Function<String, ResourceAction> DATASOURCE_READ_RA_GENERATOR = new Function<String, ResourceAction>()
- {
- @Override
- public ResourceAction apply(String input)
- {
- return new ResourceAction(
- new Resource(input, ResourceType.DATASOURCE),
- Action.READ
- );
- }
- };
+ public static final Function<String, ResourceAction> DATASOURCE_READ_RA_GENERATOR = input -> new ResourceAction(
+ new Resource(input, ResourceType.DATASOURCE),
+ Action.READ
+ );
/**
* Function for the common pattern of generating a resource-action for reading from a datasource, using the
* datasource name.
*/
- public static Function<String, ResourceAction> DATASOURCE_WRITE_RA_GENERATOR = new Function<String, ResourceAction>()
- {
- @Override
- public ResourceAction apply(String input)
- {
- return new ResourceAction(
- new Resource(input, ResourceType.DATASOURCE),
- Action.WRITE
- );
- }
- };
+ public static final Function<String, ResourceAction> DATASOURCE_WRITE_RA_GENERATOR = input -> new ResourceAction(
+ new Resource(input, ResourceType.DATASOURCE),
+ Action.WRITE
+ );
}
diff --git a/services/src/main/java/org/apache/druid/cli/CliOverlord.java b/services/src/main/java/org/apache/druid/cli/CliOverlord.java
index 05a936b..741b2e7 100644
--- a/services/src/main/java/org/apache/druid/cli/CliOverlord.java
+++ b/services/src/main/java/org/apache/druid/cli/CliOverlord.java
@@ -132,7 +132,7 @@ public class CliOverlord extends ServerRunnable
{
private static Logger log = new Logger(CliOverlord.class);
- protected static List<String> UNSECURED_PATHS = ImmutableList.of(
+ protected static final List<String> UNSECURED_PATHS = ImmutableList.of(
"/",
"/favicon.png",
"/console.html",
diff --git a/services/src/main/java/org/apache/druid/cli/RouterJettyServerInitializer.java b/services/src/main/java/org/apache/druid/cli/RouterJettyServerInitializer.java
index 596dba9..b206e4b 100644
--- a/services/src/main/java/org/apache/druid/cli/RouterJettyServerInitializer.java
+++ b/services/src/main/java/org/apache/druid/cli/RouterJettyServerInitializer.java
@@ -54,7 +54,7 @@ import java.util.List;
public class RouterJettyServerInitializer implements JettyServerInitializer
{
- private static List<String> UNSECURED_PATHS = Lists.newArrayList(
+ private static final List<String> UNSECURED_PATHS = Lists.newArrayList(
"/status/health",
// JDBC authentication uses the JDBC connection context instead of HTTP headers, skip the normal auth checks.
// The router will keep the connection context in the forwarded message, and the broker is responsible for
@@ -62,7 +62,7 @@ public class RouterJettyServerInitializer implements JettyServerInitializer
DruidAvaticaHandler.AVATICA_PATH
);
- protected static List<String> UNSECURED_PATHS_FOR_UI = ImmutableList.of(
+ protected static final List<String> UNSECURED_PATHS_FOR_UI = ImmutableList.of(
"/",
"/coordinator-console/*",
"/public/*",
diff --git a/sql/src/main/java/org/apache/druid/sql/calcite/rule/DruidRules.java b/sql/src/main/java/org/apache/druid/sql/calcite/rule/DruidRules.java
index c20f2ac..21998f1 100644
--- a/sql/src/main/java/org/apache/druid/sql/calcite/rule/DruidRules.java
+++ b/sql/src/main/java/org/apache/druid/sql/calcite/rule/DruidRules.java
@@ -137,7 +137,7 @@ public class DruidRules
public abstract static class DruidOuterQueryRule extends RelOptRule
{
- public static RelOptRule AGGREGATE = new DruidOuterQueryRule(
+ public static final RelOptRule AGGREGATE = new DruidOuterQueryRule(
operand(Aggregate.class, operand(DruidRel.class, null, CAN_BUILD_ON, any())),
"AGGREGATE"
)
@@ -159,7 +159,7 @@ public class DruidRules
}
};
- public static RelOptRule FILTER_AGGREGATE = new DruidOuterQueryRule(
+ public static final RelOptRule FILTER_AGGREGATE = new DruidOuterQueryRule(
operand(Aggregate.class, operand(Filter.class, operand(DruidRel.class, null, CAN_BUILD_ON, any()))),
"FILTER_AGGREGATE"
)
@@ -183,7 +183,7 @@ public class DruidRules
}
};
- public static RelOptRule FILTER_PROJECT_AGGREGATE = new DruidOuterQueryRule(
+ public static final RelOptRule FILTER_PROJECT_AGGREGATE = new DruidOuterQueryRule(
operand(
Aggregate.class,
operand(Project.class, operand(Filter.class, operand(DruidRel.class, null, CAN_BUILD_ON, any())))
@@ -212,7 +212,7 @@ public class DruidRules
}
};
- public static RelOptRule PROJECT_AGGREGATE = new DruidOuterQueryRule(
+ public static final RelOptRule PROJECT_AGGREGATE = new DruidOuterQueryRule(
operand(Aggregate.class, operand(Project.class, operand(DruidRel.class, null, CAN_BUILD_ON, any()))),
"PROJECT_AGGREGATE"
)
@@ -236,7 +236,7 @@ public class DruidRules
}
};
- public static RelOptRule AGGREGATE_SORT_PROJECT = new DruidOuterQueryRule(
+ public static final RelOptRule AGGREGATE_SORT_PROJECT = new DruidOuterQueryRule(
operand(
Project.class,
operand(Sort.class, operand(Aggregate.class, operand(DruidRel.class, null, CAN_BUILD_ON, any())))
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@druid.apache.org
For additional commands, e-mail: commits-help@druid.apache.org