fix: restore previous caching behavior

Author: metacosm

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

@@ -12,7 +12,6 @@
 import io.javaoperatorsdk.operator.processing.event.DefaultEventSourceManager;
 import io.javaoperatorsdk.operator.processing.event.Event;
 import io.javaoperatorsdk.operator.processing.event.EventHandler;
-import io.javaoperatorsdk.operator.processing.event.internal.CustomResourceEvent;
 import io.javaoperatorsdk.operator.processing.retry.GenericRetry;
 import io.javaoperatorsdk.operator.processing.retry.Retry;
 import io.javaoperatorsdk.operator.processing.retry.RetryExecution;
@@ -90,12 +89,6 @@ public void setEventSourceManager(DefaultEventSourceManager eventSourceManager)
 
   @Override
   public void handleEvent(Event event) {
-    // cache the latest version of the CR
-    if (event instanceof CustomResourceEvent) {
-      CustomResourceEvent crEvent = (CustomResourceEvent) event;
-      customResourceCache.cacheResource(crEvent.getCustomResource());
-    }
-
     try {
       lock.lock();
       log.debug("Received event: {}", event);

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

@@ -12,6 +12,7 @@
 import io.fabric8.kubernetes.client.dsl.Resource;
 import io.fabric8.kubernetes.client.dsl.internal.CustomResourceOperationsImpl;
 import io.javaoperatorsdk.operator.api.config.ControllerConfiguration;
+import io.javaoperatorsdk.operator.processing.CustomResourceCache;
 import io.javaoperatorsdk.operator.processing.KubernetesResourceUtils;
 import io.javaoperatorsdk.operator.processing.event.AbstractEventSource;
 import java.util.ArrayList;
@@ -35,6 +36,7 @@ public class CustomResourceEventSource<T extends CustomResource<?, ?>> extends A
   private final Map<String, Long> lastGenerationProcessedSuccessfully = new ConcurrentHashMap<>();
   private final List<Watch> watches;
   private final String resClass;
+  private final CustomResourceCache customResourceCache;
 
   public CustomResourceEventSource(
       MixedOperation<T, KubernetesResourceList<T>, Resource<T>> client,
@@ -44,7 +46,8 @@ public CustomResourceEventSource(
         configuration.getEffectiveNamespaces(),
         configuration.isGenerationAware(),
         configuration.getFinalizer(),
-        configuration.getCustomResourceClass());
+        configuration.getCustomResourceClass(),
+        new CustomResourceCache(configuration.getConfigurationService().getObjectMapper()));
   }
 
   CustomResourceEventSource(
@@ -53,12 +56,29 @@ public CustomResourceEventSource(
       boolean generationAware,
       String resourceFinalizer,
       Class<T> resClass) {
+    this(
+        client,
+        targetNamespaces,
+        generationAware,
+        resourceFinalizer,
+        resClass,
+        new CustomResourceCache());
+  }
+
+  CustomResourceEventSource(
+      MixedOperation<T, KubernetesResourceList<T>, Resource<T>> client,
+      Set<String> targetNamespaces,
+      boolean generationAware,
+      String resourceFinalizer,
+      Class<T> resClass,
+      CustomResourceCache customResourceCache) {
     this.client = (CustomResourceOperationsImpl<T, KubernetesResourceList<T>>) client;
     this.targetNamespaces = targetNamespaces;
     this.generationAware = generationAware;
     this.resourceFinalizer = resourceFinalizer;
     this.watches = new ArrayList<>();
     this.resClass = resClass.getName();
+    this.customResourceCache = customResourceCache;
   }
 
   @Override
@@ -97,6 +117,9 @@ public void eventReceived(Watcher.Action action, T customResource) {
         action.name(),
         customResource.getMetadata().getName());
 
+    // cache the latest version of the CR
+    customResourceCache.cacheResource(customResource);
+
     if (action == Action.ERROR) {
       log.debug(
           "Skipping {} event for custom resource uid: {}, version: {}",

operator-framework-core/src/test/java/io/javaoperatorsdk/operator/processing/DefaultEventHandlerTest.java

@@ -73,15 +73,15 @@ public void dispatchesEventsIfNoExecutionInProgress() {
     verify(eventDispatcherMock, timeout(50).times(1)).handleExecution(any());
   }
 
-  /*@Test
+  @Test
   public void skipProcessingIfLatestCustomResourceNotInCache() {
     Event event = prepareCREvent();
     customResourceCache.cleanup(event.getRelatedCustomResourceUid());
 
     defaultEventHandler.handleEvent(event);
 
     verify(eventDispatcherMock, timeout(50).times(0)).handleExecution(any());
-  }*/
+  }
 
   @Test
   public void ifExecutionInProgressWaitsUntilItsFinished() throws InterruptedException {