andreacavalli/tdlib-session-container
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Reduce duplicate code

Browse Source
This commit is contained in:
Andrea Cavalli 2022-01-14 20:04:29 +01:00
parent 2d0ab31fd0
commit 2e21f765ab
4 changed files with 18 additions and 37 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/main/java/it/tdlight/reactiveapi/AtomixReactiveApiMultiClient.java
View File

@ -2,17 +2,13 @@ package it.tdlight.reactiveapi;
import io.atomix.cluster.messaging.ClusterEventService; import io.atomix.cluster.messaging.ClusterEventService;
import io.atomix.cluster.messaging.MessagingException; import io.atomix.cluster.messaging.MessagingException;
import io.atomix.cluster.messaging.Subscription;
import it.tdlight.jni.TdApi; import it.tdlight.jni.TdApi;
import it.tdlight.reactiveapi.Event.ClientBoundEvent; import it.tdlight.reactiveapi.Event.ClientBoundEvent;
import it.tdlight.reactiveapi.Event.Request; import it.tdlight.reactiveapi.Event.Request;
import java.time.Duration; import java.time.Duration;
import java.time.Instant; import java.time.Instant;
import java.util.List;
import java.util.concurrent.CompletableFuture; import java.util.concurrent.CompletableFuture;
import reactor.core.publisher.BufferOverflowStrategy;
import reactor.core.publisher.Flux; import reactor.core.publisher.Flux;
import reactor.core.publisher.FluxSink.OverflowStrategy;
import reactor.core.publisher.Mono; import reactor.core.publisher.Mono;
import reactor.core.scheduler.Schedulers; import reactor.core.scheduler.Schedulers;
@ -35,7 +31,7 @@ public class AtomixReactiveApiMultiClient implements ReactiveApiMultiClient, Aut
if (closed) { if (closed) {
return Flux.empty(); return Flux.empty();
} }
return kafkaConsumer.consumeMessages(subGroupId, ack).takeUntil(s -> closed); return kafkaConsumer.consumeMessages(subGroupId).takeUntil(s -> closed);
} }
@Override @Override

7
src/main/java/it/tdlight/reactiveapi/DynamicAtomixReactiveApiClient.java
View File

@ -2,19 +2,14 @@ package it.tdlight.reactiveapi;
import io.atomix.cluster.messaging.ClusterEventService; import io.atomix.cluster.messaging.ClusterEventService;
import io.atomix.cluster.messaging.MessagingException; import io.atomix.cluster.messaging.MessagingException;
import io.atomix.cluster.messaging.Subscription;
import it.tdlight.jni.TdApi; import it.tdlight.jni.TdApi;
import it.tdlight.reactiveapi.Event.ClientBoundEvent; import it.tdlight.reactiveapi.Event.ClientBoundEvent;
import it.tdlight.reactiveapi.Event.Request; import it.tdlight.reactiveapi.Event.Request;
import java.time.Duration; import java.time.Duration;
import java.time.Instant; import java.time.Instant;
import java.util.List;
import java.util.concurrent.CompletableFuture;
import java.util.concurrent.atomic.AtomicLong; import java.util.concurrent.atomic.AtomicLong;
import reactor.core.Disposable; import reactor.core.Disposable;
import reactor.core.publisher.BufferOverflowStrategy;
import reactor.core.publisher.Flux; import reactor.core.publisher.Flux;
import reactor.core.publisher.FluxSink.OverflowStrategy;
import reactor.core.publisher.Mono; import reactor.core.publisher.Mono;
import reactor.core.scheduler.Schedulers; import reactor.core.scheduler.Schedulers;
@ -40,7 +35,7 @@ public class DynamicAtomixReactiveApiClient implements ReactiveApiClient, AutoCl
this.eventService = api.getAtomix().getEventService(); this.eventService = api.getAtomix().getEventService();
this.userId = userId; this.userId = userId;
clientBoundEvents = kafkaConsumer.consumeMessages(subGroupId, true, userId) clientBoundEvents = kafkaConsumer.consumeMessages(subGroupId, userId)
.doOnNext(e -> liveId.set(e.liveId())) .doOnNext(e -> liveId.set(e.liveId()))
.takeWhile(n -> !closed) .takeWhile(n -> !closed)
.share(); .share();

