Skip to content

Commit b39d91c

Browse files
committed
refactor: use interface instead of implementation class
1 parent c6f6d8e commit b39d91c

File tree

2 files changed

+9
-6
lines changed

2 files changed

+9
-6
lines changed

operator-framework-core/src/main/java/io/javaoperatorsdk/operator/processing/event/internal/CustomResourceEventSource.java

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,6 @@
1111
import io.fabric8.kubernetes.client.WatcherException;
1212
import io.fabric8.kubernetes.client.dsl.MixedOperation;
1313
import io.fabric8.kubernetes.client.dsl.Resource;
14-
import io.fabric8.kubernetes.client.dsl.internal.CustomResourceOperationsImpl;
1514
import io.javaoperatorsdk.operator.api.config.ControllerConfiguration;
1615
import io.javaoperatorsdk.operator.processing.CustomResourceCache;
1716
import io.javaoperatorsdk.operator.processing.KubernetesResourceUtils;
@@ -30,7 +29,7 @@ public class CustomResourceEventSource<T extends CustomResource<?, ?>> extends A
3029

3130
private static final Logger log = LoggerFactory.getLogger(CustomResourceEventSource.class);
3231

33-
private final CustomResourceOperationsImpl<T, KubernetesResourceList<T>> client;
32+
private final MixedOperation<T, KubernetesResourceList<T>, Resource<T>> client;
3433
private final Set<String> targetNamespaces;
3534
private final boolean generationAware;
3635
private final String resourceFinalizer;
@@ -73,7 +72,7 @@ public CustomResourceEventSource(
7372
String resourceFinalizer,
7473
Class<T> resClass,
7574
CustomResourceCache customResourceCache) {
76-
this.client = (CustomResourceOperationsImpl<T, KubernetesResourceList<T>>) client;
75+
this.client = client;
7776
this.targetNamespaces = targetNamespaces;
7877
this.generationAware = generationAware;
7978
this.resourceFinalizer = resourceFinalizer;

operator-framework-core/src/test/java/io/javaoperatorsdk/operator/processing/event/internal/CustomResourceEventSourceTest.java

Lines changed: 7 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,8 @@
77

88
import io.fabric8.kubernetes.api.model.KubernetesResourceList;
99
import io.fabric8.kubernetes.client.Watcher;
10-
import io.fabric8.kubernetes.client.dsl.internal.CustomResourceOperationsImpl;
10+
import io.fabric8.kubernetes.client.dsl.MixedOperation;
11+
import io.fabric8.kubernetes.client.dsl.Resource;
1112
import io.javaoperatorsdk.operator.TestUtils;
1213
import io.javaoperatorsdk.operator.processing.event.EventHandler;
1314
import io.javaoperatorsdk.operator.sample.simple.TestCustomResource;
@@ -19,8 +20,11 @@
1920
class CustomResourceEventSourceTest {
2021

2122
public static final String FINALIZER = "finalizer";
22-
CustomResourceOperationsImpl<TestCustomResource, KubernetesResourceList<TestCustomResource>>
23-
client = mock(CustomResourceOperationsImpl.class);
23+
MixedOperation<
24+
TestCustomResource,
25+
KubernetesResourceList<TestCustomResource>,
26+
Resource<TestCustomResource>>
27+
client = mock(MixedOperation.class);
2428
EventHandler eventHandler = mock(EventHandler.class);
2529

2630
private CustomResourceEventSource<TestCustomResource> customResourceEventSource =

0 commit comments

Comments
 (0)