pvary commented on code in PR #539:
URL:
https://github.com/apache/flink-kubernetes-operator/pull/539#discussion_r1120843867
##########
flink-kubernetes-operator/src/main/java/org/apache/flink/kubernetes/operator/reconciler/diff/DiffResult.java:
##########
@@ -59,18 +63,48 @@ public String toString() {
return "";
}
- final ToStringBuilder lhsBuilder =
- new ToStringBuilder(left, ToStringStyle.SHORT_PREFIX_STYLE);
- final ToStringBuilder rhsBuilder =
- new ToStringBuilder(right, ToStringStyle.SHORT_PREFIX_STYLE);
+ final StringBuilder builder = new StringBuilder();
+ builder.append(left.getClass().getSimpleName()).append("[");
diffList.forEach(
diff -> {
- lhsBuilder.append(diff.getFieldName(), diff.getLeft());
- rhsBuilder.append(diff.getFieldName(), diff.getRight());
+ try {
+ JsonNode before =
+ objectMapper.readTree(
+
objectMapper.writeValueAsString(diff.getLeft()));
+ JsonNode after =
+ objectMapper.readTree(
+
objectMapper.writeValueAsString(diff.getRight()));
+ JsonNode jsonDiff = JsonDiff.asJson(before, after);
+ jsonDiff.forEach(
+ row -> {
+ if (row.get("path").asText().equals("/")) {
+ builder.append(diff.getFieldName())
+ .append(" : ")
+ .append(before)
+ .append(" -> ")
+ .append(after)
+ .append(", ");
+ } else {
+ builder.append(diff.getFieldName())
+ .append(
+ row.get("path")
+ .asText()
+
.replaceAll("/", "."))
+ .append(" : ")
+
.append(before.at(row.get("path").asText()))
+ .append(" -> ")
+
.append(after.at(row.get("path").asText()))
+ .append(", ");
+ }
+ });
+ } catch (JsonProcessingException je) {
+ builder.append(diff.getLeft()).append(" ->
").append(diff.getRight());
+ }
});
-
- return String.format("%s differs from %s", lhsBuilder.build(),
rhsBuilder.build());
+ builder.setLength(builder.length() - 2);
Review Comment:
Actually this was in a wrong place, I have moved it.
OTOH again this is something which is done quite often in my experience -
removing the last separator between the fields after writing out things in a
loop.
--
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
To unsubscribe, e-mail: issues-unsubscr...@flink.apache.org
For queries about this service, please contact Infrastructure at:
us...@infra.apache.org
