This is an automated email from the ASF dual-hosted git repository.
gyfora pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/flink-kubernetes-operator.git
The following commit(s) were added to refs/heads/main by this push:
new ff4c730e [FLINK-33471] Make flink kubernetes operator compilable with
jdk21
ff4c730e is described below
commit ff4c730e0612a44fa9fc2eda09e1fe6bb7054145
Author: Sergey Nuyanzin <[email protected]>
AuthorDate: Fri Nov 10 08:57:45 2023 +0100
[FLINK-33471] Make flink kubernetes operator compilable with jdk21
---
.github/workflows/ci.yml | 14 +++---
.../operator/controller/FlinkResourceContext.java | 12 +++--
.../operator/utils/EventSourceUtils.java | 9 ++--
.../kubernetes/operator/OperatorTestBase.java | 4 +-
.../controller/DeploymentRecoveryTest.java | 4 +-
.../controller/FailedDeploymentRestartTest.java | 4 +-
.../operator/controller/RollbackTest.java | 4 +-
.../controller/UnhealthyDeploymentRestartTest.java | 4 +-
.../operator/health/HealthProbeTest.java | 4 +-
.../metrics/FlinkDeploymentMetricsTest.java | 4 +-
.../metrics/FlinkSessionJobMetricsTest.java | 4 +-
.../metrics/KubernetesOperatorMetricGroupTest.java | 4 +-
.../deployment/ApplicationObserverTest.java | 55 +++++++++++++++++-----
.../deployment/ApplicationReconcilerTest.java | 14 +++---
.../ApplicationReconcilerUpgradeModeTest.java | 14 +++---
.../operator/service/AbstractFlinkServiceTest.java | 4 +-
.../operator/service/NativeFlinkServiceTest.java | 4 +-
.../service/StandaloneFlinkServiceTest.java | 4 +-
.../Fabric8FlinkStandaloneKubeClientTest.java | 4 +-
.../CmdStandaloneJobManagerDecoratorTest.java | 4 +-
.../CmdStandaloneTaskManagerDecoratorTest.java | 4 +-
.../InitStandaloneTaskManagerDecoratorTest.java | 4 +-
.../decorators/UserLibMountDecoratorTest.java | 4 +-
.../StandaloneKubernetesJobManagerFactoryTest.java | 4 +-
...StandaloneKubernetesTaskManagerFactoryTest.java | 4 +-
...andaloneKubernetesJobManagerParametersTest.java | 4 +-
...ndaloneKubernetesTaskManagerParametersTest.java | 4 +-
.../KubernetesStandaloneClusterDescriptorTest.java | 4 +-
.../operator/admission/AdmissionHandlerTest.java | 4 +-
pom.xml | 6 +--
30 files changed, 153 insertions(+), 63 deletions(-)
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index 70cd7f3a..40bdfc64 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -26,7 +26,7 @@ jobs:
name: test_ci
strategy:
matrix:
- java-version: [ 11, 17 ]
+ java-version: [ 11, 17, 21 ]
steps:
- uses: actions/checkout@v2
- name: Set up JDK ${{ matrix.java-version }}
@@ -73,7 +73,7 @@ jobs:
version: ["v1_18","v1_17","v1_16","v1_15"]
namespace: ["default","flink"]
mode: ["native", "standalone"]
- java-version: [ 11, 17 ]
+ java-version: [ 11, 17, 21 ]
test:
- test_application_kubernetes_ha.sh
- test_application_operations.sh
@@ -114,16 +114,18 @@ jobs:
test: test_dynamic_config.sh
- version: v1_17
test: test_dynamic_config.sh
- - version: v1_13
- java-version: 17
- - version: v1_14
- java-version: 17
- version: v1_15
java-version: 17
- version: v1_16
java-version: 17
- version: v1_17
java-version: 17
+ - version: v1_15
+ java-version: 21
+ - version: v1_16
+ java-version: 21
+ - version: v1_17
+ java-version: 21
name: e2e_ci
steps:
- uses: actions/checkout@v2
diff --git
a/flink-kubernetes-operator/src/main/java/org/apache/flink/kubernetes/operator/controller/FlinkResourceContext.java
b/flink-kubernetes-operator/src/main/java/org/apache/flink/kubernetes/operator/controller/FlinkResourceContext.java
index ab967e7c..e2b70f21 100644
---
a/flink-kubernetes-operator/src/main/java/org/apache/flink/kubernetes/operator/controller/FlinkResourceContext.java
+++
b/flink-kubernetes-operator/src/main/java/org/apache/flink/kubernetes/operator/controller/FlinkResourceContext.java
@@ -143,13 +143,19 @@ public abstract class FlinkResourceContext<CR extends
AbstractFlinkResource<?, ?
*/
protected abstract Configuration createObserveConfig();
- /** @return Cluster deployment mode. */
+ /**
+ * @return Cluster deployment mode.
+ */
public abstract KubernetesDeploymentMode getDeploymentMode();
- /** @return Cluster Flink Version. */
+ /**
+ * @return Cluster Flink Version.
+ */
public abstract FlinkVersion getFlinkVersion();
- /** @return Operator configuration for this resource. */
+ /**
+ * @return Operator configuration for this resource.
+ */
public FlinkOperatorConfiguration getOperatorConfig() {
if (operatorConfig != null) {
return operatorConfig;
diff --git
a/flink-kubernetes-operator/src/main/java/org/apache/flink/kubernetes/operator/utils/EventSourceUtils.java
b/flink-kubernetes-operator/src/main/java/org/apache/flink/kubernetes/operator/utils/EventSourceUtils.java
index da0a4fd1..d6fa29bd 100644
---
a/flink-kubernetes-operator/src/main/java/org/apache/flink/kubernetes/operator/utils/EventSourceUtils.java
+++
b/flink-kubernetes-operator/src/main/java/org/apache/flink/kubernetes/operator/utils/EventSourceUtils.java
@@ -46,7 +46,8 @@ public class EventSourceUtils {
EventSourceContext<FlinkDeployment> context) {
final String labelSelector =
Map.of(Constants.LABEL_COMPONENT_KEY,
Constants.LABEL_COMPONENT_JOB_MANAGER)
- .entrySet().stream()
+ .entrySet()
+ .stream()
.map(Object::toString)
.collect(Collectors.joining(","));
@@ -77,7 +78,8 @@ public class EventSourceUtils {
InformerConfiguration.from(FlinkSessionJob.class, context)
.withSecondaryToPrimaryMapper(
sessionJob ->
- context.getPrimaryCache()
+ context
+ .getPrimaryCache()
.byIndex(
FLINK_DEPLOYMENT_IDX,
indexKey(
@@ -112,7 +114,8 @@ public class EventSourceUtils {
InformerConfiguration.from(FlinkDeployment.class, context)
.withSecondaryToPrimaryMapper(
flinkDeployment ->
- context.getPrimaryCache()
+ context
+ .getPrimaryCache()
.byIndex(
FLINK_SESSIONJOB_IDX,
indexKey(
diff --git
a/flink-kubernetes-operator/src/test/java/org/apache/flink/kubernetes/operator/OperatorTestBase.java
b/flink-kubernetes-operator/src/test/java/org/apache/flink/kubernetes/operator/OperatorTestBase.java
index cb9aba35..561e0275 100644
---
a/flink-kubernetes-operator/src/test/java/org/apache/flink/kubernetes/operator/OperatorTestBase.java
+++
b/flink-kubernetes-operator/src/test/java/org/apache/flink/kubernetes/operator/OperatorTestBase.java
@@ -29,7 +29,9 @@ import io.fabric8.kubernetes.client.KubernetesClient;
import io.javaoperatorsdk.operator.api.reconciler.Context;
import org.junit.jupiter.api.BeforeEach;
-/** @link JobStatusObserver unit tests */
+/**
+ * @link JobStatusObserver unit tests
+ */
public abstract class OperatorTestBase {
protected Configuration conf = new Configuration();
diff --git
a/flink-kubernetes-operator/src/test/java/org/apache/flink/kubernetes/operator/controller/DeploymentRecoveryTest.java
b/flink-kubernetes-operator/src/test/java/org/apache/flink/kubernetes/operator/controller/DeploymentRecoveryTest.java
index 61592364..67857b52 100644
---
a/flink-kubernetes-operator/src/test/java/org/apache/flink/kubernetes/operator/controller/DeploymentRecoveryTest.java
+++
b/flink-kubernetes-operator/src/test/java/org/apache/flink/kubernetes/operator/controller/DeploymentRecoveryTest.java
@@ -38,7 +38,9 @@ import org.junit.jupiter.params.provider.MethodSource;
import static org.junit.jupiter.api.Assertions.assertEquals;
import static org.junit.jupiter.api.Assertions.assertTrue;
-/** @link Missing deployment recovery tests */
+/**
+ * @link Missing deployment recovery tests
+ */
@EnableKubernetesMockClient(crud = true)
public class DeploymentRecoveryTest {
diff --git
a/flink-kubernetes-operator/src/test/java/org/apache/flink/kubernetes/operator/controller/FailedDeploymentRestartTest.java
b/flink-kubernetes-operator/src/test/java/org/apache/flink/kubernetes/operator/controller/FailedDeploymentRestartTest.java
index cdb77fd1..131d0756 100644
---
a/flink-kubernetes-operator/src/test/java/org/apache/flink/kubernetes/operator/controller/FailedDeploymentRestartTest.java
+++
b/flink-kubernetes-operator/src/test/java/org/apache/flink/kubernetes/operator/controller/FailedDeploymentRestartTest.java
@@ -36,7 +36,9 @@ import org.junit.jupiter.params.provider.MethodSource;
import static
org.apache.flink.kubernetes.operator.config.KubernetesOperatorConfigOptions.OPERATOR_JOB_RESTART_FAILED;
import static org.junit.jupiter.api.Assertions.assertEquals;
-/** @link Unhealthy deployment restart tests */
+/**
+ * @link Unhealthy deployment restart tests
+ */
@EnableKubernetesMockClient(crud = true)
public class FailedDeploymentRestartTest {
private FlinkConfigManager configManager;
diff --git
a/flink-kubernetes-operator/src/test/java/org/apache/flink/kubernetes/operator/controller/RollbackTest.java
b/flink-kubernetes-operator/src/test/java/org/apache/flink/kubernetes/operator/controller/RollbackTest.java
index f6ca19ae..b5518f91 100644
---
a/flink-kubernetes-operator/src/test/java/org/apache/flink/kubernetes/operator/controller/RollbackTest.java
+++
b/flink-kubernetes-operator/src/test/java/org/apache/flink/kubernetes/operator/controller/RollbackTest.java
@@ -51,7 +51,9 @@ import static
org.junit.jupiter.api.Assertions.assertNotEquals;
import static org.junit.jupiter.api.Assertions.assertNull;
import static org.junit.jupiter.api.Assertions.assertTrue;
-/** @link RollBack logic tests */
+/**
+ * @link RollBack logic tests
+ */
@EnableKubernetesMockClient(crud = true)
public class RollbackTest {
diff --git
a/flink-kubernetes-operator/src/test/java/org/apache/flink/kubernetes/operator/controller/UnhealthyDeploymentRestartTest.java
b/flink-kubernetes-operator/src/test/java/org/apache/flink/kubernetes/operator/controller/UnhealthyDeploymentRestartTest.java
index 1d377e25..5cdb9781 100644
---
a/flink-kubernetes-operator/src/test/java/org/apache/flink/kubernetes/operator/controller/UnhealthyDeploymentRestartTest.java
+++
b/flink-kubernetes-operator/src/test/java/org/apache/flink/kubernetes/operator/controller/UnhealthyDeploymentRestartTest.java
@@ -41,7 +41,9 @@ import static
org.apache.flink.kubernetes.operator.config.KubernetesOperatorConf
import static
org.apache.flink.kubernetes.operator.config.KubernetesOperatorConfigOptions.OPERATOR_CLUSTER_HEALTH_CHECK_RESTARTS_THRESHOLD;
import static org.junit.jupiter.api.Assertions.assertEquals;
-/** @link Unhealthy deployment restart tests */
+/**
+ * @link Unhealthy deployment restart tests
+ */
@EnableKubernetesMockClient(crud = true)
public class UnhealthyDeploymentRestartTest {
diff --git
a/flink-kubernetes-operator/src/test/java/org/apache/flink/kubernetes/operator/health/HealthProbeTest.java
b/flink-kubernetes-operator/src/test/java/org/apache/flink/kubernetes/operator/health/HealthProbeTest.java
index d06abce4..891d7592 100644
---
a/flink-kubernetes-operator/src/test/java/org/apache/flink/kubernetes/operator/health/HealthProbeTest.java
+++
b/flink-kubernetes-operator/src/test/java/org/apache/flink/kubernetes/operator/health/HealthProbeTest.java
@@ -51,7 +51,9 @@ import static org.junit.jupiter.api.Assertions.assertFalse;
import static org.junit.jupiter.api.Assertions.assertNotNull;
import static org.junit.jupiter.api.Assertions.assertTrue;
-/** @link Health probe unit tests */
+/**
+ * @link Health probe unit tests
+ */
@EnableKubernetesMockClient(crud = true)
public class HealthProbeTest {
KubernetesClient client;
diff --git
a/flink-kubernetes-operator/src/test/java/org/apache/flink/kubernetes/operator/metrics/FlinkDeploymentMetricsTest.java
b/flink-kubernetes-operator/src/test/java/org/apache/flink/kubernetes/operator/metrics/FlinkDeploymentMetricsTest.java
index 167c6ae9..73dd58a2 100644
---
a/flink-kubernetes-operator/src/test/java/org/apache/flink/kubernetes/operator/metrics/FlinkDeploymentMetricsTest.java
+++
b/flink-kubernetes-operator/src/test/java/org/apache/flink/kubernetes/operator/metrics/FlinkDeploymentMetricsTest.java
@@ -43,7 +43,9 @@ import static org.assertj.core.api.Assertions.assertThat;
import static org.junit.jupiter.api.Assertions.assertEquals;
import static org.junit.jupiter.api.Assertions.assertTrue;
-/** @link FlinkDeploymentMetrics tests. */
+/**
+ * @link FlinkDeploymentMetrics tests.
+ */
public class FlinkDeploymentMetricsTest {
private final Configuration configuration = new Configuration();
diff --git
a/flink-kubernetes-operator/src/test/java/org/apache/flink/kubernetes/operator/metrics/FlinkSessionJobMetricsTest.java
b/flink-kubernetes-operator/src/test/java/org/apache/flink/kubernetes/operator/metrics/FlinkSessionJobMetricsTest.java
index 7a8f610a..1a10c99c 100644
---
a/flink-kubernetes-operator/src/test/java/org/apache/flink/kubernetes/operator/metrics/FlinkSessionJobMetricsTest.java
+++
b/flink-kubernetes-operator/src/test/java/org/apache/flink/kubernetes/operator/metrics/FlinkSessionJobMetricsTest.java
@@ -29,7 +29,9 @@ import static
org.apache.flink.kubernetes.operator.metrics.KubernetesOperatorMet
import static org.junit.jupiter.api.Assertions.assertEquals;
import static org.junit.jupiter.api.Assertions.assertTrue;
-/** @link FlinkSessionJobMetrics tests. */
+/**
+ * @link FlinkSessionJobMetrics tests.
+ */
public class FlinkSessionJobMetricsTest {
private final Configuration configuration = new Configuration();
diff --git
a/flink-kubernetes-operator/src/test/java/org/apache/flink/kubernetes/operator/metrics/KubernetesOperatorMetricGroupTest.java
b/flink-kubernetes-operator/src/test/java/org/apache/flink/kubernetes/operator/metrics/KubernetesOperatorMetricGroupTest.java
index aec62f01..211bb65a 100644
---
a/flink-kubernetes-operator/src/test/java/org/apache/flink/kubernetes/operator/metrics/KubernetesOperatorMetricGroupTest.java
+++
b/flink-kubernetes-operator/src/test/java/org/apache/flink/kubernetes/operator/metrics/KubernetesOperatorMetricGroupTest.java
@@ -30,7 +30,9 @@ import static
org.apache.flink.kubernetes.operator.metrics.KubernetesOperatorMet
import static org.junit.jupiter.api.Assertions.assertArrayEquals;
import static org.junit.jupiter.api.Assertions.assertEquals;
-/** @link KubernetesOperatorMetricGroup tests. */
+/**
+ * @link KubernetesOperatorMetricGroup tests.
+ */
public class KubernetesOperatorMetricGroupTest {
@Test
diff --git
a/flink-kubernetes-operator/src/test/java/org/apache/flink/kubernetes/operator/observer/deployment/ApplicationObserverTest.java
b/flink-kubernetes-operator/src/test/java/org/apache/flink/kubernetes/operator/observer/deployment/ApplicationObserverTest.java
index 4e57245d..5d847cf3 100644
---
a/flink-kubernetes-operator/src/test/java/org/apache/flink/kubernetes/operator/observer/deployment/ApplicationObserverTest.java
+++
b/flink-kubernetes-operator/src/test/java/org/apache/flink/kubernetes/operator/observer/deployment/ApplicationObserverTest.java
@@ -259,17 +259,26 @@ public class ApplicationObserverTest extends
OperatorTestBase {
assertEquals(
0,
(int)
- kubernetesClient.v1().events()
-
.inNamespace(deployment.getMetadata().getNamespace()).list()
- .getItems().stream()
+ kubernetesClient
+ .v1()
+ .events()
+
.inNamespace(deployment.getMetadata().getNamespace())
+ .list()
+ .getItems()
+ .stream()
.filter(e ->
e.getReason().contains("SavepointError"))
.count());
observer.observe(deployment, readyContext);
assertFalse(SnapshotUtils.savepointInProgress(deployment.getStatus().getJobStatus()));
assertEquals(
1,
-
kubernetesClient.v1().events().inNamespace(deployment.getMetadata().getNamespace())
- .list().getItems().stream()
+ kubernetesClient
+ .v1()
+ .events()
+ .inNamespace(deployment.getMetadata().getNamespace())
+ .list()
+ .getItems()
+ .stream()
.filter(e -> e.getReason().contains("SavepointError"))
.count());
@@ -289,8 +298,13 @@ public class ApplicationObserverTest extends
OperatorTestBase {
assertFalse(SnapshotUtils.savepointInProgress(deployment.getStatus().getJobStatus()));
assertEquals(
1,
-
kubernetesClient.v1().events().inNamespace(deployment.getMetadata().getNamespace())
- .list().getItems().stream()
+ kubernetesClient
+ .v1()
+ .events()
+ .inNamespace(deployment.getMetadata().getNamespace())
+ .list()
+ .getItems()
+ .stream()
.filter(e -> e.getReason().contains("SavepointError"))
.filter(
e ->
@@ -301,8 +315,13 @@ public class ApplicationObserverTest extends
OperatorTestBase {
.count());
assertEquals(
2,
-
kubernetesClient.v1().events().inNamespace(deployment.getMetadata().getNamespace())
- .list().getItems().stream()
+ kubernetesClient
+ .v1()
+ .events()
+ .inNamespace(deployment.getMetadata().getNamespace())
+ .list()
+ .getItems()
+ .stream()
.filter(e -> e.getReason().contains("SavepointError"))
.filter(
e ->
@@ -414,8 +433,13 @@ public class ApplicationObserverTest extends
OperatorTestBase {
assertEquals(
1,
-
kubernetesClient.v1().events().inNamespace(deployment.getMetadata().getNamespace())
- .list().getItems().stream()
+ kubernetesClient
+ .v1()
+ .events()
+ .inNamespace(deployment.getMetadata().getNamespace())
+ .list()
+ .getItems()
+ .stream()
.filter(e -> e.getReason().contains("SavepointError"))
.filter(
e ->
@@ -426,8 +450,13 @@ public class ApplicationObserverTest extends
OperatorTestBase {
.count());
assertEquals(
1,
-
kubernetesClient.v1().events().inNamespace(deployment.getMetadata().getNamespace())
- .list().getItems().stream()
+ kubernetesClient
+ .v1()
+ .events()
+ .inNamespace(deployment.getMetadata().getNamespace())
+ .list()
+ .getItems()
+ .stream()
.filter(e -> e.getReason().contains("SavepointError"))
.filter(
e ->
diff --git
a/flink-kubernetes-operator/src/test/java/org/apache/flink/kubernetes/operator/reconciler/deployment/ApplicationReconcilerTest.java
b/flink-kubernetes-operator/src/test/java/org/apache/flink/kubernetes/operator/reconciler/deployment/ApplicationReconcilerTest.java
index 9e507f09..acb6f664 100644
---
a/flink-kubernetes-operator/src/test/java/org/apache/flink/kubernetes/operator/reconciler/deployment/ApplicationReconcilerTest.java
+++
b/flink-kubernetes-operator/src/test/java/org/apache/flink/kubernetes/operator/reconciler/deployment/ApplicationReconcilerTest.java
@@ -126,7 +126,9 @@ import static org.junit.jupiter.api.Assertions.assertNull;
import static org.junit.jupiter.api.Assertions.assertTrue;
import static org.junit.jupiter.api.Assertions.fail;
-/** @link JobStatusObserver unit tests */
+/**
+ * @link JobStatusObserver unit tests
+ */
@EnableKubernetesMockClient(crud = true)
public class ApplicationReconcilerTest extends OperatorTestBase {
@@ -619,11 +621,11 @@ public class ApplicationReconcilerTest extends
OperatorTestBase {
.setJobStatus(
new JobStatus()
.toBuilder()
-
.jobId(runningJobs.get(0).f1.getJobId().toHexString())
- .jobName(runningJobs.get(0).f1.getJobName())
-
.updateTime(Long.toString(System.currentTimeMillis()))
- .state("RUNNING")
- .build());
+
.jobId(runningJobs.get(0).f1.getJobId().toHexString())
+
.jobName(runningJobs.get(0).f1.getJobName())
+
.updateTime(Long.toString(System.currentTimeMillis()))
+ .state("RUNNING")
+ .build());
deployment.getStatus().setJobManagerDeploymentStatus(JobManagerDeploymentStatus.READY);
}
diff --git
a/flink-kubernetes-operator/src/test/java/org/apache/flink/kubernetes/operator/reconciler/deployment/ApplicationReconcilerUpgradeModeTest.java
b/flink-kubernetes-operator/src/test/java/org/apache/flink/kubernetes/operator/reconciler/deployment/ApplicationReconcilerUpgradeModeTest.java
index 357e595a..a5416a04 100644
---
a/flink-kubernetes-operator/src/test/java/org/apache/flink/kubernetes/operator/reconciler/deployment/ApplicationReconcilerUpgradeModeTest.java
+++
b/flink-kubernetes-operator/src/test/java/org/apache/flink/kubernetes/operator/reconciler/deployment/ApplicationReconcilerUpgradeModeTest.java
@@ -65,7 +65,9 @@ import static
org.junit.jupiter.api.Assertions.assertNotEquals;
import static org.junit.jupiter.api.Assertions.assertNull;
import static org.junit.jupiter.api.Assertions.fail;
-/** @link JobStatusObserver unit tests */
+/**
+ * @link JobStatusObserver unit tests
+ */
@EnableKubernetesMockClient(crud = true)
public class ApplicationReconcilerUpgradeModeTest extends OperatorTestBase {
@@ -723,11 +725,11 @@ public class ApplicationReconcilerUpgradeModeTest extends
OperatorTestBase {
.setJobStatus(
new JobStatus()
.toBuilder()
-
.jobId(runningJobs.get(0).f1.getJobId().toHexString())
- .jobName(runningJobs.get(0).f1.getJobName())
-
.startTime(Long.toString(System.currentTimeMillis()))
- .state("RUNNING")
- .build());
+
.jobId(runningJobs.get(0).f1.getJobId().toHexString())
+
.jobName(runningJobs.get(0).f1.getJobName())
+
.startTime(Long.toString(System.currentTimeMillis()))
+ .state("RUNNING")
+ .build());
deployment.getStatus().setJobManagerDeploymentStatus(JobManagerDeploymentStatus.READY);
}
}
diff --git
a/flink-kubernetes-operator/src/test/java/org/apache/flink/kubernetes/operator/service/AbstractFlinkServiceTest.java
b/flink-kubernetes-operator/src/test/java/org/apache/flink/kubernetes/operator/service/AbstractFlinkServiceTest.java
index 74de21a8..2e0b17e9 100644
---
a/flink-kubernetes-operator/src/test/java/org/apache/flink/kubernetes/operator/service/AbstractFlinkServiceTest.java
+++
b/flink-kubernetes-operator/src/test/java/org/apache/flink/kubernetes/operator/service/AbstractFlinkServiceTest.java
@@ -130,7 +130,9 @@ import static org.junit.jupiter.api.Assertions.assertThrows;
import static org.junit.jupiter.api.Assertions.assertTrue;
import static org.junit.jupiter.api.Assertions.fail;
-/** @link FlinkService unit tests */
+/**
+ * @link FlinkService unit tests
+ */
@EnableKubernetesMockClient(crud = true)
public class AbstractFlinkServiceTest {
diff --git
a/flink-kubernetes-operator/src/test/java/org/apache/flink/kubernetes/operator/service/NativeFlinkServiceTest.java
b/flink-kubernetes-operator/src/test/java/org/apache/flink/kubernetes/operator/service/NativeFlinkServiceTest.java
index 27bc846a..c8c0afb3 100644
---
a/flink-kubernetes-operator/src/test/java/org/apache/flink/kubernetes/operator/service/NativeFlinkServiceTest.java
+++
b/flink-kubernetes-operator/src/test/java/org/apache/flink/kubernetes/operator/service/NativeFlinkServiceTest.java
@@ -79,7 +79,9 @@ import static org.junit.jupiter.api.Assertions.assertNull;
import static org.junit.jupiter.api.Assertions.assertTrue;
import static org.junit.jupiter.api.Assertions.fail;
-/** @link FlinkService unit tests */
+/**
+ * @link FlinkService unit tests
+ */
@EnableKubernetesMockClient(crud = true)
public class NativeFlinkServiceTest {
KubernetesClient client;
diff --git
a/flink-kubernetes-operator/src/test/java/org/apache/flink/kubernetes/operator/service/StandaloneFlinkServiceTest.java
b/flink-kubernetes-operator/src/test/java/org/apache/flink/kubernetes/operator/service/StandaloneFlinkServiceTest.java
index b7ad3b3a..f583df92 100644
---
a/flink-kubernetes-operator/src/test/java/org/apache/flink/kubernetes/operator/service/StandaloneFlinkServiceTest.java
+++
b/flink-kubernetes-operator/src/test/java/org/apache/flink/kubernetes/operator/service/StandaloneFlinkServiceTest.java
@@ -50,7 +50,9 @@ import static org.junit.jupiter.api.Assertions.assertEquals;
import static org.junit.jupiter.api.Assertions.assertFalse;
import static org.junit.jupiter.api.Assertions.assertTrue;
-/** @link StandaloneFlinkService unit tests */
+/**
+ * @link StandaloneFlinkService unit tests
+ */
@EnableKubernetesMockClient(crud = true)
public class StandaloneFlinkServiceTest {
KubernetesMockServer mockServer;
diff --git
a/flink-kubernetes-standalone/src/test/java/org/apache/flink/kubernetes/operator/kubeclient/Fabric8FlinkStandaloneKubeClientTest.java
b/flink-kubernetes-standalone/src/test/java/org/apache/flink/kubernetes/operator/kubeclient/Fabric8FlinkStandaloneKubeClientTest.java
index 671a07d0..2ac8eb37 100644
---
a/flink-kubernetes-standalone/src/test/java/org/apache/flink/kubernetes/operator/kubeclient/Fabric8FlinkStandaloneKubeClientTest.java
+++
b/flink-kubernetes-standalone/src/test/java/org/apache/flink/kubernetes/operator/kubeclient/Fabric8FlinkStandaloneKubeClientTest.java
@@ -43,7 +43,9 @@ import java.util.List;
import static
org.apache.flink.kubernetes.operator.kubeclient.utils.TestUtils.TEST_NAMESPACE;
import static org.junit.jupiter.api.Assertions.assertEquals;
-/** @link Fabric8FlinkStandaloneKubeClient unit tests */
+/**
+ * @link Fabric8FlinkStandaloneKubeClient unit tests
+ */
@EnableKubernetesMockClient(crud = true, https = false)
public class Fabric8FlinkStandaloneKubeClientTest {
KubernetesMockServer mockWebServer;
diff --git
a/flink-kubernetes-standalone/src/test/java/org/apache/flink/kubernetes/operator/kubeclient/decorators/CmdStandaloneJobManagerDecoratorTest.java
b/flink-kubernetes-standalone/src/test/java/org/apache/flink/kubernetes/operator/kubeclient/decorators/CmdStandaloneJobManagerDecoratorTest.java
index f42f8a96..d40f111c 100644
---
a/flink-kubernetes-standalone/src/test/java/org/apache/flink/kubernetes/operator/kubeclient/decorators/CmdStandaloneJobManagerDecoratorTest.java
+++
b/flink-kubernetes-standalone/src/test/java/org/apache/flink/kubernetes/operator/kubeclient/decorators/CmdStandaloneJobManagerDecoratorTest.java
@@ -36,7 +36,9 @@ import static org.hamcrest.MatcherAssert.assertThat;
import static org.hamcrest.Matchers.contains;
import static org.hamcrest.Matchers.containsInAnyOrder;
-/** @link CmdStandaloneJobManagerDecorator unit tests */
+/**
+ * @link CmdStandaloneJobManagerDecorator unit tests
+ */
public class CmdStandaloneJobManagerDecoratorTest {
private static final String MOCK_ENTRYPATH = "./docker-entrypath";
diff --git
a/flink-kubernetes-standalone/src/test/java/org/apache/flink/kubernetes/operator/kubeclient/decorators/CmdStandaloneTaskManagerDecoratorTest.java
b/flink-kubernetes-standalone/src/test/java/org/apache/flink/kubernetes/operator/kubeclient/decorators/CmdStandaloneTaskManagerDecoratorTest.java
index 09d623c0..7f06018d 100644
---
a/flink-kubernetes-standalone/src/test/java/org/apache/flink/kubernetes/operator/kubeclient/decorators/CmdStandaloneTaskManagerDecoratorTest.java
+++
b/flink-kubernetes-standalone/src/test/java/org/apache/flink/kubernetes/operator/kubeclient/decorators/CmdStandaloneTaskManagerDecoratorTest.java
@@ -29,7 +29,9 @@ import org.junit.jupiter.api.Test;
import static org.hamcrest.MatcherAssert.assertThat;
import static org.hamcrest.Matchers.containsInAnyOrder;
-/** @link CmdStandaloneTaskManagerDecorator unit tests */
+/**
+ * @link CmdStandaloneTaskManagerDecorator unit tests
+ */
public class CmdStandaloneTaskManagerDecoratorTest {
private static final String MOCK_ENTRYPATH = "./docker-entrypath";
diff --git
a/flink-kubernetes-standalone/src/test/java/org/apache/flink/kubernetes/operator/kubeclient/decorators/InitStandaloneTaskManagerDecoratorTest.java
b/flink-kubernetes-standalone/src/test/java/org/apache/flink/kubernetes/operator/kubeclient/decorators/InitStandaloneTaskManagerDecoratorTest.java
index 49da3158..54436e8d 100644
---
a/flink-kubernetes-standalone/src/test/java/org/apache/flink/kubernetes/operator/kubeclient/decorators/InitStandaloneTaskManagerDecoratorTest.java
+++
b/flink-kubernetes-standalone/src/test/java/org/apache/flink/kubernetes/operator/kubeclient/decorators/InitStandaloneTaskManagerDecoratorTest.java
@@ -47,7 +47,9 @@ import static org.hamcrest.MatcherAssert.assertThat;
import static org.hamcrest.Matchers.containsInAnyOrder;
import static org.junit.jupiter.api.Assertions.assertEquals;
-/** @link InitStandaloneTaskManagerDecorator unit tests */
+/**
+ * @link InitStandaloneTaskManagerDecorator unit tests
+ */
public class InitStandaloneTaskManagerDecoratorTest extends ParametersTestBase
{
private Pod resultPod;
diff --git
a/flink-kubernetes-standalone/src/test/java/org/apache/flink/kubernetes/operator/kubeclient/decorators/UserLibMountDecoratorTest.java
b/flink-kubernetes-standalone/src/test/java/org/apache/flink/kubernetes/operator/kubeclient/decorators/UserLibMountDecoratorTest.java
index 1ff98df3..8879a114 100644
---
a/flink-kubernetes-standalone/src/test/java/org/apache/flink/kubernetes/operator/kubeclient/decorators/UserLibMountDecoratorTest.java
+++
b/flink-kubernetes-standalone/src/test/java/org/apache/flink/kubernetes/operator/kubeclient/decorators/UserLibMountDecoratorTest.java
@@ -36,7 +36,9 @@ import java.util.List;
import static org.junit.jupiter.api.Assertions.assertEquals;
-/** @link UserLibMountDecorator unit tests */
+/**
+ * @link UserLibMountDecorator unit tests
+ */
public class UserLibMountDecoratorTest {
@Test
diff --git
a/flink-kubernetes-standalone/src/test/java/org/apache/flink/kubernetes/operator/kubeclient/factory/StandaloneKubernetesJobManagerFactoryTest.java
b/flink-kubernetes-standalone/src/test/java/org/apache/flink/kubernetes/operator/kubeclient/factory/StandaloneKubernetesJobManagerFactoryTest.java
index 29883805..a1514925 100644
---
a/flink-kubernetes-standalone/src/test/java/org/apache/flink/kubernetes/operator/kubeclient/factory/StandaloneKubernetesJobManagerFactoryTest.java
+++
b/flink-kubernetes-standalone/src/test/java/org/apache/flink/kubernetes/operator/kubeclient/factory/StandaloneKubernetesJobManagerFactoryTest.java
@@ -62,7 +62,9 @@ import static org.hamcrest.Matchers.containsInAnyOrder;
import static org.junit.jupiter.api.Assertions.assertEquals;
import static org.junit.jupiter.api.Assertions.assertNull;
-/** @link StandaloneKubernetesJobManagerFactory unit tests */
+/**
+ * @link StandaloneKubernetesJobManagerFactory unit tests
+ */
public class StandaloneKubernetesJobManagerFactoryTest extends
ParametersTestBase {
KubernetesJobManagerSpecification jmSpec;
diff --git
a/flink-kubernetes-standalone/src/test/java/org/apache/flink/kubernetes/operator/kubeclient/factory/StandaloneKubernetesTaskManagerFactoryTest.java
b/flink-kubernetes-standalone/src/test/java/org/apache/flink/kubernetes/operator/kubeclient/factory/StandaloneKubernetesTaskManagerFactoryTest.java
index 86271b40..0828f0af 100644
---
a/flink-kubernetes-standalone/src/test/java/org/apache/flink/kubernetes/operator/kubeclient/factory/StandaloneKubernetesTaskManagerFactoryTest.java
+++
b/flink-kubernetes-standalone/src/test/java/org/apache/flink/kubernetes/operator/kubeclient/factory/StandaloneKubernetesTaskManagerFactoryTest.java
@@ -46,7 +46,9 @@ import static org.hamcrest.MatcherAssert.assertThat;
import static org.hamcrest.Matchers.containsInAnyOrder;
import static org.junit.jupiter.api.Assertions.assertEquals;
-/** @link StandaloneKubernetesJobManagerFactory unit tests */
+/**
+ * @link StandaloneKubernetesJobManagerFactory unit tests
+ */
public class StandaloneKubernetesTaskManagerFactoryTest extends
ParametersTestBase {
private Deployment deployment;
diff --git
a/flink-kubernetes-standalone/src/test/java/org/apache/flink/kubernetes/operator/kubeclient/parameters/StandaloneKubernetesJobManagerParametersTest.java
b/flink-kubernetes-standalone/src/test/java/org/apache/flink/kubernetes/operator/kubeclient/parameters/StandaloneKubernetesJobManagerParametersTest.java
index cf6c0250..e4d760b3 100644
---
a/flink-kubernetes-standalone/src/test/java/org/apache/flink/kubernetes/operator/kubeclient/parameters/StandaloneKubernetesJobManagerParametersTest.java
+++
b/flink-kubernetes-standalone/src/test/java/org/apache/flink/kubernetes/operator/kubeclient/parameters/StandaloneKubernetesJobManagerParametersTest.java
@@ -34,7 +34,9 @@ import static org.junit.jupiter.api.Assertions.assertFalse;
import static org.junit.jupiter.api.Assertions.assertNull;
import static org.junit.jupiter.api.Assertions.assertTrue;
-/** @link StandaloneKubernetesJobManagerParameters unit tests */
+/**
+ * @link StandaloneKubernetesJobManagerParameters unit tests
+ */
public class StandaloneKubernetesJobManagerParametersTest extends
ParametersTestBase {
private StandaloneKubernetesJobManagerParameters
kubernetesJobManagerParameters;
diff --git
a/flink-kubernetes-standalone/src/test/java/org/apache/flink/kubernetes/operator/kubeclient/parameters/StandaloneKubernetesTaskManagerParametersTest.java
b/flink-kubernetes-standalone/src/test/java/org/apache/flink/kubernetes/operator/kubeclient/parameters/StandaloneKubernetesTaskManagerParametersTest.java
index bc71bd1c..e2b56998 100644
---
a/flink-kubernetes-standalone/src/test/java/org/apache/flink/kubernetes/operator/kubeclient/parameters/StandaloneKubernetesTaskManagerParametersTest.java
+++
b/flink-kubernetes-standalone/src/test/java/org/apache/flink/kubernetes/operator/kubeclient/parameters/StandaloneKubernetesTaskManagerParametersTest.java
@@ -37,7 +37,9 @@ import static org.junit.jupiter.api.Assertions.assertFalse;
import static org.junit.jupiter.api.Assertions.assertThrows;
import static org.junit.jupiter.api.Assertions.assertTrue;
-/** @link StandaloneKubernetesTaskManagerParameters unit tests */
+/**
+ * @link StandaloneKubernetesTaskManagerParameters unit tests
+ */
public class StandaloneKubernetesTaskManagerParametersTest extends
ParametersTestBase {
private StandaloneKubernetesTaskManagerParameters
kubernetesTaskManagerParameters;
diff --git
a/flink-kubernetes-standalone/src/test/java/org/apache/flink/kubernetes/operator/standalone/KubernetesStandaloneClusterDescriptorTest.java
b/flink-kubernetes-standalone/src/test/java/org/apache/flink/kubernetes/operator/standalone/KubernetesStandaloneClusterDescriptorTest.java
index 84ba9ce6..921bccf0 100644
---
a/flink-kubernetes-standalone/src/test/java/org/apache/flink/kubernetes/operator/standalone/KubernetesStandaloneClusterDescriptorTest.java
+++
b/flink-kubernetes-standalone/src/test/java/org/apache/flink/kubernetes/operator/standalone/KubernetesStandaloneClusterDescriptorTest.java
@@ -49,7 +49,9 @@ import static org.hamcrest.Matchers.containsInAnyOrder;
import static org.junit.jupiter.api.Assertions.assertEquals;
import static org.junit.jupiter.api.Assertions.assertTrue;
-/** @link KubernetesStandaloneClusterDescriptor unit tests */
+/**
+ * @link KubernetesStandaloneClusterDescriptor unit tests
+ */
@EnableKubernetesMockClient(crud = true, https = false)
public class KubernetesStandaloneClusterDescriptorTest {
KubernetesMockServer mockWebServer;
diff --git
a/flink-kubernetes-webhook/src/test/java/org/apache/flink/kubernetes/operator/admission/AdmissionHandlerTest.java
b/flink-kubernetes-webhook/src/test/java/org/apache/flink/kubernetes/operator/admission/AdmissionHandlerTest.java
index 1d61e999..cb884eec 100644
---
a/flink-kubernetes-webhook/src/test/java/org/apache/flink/kubernetes/operator/admission/AdmissionHandlerTest.java
+++
b/flink-kubernetes-webhook/src/test/java/org/apache/flink/kubernetes/operator/admission/AdmissionHandlerTest.java
@@ -57,7 +57,9 @@ import static
org.apache.flink.shaded.netty4.io.netty.handler.codec.http.HttpVer
import static org.junit.jupiter.api.Assertions.assertEquals;
import static org.junit.jupiter.api.Assertions.assertTrue;
-/** @link AdmissionHandler unit tests */
+/**
+ * @link AdmissionHandler unit tests
+ */
public class AdmissionHandlerTest {
private final AdmissionHandler admissionHandler =
diff --git a/pom.xml b/pom.xml
index ef3a8a16..f02e1082 100644
--- a/pom.xml
+++ b/pom.xml
@@ -79,7 +79,7 @@ under the License.
<fabric8.version>6.8.1</fabric8.version>
- <lombok.version>1.18.22</lombok.version>
+ <lombok.version>1.18.30</lombok.version>
<commons-lang3.version>3.12.0</commons-lang3.version>
<commons-io.version>2.11.0</commons-io.version>
<flink.version>1.17.1</flink.version>
@@ -87,7 +87,7 @@ under the License.
<slf4j.version>1.7.36</slf4j.version>
<log4j.version>2.17.1</log4j.version>
- <spotless.version>2.27.1</spotless.version>
+ <spotless.version>2.40.0</spotless.version>
<it.skip>true</it.skip>
<hamcrest.version>1.3</hamcrest.version>
@@ -260,7 +260,7 @@ under the License.
<configuration>
<java>
<googleJavaFormat>
- <version>1.7</version>
+ <version>1.17.0</version>
<style>AOSP</style>
</googleJavaFormat>
