From 078b3fe977ad333a1c778f0b316cb52116fdf5e3 Mon Sep 17 00:00:00 2001 From: Fokko Driesprong Date: Tue, 23 Jul 2019 20:33:08 +0200 Subject: [PATCH 1/5] Add SuppressWarnings SS_SHOULD_BE_STATIC Fixes #8073 --- .../org/apache/druid/indexing/worker/config/WorkerConfig.java | 1 + 1 file changed, 1 insertion(+) diff --git a/indexing-service/src/main/java/org/apache/druid/indexing/worker/config/WorkerConfig.java b/indexing-service/src/main/java/org/apache/druid/indexing/worker/config/WorkerConfig.java index 65d09e7521bb..d6182176ef1b 100644 --- a/indexing-service/src/main/java/org/apache/druid/indexing/worker/config/WorkerConfig.java +++ b/indexing-service/src/main/java/org/apache/druid/indexing/worker/config/WorkerConfig.java @@ -29,6 +29,7 @@ /** */ +@SuppressWarnings("SS_SHOULD_BE_STATIC") public class WorkerConfig { @JsonProperty From 4c287e1a93869aa9fa359b6489ddffad13782323 Mon Sep 17 00:00:00 2001 From: Fokko Driesprong Date: Tue, 23 Jul 2019 12:18:49 +0200 Subject: [PATCH 2/5] Spotbugs: SS_SHOULD_BE_STATIC (#8073) --- codestyle/spotbugs-exclude.xml | 1 - .../apache/druid/server/security/AnonymousAuthenticator.java | 2 +- 2 files changed, 1 insertion(+), 2 deletions(-) diff --git a/codestyle/spotbugs-exclude.xml b/codestyle/spotbugs-exclude.xml index fe8a6dee64fd..3ee23309bcf4 100644 --- a/codestyle/spotbugs-exclude.xml +++ b/codestyle/spotbugs-exclude.xml @@ -83,7 +83,6 @@ - diff --git a/server/src/main/java/org/apache/druid/server/security/AnonymousAuthenticator.java b/server/src/main/java/org/apache/druid/server/security/AnonymousAuthenticator.java index 7cfe76c52047..a11018964a95 100644 --- a/server/src/main/java/org/apache/druid/server/security/AnonymousAuthenticator.java +++ b/server/src/main/java/org/apache/druid/server/security/AnonymousAuthenticator.java @@ -40,8 +40,8 @@ @JsonTypeName("anonymous") public class AnonymousAuthenticator implements Authenticator { + private static final String DEFAULT_IDENTITY = "defaultUser"; private final AuthenticationResult anonymousResult; - private final String DEFAULT_IDENTITY = "defaultUser"; @JsonCreator public AnonymousAuthenticator( From 14a3df535cee99c7eb30596979baf580a8a0cf7f Mon Sep 17 00:00:00 2001 From: Fokko Driesprong Date: Wed, 24 Jul 2019 14:02:48 +0200 Subject: [PATCH 3/5] Fix the voilation --- .../indexing/worker/config/WorkerConfig.java | 20 ++++++++++--------- 1 file changed, 11 insertions(+), 9 deletions(-) diff --git a/indexing-service/src/main/java/org/apache/druid/indexing/worker/config/WorkerConfig.java b/indexing-service/src/main/java/org/apache/druid/indexing/worker/config/WorkerConfig.java index d6182176ef1b..e41af064567d 100644 --- a/indexing-service/src/main/java/org/apache/druid/indexing/worker/config/WorkerConfig.java +++ b/indexing-service/src/main/java/org/apache/druid/indexing/worker/config/WorkerConfig.java @@ -24,40 +24,42 @@ import org.apache.druid.utils.JvmUtils; import org.joda.time.Period; +import javax.annotation.Nonnull; import javax.validation.constraints.Min; import javax.validation.constraints.NotNull; /** */ -@SuppressWarnings("SS_SHOULD_BE_STATIC") public class WorkerConfig { @JsonProperty @NotNull private final String ip = DruidNode.getDefaultHost(); - @JsonProperty + @JsonProperty(defaultValue = "0") @NotNull - private final String version = "0"; + private String version; @JsonProperty @Min(1) private final int capacity = Math.max(1, JvmUtils.getRuntimeInfo().getAvailableProcessors() - 1); - @JsonProperty - private final long intermediaryPartitionDiscoveryPeriodSec = 60L; + @JsonProperty(defaultValue = "60") + private long intermediaryPartitionDiscoveryPeriodSec; - @JsonProperty - private final long intermediaryPartitionCleanupPeriodSec = 300L; + @JsonProperty(defaultValue = "300") + private long intermediaryPartitionCleanupPeriodSec; - @JsonProperty - private final Period intermediaryPartitionTimeout = new Period("P1D"); + @JsonProperty(defaultValue = "P1D") + private Period intermediaryPartitionTimeout; + @Nonnull public String getIp() { return ip; } + @Nonnull public String getVersion() { return version; From ded55cc493fe64cbf1000921487544e047a47897 Mon Sep 17 00:00:00 2001 From: Fokko Driesprong Date: Mon, 29 Jul 2019 09:40:43 +0200 Subject: [PATCH 4/5] Make them non-final --- .../indexing/worker/config/WorkerConfig.java | 20 +++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) diff --git a/indexing-service/src/main/java/org/apache/druid/indexing/worker/config/WorkerConfig.java b/indexing-service/src/main/java/org/apache/druid/indexing/worker/config/WorkerConfig.java index e41af064567d..84584fe65483 100644 --- a/indexing-service/src/main/java/org/apache/druid/indexing/worker/config/WorkerConfig.java +++ b/indexing-service/src/main/java/org/apache/druid/indexing/worker/config/WorkerConfig.java @@ -34,24 +34,24 @@ public class WorkerConfig { @JsonProperty @NotNull - private final String ip = DruidNode.getDefaultHost(); + private String ip = DruidNode.getDefaultHost(); - @JsonProperty(defaultValue = "0") + @JsonProperty @NotNull - private String version; + private String version = "0"; @JsonProperty @Min(1) - private final int capacity = Math.max(1, JvmUtils.getRuntimeInfo().getAvailableProcessors() - 1); + private int capacity = Math.max(1, JvmUtils.getRuntimeInfo().getAvailableProcessors() - 1); - @JsonProperty(defaultValue = "60") - private long intermediaryPartitionDiscoveryPeriodSec; + @JsonProperty + private long intermediaryPartitionDiscoveryPeriodSec = 60L; - @JsonProperty(defaultValue = "300") - private long intermediaryPartitionCleanupPeriodSec; + @JsonProperty + private long intermediaryPartitionCleanupPeriodSec = 300L; - @JsonProperty(defaultValue = "P1D") - private Period intermediaryPartitionTimeout; + @JsonProperty + private Period intermediaryPartitionTimeout = new Period("P1D"); @Nonnull public String getIp() From cdb59ff903ab0990975ff6145888963d1c0e7c82 Mon Sep 17 00:00:00 2001 From: Fokko Driesprong Date: Tue, 30 Jul 2019 21:36:50 +0200 Subject: [PATCH 5/5] Remove @Nonnull --- .../apache/druid/indexing/worker/config/WorkerConfig.java | 6 ------ 1 file changed, 6 deletions(-) diff --git a/indexing-service/src/main/java/org/apache/druid/indexing/worker/config/WorkerConfig.java b/indexing-service/src/main/java/org/apache/druid/indexing/worker/config/WorkerConfig.java index 84584fe65483..4bfa6ee9521c 100644 --- a/indexing-service/src/main/java/org/apache/druid/indexing/worker/config/WorkerConfig.java +++ b/indexing-service/src/main/java/org/apache/druid/indexing/worker/config/WorkerConfig.java @@ -24,20 +24,16 @@ import org.apache.druid.utils.JvmUtils; import org.joda.time.Period; -import javax.annotation.Nonnull; import javax.validation.constraints.Min; -import javax.validation.constraints.NotNull; /** */ public class WorkerConfig { @JsonProperty - @NotNull private String ip = DruidNode.getDefaultHost(); @JsonProperty - @NotNull private String version = "0"; @JsonProperty @@ -53,13 +49,11 @@ public class WorkerConfig @JsonProperty private Period intermediaryPartitionTimeout = new Period("P1D"); - @Nonnull public String getIp() { return ip; } - @Nonnull public String getVersion() { return version;