From 441a74a7c9ab972b97c0a97a5f8283eaaf48d8ed Mon Sep 17 00:00:00 2001 From: Redkale Date: Mon, 26 Dec 2022 22:48:59 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BC=98=E5=8C=96CacheSource?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../org/redkale/source/CacheMemorySource.java | 50 ------------------- .../java/org/redkale/source/CacheSource.java | 24 +-------- 2 files changed, 2 insertions(+), 72 deletions(-) diff --git a/src/main/java/org/redkale/source/CacheMemorySource.java b/src/main/java/org/redkale/source/CacheMemorySource.java index 69293f1e7..60a821221 100644 --- a/src/main/java/org/redkale/source/CacheMemorySource.java +++ b/src/main/java/org/redkale/source/CacheMemorySource.java @@ -252,11 +252,6 @@ public final class CacheMemorySource extends AbstractCacheSource { return entry.mapValue.contains(field); } - @Override - public void hset(final String key, final String field, final Convert convert, final T value) { - hset(CacheEntryType.MAP, key, field, value); - } - @Override public void hset(final String key, final String field, final Type type, final T value) { hset(CacheEntryType.MAP, key, field, value); @@ -277,11 +272,6 @@ public final class CacheMemorySource extends AbstractCacheSource { hset(CacheEntryType.MAP, key, field, value); } - @Override - public void hsetnx(final String key, final String field, final Convert convert, final T value) { - hsetnx(CacheEntryType.MAP, key, field, value); - } - @Override public void hsetnx(final String key, final String field, final Type type, final T value) { hsetnx(CacheEntryType.MAP, key, field, value); @@ -468,11 +458,6 @@ public final class CacheMemorySource extends AbstractCacheSource { return CompletableFuture.supplyAsync(() -> hexists(key, field), getExecutor()); } - @Override - public CompletableFuture hsetAsync(final String key, final String field, final Convert convert, final T value) { - return CompletableFuture.runAsync(() -> hset(key, field, convert, value), getExecutor()).whenComplete(futureCompleteConsumer); - } - @Override public CompletableFuture hsetAsync(final String key, final String field, final Type type, final T value) { return CompletableFuture.runAsync(() -> hset(key, field, type, value), getExecutor()).whenComplete(futureCompleteConsumer); @@ -493,11 +478,6 @@ public final class CacheMemorySource extends AbstractCacheSource { return CompletableFuture.runAsync(() -> hsetLong(key, field, value), getExecutor()).whenComplete(futureCompleteConsumer); } - @Override - public CompletableFuture hsetnxAsync(final String key, final String field, final Convert convert, final T value) { - return CompletableFuture.runAsync(() -> hsetnx(key, field, convert, value), getExecutor()).whenComplete(futureCompleteConsumer); - } - @Override public CompletableFuture hsetnxAsync(final String key, final String field, final Type type, final T value) { return CompletableFuture.runAsync(() -> hsetnx(key, field, type, value), getExecutor()).whenComplete(futureCompleteConsumer); @@ -711,11 +691,6 @@ public final class CacheMemorySource extends AbstractCacheSource { }); } - @Override - public void set(String key, Convert convert, T value) { - set(CacheEntryType.OBJECT, key, value); - } - @Override public void set(String key, Type type, T value) { set(CacheEntryType.OBJECT, key, value); @@ -726,11 +701,6 @@ public final class CacheMemorySource extends AbstractCacheSource { set(CacheEntryType.OBJECT, key, value); } - @Override - public void setnx(String key, Convert convert, T value) { - setnx(CacheEntryType.OBJECT, key, value); - } - @Override public void setnx(String key, Type type, T value) { setnx(CacheEntryType.OBJECT, key, value); @@ -785,11 +755,6 @@ public final class CacheMemorySource extends AbstractCacheSource { return CompletableFuture.runAsync(() -> mset(map), getExecutor()).whenComplete(futureCompleteConsumer); } - @Override - public CompletableFuture setAsync(String key, Convert convert, T value) { - return CompletableFuture.runAsync(() -> set(key, convert, value), getExecutor()).whenComplete(futureCompleteConsumer); - } - @Override public CompletableFuture setAsync(String key, Type type, T value) { return CompletableFuture.runAsync(() -> set(key, type, value), getExecutor()).whenComplete(futureCompleteConsumer); @@ -800,11 +765,6 @@ public final class CacheMemorySource extends AbstractCacheSource { return CompletableFuture.runAsync(() -> set(key, convert, type, value), getExecutor()).whenComplete(futureCompleteConsumer); } - @Override - public CompletableFuture setnxAsync(String key, Convert convert, T value) { - return CompletableFuture.runAsync(() -> setnx(key, convert, value), getExecutor()).whenComplete(futureCompleteConsumer); - } - @Override public CompletableFuture setnxAsync(String key, Type type, T value) { return CompletableFuture.runAsync(() -> setnx(key, type, value), getExecutor()).whenComplete(futureCompleteConsumer); @@ -863,11 +823,6 @@ public final class CacheMemorySource extends AbstractCacheSource { } } - @Override - public void setex(String key, int expireSeconds, Convert convert, T value) { - set(CacheEntryType.OBJECT, expireSeconds, key, value); - } - @Override public void setex(String key, int expireSeconds, Type type, T value) { set(CacheEntryType.OBJECT, expireSeconds, key, value); @@ -888,11 +843,6 @@ public final class CacheMemorySource extends AbstractCacheSource { set(CacheEntryType.LONG, expireSeconds, key, value); } - @Override - public CompletableFuture setexAsync(String key, int expireSeconds, Convert convert, T value) { - return CompletableFuture.runAsync(() -> setex(key, expireSeconds, convert, value), getExecutor()).whenComplete(futureCompleteConsumer); - } - @Override public CompletableFuture setexAsync(String key, int expireSeconds, Type type, T value) { return CompletableFuture.runAsync(() -> setex(key, expireSeconds, type, value), getExecutor()).whenComplete(futureCompleteConsumer); diff --git a/src/main/java/org/redkale/source/CacheSource.java b/src/main/java/org/redkale/source/CacheSource.java index 32347a0fc..806bfed2c 100644 --- a/src/main/java/org/redkale/source/CacheSource.java +++ b/src/main/java/org/redkale/source/CacheSource.java @@ -114,8 +114,6 @@ public interface CacheSource extends Resourcable { public void mset(final Map map); - public void set(final String key, final Convert convert, final T value); - public void set(final String key, final Type type, final T value); public void set(final String key, final Convert convert, final Type type, final T value); @@ -127,8 +125,6 @@ public interface CacheSource extends Resourcable { public void setBytes(final String key, final byte[] value); //------------------------ setnx ------------------------ - public void setnx(final String key, final Convert convert, final T value); - public void setnx(final String key, final Type type, final T value); public void setnx(final String key, final Convert convert, final Type type, final T value); @@ -140,8 +136,6 @@ public interface CacheSource extends Resourcable { public void setnxBytes(final String key, final byte[] value); //------------------------ setex ------------------------ - public void setex(final String key, final int expireSeconds, final Convert convert, final T value); - public void setex(final String key, final int expireSeconds, final Type type, final T value); public void setex(final String key, final int expireSeconds, final Convert convert, final Type type, final T value); @@ -177,8 +171,6 @@ public interface CacheSource extends Resourcable { public long hgetLong(final String key, final String field, long defValue); //------------------------ hset ------------------------ - public void hset(final String key, final String field, final Convert convert, final T value); - public void hset(final String key, final String field, final Type type, final T value); public void hset(final String key, final String field, final Convert convert, final Type type, final T value); @@ -188,8 +180,6 @@ public interface CacheSource extends Resourcable { public void hsetLong(final String key, final String field, final long value); //------------------------ hsetnx ------------------------ - public void hsetnx(final String key, final String field, final Convert convert, final T value); - public void hsetnx(final String key, final String field, final Type type, final T value); public void hsetnx(final String key, final String field, final Convert convert, final Type type, final T value); @@ -429,8 +419,6 @@ public interface CacheSource extends Resourcable { public CompletableFuture msetAsync(final Map map); - public CompletableFuture setAsync(final String key, final Convert convert, final T value); - public CompletableFuture setAsync(final String key, final Type type, final T value); public CompletableFuture setAsync(final String key, final Convert convert, final Type type, final T value); @@ -442,8 +430,6 @@ public interface CacheSource extends Resourcable { public CompletableFuture setBytesAsync(final String key, final byte[] value); //------------------------ setnxAsync ------------------------ - public CompletableFuture setnxAsync(final String key, final Convert convert, final T value); - public CompletableFuture setnxAsync(final String key, final Type type, final T value); public CompletableFuture setnxAsync(final String key, final Convert convert, final Type type, final T value); @@ -455,8 +441,6 @@ public interface CacheSource extends Resourcable { public CompletableFuture setnxBytesAsync(final String key, final byte[] value); //------------------------ setexAsync ------------------------ - public CompletableFuture setexAsync(final String key, final int expireSeconds, final Convert convert, final T value); - public CompletableFuture setexAsync(final String key, final int expireSeconds, final Type type, final T value); public CompletableFuture setexAsync(final String key, final int expireSeconds, final Convert convert, final Type type, final T value); @@ -492,8 +476,6 @@ public interface CacheSource extends Resourcable { public CompletableFuture hgetLongAsync(final String key, final String field, long defValue); //------------------------ hsetAsync ------------------------ - public CompletableFuture hsetAsync(final String key, final String field, final Convert convert, final T value); - public CompletableFuture hsetAsync(final String key, final String field, final Type type, final T value); public CompletableFuture hsetAsync(final String key, final String field, final Convert convert, final Type type, final T value); @@ -503,8 +485,6 @@ public interface CacheSource extends Resourcable { public CompletableFuture hsetLongAsync(final String key, final String field, final long value); //------------------------ hsetnxAsync ------------------------ - public CompletableFuture hsetnxAsync(final String key, final String field, final Convert convert, final T value); - public CompletableFuture hsetnxAsync(final String key, final String field, final Type type, final T value); public CompletableFuture hsetnxAsync(final String key, final String field, final Convert convert, final Type type, final T value); @@ -664,7 +644,7 @@ public interface CacheSource extends Resourcable { @Deprecated default CompletableFuture setAsync(final int expireSeconds, final String key, final Convert convert, final T value) { - return setexAsync(key, expireSeconds, convert, value); + return setexAsync(key, expireSeconds, convert, value.getClass(), value); } @Deprecated @@ -699,7 +679,7 @@ public interface CacheSource extends Resourcable { @Deprecated default void set(final int expireSeconds, final String key, final Convert convert, final T value) { - setex(key, expireSeconds, convert, value); + setex(key, expireSeconds, convert, value.getClass(), value); } @Deprecated