refactor: remove unneeded parameter that can also be inferred from DR

operator-framework · May 23, 2023 · dec4a9a · dec4a9a
1 parent fa25f53
commit dec4a9a
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 6 deletions.
diff --git a/...peratorsdk/operator/processing/dependent/kubernetes/GenericKubernetesResourceMatcher.java b/...peratorsdk/operator/processing/dependent/kubernetes/GenericKubernetesResourceMatcher.java
@@ -18,7 +18,7 @@ private GenericKubernetesResourceMatcher(KubernetesDependentResource<R, P> depen
 
   @SuppressWarnings({"unchecked", "rawtypes"})
   static <R extends HasMetadata, P extends HasMetadata> Matcher<R, P> matcherFor(
-      Class<R> resourceType, KubernetesDependentResource<R, P> dependentResource) {
+      KubernetesDependentResource<R, P> dependentResource) {
     return new GenericKubernetesResourceMatcher(dependentResource);
   }
 

diff --git a/...javaoperatorsdk/operator/processing/dependent/kubernetes/KubernetesDependentResource.java b/...javaoperatorsdk/operator/processing/dependent/kubernetes/KubernetesDependentResource.java
@@ -50,7 +50,7 @@ public abstract class KubernetesDependentResource<R extends HasMetadata, P exten
   public KubernetesDependentResource(Class<R> resourceType) {
     super(resourceType);
     matcher = this instanceof Matcher ? (Matcher<R, P>) this
-        : GenericKubernetesResourceMatcher.matcherFor(resourceType, this);
+        : GenericKubernetesResourceMatcher.matcherFor(this);
 
     processor = this instanceof ResourceUpdatePreProcessor
         ? (ResourceUpdatePreProcessor<R>) this

diff --git a/...torsdk/operator/processing/dependent/kubernetes/GenericKubernetesResourceMatcherTest.java b/...torsdk/operator/processing/dependent/kubernetes/GenericKubernetesResourceMatcherTest.java
@@ -34,8 +34,7 @@ void checksIfDesiredValuesAreTheSame() {
     var actual = createDeployment();
     final var desired = createDeployment();
     final var dependentResource = new TestDependentResource(desired);
-    final var matcher =
-        GenericKubernetesResourceMatcher.matcherFor(Deployment.class, dependentResource);
+    final var matcher = GenericKubernetesResourceMatcher.matcherFor(dependentResource);
     assertThat(matcher.match(actual, null, context).matched()).isTrue();
     assertThat(matcher.match(actual, null, context).computedDesired().isPresent()).isTrue();
     assertThat(matcher.match(actual, null, context).computedDesired().get()).isEqualTo(desired);
@@ -86,8 +85,7 @@ void checkServiceAccount() {
         .addNewImagePullSecret("imagePullSecret3")
         .build();
 
-    final var matcher = GenericKubernetesResourceMatcher.matcherFor(ServiceAccount.class,
-        serviceAccountDR);
+    final var matcher = GenericKubernetesResourceMatcher.matcherFor(serviceAccountDR);
     assertThat(matcher.match(actual, null, context).matched()).isFalse();
   }