This is an automated email from the ASF dual-hosted git repository.
gwphua 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 034a1e09f79 Replace use of a deprecated method in commons-lang with
recommended replacement (#18615)
034a1e09f79 is described below
commit 034a1e09f7947c7a3be5373deead0c7653b3066f
Author: Lucas Capistrant <[email protected]>
AuthorDate: Sat Oct 11 08:22:58 2025 -0500
Replace use of a deprecated method in commons-lang with recommended
replacement (#18615)
---
codestyle/druid-forbidden-apis.txt | 1 +
.../KubernetesAndWorkerTaskRunnerConfig.java | 4 +--
.../k8s/overlord/KubernetesTaskRunnerConfig.java | 36 +++++++++++-----------
3 files changed, 21 insertions(+), 20 deletions(-)
diff --git a/codestyle/druid-forbidden-apis.txt
b/codestyle/druid-forbidden-apis.txt
index 959be162693..8dbf92ec8e4 100644
--- a/codestyle/druid-forbidden-apis.txt
+++ b/codestyle/druid-forbidden-apis.txt
@@ -53,6 +53,7 @@
org.apache.calcite.sql.type.OperandTypes#POSITIVE_INTEGER_LITERAL @ Use org.apac
org.apache.calcite.sql.type.OperandTypes#UNIT_INTERVAL_NUMERIC_LITERAL @
Create a type checker like org.apache.calcite.sql.type.POSITIVE_INTEGER_LITERAL
and use that instead
org.apache.calcite.sql.type.OperandTypes#NUMERIC_UNIT_INTERVAL_NUMERIC_LITERAL
@ Create a type checker like
org.apache.calcite.sql.type.POSITIVE_INTEGER_LITERAL and use that instead
org.apache.calcite.sql.type.OperandTypes#NULLABLE_LITERAL @ Create an instance
of org.apache.calcite.sql.type.CastedLiteralOperandTypeChecker that allows
nulls and use that instead
+org.apache.commons.lang3.ObjectUtils#defaultIfNull(java.lang.Object,
java.lang.Object) @ Use ObjectUtils#getIfNull(java.lang.Object,
java.lang.Object) instead
org.apache.commons.io.Charsets @ Use java.nio.charset.StandardCharsets instead
org.apache.commons.io.FileUtils#getTempDirectory() @ Use
org.junit.rules.TemporaryFolder for tests instead
org.apache.commons.io.FileUtils#deleteDirectory(java.io.File) @ Use
org.apache.druid.java.util.common.FileUtils#deleteDirectory()
diff --git
a/extensions-core/kubernetes-overlord-extensions/src/main/java/org/apache/druid/k8s/overlord/KubernetesAndWorkerTaskRunnerConfig.java
b/extensions-core/kubernetes-overlord-extensions/src/main/java/org/apache/druid/k8s/overlord/KubernetesAndWorkerTaskRunnerConfig.java
index 3efbfa18dce..89311981b0e 100644
---
a/extensions-core/kubernetes-overlord-extensions/src/main/java/org/apache/druid/k8s/overlord/KubernetesAndWorkerTaskRunnerConfig.java
+++
b/extensions-core/kubernetes-overlord-extensions/src/main/java/org/apache/druid/k8s/overlord/KubernetesAndWorkerTaskRunnerConfig.java
@@ -48,8 +48,8 @@ public class KubernetesAndWorkerTaskRunnerConfig
@JsonProperty(RUNNER_STRATEGY_WORKER_TYPE) @Nullable String workerType
)
{
- this.runnerStrategy = ObjectUtils.defaultIfNull(runnerStrategy,
KubernetesTaskRunnerFactory.TYPE_NAME);
- this.workerType = ObjectUtils.defaultIfNull(workerType,
HttpRemoteTaskRunnerFactory.TYPE_NAME);
+ this.runnerStrategy = ObjectUtils.getIfNull(runnerStrategy,
KubernetesTaskRunnerFactory.TYPE_NAME);
+ this.workerType = ObjectUtils.getIfNull(workerType,
HttpRemoteTaskRunnerFactory.TYPE_NAME);
Preconditions.checkArgument(
this.workerType.equals(HttpRemoteTaskRunnerFactory.TYPE_NAME) ||
this.workerType.equals(RemoteTaskRunnerFactory.TYPE_NAME),
diff --git
a/extensions-core/kubernetes-overlord-extensions/src/main/java/org/apache/druid/k8s/overlord/KubernetesTaskRunnerConfig.java
b/extensions-core/kubernetes-overlord-extensions/src/main/java/org/apache/druid/k8s/overlord/KubernetesTaskRunnerConfig.java
index d810c9ee23a..663126ba2e6 100644
---
a/extensions-core/kubernetes-overlord-extensions/src/main/java/org/apache/druid/k8s/overlord/KubernetesTaskRunnerConfig.java
+++
b/extensions-core/kubernetes-overlord-extensions/src/main/java/org/apache/druid/k8s/overlord/KubernetesTaskRunnerConfig.java
@@ -168,77 +168,77 @@ public class KubernetesTaskRunnerConfig
)
{
this.namespace = namespace;
- this.overlordNamespace = ObjectUtils.defaultIfNull(
+ this.overlordNamespace = ObjectUtils.getIfNull(
overlordNamespace,
this.overlordNamespace
);
this.k8sTaskPodNamePrefix = k8sTaskPodNamePrefix;
- this.debugJobs = ObjectUtils.defaultIfNull(
+ this.debugJobs = ObjectUtils.getIfNull(
debugJobs,
this.debugJobs
);
- this.sidecarSupport = ObjectUtils.defaultIfNull(
+ this.sidecarSupport = ObjectUtils.getIfNull(
sidecarSupport,
this.sidecarSupport
);
- this.primaryContainerName = ObjectUtils.defaultIfNull(
+ this.primaryContainerName = ObjectUtils.getIfNull(
primaryContainerName,
this.primaryContainerName
);
- this.kubexitImage = ObjectUtils.defaultIfNull(
+ this.kubexitImage = ObjectUtils.getIfNull(
kubexitImage,
this.kubexitImage
);
- this.graceTerminationPeriodSeconds = ObjectUtils.defaultIfNull(
+ this.graceTerminationPeriodSeconds = ObjectUtils.getIfNull(
graceTerminationPeriodSeconds,
this.graceTerminationPeriodSeconds
);
this.disableClientProxy = disableClientProxy;
- this.maxTaskDuration = ObjectUtils.defaultIfNull(
+ this.maxTaskDuration = ObjectUtils.getIfNull(
maxTaskDuration,
this.maxTaskDuration
);
- this.taskCleanupDelay = ObjectUtils.defaultIfNull(
+ this.taskCleanupDelay = ObjectUtils.getIfNull(
taskCleanupDelay,
this.taskCleanupDelay
);
- this.taskCleanupInterval = ObjectUtils.defaultIfNull(
+ this.taskCleanupInterval = ObjectUtils.getIfNull(
taskCleanupInterval,
this.taskCleanupInterval
);
- this.k8sjobLaunchTimeout = ObjectUtils.defaultIfNull(
+ this.k8sjobLaunchTimeout = ObjectUtils.getIfNull(
k8sjobLaunchTimeout,
this.k8sjobLaunchTimeout
);
- this.taskJoinTimeout = ObjectUtils.defaultIfNull(
+ this.taskJoinTimeout = ObjectUtils.getIfNull(
taskJoinTimeout,
this.taskJoinTimeout
);
- this.logSaveTimeout = ObjectUtils.defaultIfNull(
+ this.logSaveTimeout = ObjectUtils.getIfNull(
logSaveTimeout,
this.logSaveTimeout
);
- this.peonMonitors = ObjectUtils.defaultIfNull(
+ this.peonMonitors = ObjectUtils.getIfNull(
peonMonitors,
this.peonMonitors
);
- this.javaOptsArray = ObjectUtils.defaultIfNull(
+ this.javaOptsArray = ObjectUtils.getIfNull(
javaOptsArray,
this.javaOptsArray
);
- this.cpuCoreInMicro = ObjectUtils.defaultIfNull(
+ this.cpuCoreInMicro = ObjectUtils.getIfNull(
cpuCoreInMicro,
this.cpuCoreInMicro
);
- this.labels = ObjectUtils.defaultIfNull(
+ this.labels = ObjectUtils.getIfNull(
labels,
this.labels
);
- this.annotations = ObjectUtils.defaultIfNull(
+ this.annotations = ObjectUtils.getIfNull(
annotations,
this.annotations
);
- this.capacity = ObjectUtils.defaultIfNull(
+ this.capacity = ObjectUtils.getIfNull(
capacity,
this.capacity
);
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
