Skip to content

Commit b20e280

Browse files
committed
refactor: remove unneeded parameter that can also be inferred from DR
1 parent d90c7b5 commit b20e280

File tree

3 files changed

+4
-6
lines changed

3 files changed

+4
-6
lines changed

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ private GenericKubernetesResourceMatcher(KubernetesDependentResource<R, P> depen
1818

1919
@SuppressWarnings({"unchecked", "rawtypes"})
2020
static <R extends HasMetadata, P extends HasMetadata> Matcher<R, P> matcherFor(
21-
Class<R> resourceType, KubernetesDependentResource<R, P> dependentResource) {
21+
KubernetesDependentResource<R, P> dependentResource) {
2222
return new GenericKubernetesResourceMatcher(dependentResource);
2323
}
2424

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -50,7 +50,7 @@ public abstract class KubernetesDependentResource<R extends HasMetadata, P exten
5050
public KubernetesDependentResource(Class<R> resourceType) {
5151
super(resourceType);
5252
matcher = this instanceof Matcher ? (Matcher<R, P>) this
53-
: GenericKubernetesResourceMatcher.matcherFor(resourceType, this);
53+
: GenericKubernetesResourceMatcher.matcherFor(this);
5454

5555
processor = this instanceof ResourceUpdatePreProcessor
5656
? (ResourceUpdatePreProcessor<R>) this

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

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -34,8 +34,7 @@ void checksIfDesiredValuesAreTheSame() {
3434
var actual = createDeployment();
3535
final var desired = createDeployment();
3636
final var dependentResource = new TestDependentResource(desired);
37-
final var matcher =
38-
GenericKubernetesResourceMatcher.matcherFor(Deployment.class, dependentResource);
37+
final var matcher = GenericKubernetesResourceMatcher.matcherFor(dependentResource);
3938
assertThat(matcher.match(actual, null, context).matched()).isTrue();
4039
assertThat(matcher.match(actual, null, context).computedDesired().isPresent()).isTrue();
4140
assertThat(matcher.match(actual, null, context).computedDesired().get()).isEqualTo(desired);
@@ -86,8 +85,7 @@ void checkServiceAccount() {
8685
.addNewImagePullSecret("imagePullSecret3")
8786
.build();
8887

89-
final var matcher = GenericKubernetesResourceMatcher.matcherFor(ServiceAccount.class,
90-
serviceAccountDR);
88+
final var matcher = GenericKubernetesResourceMatcher.matcherFor(serviceAccountDR);
9189
assertThat(matcher.match(actual, null, context).matched()).isFalse();
9290
}
9391

0 commit comments

Comments
 (0)