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/2041/head
Nikita Koksharov 6 years ago
parent 3509434b25
commit d5a7a4ce84
9 changed files with 33 additions and 54 deletions
Show Stats Download Patch File Download Diff File

1
redisson/src/main/java/org/redisson/codec/FstCodec.java
Unescape Escape View File

@ -54,6 +54,7 @@ import io.netty.buffer.ByteBufOutputStream;
*/
public class FstCodec extends BaseCodec {
@SuppressWarnings("AvoidInlineConditionals")
static class FSTMapSerializerV2 extends FSTBasicObjectSerializer {
@Override

10
redisson/src/main/java/org/redisson/reactive/CommandReactiveBatchService.java
Unescape Escape View File

@ -15,7 +15,7 @@
*/
package org.redisson.reactive;
import java.util.function.Supplier;
import java.util.concurrent.Callable;
import org.redisson.api.BatchOptions;
import org.redisson.api.BatchResult;
@ -46,15 +46,15 @@ public class CommandReactiveBatchService extends CommandReactiveService {
}
@Override
public <R> Mono<R> reactive(Supplier<RFuture<R>> supplier) {
Mono<R> mono = super.reactive(new Supplier<RFuture<R>>() {
public <R> Mono<R> reactive(Callable<RFuture<R>> supplier) {
Mono<R> mono = super.reactive(new Callable<RFuture<R>>() {
volatile RFuture<R> future;
@Override
public RFuture<R> get() {
public RFuture<R> call() throws Exception {
if (future == null) {
synchronized (this) {
if (future == null) {
future = supplier.get();
future = supplier.call();
}
}
}

4
redisson/src/main/java/org/redisson/reactive/CommandReactiveExecutor.java
Unescape Escape View File

@ -15,7 +15,7 @@
*/
package org.redisson.reactive;
import java.util.function.Supplier;
import java.util.concurrent.Callable;
import org.redisson.api.RFuture;
import org.redisson.command.CommandAsyncExecutor;
@ -29,6 +29,6 @@ import reactor.core.publisher.Mono;
*/
public interface CommandReactiveExecutor extends CommandAsyncExecutor {
<R> Mono<R> reactive(Supplier<RFuture<R>> supplier);
<R> Mono<R> reactive(Callable<RFuture<R>> supplier);
}

12
redisson/src/main/java/org/redisson/reactive/CommandReactiveService.java
Unescape Escape View File

@ -15,7 +15,7 @@
*/
package org.redisson.reactive;
import java.util.function.Supplier;
import java.util.concurrent.Callable;
import org.redisson.api.RFuture;
import org.redisson.command.CommandAsyncService;
@ -36,10 +36,16 @@ public class CommandReactiveService extends CommandAsyncService implements Comma
}
@Override
public <R> Mono<R> reactive(Supplier<RFuture<R>> supplier) {
public <R> Mono<R> reactive(Callable<RFuture<R>> supplier) {
return Flux.<R>create(emitter -> {
emitter.onRequest(n -> {
RFuture<R> future = supplier.get();
RFuture<R> future;
try {
future = supplier.call();
} catch (Exception e) {
emitter.error(e);
return;
}
future.onComplete((v, e) -> {
if (e != null) {
emitter.error(e);

12
redisson/src/main/java/org/redisson/reactive/ReactiveProxyBuilder.java
Unescape Escape View File

@ -16,7 +16,7 @@
package org.redisson.reactive;
import java.lang.reflect.Method;
import java.util.function.Supplier;
import java.util.concurrent.Callable;
import org.redisson.api.RFuture;
import org.redisson.misc.ProxyBuilder;
@ -37,15 +37,11 @@ public class ReactiveProxyBuilder {
return ProxyBuilder.create(new Callback() {
@Override
public Object execute(Method mm, Object instance, Method instanceMethod, Object[] args) {
return commandExecutor.reactive(new Supplier<RFuture<Object>>() {
return commandExecutor.reactive(new Callable<RFuture<Object>>() {
@SuppressWarnings("unchecked")
@Override
public RFuture<Object> get() {
try {
return (RFuture<Object>) mm.invoke(instance, args);
} catch (Exception e) {
throw new IllegalStateException(e);
}
public RFuture<Object> call() throws Exception {
return (RFuture<Object>) mm.invoke(instance, args);
}
});
}

17
redisson/src/main/java/org/redisson/reactive/RedissonTransactionReactive.java
Unescape Escape View File

@ -15,10 +15,7 @@
*/
package org.redisson.reactive;
import java.util.function.Supplier;
import org.redisson.api.RBucketReactive;
import org.redisson.api.RFuture;
import org.redisson.api.RMap;
import org.redisson.api.RMapCache;
import org.redisson.api.RMapCacheReactive;
@ -118,22 +115,12 @@ public class RedissonTransactionReactive implements RTransactionReactive {
@Override
public Mono<Void> commit() {
return executorService.reactive(new Supplier<RFuture<Void>>() {
@Override
public RFuture<Void> get() {
return transaction.commitAsync();
}
});
return executorService.reactive(() -> transaction.commitAsync());
}
@Override
public Mono<Void> rollback() {
return executorService.reactive(new Supplier<RFuture<Void>>() {
@Override
public RFuture<Void> get() {
return transaction.rollbackAsync();
}
});
return executorService.reactive(() -> transaction.rollbackAsync());
}
}

8
redisson/src/main/java/org/redisson/rx/CommandRxService.java
Unescape Escape View File

@ -43,7 +43,13 @@ public class CommandRxService extends CommandAsyncService implements CommandRxEx
return p.doOnRequest(new LongConsumer() {
@Override
public void accept(long t) throws Exception {
RFuture<R> future = supplier.call();
RFuture<R> future;
try {
future = supplier.call();
} catch (Exception e) {
p.onError(e);
return;
}
future.onComplete((res, e) -> {
if (e != null) {
p.onError(e);

14
redisson/src/main/java/org/redisson/rx/RedissonBatchRx.java
Unescape Escape View File

@ -15,7 +15,6 @@
*/
package org.redisson.rx;
import java.util.concurrent.Callable;
import java.util.concurrent.TimeUnit;
import org.redisson.RedissonAtomicDouble;
@ -51,7 +50,6 @@ import org.redisson.api.RBlockingDequeRx;
import org.redisson.api.RBlockingQueueRx;
import org.redisson.api.RBucketRx;
import org.redisson.api.RDequeRx;
import org.redisson.api.RFuture;
import org.redisson.api.RGeoRx;
import org.redisson.api.RHyperLogLogRx;
import org.redisson.api.RKeysRx;
@ -74,7 +72,6 @@ import org.redisson.api.RedissonRxClient;
import org.redisson.client.codec.Codec;
import org.redisson.connection.ConnectionManager;
import org.redisson.eviction.EvictionScheduler;
import org.redisson.misc.RedissonPromise;
import io.reactivex.Maybe;
@ -298,16 +295,7 @@ public class RedissonBatchRx implements RBatchRx {
@Override
public Maybe<BatchResult<?>> execute() {
return commandExecutor.flowable(new Callable<RFuture<BatchResult<?>>>() {
@Override
public RFuture<BatchResult<?>> call() {
try {
return executorService.executeAsync(options);
} catch (Exception e) {
return RedissonPromise.newFailedFuture(e);
}
}
}).singleElement();
return commandExecutor.flowable(() -> executorService.executeAsync(options)).singleElement();
}
public RBatchRx atomic() {

9
redisson/src/main/java/org/redisson/rx/RxProxyBuilder.java
Unescape Escape View File

@ -42,14 +42,9 @@ public class RxProxyBuilder {
@Override
public Object execute(Method mm, Object instance, Method instanceMethod, Object[] args) {
Flowable<Object> flowable = commandExecutor.flowable(new Callable<RFuture<Object>>() {
@SuppressWarnings("unchecked")
@Override
public RFuture<Object> call() {
try {
return (RFuture<Object>) mm.invoke(instance, args);
} catch (Exception e) {
throw new IllegalStateException(e);
}
public RFuture<Object> call() throws Exception {
return (RFuture<Object>) mm.invoke(instance, args);
}
});

Write Preview
Loading…
Cancel
Save