refactoring

pull/970/merge
Nikita Koksharov 5 years ago
parent f97b073966
commit 8f06210bba

@ -17,7 +17,7 @@ package org.redisson.reactive;
import org.reactivestreams.Publisher;
import org.redisson.RedissonObject;
import org.redisson.RedissonSet;
import org.redisson.ScanIterator;
import org.redisson.api.*;
import org.redisson.client.RedisClient;
import org.redisson.client.protocol.decoder.ListScanResult;
@ -61,7 +61,7 @@ public class RedissonSetReactive<V> {
return Flux.create(new SetReactiveIterator<V>() {
@Override
protected RFuture<ListScanResult<Object>> scanIterator(RedisClient client, long nextIterPos) {
return ((RedissonSet) instance).scanIteratorAsync(instance.getName(), client, nextIterPos, pattern, count);
return ((ScanIterator) instance).scanIteratorAsync(instance.getName(), client, nextIterPos, pattern, count);
}
});
}

@ -19,7 +19,7 @@ import io.reactivex.Flowable;
import io.reactivex.Single;
import org.reactivestreams.Publisher;
import org.redisson.RedissonObject;
import org.redisson.RedissonSet;
import org.redisson.ScanIterator;
import org.redisson.api.*;
import org.redisson.client.RedisClient;
import org.redisson.client.protocol.decoder.ListScanResult;
@ -62,7 +62,7 @@ public class RedissonSetRx<V> {
return new SetRxIterator<V>() {
@Override
protected RFuture<ListScanResult<Object>> scanIterator(RedisClient client, long nextIterPos) {
return ((RedissonSet<V>) instance).scanIteratorAsync(instance.getName(), client, nextIterPos, pattern, count);
return ((ScanIterator) instance).scanIteratorAsync(instance.getName(), client, nextIterPos, pattern, count);
}
}.create();
}

@ -15,10 +15,8 @@
*/
package org.redisson.transaction;
import java.util.List;
import java.util.Set;
import org.redisson.RedissonSet;
import org.redisson.ScanIterator;
import org.redisson.api.RCollectionAsync;
import org.redisson.api.RFuture;
import org.redisson.api.RLock;
@ -31,6 +29,9 @@ import org.redisson.transaction.operation.set.AddOperation;
import org.redisson.transaction.operation.set.MoveOperation;
import org.redisson.transaction.operation.set.RemoveOperation;
import java.util.List;
import java.util.Set;
/**
*
* @author Nikita Koksharov
@ -52,7 +53,7 @@ public class TransactionalSet<V> extends BaseTransactionalSet<V> {
@Override
protected ListScanResult<Object> scanIteratorSource(String name, RedisClient client, long startPos,
String pattern, int count) {
return ((RedissonSet<?>) set).scanIterator(name, client, startPos, pattern, count);
return ((ScanIterator) set).scanIterator(name, client, startPos, pattern, count);
}
@Override

@ -15,11 +15,8 @@
*/
package org.redisson.transaction;
import java.util.List;
import java.util.Set;
import java.util.concurrent.TimeUnit;
import org.redisson.RedissonSetCache;
import org.redisson.ScanIterator;
import org.redisson.api.RCollectionAsync;
import org.redisson.api.RFuture;
import org.redisson.api.RLock;
@ -32,6 +29,10 @@ import org.redisson.transaction.operation.set.AddCacheOperation;
import org.redisson.transaction.operation.set.MoveOperation;
import org.redisson.transaction.operation.set.RemoveCacheOperation;
import java.util.List;
import java.util.Set;
import java.util.concurrent.TimeUnit;
/**
*
* @author Nikita Koksharov
@ -53,7 +54,7 @@ public class TransactionalSetCache<V> extends BaseTransactionalSet<V> {
@Override
protected ListScanResult<Object> scanIteratorSource(String name, RedisClient client, long startPos,
String pattern, int count) {
return ((RedissonSetCache<?>) set).scanIterator(name, client, startPos, pattern, count);
return ((ScanIterator) set).scanIterator(name, client, startPos, pattern, count);
}
@Override

Loading…
Cancel
Save