#12: introduced Memory::dispose

skapral · Mar 23, 2022 · 24bdd2c · 24bdd2c
1 parent fcd566b
commit 24bdd2c
Show file tree

Hide file tree

Showing 3 changed files with 32 additions and 0 deletions.
diff --git a/oo-memoized/memoized-chm/src/main/java/com/pragmaticobjects/oo/memoized/chm/MemoryCHM.java b/oo-memoized/memoized-chm/src/main/java/com/pragmaticobjects/oo/memoized/chm/MemoryCHM.java
@@ -30,6 +30,7 @@
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
+import java.util.Optional;
 import java.util.concurrent.ConcurrentHashMap;
 import java.util.concurrent.FutureTask;
 
@@ -75,6 +76,19 @@ public final <T> T memoized(MemoizedCallable<T> callable) {
         }
     }
 
+    @Override
+    public final <T> Optional<T> dispose(MemoizedCallable<T> callable) {
+        return Optional.ofNullable(memoizedObjects.remove(callable))
+            .map(futureTask -> {
+                try {
+                    return futureTask.get();
+                } catch(Exception ex) {
+                    throw new RuntimeException(ex);
+                }
+            })
+            .map(v -> (T) v);
+    }
+
     @Override
     public final void clean() {
         memoizedObjects.clear();

diff --git a/oo-memoized/memoized-core/src/main/java/com/pragmaticobjects/oo/memoized/core/Memory.java b/oo-memoized/memoized-core/src/main/java/com/pragmaticobjects/oo/memoized/core/Memory.java
@@ -25,6 +25,8 @@
  */
 package com.pragmaticobjects.oo.memoized.core;
 
+import java.util.Optional;
+
 /**
  * Abstraction for a place where memoized values are kept.
  * 
@@ -39,6 +41,15 @@ public interface Memory {
      */
     <T> T memoized(MemoizedCallable<T> callable);
 
+    /**
+     * Dispose memoized value, if anything was calculated, and return it to the caller
+     *
+     * @param <T> result type
+     * @param callable callable to memoize
+     * @return result
+     */
+    <T> Optional<T> dispose(MemoizedCallable<T> callable);
+
     /**
      * Drop all memoized values
      */

diff --git a/...emoized-core/src/test/java/com/pragmaticobjects/oo/memoized/core/AssertCallTimesTest.java b/...emoized-core/src/test/java/com/pragmaticobjects/oo/memoized/core/AssertCallTimesTest.java
@@ -29,6 +29,8 @@
 import com.pragmaticobjects.oo.tests.TestCase;
 import com.pragmaticobjects.oo.tests.junit5.TestsSuite;
 
+import java.util.Optional;
+
 /**
  * Test {@link Memory} implementation that memoises nothing
  */
@@ -38,6 +40,11 @@ public final <T> T memoized(MemoizedCallable<T> callable) {
         return callable.call();
     }
 
+    @Override
+    public final <T> Optional<T> dispose(MemoizedCallable<T> callable) {
+        return Optional.empty();
+    }
+
     @Override
     public final void clean() {
         // Do Nothing