Skip to content

Commit 4cea98f

Browse files
committed
slight improvements
Signed-off-by: bachmanity1 <[email protected]>
1 parent bd0ff66 commit 4cea98f

File tree

1 file changed

+6
-9
lines changed

1 file changed

+6
-9
lines changed

Diff for: operator-framework-core/src/main/java/io/javaoperatorsdk/operator/processing/dependent/kubernetes/SSABasedGenericKubernetesResourceMatcher.java

+6-9
Original file line numberDiff line numberDiff line change
@@ -109,7 +109,7 @@ public boolean matches(R actual, R desired, Context<?> context) {
109109

110110
if (!matches && LoggingUtils.isNotSensitiveResource(desired)) {
111111
var diff = getDiff(prunedActual, desiredMap, objectMapper);
112-
if (diff != null) {
112+
if (log.isDebugEnabled()) {
113113
log.debug("Diff between actual and desired state for resource: {} with name: {} in namespace: {} is: \n{}",
114114
actual.getKind(), actual.getMetadata().getName(), actual.getMetadata().getNamespace(), diff);
115115
}
@@ -120,15 +120,12 @@ public boolean matches(R actual, R desired, Context<?> context) {
120120

121121
private String getDiff(Map<String, Object> prunedActualMap, Map<String, Object> desiredMap,
122122
KubernetesSerialization serialization) {
123-
if (log.isDebugEnabled()) {
124-
var actualLines = serialization.asYaml(sortMap(prunedActualMap)).lines().toList();
125-
var desiredLines = serialization.asYaml(sortMap(desiredMap)).lines().toList();
123+
var actualLines = serialization.asYaml(sortMap(prunedActualMap)).lines().toList();
124+
var desiredLines = serialization.asYaml(sortMap(desiredMap)).lines().toList();
126125

127-
var patch = DiffUtils.diff(actualLines, desiredLines);
128-
List<String> unifiedDiff = DiffUtils.generateUnifiedDiff("", "", actualLines, patch, 0);
129-
return unifiedDiff.isEmpty() ? null : String.join("\n", unifiedDiff);
130-
}
131-
return null;
126+
var patch = DiffUtils.diff(actualLines, desiredLines);
127+
List<String> unifiedDiff = DiffUtils.generateUnifiedDiff("", "", actualLines, patch, 0);
128+
return String.join("\n", unifiedDiff);
132129
}
133130

134131
@SuppressWarnings("unchecked")

0 commit comments

Comments
 (0)