From 336967c799c8b16114742221c4a241d0d117b2dd Mon Sep 17 00:00:00 2001 From: Nikita Koksharov Date: Tue, 4 Jan 2022 11:09:49 +0300 Subject: [PATCH] refactoring --- .../main/java/org/redisson/hibernate/region/BaseRegion.java | 2 +- .../main/java/org/redisson/hibernate/region/BaseRegion.java | 2 +- .../main/java/org/redisson/hibernate/region/BaseRegion.java | 2 +- .../src/main/java/org/redisson/hibernate/RedissonStorage.java | 2 +- .../src/main/java/org/redisson/reactive/ElementsStream.java | 2 +- .../src/main/java/org/redisson/reactive/IteratorConsumer.java | 2 +- .../src/main/java/org/redisson/reactive/PublisherAdder.java | 2 +- .../main/java/org/redisson/reactive/RedissonListReactive.java | 2 +- .../org/redisson/reactive/RedissonReliableTopicReactive.java | 4 ++-- .../java/org/redisson/reactive/RedissonTopicReactive.java | 4 ++-- .../org/redisson/reactive/RedissonTransferQueueReactive.java | 2 +- 11 files changed, 13 insertions(+), 13 deletions(-) diff --git a/redisson-hibernate/redisson-hibernate-4/src/main/java/org/redisson/hibernate/region/BaseRegion.java b/redisson-hibernate/redisson-hibernate-4/src/main/java/org/redisson/hibernate/region/BaseRegion.java index aecff2e40..07677c39a 100644 --- a/redisson-hibernate/redisson-hibernate-4/src/main/java/org/redisson/hibernate/region/BaseRegion.java +++ b/redisson-hibernate/redisson-hibernate-4/src/main/java/org/redisson/hibernate/region/BaseRegion.java @@ -93,7 +93,7 @@ public class BaseRegion implements TransactionalDataRegion, GeneralDataRegion { fallbackMode = true; connectionManager.newTimeout(t -> { RFuture future = mapCache.isExistsAsync(); - future.onComplete((r, ex) -> { + future.whenComplete((r, ex) -> { if (ex == null) { fallbackMode = false; } else { diff --git a/redisson-hibernate/redisson-hibernate-5/src/main/java/org/redisson/hibernate/region/BaseRegion.java b/redisson-hibernate/redisson-hibernate-5/src/main/java/org/redisson/hibernate/region/BaseRegion.java index ba3bf8c6a..df82465a6 100644 --- a/redisson-hibernate/redisson-hibernate-5/src/main/java/org/redisson/hibernate/region/BaseRegion.java +++ b/redisson-hibernate/redisson-hibernate-5/src/main/java/org/redisson/hibernate/region/BaseRegion.java @@ -94,7 +94,7 @@ public class BaseRegion implements TransactionalDataRegion, GeneralDataRegion { fallbackMode = true; connectionManager.newTimeout(t -> { RFuture future = mapCache.isExistsAsync(); - future.onComplete((r, ex) -> { + future.whenComplete((r, ex) -> { if (ex == null) { fallbackMode = false; } else { diff --git a/redisson-hibernate/redisson-hibernate-52/src/main/java/org/redisson/hibernate/region/BaseRegion.java b/redisson-hibernate/redisson-hibernate-52/src/main/java/org/redisson/hibernate/region/BaseRegion.java index 221afdc0b..488c47efd 100644 --- a/redisson-hibernate/redisson-hibernate-52/src/main/java/org/redisson/hibernate/region/BaseRegion.java +++ b/redisson-hibernate/redisson-hibernate-52/src/main/java/org/redisson/hibernate/region/BaseRegion.java @@ -94,7 +94,7 @@ public class BaseRegion implements TransactionalDataRegion, GeneralDataRegion { fallbackMode = true; connectionManager.newTimeout(t -> { RFuture future = mapCache.isExistsAsync(); - future.onComplete((r, ex) -> { + future.whenComplete((r, ex) -> { if (ex == null) { fallbackMode = false; } else { diff --git a/redisson-hibernate/redisson-hibernate-53/src/main/java/org/redisson/hibernate/RedissonStorage.java b/redisson-hibernate/redisson-hibernate-53/src/main/java/org/redisson/hibernate/RedissonStorage.java index 9c877d441..357992a81 100644 --- a/redisson-hibernate/redisson-hibernate-53/src/main/java/org/redisson/hibernate/RedissonStorage.java +++ b/redisson-hibernate/redisson-hibernate-53/src/main/java/org/redisson/hibernate/RedissonStorage.java @@ -85,7 +85,7 @@ public class RedissonStorage implements DomainDataStorageAccess { fallbackMode = true; connectionManager.newTimeout(t -> { RFuture future = mapCache.isExistsAsync(); - future.onComplete((r, ex) -> { + future.whenComplete((r, ex) -> { if (ex == null) { fallbackMode = false; } else { diff --git a/redisson/src/main/java/org/redisson/reactive/ElementsStream.java b/redisson/src/main/java/org/redisson/reactive/ElementsStream.java index 39551513a..f8c7ffe45 100644 --- a/redisson/src/main/java/org/redisson/reactive/ElementsStream.java +++ b/redisson/src/main/java/org/redisson/reactive/ElementsStream.java @@ -39,7 +39,7 @@ public class ElementsStream { return; } futureRef.set(future); - future.onComplete((res, e) -> { + future.whenComplete((res, e) -> { if (e != null) { emitter.error(e); return; diff --git a/redisson/src/main/java/org/redisson/reactive/IteratorConsumer.java b/redisson/src/main/java/org/redisson/reactive/IteratorConsumer.java index 69b620a01..701ff316e 100644 --- a/redisson/src/main/java/org/redisson/reactive/IteratorConsumer.java +++ b/redisson/src/main/java/org/redisson/reactive/IteratorConsumer.java @@ -54,7 +54,7 @@ public abstract class IteratorConsumer implements LongConsumer { } protected void nextValues(FluxSink emitter) { - scanIterator(client, nextIterPos).onComplete((res, e) -> { + scanIterator(client, nextIterPos).whenComplete((res, e) -> { if (e != null) { emitter.error(e); return; diff --git a/redisson/src/main/java/org/redisson/reactive/PublisherAdder.java b/redisson/src/main/java/org/redisson/reactive/PublisherAdder.java index f2e39445c..d8de1b6a2 100644 --- a/redisson/src/main/java/org/redisson/reactive/PublisherAdder.java +++ b/redisson/src/main/java/org/redisson/reactive/PublisherAdder.java @@ -53,7 +53,7 @@ public abstract class PublisherAdder { @Override protected void hookOnNext(V o) { values.getAndIncrement(); - add(o).onComplete((res, e) -> { + add(o).whenComplete((res, e) -> { if (e != null) { promise.completeExceptionally(e); return; diff --git a/redisson/src/main/java/org/redisson/reactive/RedissonListReactive.java b/redisson/src/main/java/org/redisson/reactive/RedissonListReactive.java index 42e7ed20e..a4ce5e205 100644 --- a/redisson/src/main/java/org/redisson/reactive/RedissonListReactive.java +++ b/redisson/src/main/java/org/redisson/reactive/RedissonListReactive.java @@ -88,7 +88,7 @@ public class RedissonListReactive { } private void onRequest(boolean forward, FluxSink emitter, long n) { - instance.getAsync(currentIndex).onComplete((value, e) -> { + instance.getAsync(currentIndex).whenComplete((value, e) -> { if (e != null) { emitter.error(e); return; diff --git a/redisson/src/main/java/org/redisson/reactive/RedissonReliableTopicReactive.java b/redisson/src/main/java/org/redisson/reactive/RedissonReliableTopicReactive.java index 439170bb3..e9a6359e2 100644 --- a/redisson/src/main/java/org/redisson/reactive/RedissonReliableTopicReactive.java +++ b/redisson/src/main/java/org/redisson/reactive/RedissonReliableTopicReactive.java @@ -36,7 +36,7 @@ public class RedissonReliableTopicReactive { } public Flux getMessages(Class type) { - return Flux.create(emitter -> { + return Flux.create(emitter -> { emitter.onRequest(n -> { AtomicLong counter = new AtomicLong(n); AtomicReference idRef = new AtomicReference<>(); @@ -47,7 +47,7 @@ public class RedissonReliableTopicReactive { emitter.complete(); } }); - t.onComplete((id, e) -> { + t.whenComplete((id, e) -> { if (e != null) { emitter.error(e); return; diff --git a/redisson/src/main/java/org/redisson/reactive/RedissonTopicReactive.java b/redisson/src/main/java/org/redisson/reactive/RedissonTopicReactive.java index 251b7156e..602e23b90 100644 --- a/redisson/src/main/java/org/redisson/reactive/RedissonTopicReactive.java +++ b/redisson/src/main/java/org/redisson/reactive/RedissonTopicReactive.java @@ -37,7 +37,7 @@ public class RedissonTopicReactive { } public Flux getMessages(Class type) { - return Flux.create(emitter -> { + return Flux.create(emitter -> { emitter.onRequest(n -> { AtomicLong counter = new AtomicLong(n); RFuture t = topic.addListenerAsync(type, new MessageListener() { @@ -50,7 +50,7 @@ public class RedissonTopicReactive { } } }); - t.onComplete((id, e) -> { + t.whenComplete((id, e) -> { if (e != null) { emitter.error(e); return; diff --git a/redisson/src/main/java/org/redisson/reactive/RedissonTransferQueueReactive.java b/redisson/src/main/java/org/redisson/reactive/RedissonTransferQueueReactive.java index 69ccd9f43..b846fedbc 100644 --- a/redisson/src/main/java/org/redisson/reactive/RedissonTransferQueueReactive.java +++ b/redisson/src/main/java/org/redisson/reactive/RedissonTransferQueueReactive.java @@ -57,7 +57,7 @@ public class RedissonTransferQueueReactive { } protected void onRequest(boolean forward, FluxSink emitter, long n) { - queue.getValueAsync(currentIndex).onComplete((value, e) -> { + queue.getValueAsync(currentIndex).whenComplete((value, e) -> { if (e != null) { emitter.error(e); return;