refactor: simplify, make sure empty ignored paths are properly handled

Author: metacosm

operator-framework-core/src/main/java/io/javaoperatorsdk/operator/processing/dependent/kubernetes/GenericKubernetesResourceMatcher.java

@@ -35,8 +35,7 @@ static <R extends HasMetadata, P extends HasMetadata> Matcher<R, P> matcherFor(
   @Override
   public Result<R> match(R actualResource, P primary, Context<P> context) {
     var desired = dependentResource.desired(primary, context);
-    return match(desired, actualResource, true, false,
-        false, Collections.emptyList());
+    return match(desired, actualResource, true, false, false);
   }
 
   public static <R extends HasMetadata> Result<R> match(R desired, R actualResource,
@@ -70,25 +69,25 @@ public static <R extends HasMetadata> Result<R> match(R desired, R actualResourc
    */
   public static <R extends HasMetadata> Result<R> match(R desired, R actualResource,
       boolean considerMetadata, boolean equality) {
-    return match(desired, actualResource, considerMetadata, false, equality,
-        Collections.emptyList());
+    return match(desired, actualResource, considerMetadata, false, equality);
   }
 
   public static <R extends HasMetadata> Result<R> match(R desired, R actualResource,
       boolean considerMetadata, String... ignoreList) {
-    return match(desired, actualResource, considerMetadata, false, false,
-        Arrays.asList(ignoreList));
+    return match(desired, actualResource, considerMetadata, false, false, ignoreList);
   }
 
   public static <R extends HasMetadata> Result<R> match(R desired, R actualResource,
       boolean considerMetadata, boolean metadataEquality, String... ignoreList) {
-    return match(desired, actualResource, considerMetadata, metadataEquality, false,
-        Arrays.asList(ignoreList));
+    return match(desired, actualResource, considerMetadata, metadataEquality, false, ignoreList);
   }
 
   private static <R extends HasMetadata> Result<R> match(R desired, R actualResource,
       boolean considerMetadata, boolean metadataEquality, boolean specEquality,
-      List<String> ignoreList) {
+      String... ignoredPaths) {
+    final List<String> ignoreList =
+        ignoredPaths != null && ignoredPaths.length > 0 ? Arrays.asList(ignoredPaths)
+            : Collections.emptyList();
 
     if (specEquality && !ignoreList.isEmpty()) {
       throw new IllegalArgumentException(
@@ -195,15 +194,18 @@ private static String getPath(JsonNode n) {
 
   private static List<JsonNode> getDiffsImpactingPathsWithPrefixes(JsonNode diffJsonPatch,
       String... prefixes) {
-    var res = new ArrayList<JsonNode>();
-    var prefixList = Arrays.asList(prefixes);
-    for (int i = 0; i < diffJsonPatch.size(); i++) {
-      var node = diffJsonPatch.get(i);
-      if (nodeIsChildOf(node, prefixList)) {
-        res.add(node);
+    if (prefixes != null && prefixes.length > 0) {
+      var res = new ArrayList<JsonNode>();
+      var prefixList = Arrays.asList(prefixes);
+      for (int i = 0; i < diffJsonPatch.size(); i++) {
+        var node = diffJsonPatch.get(i);
+        if (nodeIsChildOf(node, prefixList)) {
+          res.add(node);
+        }
       }
+      return res;
     }
-    return res;
+    return Collections.emptyList();
   }
 
   /**
@@ -272,19 +274,11 @@ public static <R extends HasMetadata, P extends HasMetadata> Result<R> match(
     return match(desired, actualResource, considerMetadata, metadataEquality, ignorePaths);
   }
 
-  public static <R extends HasMetadata, P extends HasMetadata> Result<R> match(
-      KubernetesDependentResource<R, P> dependentResource, R actualResource, P primary,
-      Context<P> context, boolean considerMetadata) {
-    final var desired = dependentResource.desired(primary, context);
-    return match(desired, actualResource, considerMetadata, false);
-  }
-
   public static <R extends HasMetadata, P extends HasMetadata> Result<R> match(
       KubernetesDependentResource<R, P> dependentResource, R actualResource, P primary,
       Context<P> context, boolean considerMetadata, boolean metadataEquality,
       boolean strongEquality) {
     final var desired = dependentResource.desired(primary, context);
-    return match(desired, actualResource, considerMetadata, metadataEquality, strongEquality,
-        Collections.emptyList());
+    return match(desired, actualResource, considerMetadata, metadataEquality, strongEquality);
   }
 }

operator-framework-core/src/test/java/io/javaoperatorsdk/operator/processing/dependent/kubernetes/GenericKubernetesResourceMatcherTest.java

@@ -76,7 +76,18 @@ void doesNotMatchChangedValues() {
   }
 
   @Test
-  void doesNotMatchIgnoredPaths() {
+  void doesNotMatchChangedValuesWhenNoIgnoredPathsAreProvided() {
+    actual = createDeployment();
+    actual.getSpec().setReplicas(2);
+    assertThat(GenericKubernetesResourceMatcher
+        .match(dependentResource, actual, null, context, true).matched())
+        .withFailMessage(
+            "Should not have matched because values have changed and no ignored path is provided")
+        .isFalse();
+  }
+
+  @Test
+  void doesNotAttemptToMatchIgnoredPaths() {
     actual = createDeployment();
     actual.getSpec().setReplicas(2);
     assertThat(GenericKubernetesResourceMatcher
@@ -114,7 +125,8 @@ void matchesMetadata() {
 
     assertThat(GenericKubernetesResourceMatcher
         .match(dependentResource, actual, null, context, true, false).matched())
-        .withFailMessage("Should match when strong equality is not considered and only additive changes are made")
+        .withFailMessage(
+            "Should match when strong equality is not considered and only additive changes are made")
         .isTrue();
 
   }