From 57a0ee2f0e53b2020cd918f40386c8568fdcc309 Mon Sep 17 00:00:00 2001
From: bachmanity1 <bachmanity138@gmail.com>
Date: Wed, 2 Oct 2024 18:24:06 +0900
Subject: [PATCH] use java-diff-utils

Signed-off-by: bachmanity1 <bachmanity138@gmail.com>
---
 operator-framework-core/pom.xml                          | 5 +++++
 .../SSABasedGenericKubernetesResourceMatcher.java        | 9 ++++++---
 pom.xml                                                  | 6 ++++++
 3 files changed, 17 insertions(+), 3 deletions(-)

diff --git a/operator-framework-core/pom.xml b/operator-framework-core/pom.xml
index e1dc2f7db2..0ead5bab7f 100644
--- a/operator-framework-core/pom.xml
+++ b/operator-framework-core/pom.xml
@@ -14,6 +14,10 @@
   <description>Core framework for implementing Kubernetes operators</description>
 
   <dependencies>
+    <dependency>
+      <groupId>io.github.java-diff-utils</groupId>
+      <artifactId>java-diff-utils</artifactId>
+    </dependency>
     <dependency>
       <groupId>io.fabric8</groupId>
       <artifactId>kubernetes-client</artifactId>
@@ -58,6 +62,7 @@
     <dependency>
       <groupId>org.assertj</groupId>
       <artifactId>assertj-core</artifactId>
+      <scope>test</scope>
     </dependency>
     <dependency>
       <groupId>io.fabric8</groupId>
diff --git a/operator-framework-core/src/main/java/io/javaoperatorsdk/operator/processing/dependent/kubernetes/SSABasedGenericKubernetesResourceMatcher.java b/operator-framework-core/src/main/java/io/javaoperatorsdk/operator/processing/dependent/kubernetes/SSABasedGenericKubernetesResourceMatcher.java
index 7bf3e07999..94a991f62d 100644
--- a/operator-framework-core/src/main/java/io/javaoperatorsdk/operator/processing/dependent/kubernetes/SSABasedGenericKubernetesResourceMatcher.java
+++ b/operator-framework-core/src/main/java/io/javaoperatorsdk/operator/processing/dependent/kubernetes/SSABasedGenericKubernetesResourceMatcher.java
@@ -14,7 +14,6 @@
 import java.util.SortedMap;
 import java.util.TreeMap;
 
-import org.assertj.core.util.diff.DiffUtils;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
@@ -27,6 +26,9 @@
 import io.javaoperatorsdk.operator.api.reconciler.Context;
 import io.javaoperatorsdk.operator.processing.LoggingUtils;
 
+import com.github.difflib.DiffUtils;
+import com.github.difflib.UnifiedDiffUtils;
+
 /**
  * Matches the actual state on the server vs the desired state. Based on the managedFields of SSA.
  *
@@ -123,12 +125,13 @@ private String getDiff(Map<String, Object> prunedActualMap, Map<String, Object>
     var actualYaml = serialization.asYaml(sortMap(prunedActualMap));
     var desiredYaml = serialization.asYaml(sortMap(desiredMap));
     if (log.isTraceEnabled()) {
-      log.trace("Pruned actual resource: \n{} \ndesired resource: \n{} ", actualYaml, desiredYaml);
+      log.trace("Pruned actual resource: \n {} \ndesired resource: \n {} ", actualYaml,
+          desiredYaml);
     }
 
     var patch = DiffUtils.diff(actualYaml.lines().toList(), desiredYaml.lines().toList());
     List<String> unifiedDiff =
-        DiffUtils.generateUnifiedDiff("", "", actualYaml.lines().toList(), patch, 1);
+        UnifiedDiffUtils.generateUnifiedDiff("", "", actualYaml.lines().toList(), patch, 1);
     return String.join("\n", unifiedDiff);
   }
 
diff --git a/pom.xml b/pom.xml
index ea33898000..0983f34b08 100644
--- a/pom.xml
+++ b/pom.xml
@@ -75,6 +75,7 @@
     <caffeine.version>3.1.8</caffeine.version>
     <mustache.version>0.9.11</mustache.version>
     <commons.io.version>2.16.1</commons.io.version>
+    <java.diff.version>4.12</java.diff.version>
 
     <fmt-maven-plugin.version>2.11</fmt-maven-plugin.version>
     <maven-compiler-plugin.version>3.12.1</maven-compiler-plugin.version>
@@ -161,6 +162,11 @@
         <version>${mokito.version}</version>
       </dependency>
 
+      <dependency>
+        <groupId>io.github.java-diff-utils</groupId>
+        <artifactId>java-diff-utils</artifactId>
+        <version>${java.diff.version}</version>
+      </dependency>
       <dependency>
         <groupId>org.slf4j</groupId>
         <artifactId>slf4j-api</artifactId>