refactor: use isSameResource method

Author: metacosm

operator-framework-core/src/main/java/io/javaoperatorsdk/operator/api/config/AnnotationControllerConfiguration.java

@@ -311,7 +311,8 @@ private Object createKubernetesResourceConfig(Class<? extends DependentResource>
               .orElse(null);
 
       resourceDiscriminator =
-          instantiateIfNotDefault(kubeDependent.resourceDiscriminator(), ResourceDiscriminator.class, context);
+          instantiateIfNotDefault(kubeDependent.resourceDiscriminator(),
+              ResourceDiscriminator.class, context);
     }
 
     config =
@@ -321,7 +322,7 @@ private Object createKubernetesResourceConfig(Class<? extends DependentResource>
 
     return config;
   }
-  
+
   public static <T> T valueOrDefault(
       ControllerConfiguration controllerConfiguration,
       Function<ControllerConfiguration, T> mapper,

operator-framework-core/src/main/java/io/javaoperatorsdk/operator/api/reconciler/ResourceIDMatcherDiscriminator.java

@@ -19,10 +19,7 @@ public ResourceIDMatcherDiscriminator(Function<P, ResourceID> mapper) {
   public Optional<R> distinguish(Class<R> resource, P primary, Context<P> context) {
     var resourceID = mapper.apply(primary);
     return context.getSecondaryResources(resource).stream()
-        .filter(r -> r.getMetadata().getName()
-            .equals(resourceID.getName()) &&
-            resourceID.getNamespace().map(ns -> ns.equals(r.getMetadata().getNamespace()))
-                .orElse(true))
+        .filter(resourceID::isSameResource)
         .findFirst();
   }
 }