Skip to content

Commit 4834517

Browse files
committed
More PR comments addressed
1 parent 7bcb244 commit 4834517

File tree

4 files changed

+11
-12
lines changed

4 files changed

+11
-12
lines changed

flink-kubernetes-operator-api/src/main/java/org/apache/flink/kubernetes/operator/api/utils/SpecUtils.java

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -99,7 +99,7 @@ public static String writeSpecWithMeta(
9999
}
100100
}
101101

102-
public static String serializeObject(Object object, String wrapperKey) {
102+
public static String writeSpecAsJSON(Object object, String wrapperKey) {
103103
ObjectNode wrapper = objectMapper.createObjectNode();
104104
wrapper.set(wrapperKey, objectMapper.valueToTree(checkNotNull(object)));
105105

@@ -111,8 +111,7 @@ public static String serializeObject(Object object, String wrapperKey) {
111111
}
112112
}
113113

114-
public static <T> T deserializeObject(String serialized, String wrapperKey, Class<T> valueType)
115-
throws JsonProcessingException {
114+
public static <T> T readSpecFromJSON(String serialized, String wrapperKey, Class<T> valueType) {
116115
try {
117116
ObjectNode wrapper = (ObjectNode) objectMapper.readTree(serialized);
118117
return objectMapper.treeToValue(wrapper.get(wrapperKey), valueType);

flink-kubernetes-operator/src/main/java/org/apache/flink/kubernetes/operator/controller/FlinkBlueGreenDeploymentController.java

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -178,7 +178,7 @@ private UpdateControl<FlinkBlueGreenDeployment> monitorTransition(
178178
// this means the spec was changed during transition,
179179
// ignore the new change, revert the spec and log as warning
180180
bgDeployment.setSpec(
181-
SpecUtils.deserializeObject(
181+
SpecUtils.readSpecFromJSON(
182182
deploymentStatus.getLastReconciledSpec(),
183183
"spec",
184184
FlinkBlueGreenDeploymentSpec.class));
@@ -407,7 +407,7 @@ private static void setLastReconciledSpec(
407407
FlinkBlueGreenDeployment bgDeployment,
408408
FlinkBlueGreenDeploymentStatus deploymentStatus) {
409409
deploymentStatus.setLastReconciledSpec(
410-
SpecUtils.serializeObject(bgDeployment.getSpec(), "spec"));
410+
SpecUtils.writeSpecAsJSON(bgDeployment.getSpec(), "spec"));
411411
deploymentStatus.setLastReconciledTimestamp(System.currentTimeMillis());
412412
}
413413

@@ -467,7 +467,7 @@ private boolean hasSpecChanged(
467467
FlinkBlueGreenDeploymentSpec newSpec, FlinkBlueGreenDeploymentStatus deploymentStatus) {
468468

469469
String lastReconciledSpec = deploymentStatus.getLastReconciledSpec();
470-
String newSpecSerialized = SpecUtils.serializeObject(newSpec, "spec");
470+
String newSpecSerialized = SpecUtils.writeSpecAsJSON(newSpec, "spec");
471471

472472
return !lastReconciledSpec.equals(newSpecSerialized);
473473
}

flink-kubernetes-operator/src/main/java/org/apache/flink/kubernetes/operator/controller/FlinkBlueGreenDeploymentUtils.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -52,8 +52,8 @@ public static <T> T adjustNameReferences(
5252
String wrapperKey,
5353
Class<T> valueType)
5454
throws JsonProcessingException {
55-
String serializedSpec = SpecUtils.serializeObject(spec, wrapperKey);
55+
String serializedSpec = SpecUtils.writeSpecAsJSON(spec, wrapperKey);
5656
String replacedSerializedSpec = serializedSpec.replace(deploymentName, childDeploymentName);
57-
return SpecUtils.deserializeObject(replacedSerializedSpec, wrapperKey, valueType);
57+
return SpecUtils.readSpecFromJSON(replacedSerializedSpec, wrapperKey, valueType);
5858
}
5959
}

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

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -269,8 +269,8 @@ public void verifySpecChangeDuringTransition(FlinkVersion flinkVersion) throws E
269269

270270
// The spec should have been reverted
271271
assertEquals(
272-
SpecUtils.serializeObject(originalSpec, "spec"),
273-
SpecUtils.serializeObject(rs.deployment.getSpec(), "spec"));
272+
SpecUtils.writeSpecAsJSON(originalSpec, "spec"),
273+
SpecUtils.writeSpecAsJSON(rs.deployment.getSpec(), "spec"));
274274
}
275275

276276
@ParameterizedTest
@@ -414,7 +414,7 @@ private void assertDeploymentDeleted(
414414
assertEquals(expectedDeletionDelay, deletionDelay);
415415
assertTrue(rs.reconciledStatus.getDeploymentReadyTimestamp() > 0);
416416
assertEquals(
417-
SpecUtils.serializeObject(bgSpecBefore, "spec"),
417+
SpecUtils.writeSpecAsJSON(bgSpecBefore, "spec"),
418418
rs.reconciledStatus.getLastReconciledSpec());
419419

420420
// A reconciliation before the deletion delay has expired should result in no-op
@@ -482,7 +482,7 @@ private void testTransitionToGreen(
482482
assertTrue(minReconciliationTs < rs.reconciledStatus.getLastReconciledTimestamp());
483483
assertNotNull(rs.reconciledStatus.getLastReconciledSpec());
484484
assertEquals(
485-
SpecUtils.serializeObject(bgUpdatedSpec, "spec"),
485+
SpecUtils.writeSpecAsJSON(bgUpdatedSpec, "spec"),
486486
rs.reconciledStatus.getLastReconciledSpec());
487487
assertEquals(
488488
FlinkBlueGreenDeploymentState.ACTIVE_GREEN,

0 commit comments

Comments
 (0)