40
src/main/java/it/tdlight/reactiveapi/KafkaConsumer.java
View File

@ -14,7 +14,6 @@ import org.apache.logging.log4j.LogManager;
import org.apache.logging.log4j.Logger; import org.apache.logging.log4j.Logger;
import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.NotNull;
import org.jetbrains.annotations.Nullable; import org.jetbrains.annotations.Nullable;
import org.reactivestreams.Publisher;
import reactor.core.publisher.Flux; import reactor.core.publisher.Flux;
import reactor.core.publisher.SignalType; import reactor.core.publisher.SignalType;
import reactor.kafka.receiver.KafkaReceiver; import reactor.kafka.receiver.KafkaReceiver;
@ -66,33 +65,24 @@ public class KafkaConsumer {
.doBeforeRetry(s -> LOG.warn("Rebalancing in progress"))); .doBeforeRetry(s -> LOG.warn("Rebalancing in progress")));
} }
public Flux<ClientBoundEvent> consumeMessages(@NotNull String subGroupId, boolean ack, long userId, long liveId) { public Flux<ClientBoundEvent> consumeMessages(@NotNull String subGroupId, long userId, long liveId) {
return consumeMessages(subGroupId, ack, userId).filter(e -> e.liveId() == liveId); return consumeMessagesInternal(subGroupId, userId).filter(e -> e.liveId() == liveId);
} }
public Flux<ClientBoundEvent> consumeMessages(@NotNull String subGroupId, boolean ack, long userId) { public Flux<ClientBoundEvent> consumeMessages(@NotNull String subGroupId, long userId) {
if (ack) { return consumeMessagesInternal(subGroupId, userId);
return createReceiver(kafkaParameters.groupId() + "-" + subGroupId, userId)
.receive()
.log("consume-messages", Level.FINEST, SignalType.REQUEST)
.doOnNext(result -> result.receiverOffset().acknowledge())
.map(ConsumerRecord::value)
.transform(this::retryIfCleanup);
} else {
return createReceiver(kafkaParameters.groupId() + "-" + subGroupId, userId).receive().map(ConsumerRecord::value);
}
} }
public Flux<ClientBoundEvent> consumeMessages(@NotNull String subGroupId, boolean ack) { public Flux<ClientBoundEvent> consumeMessages(@NotNull String subGroupId) {
if (ack) { return consumeMessagesInternal(subGroupId, null);
return createReceiver(kafkaParameters.groupId() + "-" + subGroupId, null) }
.receive()
.log("consume-messages", Level.FINEST, SignalType.REQUEST) private Flux<ClientBoundEvent> consumeMessagesInternal(@NotNull String subGroupId, @Nullable Long userId) {
.doOnNext(result -> result.receiverOffset().acknowledge()) return createReceiver(kafkaParameters.groupId() + "-" + subGroupId, userId)
.map(ConsumerRecord::value) .receive()
.transform(this::retryIfCleanup); .log("consume-messages", Level.FINEST, SignalType.REQUEST)
} else { .doOnNext(result -> result.receiverOffset().acknowledge())
return createReceiver(kafkaParameters.groupId() + "-" + subGroupId, null).receive().map(ConsumerRecord::value); .map(ConsumerRecord::value)
} .transform(this::retryIfCleanup);
} }
} }

2
src/main/java/it/tdlight/reactiveapi/LiveAtomixReactiveApiClient.java
View File

@ -37,7 +37,7 @@ public class LiveAtomixReactiveApiClient implements ReactiveApiClient {
this.eventService = atomix.getEventService(); this.eventService = atomix.getEventService();
this.liveId = liveId; this.liveId = liveId;
this.userId = userId; this.userId = userId;
this.clientBoundEvents = kafkaConsumer.consumeMessages(subGroupId, true, userId, liveId).share(); this.clientBoundEvents = kafkaConsumer.consumeMessages(subGroupId, userId, liveId).share();
} }
@Override @Override