diff --git a/src/main/java/org/redkale/source/AbstractCacheSource.java b/src/main/java/org/redkale/source/AbstractCacheSource.java index 955651e3a..f410bb239 100644 --- a/src/main/java/org/redkale/source/AbstractCacheSource.java +++ b/src/main/java/org/redkale/source/AbstractCacheSource.java @@ -3,8 +3,6 @@ package org.redkale.source; import java.util.*; -import java.util.concurrent.*; -import java.util.function.Supplier; import org.redkale.annotation.AutoLoad; import org.redkale.annotation.ResourceListener; import org.redkale.annotation.ResourceType; @@ -111,32 +109,4 @@ public abstract class AbstractCacheSource extends AbstractService implements Cac return source; } - protected CompletableFuture supplyFuture(Supplier supplier) { - try { - return CompletableFuture.completedFuture(supplier.get()); - } catch (Throwable t) { - return CompletableFuture.failedFuture(t); - } - } - - protected CompletableFuture runFuture(Runnable runner) { - try { - runner.run(); - return CompletableFuture.completedFuture(null); - } catch (Throwable t) { - return CompletableFuture.failedFuture(t); - } - } - - protected CompletableFuture supplyAsync(Supplier supplier) { - return CompletableFuture.supplyAsync(supplier); - } - - protected CompletableFuture supplyAsync(Supplier supplier, Executor executor) { - return CompletableFuture.supplyAsync(supplier, executor); - } - - protected CompletableFuture runAsync(Runnable runner, Executor executor) { - return CompletableFuture.runAsync(runner, executor); - } } diff --git a/src/main/java/org/redkale/source/CacheMemorySource.java b/src/main/java/org/redkale/source/CacheMemorySource.java index 620fafe21..82b6fc227 100644 --- a/src/main/java/org/redkale/source/CacheMemorySource.java +++ b/src/main/java/org/redkale/source/CacheMemorySource.java @@ -193,6 +193,35 @@ public final class CacheMemorySource extends AbstractCacheSource { } } + protected CompletableFuture supplyFuture(Supplier supplier) { + try { + return CompletableFuture.completedFuture(supplier.get()); + } catch (Throwable t) { + return CompletableFuture.failedFuture(t); + } + } + + protected CompletableFuture runFuture(Runnable runner) { + try { + runner.run(); + return CompletableFuture.completedFuture(null); + } catch (Throwable t) { + return CompletableFuture.failedFuture(t); + } + } + + protected CompletableFuture supplyAsync(Supplier supplier) { + return CompletableFuture.supplyAsync(supplier); + } + + protected CompletableFuture supplyAsync(Supplier supplier, Executor executor) { + return CompletableFuture.supplyAsync(supplier, executor); + } + + protected CompletableFuture runAsync(Runnable runner, Executor executor) { + return CompletableFuture.runAsync(runner, executor); + } + @Override public CompletableFuture isOpenAsync() { return CompletableFuture.completedFuture(true);