From 616a501af71f3addc12a6c42ce13b24bbce1c5f9 Mon Sep 17 00:00:00 2001 From: Redkale Date: Wed, 21 Dec 2022 17:35:43 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BC=98=E5=8C=96CacheSource=E9=83=A8=E5=88=86?= =?UTF-8?q?=E6=96=B9=E6=B3=95=E5=90=8D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/org/redkale/boot/Application.java | 2 +- .../org/redkale/source/CacheMemorySource.java | 38 +++++------ .../java/org/redkale/source/CacheSource.java | 66 +++++++++++++++---- 3 files changed, 73 insertions(+), 33 deletions(-) diff --git a/src/main/java/org/redkale/boot/Application.java b/src/main/java/org/redkale/boot/Application.java index 2e1226165..182a3bb62 100644 --- a/src/main/java/org/redkale/boot/Application.java +++ b/src/main/java/org/redkale/boot/Application.java @@ -1052,7 +1052,7 @@ public final class Application { return server; } // if (type == WatchFactory.class) { -// field.set(src, application.watchFactory); +// field.setex(src, application.watchFactory); // } return null; } catch (Exception e) { diff --git a/src/main/java/org/redkale/source/CacheMemorySource.java b/src/main/java/org/redkale/source/CacheMemorySource.java index 6a7b6f2e6..26476f9eb 100644 --- a/src/main/java/org/redkale/source/CacheMemorySource.java +++ b/src/main/java/org/redkale/source/CacheMemorySource.java @@ -790,53 +790,53 @@ public final class CacheMemorySource extends AbstractCacheSource { } @Override - public void set(final int expireSeconds, String key, Convert convert, T value) { + public void setex(final int expireSeconds, String key, Convert convert, T value) { set(CacheEntryType.OBJECT, expireSeconds, key, value); } @Override - public void set(final int expireSeconds, String key, Type type, T value) { + public void setex(final int expireSeconds, String key, Type type, T value) { set(CacheEntryType.OBJECT, expireSeconds, key, value); } @Override - public void set(final int expireSeconds, String key, Convert convert, Type type, T value) { + public void setex(final int expireSeconds, String key, Convert convert, Type type, T value) { set(CacheEntryType.OBJECT, expireSeconds, key, value); } @Override - public void setString(int expireSeconds, String key, String value) { + public void setexString(int expireSeconds, String key, String value) { set(CacheEntryType.STRING, expireSeconds, key, value); } @Override - public void setLong(int expireSeconds, String key, long value) { + public void setexLong(int expireSeconds, String key, long value) { set(CacheEntryType.LONG, expireSeconds, key, value); } @Override - public CompletableFuture setAsync(int expireSeconds, String key, Convert convert, T value) { - return CompletableFuture.runAsync(() -> set(expireSeconds, key, convert, value), getExecutor()).whenComplete(futureCompleteConsumer); + public CompletableFuture setexAsync(int expireSeconds, String key, Convert convert, T value) { + return CompletableFuture.runAsync(() -> setex(expireSeconds, key, convert, value), getExecutor()).whenComplete(futureCompleteConsumer); } @Override - public CompletableFuture setAsync(int expireSeconds, String key, Type type, T value) { - return CompletableFuture.runAsync(() -> set(expireSeconds, key, type, value), getExecutor()).whenComplete(futureCompleteConsumer); + public CompletableFuture setexAsync(int expireSeconds, String key, Type type, T value) { + return CompletableFuture.runAsync(() -> setex(expireSeconds, key, type, value), getExecutor()).whenComplete(futureCompleteConsumer); } @Override - public CompletableFuture setAsync(int expireSeconds, String key, Convert convert, Type type, T value) { - return CompletableFuture.runAsync(() -> set(expireSeconds, key, convert, type, value), getExecutor()).whenComplete(futureCompleteConsumer); + public CompletableFuture setexAsync(int expireSeconds, String key, Convert convert, Type type, T value) { + return CompletableFuture.runAsync(() -> setex(expireSeconds, key, convert, type, value), getExecutor()).whenComplete(futureCompleteConsumer); } @Override - public CompletableFuture setStringAsync(int expireSeconds, String key, String value) { - return CompletableFuture.runAsync(() -> setString(expireSeconds, key, value), getExecutor()).whenComplete(futureCompleteConsumer); + public CompletableFuture setexStringAsync(int expireSeconds, String key, String value) { + return CompletableFuture.runAsync(() -> setexString(expireSeconds, key, value), getExecutor()).whenComplete(futureCompleteConsumer); } @Override - public CompletableFuture setLongAsync(int expireSeconds, String key, long value) { - return CompletableFuture.runAsync(() -> setLong(expireSeconds, key, value), getExecutor()).whenComplete(futureCompleteConsumer); + public CompletableFuture setexLongAsync(int expireSeconds, String key, long value) { + return CompletableFuture.runAsync(() -> setexLong(expireSeconds, key, value), getExecutor()).whenComplete(futureCompleteConsumer); } @Override @@ -1419,7 +1419,7 @@ public final class CacheMemorySource extends AbstractCacheSource { } @Override - public CompletableFuture setBytesAsync(final int expireSeconds, final String key, byte[] value) { + public CompletableFuture setexBytesAsync(final int expireSeconds, final String key, byte[] value) { return CompletableFuture.runAsync(() -> setBytes(expireSeconds, key, value), getExecutor()).whenComplete(futureCompleteConsumer); } @@ -1434,13 +1434,13 @@ public final class CacheMemorySource extends AbstractCacheSource { } @Override - public void setBytes(final int expireSeconds, final String key, final Convert convert, final Type type, final T value) { + public void setexBytes(final int expireSeconds, final String key, final Convert convert, final Type type, final T value) { set(CacheEntryType.BYTES, expireSeconds, key, convert.convertToBytes(type, value)); } @Override - public CompletableFuture setBytesAsync(final int expireSeconds, final String key, final Convert convert, final Type type, final T value) { - return CompletableFuture.runAsync(() -> setBytes(expireSeconds, key, convert, type, value), getExecutor()).whenComplete(futureCompleteConsumer); + public CompletableFuture setexBytesAsync(final int expireSeconds, final String key, final Convert convert, final Type type, final T value) { + return CompletableFuture.runAsync(() -> setexBytes(expireSeconds, key, convert, type, value), getExecutor()).whenComplete(futureCompleteConsumer); } @Override diff --git a/src/main/java/org/redkale/source/CacheSource.java b/src/main/java/org/redkale/source/CacheSource.java index a19a07804..e0f762032 100644 --- a/src/main/java/org/redkale/source/CacheSource.java +++ b/src/main/java/org/redkale/source/CacheSource.java @@ -115,11 +115,26 @@ public interface CacheSource extends Resourcable { public T getSet(final String key, final Convert convert, final Type type, final T value); - public void set(final int expireSeconds, final String key, final Convert convert, final T value); + @Deprecated + default void set(final int expireSeconds, final String key, final Convert convert, final T value) { + setex(expireSeconds, key, convert, value); + } - public void set(final int expireSeconds, final String key, final Type type, final T value); + @Deprecated + default void set(final int expireSeconds, final String key, final Type type, final T value) { + setex(expireSeconds, key, type, value); + } - public void set(final int expireSeconds, final String key, final Convert convert, final Type type, final T value); + @Deprecated + default void set(final int expireSeconds, final String key, final Convert convert, final Type type, final T value) { + setex(expireSeconds, key, convert, type, value); + } + + public void setex(final int expireSeconds, final String key, final Convert convert, final T value); + + public void setex(final int expireSeconds, final String key, final Type type, final T value); + + public void setex(final int expireSeconds, final String key, final Convert convert, final Type type, final T value); @Deprecated default void setExpireSeconds(final String key, final int expireSeconds) { @@ -179,7 +194,7 @@ public interface CacheSource extends Resourcable { public void setBytes(final String key, final Convert convert, final Type type, final T value); - public void setBytes(final int expireSeconds, final String key, final Convert convert, final Type type, final T value); + public void setexBytes(final int expireSeconds, final String key, final Convert convert, final Type type, final T value); public List queryKeys(); @@ -199,7 +214,12 @@ public interface CacheSource extends Resourcable { public void setnxString(final String key, final String value); - public void setString(final int expireSeconds, final String key, final String value); + @Deprecated + default void setString(final int expireSeconds, final String key, final String value) { + setexString(expireSeconds, key, value); + } + + public void setexString(final int expireSeconds, final String key, final String value); public Map getStringMap(final String... keys); @@ -235,7 +255,12 @@ public interface CacheSource extends Resourcable { public void setnxLong(final String key, final long value); - public void setLong(final int expireSeconds, final String key, final long value); + @Deprecated + default void setLong(final int expireSeconds, final String key, final long value) { + setexLong(expireSeconds, key, value); + } + + public void setexLong(final int expireSeconds, final String key, final long value); public Map getLongMap(final String... keys); @@ -286,11 +311,26 @@ public interface CacheSource extends Resourcable { public CompletableFuture getSetAsync(final String key, final Convert convert, final Type type, final T value); - public CompletableFuture setAsync(final int expireSeconds, final String key, final Convert convert, final T value); + @Deprecated + default CompletableFuture setAsync(final int expireSeconds, final String key, final Convert convert, final T value) { + return setexAsync(expireSeconds, key, convert, value); + } - public CompletableFuture setAsync(final int expireSeconds, final String key, final Type type, final T value); + @Deprecated + default CompletableFuture setAsync(final int expireSeconds, final String key, final Type type, final T value) { + return setexAsync(expireSeconds, key, type, value); + } - public CompletableFuture setAsync(final int expireSeconds, final String key, final Convert convert, final Type type, final T value); + @Deprecated + default CompletableFuture setAsync(final int expireSeconds, final String key, final Convert convert, final Type type, final T value) { + return setexAsync(expireSeconds, key, convert, type, value); + } + + public CompletableFuture setexAsync(final int expireSeconds, final String key, final Convert convert, final T value); + + public CompletableFuture setexAsync(final int expireSeconds, final String key, final Type type, final T value); + + public CompletableFuture setexAsync(final int expireSeconds, final String key, final Convert convert, final Type type, final T value); @Deprecated default CompletableFuture setExpireSecondsAsync(final String key, final int expireSeconds) { @@ -403,11 +443,11 @@ public interface CacheSource extends Resourcable { public CompletableFuture setBytesAsync(final String key, final byte[] value); - public CompletableFuture setBytesAsync(final int expireSeconds, final String key, final byte[] value); + public CompletableFuture setexBytesAsync(final int expireSeconds, final String key, final byte[] value); public CompletableFuture setBytesAsync(final String key, final Convert convert, final Type type, final T value); - public CompletableFuture setBytesAsync(final int expireSeconds, final String key, final Convert convert, final Type type, final T value); + public CompletableFuture setexBytesAsync(final int expireSeconds, final String key, final Convert convert, final Type type, final T value); public CompletableFuture> queryKeysAsync(); @@ -427,7 +467,7 @@ public interface CacheSource extends Resourcable { public CompletableFuture setnxStringAsync(final String key, final String value); - public CompletableFuture setStringAsync(final int expireSeconds, final String key, final String value); + public CompletableFuture setexStringAsync(final int expireSeconds, final String key, final String value); public CompletableFuture> getStringMapAsync(final String... keys); @@ -463,7 +503,7 @@ public interface CacheSource extends Resourcable { public CompletableFuture setnxLongAsync(final String key, long value); - public CompletableFuture setLongAsync(final int expireSeconds, final String key, final long value); + public CompletableFuture setexLongAsync(final int expireSeconds, final String key, final long value); public CompletableFuture> getLongMapAsync(final String... keys);