refactor: Always return wrapped response with HTTP info

BREAKING CHANGE: The old executeWithDetails() and enqueueWithDetails() methods have been deleted. In
addition, the basic versions of those methods now return the wrapped response that the old methods
used to.

Author: lpatino10

src/main/java/com/ibm/cloud/sdk/core/http/ServiceCall.java

@@ -33,46 +33,24 @@ public interface ServiceCall<T> {
   /**
    * Synchronous request.
    *
-   * @return the generic type
-   * @throws RuntimeException the exception from HTTP request
-   */
-  T execute() throws RuntimeException;
-
-  /**
-   * Synchronous request with added HTTP information.
-   *
    * @return a Response object with the generic response model and various HTTP information fields
-   * @throws RuntimeException the exception from the HTTP request
-   */
-  Response<T> executeWithDetails() throws RuntimeException;
-
-  /**
-   * Asynchronous requests, in this case, you receive a callback when the data has been received.
-   *
-   * @param callback the callback
+   * @throws RuntimeException the exception from HTTP request
    */
-  void enqueue(ServiceCallback<? super T> callback);
+  Response<T> execute() throws RuntimeException;
 
   /**
-   * Asynchronous requests with added HTTP information. In this case, you receive a callback when the data has been
+   * Asynchronous request with added HTTP information. In this case, you receive a callback when the data has been
    * received.
    *
    * @param callback the callback
    */
-  void enqueueWithDetails(ServiceCallbackWithDetails<T> callback);
-
-  /**
-   * Reactive request using the RxJava 2 library. See https://github.com/ReactiveX/RxJava.
-   *
-   * @return a Single object containing the service call to be observed/subscribed to
-   */
-  Single<T> reactiveRequest();
+  void enqueue(ServiceCallback<? super T> callback);
 
   /**
    * Reactive request using the RxJava 2 library. See https://github.com/ReactiveX/RxJava. In addition, the wrapped
    * service call will contain added HTTP information.
    *
    * @return a Single object containing the service call to be observed/subscribed to
    */
-  Single<Response<T>> reactiveRequestWithDetails();
+  Single<Response<T>> reactiveRequest();
 }

src/main/java/com/ibm/cloud/sdk/core/http/ServiceCallback.java

@@ -24,7 +24,7 @@ public interface ServiceCallback<T> {
    *
    * @param response the response
    */
-  void onResponse(T response);
+  void onResponse(Response<T> response);
 
   /**
    * Called if there is an error during the request.

src/main/java/com/ibm/cloud/sdk/core/http/ServiceCallbackWithDetails.java

@@ -19,7 +19,6 @@
 import com.ibm.cloud.sdk.core.http.ResponseConverter;
 import com.ibm.cloud.sdk.core.http.ServiceCall;
 import com.ibm.cloud.sdk.core.http.ServiceCallback;
-import com.ibm.cloud.sdk.core.http.ServiceCallbackWithDetails;
 import com.ibm.cloud.sdk.core.service.exception.BadRequestException;
 import com.ibm.cloud.sdk.core.service.exception.ConflictException;
 import com.ibm.cloud.sdk.core.service.exception.ForbiddenException;
@@ -480,47 +479,18 @@ public ServiceCall<T> addHeader(String name, String value) {
     }
 
     @Override
-    public T execute() {
+    public com.ibm.cloud.sdk.core.http.Response<T> execute() {
       try {
         Response response = call.execute();
-        return processServiceCall(converter, response);
-      } catch (IOException e) {
-        throw new RuntimeException(e);
-      }
-    }
-
-    @Override
-    public com.ibm.cloud.sdk.core.http.Response<T> executeWithDetails() throws RuntimeException {
-      try {
-        Response httpResponse = call.execute();
-        T responseModel = processServiceCall(converter, httpResponse);
-        return new com.ibm.cloud.sdk.core.http.Response<>(responseModel, httpResponse);
+        T responseModel = processServiceCall(converter, response);
+        return new com.ibm.cloud.sdk.core.http.Response<>(responseModel, response);
       } catch (IOException e) {
         throw new RuntimeException(e);
       }
     }
 
     @Override
     public void enqueue(final ServiceCallback<? super T> callback) {
-      call.enqueue(new Callback() {
-        @Override
-        public void onFailure(Call call, IOException e) {
-          callback.onFailure(e);
-        }
-
-        @Override
-        public void onResponse(Call call, Response response) {
-          try {
-            callback.onResponse(processServiceCall(converter, response));
-          } catch (Exception e) {
-            callback.onFailure(e);
-          }
-        }
-      });
-    }
-
-    @Override
-    public void enqueueWithDetails(final ServiceCallbackWithDetails<T> callback) {
       call.enqueue(new Callback() {
         @Override
         public void onFailure(Call call, IOException e) {
@@ -540,24 +510,13 @@ public void onResponse(Call call, Response response) {
     }
 
     @Override
-    public Single<T> reactiveRequest() {
-      return Single.fromCallable(new Callable<T>() {
-        @Override
-        public T call() throws Exception {
-          Response response = call.execute();
-          return processServiceCall(converter, response);
-        }
-      });
-    }
-
-    @Override
-    public Single<com.ibm.cloud.sdk.core.http.Response<T>> reactiveRequestWithDetails() {
+    public Single<com.ibm.cloud.sdk.core.http.Response<T>> reactiveRequest() {
       return Single.fromCallable(new Callable<com.ibm.cloud.sdk.core.http.Response<T>>() {
         @Override
         public com.ibm.cloud.sdk.core.http.Response<T> call() throws Exception {
-          Response httpResponse = call.execute();
-          T responseModel = processServiceCall(converter, httpResponse);
-          return new com.ibm.cloud.sdk.core.http.Response<>(responseModel, httpResponse);
+          Response response = call.execute();
+          T responseModel = processServiceCall(converter, response);
+          return new com.ibm.cloud.sdk.core.http.Response<>(responseModel, response);
         }
       });
     }