Fix generics in request and callbacks

Author: pengrad

src/main/java/com/pengrad/telegrambot/Callback.java

@@ -1,14 +1,15 @@
 package com.pengrad.telegrambot;
 
 import com.pengrad.telegrambot.request.BaseRequest;
+import com.pengrad.telegrambot.response.BaseResponse;
 
 import java.io.IOException;
 
 /**
  * stas
  * 5/3/16.
  */
-public interface Callback<T extends BaseRequest, R> {
+public interface Callback<T extends BaseRequest, R extends BaseResponse> {
 
     void onResponse(T request, R response);
 

src/main/java/com/pengrad/telegrambot/OldTelegramBot.java

@@ -18,7 +18,7 @@ public abstract class OldTelegramBot {
         this.fileApi = file;
     }
 
-    abstract public <T extends BaseRequest, R> R execute(BaseRequest<T, R> request);
+    abstract public <T extends BaseRequest, R extends BaseResponse> R execute(BaseRequest<T, R> request);
 
     @Deprecated
     public GetFileResponse getFile(String fileId) {

src/main/java/com/pengrad/telegrambot/TelegramBot.java

@@ -4,6 +4,7 @@
 import com.pengrad.telegrambot.impl.TelegramBotClient;
 import com.pengrad.telegrambot.model.File;
 import com.pengrad.telegrambot.request.BaseRequest;
+import com.pengrad.telegrambot.response.BaseResponse;
 
 /**
  * Stas Parshin
@@ -25,11 +26,11 @@ public String getFullFilePath(File file) {
     }
 
     @Override
-    public <T extends BaseRequest, R> R execute(BaseRequest<T, R> request) {
+    public <T extends BaseRequest, R extends BaseResponse> R execute(BaseRequest<T, R> request) {
         return api.send(request);
     }
 
-    public <T extends BaseRequest<T, R>, R> void execute(T request, Callback<T, R> callback) {
+    public <T extends BaseRequest<T, R>, R extends BaseResponse> void execute(T request, Callback<T, R> callback) {
         api.send(request, callback);
     }
 }

src/main/java/com/pengrad/telegrambot/impl/TelegramBotClient.java

@@ -3,6 +3,7 @@
 import com.google.gson.Gson;
 import com.pengrad.telegrambot.Callback;
 import com.pengrad.telegrambot.request.BaseRequest;
+import com.pengrad.telegrambot.response.BaseResponse;
 import okhttp3.*;
 
 import java.io.File;
@@ -25,7 +26,7 @@ public TelegramBotClient(OkHttpClient client, Gson gson, String baseUrl) {
         this.baseUrl = baseUrl;
     }
 
-    public <T extends BaseRequest<T, R>, R> void send(final T request, final Callback<T, R> callback) {
+    public <T extends BaseRequest, R extends BaseResponse> void send(final T request, final Callback<T, R> callback) {
         client.newCall(createRequest(request)).enqueue(new okhttp3.Callback() {
             @Override
             public void onResponse(Call call, Response response) {
@@ -44,7 +45,7 @@ public void onFailure(Call call, IOException e) {
         });
     }
 
-    public <T extends BaseRequest, R> R send(final BaseRequest<T, R> request) {
+    public <T extends BaseRequest, R extends BaseResponse> R send(final BaseRequest<T, R> request) {
         try {
             Response response = client.newCall(createRequest(request)).execute();
             return gson.fromJson(response.body().string(), request.getResponseType());
@@ -53,14 +54,14 @@ public <T extends BaseRequest, R> R send(final BaseRequest<T, R> request) {
         }
     }
 
-    private <R> Request createRequest(BaseRequest<?, R> request) {
+    private Request createRequest(BaseRequest request) {
         return new Request.Builder()
                 .url(baseUrl + request.getMethod())
                 .post(createRequestBody(request))
                 .build();
     }
 
-    private <R> RequestBody createRequestBody(BaseRequest<?, R> request) {
+    private RequestBody createRequestBody(BaseRequest<?, ?> request) {
         if (request.isMultipart()) {
             MediaType contentType = MediaType.parse(request.getContentType());
 

src/main/java/com/pengrad/telegrambot/request/BaseRequest.java

@@ -1,5 +1,7 @@
 package com.pengrad.telegrambot.request;
 
+import com.pengrad.telegrambot.response.BaseResponse;
+
 import java.lang.reflect.Type;
 import java.util.HashMap;
 import java.util.Map;
@@ -8,15 +10,15 @@
  * stas
  * 5/1/16.
  */
-abstract public class BaseRequest<T extends BaseRequest, R> {
+abstract public class BaseRequest<T extends BaseRequest, R extends BaseResponse> {
 
     @SuppressWarnings("unchecked")
     private final T thisAsT = (T) this;
 
-    private final Class responseClass;
+    private final Class<? extends R> responseClass;
     private final Map<String, Object> parameters;
 
-    public BaseRequest(Class responseClass) {
+    public BaseRequest(Class<? extends R> responseClass) {
         this.responseClass = responseClass;
         this.parameters = new HashMap<String, Object>();
     }