fix: secondary resource is optional

Author: csviri

operator-framework-core/src/main/java/io/javaoperatorsdk/operator/api/reconciler/Context.java

@@ -6,9 +6,9 @@ public interface Context {
 
   Optional<RetryInfo> getRetryInfo();
 
-  default <T> T getSecondaryResource(Class<T> expectedType) {
+  default <T> Optional<T> getSecondaryResource(Class<T> expectedType) {
     return getSecondaryResource(expectedType, null);
   }
 
-  <T> T getSecondaryResource(Class<T> expectedType, String eventSourceName);
+  <T> Optional<T> getSecondaryResource(Class<T> expectedType, String eventSourceName);
 }

operator-framework-core/src/main/java/io/javaoperatorsdk/operator/api/reconciler/DefaultContext.java

@@ -23,9 +23,10 @@ public Optional<RetryInfo> getRetryInfo() {
   }
 
   @Override
-  public <T> T getSecondaryResource(Class<T> expectedType, String eventSourceName) {
+  public <T> Optional<T> getSecondaryResource(Class<T> expectedType, String eventSourceName) {
     final var eventSource =
         controller.getEventSourceManager().getResourceEventSourceFor(expectedType, eventSourceName);
-    return eventSource.map(es -> es.getAssociated(primaryResource)).orElse(null);
+    return eventSource.map(es -> Optional.ofNullable(es.getAssociated(primaryResource)))
+        .orElse(Optional.empty());
   }
 }

operator-framework/src/test/java/io/javaoperatorsdk/operator/sample/informereventsource/InformerEventSourceTestCustomReconciler.java

@@ -1,6 +1,7 @@
 package io.javaoperatorsdk.operator.sample.informereventsource;
 
 import java.util.List;
+import java.util.Optional;
 
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
@@ -51,9 +52,12 @@ public UpdateControl<InformerEventSourceTestCustomResource> reconcile(
 
     // Reading the config map from the informer not from the API
     // name of the config map same as custom resource for sake of simplicity
-    ConfigMap configMap = context.getSecondaryResource(ConfigMap.class);
+    Optional<ConfigMap> configMap = context.getSecondaryResource(ConfigMap.class);
+    if (configMap.isEmpty()) {
+      throw new IllegalStateException("Config map should be present at this place.");
+    }
 
-    String targetStatus = configMap.getData().get(TARGET_CONFIG_MAP_KEY);
+    String targetStatus = configMap.get().getData().get(TARGET_CONFIG_MAP_KEY);
     LOGGER.debug("Setting target status for CR: {}", targetStatus);
     resource.setStatus(new InformerEventSourceTestCustomResourceStatus());
     resource.getStatus().setConfigMapValue(targetStatus);

sample-operators/tomcat-operator/src/main/java/io/javaoperatorsdk/operator/sample/TomcatReconciler.java

@@ -4,6 +4,7 @@
 import java.io.InputStream;
 import java.util.List;
 import java.util.Objects;
+import java.util.Optional;
 import java.util.Set;
 
 import org.slf4j.Logger;
@@ -63,11 +64,11 @@ public UpdateControl<Tomcat> reconcile(Tomcat tomcat, Context context) {
     createOrUpdateDeployment(tomcat);
     createOrUpdateService(tomcat);
 
-    Deployment deployment = context.getSecondaryResource(Deployment.class);
+    Optional<Deployment> deployment = context.getSecondaryResource(Deployment.class);
 
-    if (deployment != null) {
+    if (deployment.isPresent()) {
       Tomcat updatedTomcat =
-          updateTomcatStatus(tomcat, deployment);
+          updateTomcatStatus(tomcat, deployment.get());
       log.info(
           "Updating status of Tomcat {} in namespace {} to {} ready replicas",
           tomcat.getMetadata().getName(),

sample-operators/tomcat-operator/src/main/java/io/javaoperatorsdk/operator/sample/WebappReconciler.java

@@ -3,6 +3,7 @@
 import java.io.ByteArrayOutputStream;
 import java.util.List;
 import java.util.Objects;
+import java.util.Optional;
 import java.util.concurrent.CompletableFuture;
 import java.util.concurrent.ExecutionException;
 import java.util.concurrent.TimeUnit;
@@ -70,13 +71,13 @@ public UpdateControl<Webapp> reconcile(Webapp webapp, Context context) {
       return UpdateControl.noUpdate();
     }
 
-    Tomcat tomcat = context.getSecondaryResource(Tomcat.class);
-    if (tomcat == null) {
+    Optional<Tomcat> tomcatValue = context.getSecondaryResource(Tomcat.class);
+    if (tomcatValue.isEmpty()) {
       throw new IllegalStateException("Cannot find Tomcat " + webapp.getSpec().getTomcat()
           + " for Webapp " + webapp.getMetadata().getName() + " in namespace "
           + webapp.getMetadata().getNamespace());
     }
-
+    Tomcat tomcat = tomcatValue.get();
     if (tomcat.getStatus() != null
         && Objects.equals(tomcat.getSpec().getReplicas(), tomcat.getStatus().getReadyReplicas())) {
       log.info(