From 8241493fc08450032e8b79ab09d0e84d19644396 Mon Sep 17 00:00:00 2001
From: Andrea Cavalli <andrea@cavallium.it>
Date: Tue, 13 Apr 2021 21:48:36 +0200
Subject: [PATCH] Update

---
 .../td/ReactorTelegramClient.java             |  4 ++--
 .../td/WrappedReactorTelegramClient.java      | 10 ++++-----
 .../tdlibsession/td/direct/TestClient.java    | 22 ++++++-------------
 3 files changed, 13 insertions(+), 23 deletions(-)

diff --git a/src/main/java/it/tdlight/tdlibsession/td/ReactorTelegramClient.java b/src/main/java/it/tdlight/tdlibsession/td/ReactorTelegramClient.java
index 8e0c6cf..5a4fd73 100644
--- a/src/main/java/it/tdlight/tdlibsession/td/ReactorTelegramClient.java
+++ b/src/main/java/it/tdlight/tdlibsession/td/ReactorTelegramClient.java
@@ -11,7 +11,7 @@ public interface ReactorTelegramClient {
 
 	Flux<Object> receive();
 
-	<T extends TdApi.Object> Mono<T> send(TdApi.Function query);
+	Mono<TdApi.Object> send(TdApi.Function query);
 
-	<T extends TdApi.Object> T execute(TdApi.Function query);
+	TdApi.Object execute(TdApi.Function query);
 }
diff --git a/src/main/java/it/tdlight/tdlibsession/td/WrappedReactorTelegramClient.java b/src/main/java/it/tdlight/tdlibsession/td/WrappedReactorTelegramClient.java
index 9cb9f32..e73cc48 100644
--- a/src/main/java/it/tdlight/tdlibsession/td/WrappedReactorTelegramClient.java
+++ b/src/main/java/it/tdlight/tdlibsession/td/WrappedReactorTelegramClient.java
@@ -46,14 +46,13 @@ public class WrappedReactorTelegramClient implements ReactorTelegramClient {
 	 * @return a publisher that will emit exactly one item, or an error
 	 */
 	@Override
-	public <T extends TdApi.Object> Mono<T> send(TdApi.Function query) {
+	public Mono<TdApi.Object> 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);
+				sink.next(item);
 			}
 		});
 	}
@@ -66,8 +65,7 @@ public class WrappedReactorTelegramClient implements ReactorTelegramClient {
 	 * @throws NullPointerException if query is null.
 	 */
 	@Override
-	public <T extends TdApi.Object> T execute(TdApi.Function query) {
-		//noinspection unchecked
-		return (T) reactiveTelegramClient.execute(query);
+	public TdApi.Object execute(TdApi.Function query) {
+		return reactiveTelegramClient.execute(query);
 	}
 }
diff --git a/src/main/java/it/tdlight/tdlibsession/td/direct/TestClient.java b/src/main/java/it/tdlight/tdlibsession/td/direct/TestClient.java
index f591e60..2afcd96 100644
--- a/src/main/java/it/tdlight/tdlibsession/td/direct/TestClient.java
+++ b/src/main/java/it/tdlight/tdlibsession/td/direct/TestClient.java
@@ -8,7 +8,6 @@ import it.tdlight.jni.TdApi.AuthorizationStateClosing;
 import it.tdlight.jni.TdApi.AuthorizationStateReady;
 import it.tdlight.jni.TdApi.Close;
 import it.tdlight.jni.TdApi.ConnectionStateReady;
-import it.tdlight.jni.TdApi.Error;
 import it.tdlight.jni.TdApi.FormattedText;
 import it.tdlight.jni.TdApi.Function;
 import it.tdlight.jni.TdApi.Message;
@@ -24,7 +23,6 @@ import it.tdlight.jni.TdApi.UpdateAuthorizationState;
 import it.tdlight.jni.TdApi.UpdateConnectionState;
 import it.tdlight.jni.TdApi.UpdateNewMessage;
 import it.tdlight.tdlibsession.td.ReactorTelegramClient;
-import it.tdlight.tdlibsession.td.TdError;
 import java.util.ArrayList;
 import java.util.Iterator;
 import java.util.List;
@@ -109,29 +107,23 @@ public class TestClient implements ReactorTelegramClient {
 	}
 
 	@Override
-	public <T extends TdApi.Object> Mono<T> send(Function query) {
-		return Mono.<T>fromCallable(() -> {
+	public Mono<TdApi.Object> send(Function query) {
+		return Mono.fromCallable(() -> {
 			TdApi.Object result = executeCommon(query);
 			if (result != null) {
-				if (result.getConstructor() != Error.CONSTRUCTOR) {
-					//noinspection unchecked
-					return (T) result;
-				} else {
-					Error error = (Error) result;
-					throw new TdError(error.code, error.message);
-				}
+				return result;
 			}
-			throw new TdError(500, "Unsupported");
+			return new TdApi.Error(500, "Unsupported");
 		});
 	}
 
 	@Override
-	public <T extends TdApi.Object> T execute(Function query) {
+	public TdApi.Object execute(Function query) {
 		TdApi.Object result = executeCommon(query);
 		if (result != null) {
-			return (T) result;
+			return result;
 		}
-		throw new TdError(500, "Unsupported");
+		return new TdApi.Error(500, "Unsupported");
 	}
 
 	@Nullable