Skip to content

Commit 447ea75

Browse files
csviricsviri
committed
remove empty lines
Signed-off-by: Attila Mészáros <[email protected]>
1 parent 3829654 commit 447ea75

19 files changed

+0
-52
lines changed

‎flink-kubernetes-operator/src/test/java/org/apache/flink/kubernetes/operator/autoscaler/KubernetesScalingRealizerTest.java‎

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -96,14 +96,12 @@ private void assertOverridesDoNotChange(
9696
FlinkDeployment resource = (FlinkDeployment) ctx.getResource();
9797

9898
// Create resource with existing parallelism overrides
99-
10099
resource.getSpec()
101100
.getFlinkConfiguration()
102101
.put(PipelineOptions.PARALLELISM_OVERRIDES.key(), currentOverrides);
103102
resource.getStatus()
104103
.getReconciliationStatus()
105104
.serializeAndSetLastReconciledSpec(resource.getSpec(), resource);
106-
107105
resource.getSpec()
108106
.getFlinkConfiguration()
109107
.remove(PipelineOptions.PARALLELISM_OVERRIDES.key());

‎flink-kubernetes-operator/src/test/java/org/apache/flink/kubernetes/operator/config/FlinkConfigBuilderTest.java‎

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -758,7 +758,6 @@ public void testApplyJobOrSessionSpecWithNoJar() throws Exception {
758758
@Test
759759
public void testAllowNonRestoredStateInSpecOverrideInFlinkConf() throws URISyntaxException {
760760
flinkDeployment.getSpec().getJob().setAllowNonRestoredState(false);
761-
762761
flinkDeployment
763762
.getSpec()
764763
.getFlinkConfiguration()
@@ -771,7 +770,6 @@ public void testAllowNonRestoredStateInSpecOverrideInFlinkConf() throws URISynta
771770
configuration.getBoolean(SavepointConfigOptions.SAVEPOINT_IGNORE_UNCLAIMED_STATE));
772771

773772
flinkDeployment.getSpec().getJob().setAllowNonRestoredState(true);
774-
775773
flinkDeployment
776774
.getSpec()
777775
.getFlinkConfiguration()

‎flink-kubernetes-operator/src/test/java/org/apache/flink/kubernetes/operator/controller/DeploymentRecoveryTest.java‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -177,7 +177,6 @@ public void verifyRecoveryWithoutHaData(FlinkVersion flinkVersion, UpgradeMode u
177177

178178
// We disable HA for stateless to test recovery without HA metadata
179179
if (upgradeMode == UpgradeMode.STATELESS) {
180-
181180
appCluster
182181
.getSpec()
183182
.getFlinkConfiguration()

‎flink-kubernetes-operator/src/test/java/org/apache/flink/kubernetes/operator/controller/FlinkDeploymentControllerTest.java‎

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -197,7 +197,6 @@ public void verifyReconcileLoopForInitialSuspendedDeploymentWithSavepoint(
197197
TestUtils.buildApplicationCluster(flinkVersion, JobState.SUSPENDED);
198198
appCluster.getSpec().getJob().setUpgradeMode(UpgradeMode.SAVEPOINT);
199199
appCluster.getSpec().getJob().setInitialSavepointPath("s0");
200-
201200
appCluster
202201
.getSpec()
203202
.getFlinkConfiguration()
@@ -305,7 +304,6 @@ public void verifyUpgradeFromSavepointLegacyMode(FlinkVersion flinkVersion) thro
305304
FlinkDeployment appCluster = TestUtils.buildApplicationCluster(flinkVersion);
306305
appCluster.getSpec().getJob().setUpgradeMode(UpgradeMode.SAVEPOINT);
307306
appCluster.getSpec().getJob().setInitialSavepointPath("s0");
308-
309307
appCluster
310308
.getSpec()
311309
.getFlinkConfiguration()
@@ -798,7 +796,6 @@ private void testUpgradeNotReadyCluster(FlinkDeployment appCluster) throws Excep
798796

799797
// triggering upgrade with no last-state fallback on non-healthy app
800798
flinkService.setPortReady(false);
801-
802799
appCluster
803800
.getSpec()
804801
.getFlinkConfiguration()

‎flink-kubernetes-operator/src/test/java/org/apache/flink/kubernetes/operator/controller/FlinkSessionJobControllerTest.java‎

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -516,7 +516,6 @@ public void verifyReconcileWithBadConfig() throws Exception {
516516
UpdateControl<FlinkDeployment> updateControl;
517517
// Override headers, and it should be saved in lastReconciledSpec once a successful
518518
// reconcile() finishes.
519-
520519
sessionJob
521520
.getSpec()
522521
.getFlinkConfiguration()
@@ -540,7 +539,6 @@ public void verifyReconcileWithBadConfig() throws Exception {
540539
// Make sure we do validation before getting effective config in reconcile().
541540
// Verify the saved headers in lastReconciledSpec is actually used in observe() by
542541
// utilizing listJobConsumer
543-
544542
sessionJob
545543
.getSpec()
546544
.getFlinkConfiguration()

‎flink-kubernetes-operator/src/test/java/org/apache/flink/kubernetes/operator/controller/FlinkStateSnapshotControllerTest.java‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -750,7 +750,6 @@ private FlinkDeployment createDeployment(FlinkVersion flinkVersion) {
750750
.getStatus()
751751
.setJobStatus(JobStatus.builder().state(RUNNING).jobId(JOB_ID).build());
752752
deployment.getSpec().setFlinkVersion(flinkVersion);
753-
754753
deployment
755754
.getSpec()
756755
.getFlinkConfiguration()

‎flink-kubernetes-operator/src/test/java/org/apache/flink/kubernetes/operator/controller/RollbackTest.java‎

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -170,8 +170,6 @@ public void testSavepointNoRollbackWithoutHaMetadataAndJMWasReady() throws Excep
170170
deployment.getSpec().getJob().setUpgradeMode(UpgradeMode.SAVEPOINT);
171171
offsetReconcilerClock(deployment, Duration.ZERO);
172172

173-
var flinkConfiguration = deployment.getSpec().getFlinkConfiguration();
174-
175173
deployment
176174
.getSpec()
177175
.getFlinkConfiguration()
@@ -221,7 +219,6 @@ public void testSavepointNoRollbackWithoutHaMetadataAndJMWasReady() throws Excep
221219
public void testRollbackFailureWithLastState() throws Exception {
222220
var dep = TestUtils.buildApplicationCluster();
223221
dep.getSpec().getJob().setUpgradeMode(UpgradeMode.LAST_STATE);
224-
225222
dep.getSpec().getFlinkConfiguration().put("t", "1");
226223
offsetReconcilerClock(dep, Duration.ZERO);
227224

@@ -308,7 +305,6 @@ public void testRollbackStateless() throws Exception {
308305
.getSubmittedConf()
309306
.getString("test.deploy.config", "unknown"));
310307
// Validate that rollback config is picked up from latest deploy conf
311-
312308
dep.getSpec()
313309
.getFlinkConfiguration()
314310
.put(

‎flink-kubernetes-operator/src/test/java/org/apache/flink/kubernetes/operator/observer/JobStatusObserverTest.java‎

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -745,7 +745,6 @@ private static Stream<Arguments> cancellingArgs() {
745745
private static FlinkDeployment initDeployment() {
746746
FlinkDeployment deployment = TestUtils.buildApplicationCluster();
747747
var jobId = new JobID().toHexString();
748-
749748
deployment
750749
.getSpec()
751750
.getFlinkConfiguration()
@@ -761,11 +760,9 @@ private static FlinkDeployment initDeployment() {
761760
private static FlinkSessionJob initSessionJob() {
762761
var job = TestUtils.buildSessionJob();
763762
var jobId = new JobID().toHexString();
764-
765763
job.getSpec()
766764
.getFlinkConfiguration()
767765
.put(PipelineOptionsInternal.PIPELINE_FIXED_JOB_ID.key(), jobId);
768-
769766
job.getStatus().getJobStatus().setJobId(jobId);
770767
job.getStatus()
771768
.getReconciliationStatus()

‎flink-kubernetes-operator/src/test/java/org/apache/flink/kubernetes/operator/observer/deployment/ApplicationObserverTest.java‎

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -82,12 +82,10 @@ public void setup() {
8282
readyContext = TestUtils.createContextWithReadyJobManagerDeployment(kubernetesClient);
8383
deployment = TestUtils.buildApplicationCluster();
8484
var jobId = new JobID().toHexString();
85-
8685
deployment
8786
.getSpec()
8887
.getFlinkConfiguration()
8988
.put(PipelineOptionsInternal.PIPELINE_FIXED_JOB_ID.key(), jobId);
90-
9189
deployment.getStatus().getJobStatus().setJobId(jobId);
9290
}
9391

@@ -247,7 +245,6 @@ public void observeSavepoint() throws Exception {
247245
deployment.getSpec().getJob().setSavepointTriggerNonce(timedOutNonce);
248246
Configuration conf =
249247
configManager.getDeployConfig(deployment.getMetadata(), deployment.getSpec());
250-
251248
deployment
252249
.getSpec()
253250
.getFlinkConfiguration()

‎flink-kubernetes-operator/src/test/java/org/apache/flink/kubernetes/operator/reconciler/deployment/ApplicationReconcilerTest.java‎

Lines changed: 0 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -207,7 +207,6 @@ public void testSubmitAndCleanUpWithSavepoint(FlinkVersion flinkVersion) throws
207207
public void testSubmitAndCleanUpWithSavepointOnResource(FlinkVersion flinkVersion)
208208
throws Exception {
209209
FlinkDeployment deployment = TestUtils.buildApplicationCluster(flinkVersion);
210-
211210
deployment
212211
.getSpec()
213212
.getFlinkConfiguration()
@@ -443,7 +442,6 @@ public void triggerSavepointLegacy() throws Exception {
443442
public void triggerSavepointWithSnapshotResource(boolean disposeOnDelete) throws Exception {
444443
var deployment = TestUtils.buildApplicationCluster();
445444
if (disposeOnDelete) {
446-
447445
deployment
448446
.getSpec()
449447
.getFlinkConfiguration()
@@ -757,7 +755,6 @@ public void testJobUpgradeIgnorePendingSavepointLegacy() throws Exception {
757755
getJobStatus(spDeployment).getState());
758756

759757
// Force upgrade when savepoint is in progress.
760-
761758
spDeployment
762759
.getSpec()
763760
.getFlinkConfiguration()
@@ -776,7 +773,6 @@ public void testJobUpgradeIgnorePendingSavepointLegacy() throws Exception {
776773
public void testRandomJobResultStorePath() throws Exception {
777774
FlinkDeployment flinkApp = TestUtils.buildApplicationCluster();
778775
final String haStoragePath = "file:///flink-data/ha";
779-
780776
flinkApp.getSpec()
781777
.getFlinkConfiguration()
782778
.put(HighAvailabilityOptions.HA_STORAGE_PATH.key(), haStoragePath);
@@ -847,7 +843,6 @@ public void testScaleWithReactiveModeEnabled() throws Exception {
847843

848844
FlinkDeployment deployment = TestUtils.buildApplicationCluster();
849845
deployment.getSpec().setMode(KubernetesDeploymentMode.STANDALONE);
850-
851846
deployment
852847
.getSpec()
853848
.getFlinkConfiguration()
@@ -927,7 +922,6 @@ public CancelResult cancelJob(
927922
// Set all the properties required by the rescale api
928923
deployment.getSpec().setFlinkVersion(FlinkVersion.v1_18);
929924
deployment.getSpec().setMode(KubernetesDeploymentMode.NATIVE);
930-
931925
deployment
932926
.getSpec()
933927
.getFlinkConfiguration()
@@ -941,7 +935,6 @@ public CancelResult cancelJob(
941935
verifyAndSetRunningJobsToStatus(deployment, flinkService.listJobs());
942936

943937
// Override parallelism for a vertex and trigger rescaling
944-
945938
deployment
946939
.getSpec()
947940
.getFlinkConfiguration()
@@ -1253,7 +1246,6 @@ public void testRestartUnhealthyEvent() throws Exception {
12531246
.getSpec()
12541247
.getFlinkConfiguration()
12551248
.put(OPERATOR_CLUSTER_HEALTH_CHECK_ENABLED.key(), "true");
1256-
12571249
reconciler.reconcile(deployment, context);
12581250
Assertions.assertEquals(
12591251
MSG_SUBMIT, flinkResourceEventCollector.events.remove().getMessage());
@@ -1276,7 +1268,6 @@ public void testReconcileIfUpgradeModeNotAvailable() throws Exception {
12761268

12771269
// We disable last state fallback as we want to test that the deployment is properly
12781270
// recovered before upgrade
1279-
12801271
deployment
12811272
.getSpec()
12821273
.getFlinkConfiguration()

0 commit comments

Comments
 (0)