RLexSortedSet should extend RSortedSet #940

redisson · Jun 26, 2017 · 96a62e6 · 96a62e6
1 parent 631f455
commit 96a62e6
Show file tree

Hide file tree

Showing 4 changed files with 36 additions and 32 deletions.
diff --git a/redisson/src/main/java/org/redisson/RedissonLexSortedSet.java b/redisson/src/main/java/org/redisson/RedissonLexSortedSet.java
@@ -17,7 +17,9 @@
 
 import java.util.ArrayList;
 import java.util.Collection;
+import java.util.Comparator;
 import java.util.List;
+import java.util.SortedSet;
 
 import org.redisson.api.RFuture;
 import org.redisson.api.RLexSortedSet;
@@ -233,5 +235,30 @@ public Collection<String> range(int startIndex, int endIndex) {
     public RFuture<Collection<String>> rangeAsync(int startIndex, int endIndex) {
         return valueRangeAsync(startIndex, endIndex);
     }
-
+
+    @Override
+    public boolean trySetComparator(Comparator<? super String> comparator) {
+        throw new UnsupportedOperationException();
+    }
+
+    @Override
+    public Comparator<? super String> comparator() {
+        return null;
+    }
+
+    @Override
+    public SortedSet<String> subSet(String fromElement, String toElement) {
+        throw new UnsupportedOperationException();
+    }
+
+    @Override
+    public SortedSet<String> headSet(String toElement) {
+        return subSet(null, toElement);
+    }
+
+    @Override
+    public SortedSet<String> tailSet(String fromElement) {
+        return subSet(fromElement, null);
+    }
+
 }
diff --git a/redisson/src/main/java/org/redisson/RedissonSortedSet.java b/redisson/src/main/java/org/redisson/RedissonSortedSet.java
@@ -171,12 +171,12 @@ private static String calcClassSign(String name) {
     }
 
     @Override
-    public Set<V> readAll() {
+    public Collection<V> readAll() {
         return get(readAllAsync());
     }
 
     @Override
-    public RFuture<Set<V>> readAllAsync() {
+    public RFuture<Collection<V>> readAllAsync() {
         return commandExecutor.readAsync(getName(), codec, RedisCommands.LRANGE_SET, getName(), 0, -1);
     }
 
@@ -267,7 +267,7 @@ public void run() {
     }
 
     @Override
-    public RFuture<Boolean> removeAsync(final V value) {
+    public RFuture<Boolean> removeAsync(final Object value) {
         final RPromise<Boolean> promise = newPromise();
         commandExecutor.getConnectionManager().getExecutor().execute(new Runnable() {
             @Override

diff --git a/redisson/src/main/java/org/redisson/api/RLexSortedSet.java b/redisson/src/main/java/org/redisson/api/RLexSortedSet.java
@@ -16,35 +16,19 @@
 package org.redisson.api;
 
 import java.util.Collection;
-import java.util.Set;
-
-import org.redisson.api.mapreduce.RCollectionMapReduce;
 
 /**
  * Sorted set contained values of String type
  * 
  * @author Nikita Koksharov
  *
  */
-public interface RLexSortedSet extends RLexSortedSetAsync, Set<String>, RExpirable {
-
-    /**
-     * Returns <code>RMapReduce</code> object associated with this object
-     * 
-     * @param <KOut> output key
-     * @param <VOut> output value
-     * @return MapReduce instance
-     */
-    <KOut, VOut> RCollectionMapReduce<String, KOut, VOut> mapReduce();
+public interface RLexSortedSet extends RLexSortedSetAsync, RSortedSet<String>, RExpirable {
 
     String pollFirst();
 
     String pollLast();
 
-    String first();
-
-    String last();
-
     /**
      * Returns rank of value, with the scores ordered from high to low.
      * 
@@ -53,13 +37,6 @@ public interface RLexSortedSet extends RLexSortedSetAsync, Set<String>, RExpirab
      */
     Integer revRank(String o);
 
-    /**
-     * Read all values at once.
-     * 
-     * @return collection of values
-     */
-    Collection<String> readAll();
-
     int removeRangeTail(String fromElement, boolean fromInclusive);
 
     int removeRangeHead(String toElement, boolean toInclusive);

diff --git a/redisson/src/main/java/org/redisson/api/RSortedSet.java b/redisson/src/main/java/org/redisson/api/RSortedSet.java
@@ -15,8 +15,8 @@
  */
 package org.redisson.api;
 
+import java.util.Collection;
 import java.util.Comparator;
-import java.util.Set;
 import java.util.SortedSet;
 
 import org.redisson.api.mapreduce.RCollectionMapReduce;
@@ -38,13 +38,13 @@ public interface RSortedSet<V> extends SortedSet<V>, RObject {
      */
     <KOut, VOut> RCollectionMapReduce<V, KOut, VOut> mapReduce();
 
-    Set<V> readAll();
+    Collection<V> readAll();
 
-    RFuture<Set<V>> readAllAsync();
+    RFuture<Collection<V>> readAllAsync();
 
     RFuture<Boolean> addAsync(V value);
 
-    RFuture<Boolean> removeAsync(V value);
+    RFuture<Boolean> removeAsync(Object value);
 
     /**
      * Sets new comparator only if current set is empty