Skip to content

Commit 174097f

Browse files
committed
refactor: generify CustomResourceFacade
1 parent 4277b3d commit 174097f

File tree

2 files changed

+8
-6
lines changed

2 files changed

+8
-6
lines changed

operator-framework-core/src/main/java/io/javaoperatorsdk/operator/Operator.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -53,7 +53,7 @@ public <R extends CustomResource> void register(
5353
final var targetNamespaces = configuration.getNamespaces().toArray(new String[] {});
5454
Class<R> resClass = configuration.getCustomResourceClass();
5555
String finalizer = configuration.getFinalizer();
56-
MixedOperation client = k8sClient.customResources(resClass);
56+
final var client = k8sClient.customResources(resClass);
5757
EventDispatcher dispatcher =
5858
new EventDispatcher(
5959
controller, finalizer, new EventDispatcher.CustomResourceFacade(client));

operator-framework-core/src/main/java/io/javaoperatorsdk/operator/processing/EventDispatcher.java

Lines changed: 7 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,7 @@
55
import static io.javaoperatorsdk.operator.processing.KubernetesResourceUtils.getVersion;
66
import static io.javaoperatorsdk.operator.processing.KubernetesResourceUtils.markedForDeletion;
77

8+
import io.fabric8.kubernetes.api.model.KubernetesResourceList;
89
import io.fabric8.kubernetes.client.CustomResource;
910
import io.fabric8.kubernetes.client.dsl.MixedOperation;
1011
import io.fabric8.kubernetes.client.dsl.Resource;
@@ -189,23 +190,24 @@ private void addFinalizerIfNotPresent(CustomResource resource) {
189190
}
190191

191192
// created to support unit testing
192-
public static class CustomResourceFacade {
193+
public static class CustomResourceFacade<R extends CustomResource> {
193194

194-
private final MixedOperation<?, ?, Resource<CustomResource>> resourceOperation;
195+
private final MixedOperation<R, KubernetesResourceList<R>, Resource<R>> resourceOperation;
195196

196-
public CustomResourceFacade(MixedOperation<?, ?, Resource<CustomResource>> resourceOperation) {
197+
public CustomResourceFacade(
198+
MixedOperation<R, KubernetesResourceList<R>, Resource<R>> resourceOperation) {
197199
this.resourceOperation = resourceOperation;
198200
}
199201

200-
public CustomResource updateStatus(CustomResource resource) {
202+
public R updateStatus(R resource) {
201203
log.trace("Updating status for resource: {}", resource);
202204
return resourceOperation
203205
.inNamespace(resource.getMetadata().getNamespace())
204206
.withName(resource.getMetadata().getName())
205207
.updateStatus(resource);
206208
}
207209

208-
public CustomResource replaceWithLock(CustomResource resource) {
210+
public R replaceWithLock(R resource) {
209211
return resourceOperation
210212
.inNamespace(resource.getMetadata().getNamespace())
211213
.withName(resource.getMetadata().getName())

0 commit comments

Comments
 (0)