wip

Signed-off-by: Attila Mészáros <a_meszaros@apple.com>

Author: csviri

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

@@ -1,6 +1,8 @@
 package io.javaoperatorsdk.operator.api.reconciler;
 
 import io.fabric8.kubernetes.api.model.HasMetadata;
+import io.fabric8.kubernetes.client.KubernetesClient;
+import io.javaoperatorsdk.operator.api.reconciler.support.UserPrimaryResourceCache;
 import io.javaoperatorsdk.operator.processing.event.ResourceID;
 
 public class PrimaryUpdateAndCacheUtils {
@@ -19,7 +21,15 @@ public static <P extends HasMetadata> P updateAndCacheStatus(P primary, Context<
     return updatedResource;
   }
 
-  public static <P extends HasMetadata> P patchAndCacheStatus(P primary) {
+  public static <P extends HasMetadata> P patchAndCacheStatus(
+      P primary, Context<P> context, UserPrimaryResourceCache<P> cache) {
+
+    return null;
+  }
+
+  public static <P extends HasMetadata> P patchAndCacheStatus(
+      P primary, KubernetesClient client, UserPrimaryResourceCache<P> cache) {
+
     return null;
   }
 }

operator-framework-core/src/main/java/io/javaoperatorsdk/operator/api/reconciler/support/ResourceCache.java renamed to operator-framework-core/src/main/java/io/javaoperatorsdk/operator/api/reconciler/support/UserPrimaryResourceCache.java

@@ -6,13 +6,13 @@
 import io.fabric8.kubernetes.api.model.HasMetadata;
 import io.javaoperatorsdk.operator.processing.event.ResourceID;
 
-public class ResourceCache<P extends HasMetadata> {
+public class UserPrimaryResourceCache<P extends HasMetadata> {
 
-  private BiPredicate<Pair<P>, P> evictionPredicate;
+  private BiPredicate<Pair<P>, P> evictionCondition;
   private ConcurrentHashMap<ResourceID, Pair<P>> cache = new ConcurrentHashMap<>();
 
-  public ResourceCache(BiPredicate<Pair<P>, P> evictionPredicate) {
-    this.evictionPredicate = evictionPredicate;
+  public UserPrimaryResourceCache(BiPredicate<Pair<P>, P> evictionCondition) {
+    this.evictionCondition = evictionCondition;
   }
 
   public void cacheResource(P afterUpdate) {
@@ -35,7 +35,7 @@ public P getFreshResource(P newVersion) {
       cache.remove(resourceId);
       return newVersion;
     }
-    if (evictionPredicate.test(pair, newVersion)) {
+    if (evictionCondition.test(pair, newVersion)) {
       cache.remove(resourceId);
       return newVersion;
     } else {

operator-framework-core/src/test/java/io/javaoperatorsdk/operator/processing/event/source/informer/TemporaryResourceCacheTest.java renamed to operator-framework-core/src/test/java/io/javaoperatorsdk/operator/processing/event/source/informer/TemporaryUserPrimaryResourceCacheTest.java

@@ -19,7 +19,7 @@
 import static org.mockito.Mockito.mock;
 import static org.mockito.Mockito.when;
 
-class TemporaryResourceCacheTest {
+class TemporaryUserPrimaryResourceCacheTest {
 
   public static final String RESOURCE_VERSION = "2";