github-forks
/
redisson
mirror of https://github.com/redisson/redisson.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

refactoring

Browse Source
pull/4272/head
Nikita Koksharov 3 years ago
parent 31a5dc0977
commit 9bb03cd5c1
13 changed files with 35 additions and 126 deletions
Show Stats Download Patch File Download Diff File

6
redisson-spring-data/redisson-spring-data-16/src/main/java/org/redisson/spring/data/connection/RedissonConnection.java
Unescape Escape View File

@ -23,7 +23,6 @@ import org.redisson.api.BatchResult;
import org.redisson.api.RFuture;
import org.redisson.api.RedissonClient;
import org.redisson.client.RedisClient;
import org.redisson.client.RedisException;
import org.redisson.client.codec.*;
import org.redisson.client.protocol.RedisCommand;
import org.redisson.client.protocol.RedisCommands;
@ -37,8 +36,6 @@ import org.redisson.command.CommandAsyncService;
import org.redisson.command.CommandBatchService;
import org.redisson.connection.MasterSlaveEntry;
import org.redisson.misc.CompletableFutureWrapper;
import org.redisson.misc.RPromise;
import org.redisson.misc.RedissonPromise;
import org.springframework.dao.DataAccessException;
import org.springframework.dao.InvalidDataAccessApiUsageException;
import org.springframework.data.redis.RedisSystemException;
@ -54,10 +51,7 @@ import java.math.BigDecimal;
import java.util.*;
import java.util.Map.Entry;
import java.util.concurrent.CompletableFuture;
import java.util.concurrent.CompletionStage;
import java.util.concurrent.atomic.AtomicLong;
import java.util.concurrent.atomic.AtomicReference;
import java.util.function.BiConsumer;
import static org.redisson.client.protocol.RedisCommands.LRANGE;

5
redisson-spring-data/redisson-spring-data-17/src/main/java/org/redisson/spring/data/connection/RedissonConnection.java
Unescape Escape View File

