fix: Optional associated resource (operator-framework#793)

csviri · web-flow · commit 4088a3c113db · 2022-01-05T13:13:37.000+01:00
diff --git a/operator-framework-core/src/main/java/io/javaoperatorsdk/operator/api/reconciler/DefaultContext.java b/operator-framework-core/src/main/java/io/javaoperatorsdk/operator/api/reconciler/DefaultContext.java
@@ -4,6 +4,7 @@
 
 import io.fabric8.kubernetes.api.model.HasMetadata;
 import io.javaoperatorsdk.operator.processing.Controller;
+import io.javaoperatorsdk.operator.processing.event.source.ResourceEventSource;
 
 public class DefaultContext<P extends HasMetadata> implements Context {
 
@@ -24,8 +25,9 @@ public Optional<RetryInfo> getRetryInfo() {
 
   @Override
   public <T> Optional<T> getSecondaryResource(Class<T> expectedType, String eventSourceName) {
-    final var eventSource =
+    final Optional<ResourceEventSource<P, T>> eventSource =
         controller.getEventSourceManager().getResourceEventSourceFor(expectedType, eventSourceName);
-    return eventSource.map(es -> es.getAssociated(primaryResource));
+    return eventSource.isEmpty() ? Optional.empty()
+        : eventSource.get().getAssociated(primaryResource);
   }
 }
diff --git a/operator-framework-core/src/main/java/io/javaoperatorsdk/operator/processing/event/source/CachingEventSource.java b/operator-framework-core/src/main/java/io/javaoperatorsdk/operator/processing/event/source/CachingEventSource.java
@@ -90,8 +90,8 @@ public void stop() throws OperatorException {
   }
 
   @Override
-  public T getAssociated(P primary) {
-    return cache.get(ResourceID.fromResource(primary)).orElse(null);
+  public Optional<T> getAssociated(P primary) {
+    return cache.get(ResourceID.fromResource(primary));
   }
 
   protected static class MapCache<T> implements UpdatableCache<T> {
diff --git a/operator-framework-core/src/main/java/io/javaoperatorsdk/operator/processing/event/source/ResourceEventSource.java b/operator-framework-core/src/main/java/io/javaoperatorsdk/operator/processing/event/source/ResourceEventSource.java
@@ -1,10 +1,12 @@
 package io.javaoperatorsdk.operator.processing.event.source;
 
+import java.util.Optional;
+
 import io.fabric8.kubernetes.api.model.HasMetadata;
 
 public interface ResourceEventSource<P extends HasMetadata, R> extends EventSource {
 
   Class<R> getResourceClass();
 
-  R getAssociated(P primary);
+  Optional<R> getAssociated(P primary);
 }
diff --git a/operator-framework-core/src/main/java/io/javaoperatorsdk/operator/processing/event/source/controller/ControllerResourceEventSource.java b/operator-framework-core/src/main/java/io/javaoperatorsdk/operator/processing/event/source/controller/ControllerResourceEventSource.java
@@ -201,7 +201,7 @@ private void handleKubernetesClientException(Exception e) {
   }
 
   @Override
-  public T getAssociated(T primary) {
-    return cache.get(ResourceID.fromResource(primary)).orElse(null);
+  public Optional<T> getAssociated(T primary) {
+    return cache.get(ResourceID.fromResource(primary));
   }
 }
diff --git a/operator-framework-core/src/main/java/io/javaoperatorsdk/operator/processing/event/source/informer/InformerEventSource.java b/operator-framework-core/src/main/java/io/javaoperatorsdk/operator/processing/event/source/informer/InformerEventSource.java
@@ -138,9 +138,9 @@ private Store<T> getStore() {
    * @param resource the primary resource we want to retrieve the associated resource for
    * @return the informed resource associated with the specified primary resource
    */
-  public T getAssociated(P resource) {
+  public Optional<T> getAssociated(P resource) {
     final var id = associatedWith.associatedSecondaryID(resource);
-    return get(id).orElse(null);
+    return get(id);
   }
 
 

Original file line number	Diff line number	Diff line change
`@@ -90,8 +90,8 @@ public void stop() throws OperatorException {`
`90`	`90`	`}`
`91`	`91`
`92`	`92`	`@Override`
`93`		`- public T getAssociated(P primary) {`
`94`		`- return cache.get(ResourceID.fromResource(primary)).orElse(null);`
	`93`	`+ public Optional<T> getAssociated(P primary) {`
	`94`	`+ return cache.get(ResourceID.fromResource(primary));`
`95`	`95`	`}`
`96`	`96`
`97`	`97`	`protected static class MapCache<T> implements UpdatableCache<T> {`
Original file line number	Diff line number	Diff line change
`@@ -201,7 +201,7 @@ private void handleKubernetesClientException(Exception e) {`
`201`	`201`	`}`
`202`	`202`
`203`	`203`	`@Override`
`204`		`- public T getAssociated(T primary) {`
`205`		`- return cache.get(ResourceID.fromResource(primary)).orElse(null);`
	`204`	`+ public Optional<T> getAssociated(T primary) {`
	`205`	`+ return cache.get(ResourceID.fromResource(primary));`
`206`	`206`	`}`
`207`	`207`	`}`