You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@druid.apache.org by xv...@apache.org on 2021/03/11 15:32:00 UTC
[druid] branch master updated: update code check plugins for Java
15 support (#10978)
This is an automated email from the ASF dual-hosted git repository.
xvrl pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/druid.git
The following commit(s) were added to refs/heads/master by this push:
new d26e1bc update code check plugins for Java 15 support (#10978)
d26e1bc is described below
commit d26e1bc70d039d3ab54159291c8c5081953ca670
Author: Xavier Léauté <xv...@apache.org>
AuthorDate: Thu Mar 11 07:31:41 2021 -0800
update code check plugins for Java 15 support (#10978)
* update maven-forbidden-api plugin to 3.1
* update maven-pmd-plugin to 3.14
* update spotbugs to 4.2.2
* fixes validation failures newly caught by those updates
- fix SpotBugs NP_NONNULL_PARAM_VIOLATION
- fix PMD UnnecessaryFullyQualifiedName
---
pom.xml | 8 ++++----
.../aggregation/post/FinalizingFieldAccessPostAggregator.java | 6 ++++--
.../org/apache/druid/segment/incremental/IncrementalIndex.java | 2 +-
.../org/apache/druid/segment/serde/ComplexColumnPartSerde.java | 3 ++-
.../druid/segment/serde/DictionaryEncodedColumnPartSerde.java | 2 +-
.../apache/druid/metadata/SQLMetadataStorageActionHandler.java | 1 +
6 files changed, 13 insertions(+), 9 deletions(-)
diff --git a/pom.xml b/pom.xml
index de76ee1..cc2321d 100644
--- a/pom.xml
+++ b/pom.xml
@@ -1357,13 +1357,13 @@
<plugin>
<groupId>com.github.spotbugs</groupId>
<artifactId>spotbugs-maven-plugin</artifactId>
- <version>3.1.12</version>
+ <version>4.2.0</version>
<dependencies>
<!-- overwrite dependency on spotbugs if you want to specify the version of spotbugs -->
<dependency>
<groupId>com.github.spotbugs</groupId>
<artifactId>spotbugs</artifactId>
- <version>3.1.12</version>
+ <version>4.2.2</version>
</dependency>
</dependencies>
<configuration>
@@ -1373,7 +1373,7 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-pmd-plugin</artifactId>
- <version>3.8</version>
+ <version>3.14.0</version>
<configuration>
<printFailingErrors>true</printFailingErrors>
<rulesets>
@@ -1396,7 +1396,7 @@
<plugin>
<groupId>de.thetaphi</groupId>
<artifactId>forbiddenapis</artifactId>
- <version>2.6</version>
+ <version>3.1</version>
<configuration>
<failOnUnresolvableSignatures>false</failOnUnresolvableSignatures>
<bundledSignatures>
diff --git a/processing/src/main/java/org/apache/druid/query/aggregation/post/FinalizingFieldAccessPostAggregator.java b/processing/src/main/java/org/apache/druid/query/aggregation/post/FinalizingFieldAccessPostAggregator.java
index 4acf45d..e3c4f41 100644
--- a/processing/src/main/java/org/apache/druid/query/aggregation/post/FinalizingFieldAccessPostAggregator.java
+++ b/processing/src/main/java/org/apache/druid/query/aggregation/post/FinalizingFieldAccessPostAggregator.java
@@ -43,7 +43,9 @@ public class FinalizingFieldAccessPostAggregator implements PostAggregator
// prior to usage (and is currently done so in the query constructors of all queries which can have post-aggs)
@Nullable
private final ValueType finalizedType;
+ @Nullable
private final Comparator<Object> comparator;
+ @Nullable
private final Function<Object, Object> finalizer;
@JsonCreator
@@ -59,8 +61,8 @@ public class FinalizingFieldAccessPostAggregator implements PostAggregator
final String name,
final String fieldName,
@Nullable final ValueType finalizedType,
- final Comparator<Object> comparator,
- final Function<Object, Object> finalizer
+ @Nullable final Comparator<Object> comparator,
+ @Nullable final Function<Object, Object> finalizer
)
{
this.name = name;
diff --git a/processing/src/main/java/org/apache/druid/segment/incremental/IncrementalIndex.java b/processing/src/main/java/org/apache/druid/segment/incremental/IncrementalIndex.java
index 5667267..63cfa64 100644
--- a/processing/src/main/java/org/apache/druid/segment/incremental/IncrementalIndex.java
+++ b/processing/src/main/java/org/apache/druid/segment/incremental/IncrementalIndex.java
@@ -784,7 +784,7 @@ public abstract class IncrementalIndex<AggregatorType> extends AbstractIndex imp
}
}
- private ColumnCapabilitiesImpl makeDefaultCapabilitiesFromValueType(ValueType type, String typeName)
+ private ColumnCapabilitiesImpl makeDefaultCapabilitiesFromValueType(ValueType type, @Nullable String typeName)
{
switch (type) {
case STRING:
diff --git a/processing/src/main/java/org/apache/druid/segment/serde/ComplexColumnPartSerde.java b/processing/src/main/java/org/apache/druid/segment/serde/ComplexColumnPartSerde.java
index f0f2d03..effb4d3 100644
--- a/processing/src/main/java/org/apache/druid/segment/serde/ComplexColumnPartSerde.java
+++ b/processing/src/main/java/org/apache/druid/segment/serde/ComplexColumnPartSerde.java
@@ -34,10 +34,11 @@ public class ComplexColumnPartSerde implements ColumnPartSerde
private final String typeName;
@Nullable
private final ComplexMetricSerde serde;
+ @Nullable
private final Serializer serializer;
private static final Logger log = new Logger(ComplexColumnPartSerde.class);
- private ComplexColumnPartSerde(String typeName, Serializer serializer)
+ private ComplexColumnPartSerde(String typeName, @Nullable Serializer serializer)
{
this.typeName = typeName;
this.serde = ComplexMetrics.getSerdeForType(typeName);
diff --git a/processing/src/main/java/org/apache/druid/segment/serde/DictionaryEncodedColumnPartSerde.java b/processing/src/main/java/org/apache/druid/segment/serde/DictionaryEncodedColumnPartSerde.java
index 1005c9a..833164b 100644
--- a/processing/src/main/java/org/apache/druid/segment/serde/DictionaryEncodedColumnPartSerde.java
+++ b/processing/src/main/java/org/apache/druid/segment/serde/DictionaryEncodedColumnPartSerde.java
@@ -116,7 +116,7 @@ public class DictionaryEncodedColumnPartSerde implements ColumnPartSerde
private DictionaryEncodedColumnPartSerde(
ByteOrder byteOrder,
BitmapSerdeFactory bitmapSerdeFactory,
- Serializer serializer
+ @Nullable Serializer serializer
)
{
this.byteOrder = byteOrder;
diff --git a/server/src/main/java/org/apache/druid/metadata/SQLMetadataStorageActionHandler.java b/server/src/main/java/org/apache/druid/metadata/SQLMetadataStorageActionHandler.java
index e6fdcfb..7f30d04 100644
--- a/server/src/main/java/org/apache/druid/metadata/SQLMetadataStorageActionHandler.java
+++ b/server/src/main/java/org/apache/druid/metadata/SQLMetadataStorageActionHandler.java
@@ -70,6 +70,7 @@ public abstract class SQLMetadataStorageActionHandler<EntryType, StatusType, Log
private final TaskInfoMapper<EntryType, StatusType> taskInfoMapper;
+ @SuppressWarnings("PMD.UnnecessaryFullyQualifiedName")
public SQLMetadataStorageActionHandler(
final SQLMetadataConnector connector,
final ObjectMapper jsonMapper,
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@druid.apache.org
For additional commands, e-mail: commits-help@druid.apache.org