@ -53,8 +53,6 @@ import org.redisson.command.CommandAsyncService;
import org.redisson.command.CommandBatchService;
import org.redisson.connection.MasterSlaveEntry;
import org.redisson.misc.CompletableFutureWrapper;
import org.redisson.misc.RPromise;
import org.redisson.misc.RedissonPromise;
import org.springframework.dao.DataAccessException;
import org.springframework.dao.InvalidDataAccessApiUsageException;
import org.springframework.data.redis.RedisSystemException;
@ -77,9 +75,6 @@ import org.springframework.data.redis.core.types.RedisClientInfo;
import org.springframework.util.Assert;
import org.springframework.util.ReflectionUtils;
import io.netty.util.concurrent.Future;
import io.netty.util.concurrent.FutureListener;
/**
* Redisson connection
*

8
redisson-spring-data/redisson-spring-data-18/src/main/java/org/redisson/spring/data/connection/RedissonConnection.java
Unescape Escape View File

@ -25,8 +25,6 @@ import java.util.Map.Entry;
import java.util.concurrent.CompletableFuture;
import java.util.concurrent.TimeUnit;
import java.util.concurrent.atomic.AtomicLong;
import java.util.concurrent.atomic.AtomicReference;
import java.util.function.BiConsumer;
import org.redisson.Redisson;
import org.redisson.SlotCallback;
@ -36,7 +34,6 @@ import org.redisson.api.BatchResult;
import org.redisson.api.RFuture;
import org.redisson.api.RedissonClient;
import org.redisson.client.RedisClient;
import org.redisson.client.RedisException;
import org.redisson.client.codec.ByteArrayCodec;
import org.redisson.client.codec.Codec;
import org.redisson.client.codec.DoubleCodec;
@ -54,8 +51,6 @@ import org.redisson.command.CommandAsyncService;
import org.redisson.command.CommandBatchService;
import org.redisson.connection.MasterSlaveEntry;
import org.redisson.misc.CompletableFutureWrapper;
import org.redisson.misc.RPromise;
import org.redisson.misc.RedissonPromise;
import org.springframework.dao.DataAccessException;
import org.springframework.dao.InvalidDataAccessApiUsageException;
import org.springframework.data.geo.*;
@ -80,9 +75,6 @@ import org.springframework.util.Assert;
import org.springframework.util.ObjectUtils;
import org.springframework.util.ReflectionUtils;
import io.netty.util.concurrent.Future;
import io.netty.util.concurrent.FutureListener;
/**
* Redisson connection
*

18
redisson-spring-data/redisson-spring-data-20/src/main/java/org/redisson/spring/data/connection/RedissonBaseReactive.java
Unescape Escape View File

@ -17,6 +17,7 @@ package org.redisson.spring.data.connection;
import java.net.InetSocketAddress;
import java.nio.ByteBuffer;
import java.util.concurrent.CompletionStage;
import java.util.function.Function;
import org.reactivestreams.Publisher;
@ -25,8 +26,7 @@ import org.redisson.client.codec.Codec;
import org.redisson.client.codec.StringCodec;
import org.redisson.client.protocol.RedisCommand;
import org.redisson.connection.MasterSlaveEntry;
import org.redisson.misc.RPromise;
import org.redisson.misc.RedissonPromise;
import org.redisson.misc.CompletableFutureWrapper;
import org.redisson.reactive.CommandReactiveExecutor;
import org.springframework.data.redis.RedisSystemException;
import org.springframework.data.redis.connection.RedisClusterNode;
@ -54,18 +54,10 @@ abstract class RedissonBaseReactive {
buffer.position(pos);
return dst;
}
RFuture<String> toStringFuture(RFuture<Void> f) {
RPromise<String> promise = new RedissonPromise<>();
f.onComplete((res, e) -> {
if (e != null) {
promise.tryFailure(e);
return;
}
promise.trySuccess("OK");
});
return promise;
CompletionStage<String> ff = f.thenApply(r -> "OK");
return new CompletableFutureWrapper<>(ff);
}
<T> Mono<T> execute(RedisClusterNode node, RedisCommand<T> command, Object... params) {

2
redisson-spring-data/redisson-spring-data-20/src/main/java/org/redisson/spring/data/connection/RedissonConnection.java
Unescape Escape View File

@ -38,8 +38,6 @@ import org.redisson.command.CommandAsyncService;
import org.redisson.command.CommandBatchService;
import org.redisson.connection.MasterSlaveEntry;
import org.redisson.misc.CompletableFutureWrapper;
import org.redisson.misc.RPromise;
import org.redisson.misc.RedissonPromise;
import org.springframework.dao.DataAccessException;
import org.springframework.dao.InvalidDataAccessApiUsageException;
import org.springframework.data.geo.*;

20
redisson-spring-data/redisson-spring-data-21/src/main/java/org/redisson/spring/data/connection/RedissonBaseReactive.java
Unescape Escape View File

@ -17,6 +17,7 @@ package org.redisson.spring.data.connection;
import java.net.InetSocketAddress;
import java.nio.ByteBuffer;
import java.util.concurrent.CompletionStage;
import java.util.function.Function;
import org.reactivestreams.Publisher;
@ -25,14 +26,11 @@ import org.redisson.client.codec.Codec;
import org.redisson.client.codec.StringCodec;
import org.redisson.client.protocol.RedisCommand;
import org.redisson.connection.MasterSlaveEntry;
import org.redisson.misc.RPromise;
import org.redisson.misc.RedissonPromise;
import org.redisson.misc.CompletableFutureWrapper;
import org.redisson.reactive.CommandReactiveExecutor;
import org.springframework.data.redis.RedisSystemException;
import org.springframework.data.redis.connection.RedisClusterNode;
import io.netty.util.concurrent.Future;
import io.netty.util.concurrent.FutureListener;
import reactor.core.publisher.Flux;
import reactor.core.publisher.Mono;
@ -56,18 +54,10 @@ abstract class RedissonBaseReactive {
buffer.position(pos);
return dst;
}
RFuture<String> toStringFuture(RFuture<Void> f) {
RPromise<String> promise = new RedissonPromise<>();
f.onComplete((res, e) -> {
if (e != null) {
promise.tryFailure(e);
return;
}
promise.trySuccess("OK");
});
return promise;
CompletionStage<String> ff = f.thenApply(r -> "OK");
return new CompletableFutureWrapper<>(ff);
}
<T> Mono<T> execute(RedisClusterNode node, RedisCommand<T> command, Object... params) {

20
redisson-spring-data/redisson-spring-data-22/src/main/java/org/redisson/spring/data/connection/RedissonBaseReactive.java
Unescape Escape View File

@ -17,6 +17,7 @@ package org.redisson.spring.data.connection;
import java.net.InetSocketAddress;
import java.nio.ByteBuffer;
import java.util.concurrent.CompletionStage;
import java.util.function.Function;
import org.reactivestreams.Publisher;
@ -25,14 +26,11 @@ import org.redisson.client.codec.Codec;
import org.redisson.client.codec.StringCodec;
import org.redisson.client.protocol.RedisCommand;
import org.redisson.connection.MasterSlaveEntry;
import org.redisson.misc.RPromise;
import org.redisson.misc.RedissonPromise;
import org.redisson.misc.CompletableFutureWrapper;
import org.redisson.reactive.CommandReactiveExecutor;
import org.springframework.data.redis.RedisSystemException;
import org.springframework.data.redis.connection.RedisClusterNode;
import io.netty.util.concurrent.Future;
import io.netty.util.concurrent.FutureListener;
import reactor.core.publisher.Flux;
import reactor.core.publisher.Mono;
@ -56,18 +54,10 @@ abstract class RedissonBaseReactive {
buffer.position(pos);
return dst;
}
RFuture<String> toStringFuture(RFuture<Void> f) {
RPromise<String> promise = new RedissonPromise<>();
f.onComplete((res, e) -> {
if (e != null) {
promise.tryFailure(e);
return;
}
promise.trySuccess("OK");
});
return promise;
CompletionStage<String> ff = f.thenApply(r -> "OK");
return new CompletableFutureWrapper<>(ff);
}
<T> Mono<T> execute(RedisClusterNode node, RedisCommand<T> command, Object... params) {

20
redisson-spring-data/redisson-spring-data-23/src/main/java/org/redisson/spring/data/connection/RedissonBaseReactive.java
Unescape Escape View File

@ -17,6 +17,7 @@ package org.redisson.spring.data.connection;
import java.net.InetSocketAddress;
import java.nio.ByteBuffer;
import java.util.concurrent.CompletionStage;
import java.util.function.Function;
import org.reactivestreams.Publisher;
@ -25,14 +26,11 @@ import org.redisson.client.codec.Codec;
import org.redisson.client.codec.StringCodec;
import org.redisson.client.protocol.RedisCommand;
import org.redisson.connection.MasterSlaveEntry;
import org.redisson.misc.RPromise;
import org.redisson.misc.RedissonPromise;
import org.redisson.misc.CompletableFutureWrapper;
import org.redisson.reactive.CommandReactiveExecutor;
import org.springframework.data.redis.RedisSystemException;
import org.springframework.data.redis.connection.RedisClusterNode;
import io.netty.util.concurrent.Future;
import io.netty.util.concurrent.FutureListener;
import reactor.core.publisher.Flux;
import reactor.core.publisher.Mono;
@ -56,18 +54,10 @@ abstract class RedissonBaseReactive {
buffer.position(pos);
return dst;
}
RFuture<String> toStringFuture(RFuture<Void> f) {
RPromise<String> promise = new RedissonPromise<>();
f.onComplete((res, e) -> {
if (e != null) {
promise.tryFailure(e);
return;
}
promise.trySuccess("OK");
});
return promise;
CompletionStage<String> ff = f.thenApply(r -> "OK");
return new CompletableFutureWrapper<>(ff);
}
<T> Mono<T> execute(RedisClusterNode node, RedisCommand<T> command, Object... params) {

20
redisson-spring-data/redisson-spring-data-24/src/main/java/org/redisson/spring/data/connection/RedissonBaseReactive.java
Unescape Escape View File

@ -17,6 +17,7 @@ package org.redisson.spring.data.connection;
import java.net.InetSocketAddress;
import java.nio.ByteBuffer;
import java.util.concurrent.CompletionStage;
import java.util.function.Function;
import org.reactivestreams.Publisher;
@ -25,14 +26,11 @@ import org.redisson.client.codec.Codec;
import org.redisson.client.codec.StringCodec;
import org.redisson.client.protocol.RedisCommand;
import org.redisson.connection.MasterSlaveEntry;
import org.redisson.misc.RPromise;
import org.redisson.misc.RedissonPromise;
import org.redisson.misc.CompletableFutureWrapper;
import org.redisson.reactive.CommandReactiveExecutor;
import org.springframework.data.redis.RedisSystemException;
import org.springframework.data.redis.connection.RedisClusterNode;
import io.netty.util.concurrent.Future;
import io.netty.util.concurrent.FutureListener;
import reactor.core.publisher.Flux;
import reactor.core.publisher.Mono;
@ -56,18 +54,10 @@ abstract class RedissonBaseReactive {
buffer.position(pos);
return dst;
}
RFuture<String> toStringFuture(RFuture<Void> f) {
RPromise<String> promise = new RedissonPromise<>();
f.onComplete((res, e) -> {
if (e != null) {
promise.tryFailure(e);
return;
}
promise.trySuccess("OK");
});
return promise;
CompletionStage<String> ff = f.thenApply(r -> "OK");
return new CompletableFutureWrapper<>(ff);
}
<T> Mono<T> execute(RedisClusterNode node, RedisCommand<T> command, Object... params) {

20
redisson-spring-data/redisson-spring-data-25/src/main/java/org/redisson/spring/data/connection/RedissonBaseReactive.java
Unescape Escape View File

@ -17,6 +17,7 @@ package org.redisson.spring.data.connection;
import java.net.InetSocketAddress;
import java.nio.ByteBuffer;
import java.util.concurrent.CompletionStage;
import java.util.function.Function;
import org.reactivestreams.Publisher;
@ -25,14 +26,11 @@ import org.redisson.client.codec.Codec;
import org.redisson.client.codec.StringCodec;
import org.redisson.client.protocol.RedisCommand;
import org.redisson.connection.MasterSlaveEntry;
import org.redisson.misc.RPromise;
import org.redisson.misc.RedissonPromise;
import org.redisson.misc.CompletableFutureWrapper;
import org.redisson.reactive.CommandReactiveExecutor;
import org.springframework.data.redis.RedisSystemException;
import org.springframework.data.redis.connection.RedisClusterNode;
import io.netty.util.concurrent.Future;
import io.netty.util.concurrent.FutureListener;
import reactor.core.publisher.Flux;
import reactor.core.publisher.Mono;
@ -56,18 +54,10 @@ abstract class RedissonBaseReactive {
buffer.position(pos);
return dst;
}
RFuture<String> toStringFuture(RFuture<Void> f) {
RPromise<String> promise = new RedissonPromise<>();
f.onComplete((res, e) -> {
if (e != null) {
promise.tryFailure(e);
return;
}
promise.trySuccess("OK");
});
return promise;
CompletionStage<String> ff = f.thenApply(r -> "OK");
return new CompletableFutureWrapper<>(ff);
}
<T> Mono<T> execute(RedisClusterNode node, RedisCommand<T> command, Object... params) {

18
redisson-spring-data/redisson-spring-data-26/src/main/java/org/redisson/spring/data/connection/RedissonBaseReactive.java
Unescape Escape View File

@ -17,6 +17,7 @@ package org.redisson.spring.data.connection;
import java.net.InetSocketAddress;
import java.nio.ByteBuffer;
import java.util.concurrent.CompletionStage;
import java.util.function.Function;
import org.reactivestreams.Publisher;
@ -25,14 +26,11 @@ import org.redisson.client.codec.Codec;
import org.redisson.client.codec.StringCodec;
import org.redisson.client.protocol.RedisCommand;
import org.redisson.connection.MasterSlaveEntry;
import org.redisson.misc.RPromise;
import org.redisson.misc.RedissonPromise;
import org.redisson.misc.CompletableFutureWrapper;
import org.redisson.reactive.CommandReactiveExecutor;
import org.springframework.data.redis.RedisSystemException;
import org.springframework.data.redis.connection.RedisClusterNode;
import io.netty.util.concurrent.Future;
import io.netty.util.concurrent.FutureListener;
import reactor.core.publisher.Flux;
import reactor.core.publisher.Mono;
@ -58,16 +56,8 @@ abstract class RedissonBaseReactive {
}
RFuture<String> toStringFuture(RFuture<Void> f) {
RPromise<String> promise = new RedissonPromise<>();
f.onComplete((res, e) -> {
if (e != null) {
promise.tryFailure(e);
return;
}
promise.trySuccess("OK");
});
return promise;
CompletionStage<String> ff = f.thenApply(r -> "OK");
return new CompletableFutureWrapper<>(ff);
}
<T> Mono<T> execute(RedisClusterNode node, RedisCommand<T> command, Object... params) {

1
redisson/src/main/java/org/redisson/misc/RedissonPromise.java
Unescape Escape View File

@ -32,6 +32,7 @@ import io.netty.util.concurrent.Promise;
*
* @param <T> type of object
*/
@Deprecated
public class RedissonPromise<T> extends CompletableFuture<T> implements RPromise<T> {
private static final Field LISTENERS_FIELD;

3
redisson/src/test/java/org/redisson/RedisClientTest.java
Unescape Escape View File

@ -1,7 +1,6 @@
package org.redisson;
import org.junit.jupiter.api.*;
import org.redisson.api.RFuture;
import org.redisson.client.*;
import org.redisson.client.codec.LongCodec;
import org.redisson.client.codec.StringCodec;
@ -9,8 +8,6 @@ import org.redisson.client.protocol.CommandData;
import org.redisson.client.protocol.CommandsData;
import org.redisson.client.protocol.RedisCommands;
import org.redisson.client.protocol.pubsub.PubSubType;
import org.redisson.misc.RPromise;
import org.redisson.misc.RedissonPromise;
import java.io.IOException;
import java.util.ArrayList;

Write Preview
Loading…
Cancel
Save