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

Update ResponseError.java and AsyncTdMiddleEventBusClient.java

Browse Source
This commit is contained in:
Andrea Cavalli 2020-10-14 12:19:14 +02:00
parent f3eed20bf7
commit cdfc68d30f
2 changed files with 11 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
src/main/java/it/tdlight/tdlibsession/td/ResponseError.java
View File

@ -123,4 +123,9 @@ public class ResponseError extends IOException {
.replace(" ", "") .replace(" ", "")
.replace(" = ", "="); .replace(" = ", "=");
} }
@Override
public String toString() {
return getMessage();
}
} }

13
src/main/java/it/tdlight/tdlibsession/td/middle/client/AsyncTdMiddleEventBusClient.java
View File

@ -305,20 +305,19 @@ public class AsyncTdMiddleEventBusClient extends AbstractVerticle implements Asy
return Mono.from(tdClosed).single() return Mono.from(tdClosed).single()
.filter(tdClosed -> !tdClosed) .filter(tdClosed -> !tdClosed)
.flatMap(_x -> Mono.<TdResult<T>>create(sink -> { .<TdResult<T>>handle((_x, sink) -> {
cluster.getEventBus().request(botAddress + ".execute", req, cluster.newDeliveryOpts().setLocalOnly(local), (AsyncResult<Message<TdResultMessage>> event) -> { cluster.getEventBus().request(botAddress + ".execute", req, cluster.newDeliveryOpts().setLocalOnly(local), (AsyncResult<Message<TdResultMessage>> event) -> {
if (event.succeeded()) { if (event.succeeded()) {
if (event.result().body() == null) { if (event.result().body() == null) {
sink.success(); sink.complete();
} else { } else {
sink.success(Objects.requireNonNull(event.result().body()).toTdResult()); sink.next(Objects.requireNonNull(event.result().body()).toTdResult());
} }
} else { } else {
sink.error(ResponseError.newResponseError(request, botAlias, event.cause())); sink.error(ResponseError.newResponseError(request, botAlias, event.cause()));
} }
}); });
}).handle((response, sink) -> {
})).flatMap(response -> {
try { try {
Objects.requireNonNull(response); Objects.requireNonNull(response);
if (OUTPUT_REQUESTS) { if (OUTPUT_REQUESTS) {
@ -328,9 +327,9 @@ public class AsyncTdMiddleEventBusClient extends AbstractVerticle implements Asy
.replace(" ", "") .replace(" ", "")
.replace(" = ", "=")); .replace(" = ", "="));
} }
return Mono.just((TdResult<T>) response); sink.next(response);
} catch (ClassCastException | NullPointerException e) { } catch (ClassCastException | NullPointerException e) {
return Mono.error(e); sink.error(e);
} }
}); });
} }