From 85d23214ec119cacd9ae4f32692e7fc522527877 Mon Sep 17 00:00:00 2001
From: redkale <redkale@qq.com>
Date: Fri, 9 Jun 2023 11:34:55 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BC=98=E5=8C=96CacheSource.lrange?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../java/org/redkale/mq/MessageConsumer.java  |  2 +-
 .../org/redkale/source/CacheMemorySource.java |  6 +-
 .../java/org/redkale/source/CacheSource.java  | 88 ++++++++++++++-----
 3 files changed, 72 insertions(+), 24 deletions(-)

diff --git a/src/main/java/org/redkale/mq/MessageConsumer.java b/src/main/java/org/redkale/mq/MessageConsumer.java
index ebe1c5f1d..d835144ac 100644
--- a/src/main/java/org/redkale/mq/MessageConsumer.java
+++ b/src/main/java/org/redkale/mq/MessageConsumer.java
@@ -25,7 +25,7 @@ public interface MessageConsumer<T> {
     default void init(AnyValue config) {
     }
 
-    public void onMessage(String topic, T message);
+    public void onMessage(String topic, T[] messages);
 
     default void destroy(AnyValue config) {
     }
diff --git a/src/main/java/org/redkale/source/CacheMemorySource.java b/src/main/java/org/redkale/source/CacheMemorySource.java
index 3c5cfd6b0..544bf0690 100644
--- a/src/main/java/org/redkale/source/CacheMemorySource.java
+++ b/src/main/java/org/redkale/source/CacheMemorySource.java
@@ -1292,7 +1292,7 @@ public final class CacheMemorySource extends AbstractCacheSource {
     }
 
     @Override
-    public <T> List<T> lrange(final String key, final Type componentType) {
+    public <T> List<T> lrange(final String key, final Type componentType, int start, int stop) {
         return (List<T>) get(key, componentType);
     }
 
@@ -1395,8 +1395,8 @@ public final class CacheMemorySource extends AbstractCacheSource {
     }
 
     @Override
-    public <T> CompletableFuture<List<T>> lrangeAsync(String key, Type componentType) {
-        return supplyAsync(() -> lrange(key, componentType), getExecutor());
+    public <T> CompletableFuture<List<T>> lrangeAsync(String key, Type componentType, int start, int stop) {
+        return supplyAsync(() -> lrange(key, componentType, start, stop), getExecutor());
     }
 
     @Override
diff --git a/src/main/java/org/redkale/source/CacheSource.java b/src/main/java/org/redkale/source/CacheSource.java
index 3a7fb1c0d..ef2cd40c6 100644
--- a/src/main/java/org/redkale/source/CacheSource.java
+++ b/src/main/java/org/redkale/source/CacheSource.java
@@ -257,27 +257,49 @@ public interface CacheSource extends Resourcable {
     //------------------------ list ------------------------
     public int llen(final String key);
 
-    public <T> List<T> lrange(final String key, final Type componentType);
-
     public <T> Map<String, List<T>> lrange(final Type componentType, final String... keys);
 
-    public <T> void rpush(final String key, final Type componentType, final T value);
+    public <T> List<T> lrange(final String key, final Type componentType, int start, int stop);
+
+    default List<String> lrangeString(final String key, int start, int stop) {
+        return lrange(key, String.class, start, stop);
+    }
+
+    default List<Long> lrangeLong(final String key, int start, int stop) {
+        return lrange(key, Long.class, start, stop);
+    }
+
+    default <T> List<T> lrange(final String key, final Type componentType) {
+        return lrange(key, componentType, 0, -1);
+    }
+
+    default List<String> lrangeString(final String key) {
+        return lrange(key, String.class, 0, -1);
+    }
+
+    default List<Long> lrangeLong(final String key) {
+        return lrange(key, Long.class, 0, -1);
+    }
 
     public <T> int lrem(final String key, final Type componentType, final T value);
 
-    //---------- list-string ----------
-    default List<String> lrangeString(final String key) {
-        return lrange(key, String.class);
+    default int lremString(final String key, final String value) {
+        return lrem(key, String.class, value);
     }
 
-    public void rpushString(final String key, final String value);
+    default int lremLong(final String key, final long value) {
+        return lrem(key, Long.class, value);
+    }
 
-    public int lremString(final String key, final String value);
+    public <T> void rpush(final String key, final Type componentType, final T value);
 
-    //---------- list-long ----------
-    public void rpushLong(final String key, final long value);
+    default void rpushString(final String key, final String value) {
+        rpush(key, String.class, value);
+    }
 
-    public int lremLong(final String key, final long value);
+    default void rpushLong(final String key, final long value) {
+        rpush(key, Long.class, value);
+    }
 
     //------------------------ set ------------------------   
     public int scard(final String key);
@@ -596,23 +618,49 @@ public interface CacheSource extends Resourcable {
     //------------------------ listAsync ------------------------  
     public CompletableFuture<Integer> llenAsync(final String key);
 
-    public <T> CompletableFuture<List<T>> lrangeAsync(final String key, final Type componentType);
-
     public <T> CompletableFuture<Map<String, List<T>>> lrangeAsync(final Type componentType, final String... keys);
 
-    public <T> CompletableFuture<Void> rpushAsync(final String key, final Type componentType, final T value);
+    public <T> CompletableFuture<List<T>> lrangeAsync(final String key, final Type componentType, int start, int stop);
+
+    default CompletableFuture<List<String>> lrangeStringAsync(final String key, int start, int stop) {
+        return lrangeAsync(key, String.class, start, stop);
+    }
+
+    default CompletableFuture<List<Long>> lrangeLongAsync(final String key, int start, int stop) {
+        return lrangeAsync(key, Long.class, start, stop);
+    }
+
+    default <T> CompletableFuture<List<T>> lrangeAsync(final String key, final Type componentType) {
+        return lrangeAsync(key, componentType, 0, -1);
+    }
+
+    default CompletableFuture<List<String>> lrangeStringAsync(final String key) {
+        return lrangeAsync(key, String.class, 0, -1);
+    }
+
+    default CompletableFuture<List<Long>> lrangeLongAsync(final String key) {
+        return lrangeAsync(key, Long.class, 0, -1);
+    }
 
     public <T> CompletableFuture<Integer> lremAsync(final String key, final Type componentType, final T value);
 
-    //---------- list-string ----------
-    public CompletableFuture<Void> rpushStringAsync(final String key, final String value);
+    default CompletableFuture<Integer> lremStringAsync(final String key, final String value) {
+        return lremAsync(key, String.class, value);
+    }
 
-    public CompletableFuture<Integer> lremStringAsync(final String key, final String value);
+    default CompletableFuture<Integer> lremLongAsync(final String key, final long value) {
+        return lremAsync(key, Long.class, value);
+    }
 
-    //---------- list-long ----------
-    public CompletableFuture<Void> rpushLongAsync(final String key, final long value);
+    public <T> CompletableFuture<Void> rpushAsync(final String key, final Type componentType, final T value);
 
-    public CompletableFuture<Integer> lremLongAsync(final String key, final long value);
+    default CompletableFuture<Void> rpushStringAsync(final String key, final String value) {
+        return rpushAsync(key, String.class, value);
+    }
+
+    default CompletableFuture<Void> rpushLongAsync(final String key, final long value) {
+        return rpushAsync(key, Long.class, value);
+    }
 
     //------------------------ setAsync ------------------------
     public CompletableFuture<Integer> scardAsync(final String key);