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

Improve code quality

This commit is contained in:
Andrea Cavalli 2021-04-11 14:57:05 +02:00
parent 49336ad910
commit 03132ca0bf
3 changed files with 33 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/main/java/it/tdlight/tdlibsession/td/ReactorTelegramClient.java
View File

@ -11,7 +11,7 @@ public interface ReactorTelegramClient {
Flux<Object> receive();
Mono<Object> send(TdApi.Function query);
<T extends TdApi.Object> Mono<T> send(TdApi.Function query);
Object execute(TdApi.Function query);
<T extends TdApi.Object> T execute(TdApi.Function query);
}

28
src/main/java/it/tdlight/tdlibsession/td/WrappedReactorTelegramClient.java
View File

@ -2,6 +2,7 @@ package it.tdlight.tdlibsession.td;
import it.tdlight.common.ReactiveTelegramClient;
import it.tdlight.jni.TdApi;
import it.tdlight.jni.TdApi.Error;
import it.tdlight.utils.MonoUtils;
import reactor.core.publisher.Flux;
import reactor.core.publisher.Mono;
@ -24,15 +25,15 @@ public class WrappedReactorTelegramClient implements ReactorTelegramClient {
public Flux<TdApi.Object> receive() {
return Flux
.from(reactiveTelegramClient)
.concatMap(item -> {
.handle((item, sink) -> {
if (item.isUpdate()) {
return Mono.just(item.getUpdate());
sink.next(item.getUpdate());
} else if (item.isHandleException()) {
return Mono.error(item.getHandleException());
sink.error(item.getHandleException());
} else if (item.isUpdateException()) {
return Mono.error(item.getUpdateException());
sink.error(item.getUpdateException());
} else {
return Mono.error(new IllegalStateException("This shouldn't happen. Received unknown ReactiveItem type"));
sink.error(new IllegalStateException("This shouldn't happen. Received unknown ReactiveItem type"));
}
});
}
@ -45,8 +46,16 @@ public class WrappedReactorTelegramClient implements ReactorTelegramClient {
* @return a publisher that will emit exactly one item, or an error
*/
@Override
public Mono<TdApi.Object> send(TdApi.Function query) {
return Mono.from(reactiveTelegramClient.send(query)).single();
public <T extends TdApi.Object> Mono<T> send(TdApi.Function query) {
return Flux.from(reactiveTelegramClient.send(query)).single().handle((item, sink) -> {
if (item.getConstructor() == Error.CONSTRUCTOR) {
var error = ((TdApi.Error) item);
sink.error(new TdError(error.code, error.message));
} else {
//noinspection unchecked
sink.next((T) item);
}
});
}
/**
@ -57,7 +66,8 @@ public class WrappedReactorTelegramClient implements ReactorTelegramClient {
* @throws NullPointerException if query is null.
*/
@Override
public TdApi.Object execute(TdApi.Function query) {
return reactiveTelegramClient.execute(query);
public <T extends TdApi.Object> T execute(TdApi.Function query) {
//noinspection unchecked
return (T) reactiveTelegramClient.execute(query);
}
}

19
src/main/java/it/tdlight/tdlibsession/td/direct/TestClient.java
View File

@ -14,7 +14,6 @@ import it.tdlight.jni.TdApi.Function;
import it.tdlight.jni.TdApi.Message;
import it.tdlight.jni.TdApi.MessageSenderUser;
import it.tdlight.jni.TdApi.MessageText;
import it.tdlight.jni.TdApi.Object;
import it.tdlight.jni.TdApi.Ok;
import it.tdlight.jni.TdApi.SetLogTagVerbosityLevel;
import it.tdlight.jni.TdApi.SetLogVerbosityLevel;
@ -110,23 +109,29 @@ public class TestClient implements ReactorTelegramClient {
}
@Override
public Mono<Object> send(Function query) {
return Mono.fromCallable(() -> {
public <T extends TdApi.Object> Mono<T> send(Function query) {
return Mono.<T>fromCallable(() -> {
TdApi.Object result = executeCommon(query);
if (result != null) {
return result;
if (result.getConstructor() != Error.CONSTRUCTOR) {
//noinspection unchecked
return (T) result;
} else {
Error error = (Error) result;
throw new TdError(error.code, error.message);
}
}
throw new TdError(500, "Unsupported");
});
}
@Override
public TdApi.Object execute(Function query) {
public <T extends TdApi.Object> T execute(Function query) {
TdApi.Object result = executeCommon(query);
if (result != null) {
return result;
return (T) result;
}
return new Error(500, "Unsupported");
throw new TdError(500, "Unsupported");
}
@Nullable