wip

Signed-off-by: Attila Mészáros <[email protected]>

Author: csviri

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

@@ -11,7 +11,7 @@
 
 public class ExpectationManager<P extends HasMetadata> {
 
-  private final ConcurrentHashMap<ResourceID, RegisteredExpectation<P>> registeredExpectations =
+  protected final ConcurrentHashMap<ResourceID, RegisteredExpectation<P>> registeredExpectations =
       new ConcurrentHashMap<>();
 
   public void setExpectation(P primary, Expectation<P> expectation, Duration timeout) {
@@ -53,6 +53,10 @@ public Optional<Expectation<P>> getExpectation(P primary) {
     return Optional.ofNullable(regExp).map(RegisteredExpectation::expectation);
   }
 
+  public Optional<String> getExpectationName(P primary) {
+    return getExpectation(primary).map(Expectation::name);
+  }
+
   public void cleanup(P primary) {
     registeredExpectations.remove(ResourceID.fromResource(primary));
   }

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

@@ -12,4 +12,8 @@ public boolean isFulfilled() {
   public boolean isTimedOut() {
     return status == ExpectationStatus.TIMED_OUT;
   }
+
+  public String name() {
+    return expectation.name();
+  }
 }

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

@@ -0,0 +1,43 @@
+package io.javaoperatorsdk.operator.processing.expectation;
+
+import java.time.Duration;
+import java.time.LocalDateTime;
+
+import io.fabric8.kubernetes.api.model.HasMetadata;
+import io.javaoperatorsdk.operator.api.reconciler.IndexedResourceCache;
+
+public class PeriodicCleanerExpectationManager<P extends HasMetadata>
+    extends ExpectationManager<P> {
+
+  private final Duration cleanupDelayAfterExpiration;
+  private final IndexedResourceCache<P> primaryCache;
+
+  // todo fixes schedule
+  public PeriodicCleanerExpectationManager(Duration period, Duration cleanupDelayAfterExpiration) {
+    this.cleanupDelayAfterExpiration = cleanupDelayAfterExpiration;
+    this.primaryCache = null;
+  }
+
+  public PeriodicCleanerExpectationManager(Duration period, IndexedResourceCache<P> primaryCache) {
+    this.cleanupDelayAfterExpiration = null;
+    this.primaryCache = primaryCache;
+  }
+
+  public void clean() {
+    registeredExpectations
+        .entrySet()
+        .removeIf(
+            e -> {
+              if (cleanupDelayAfterExpiration != null) {
+                return LocalDateTime.now()
+                    .isAfter(
+                        e.getValue()
+                            .registeredAt()
+                            .plus(e.getValue().timeout())
+                            .plus(cleanupDelayAfterExpiration));
+              } else {
+                return primaryCache.get(e.getKey()).isEmpty();
+              }
+            });
+  }
+}