From b5aa0f459907d1d1fa514883e389e1f1fd8b5841 Mon Sep 17 00:00:00 2001
From: Jianghao Lu <jianghaolu@users.noreply.github.com>
Date: Tue, 6 Sep 2016 12:23:34 -0700
Subject: [PATCH] Remove ServiceResponse<> wrappers in most methods

---
 .../java/com/microsoft/azure/AzureServiceCall.java   |  2 +-
 .../main/java/com/microsoft/rest/ServiceCall.java    | 12 ++++++------
 .../java/com/microsoft/rest/ServiceCallback.java     |  4 ++--
 3 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/azure-client-runtime/src/main/java/com/microsoft/azure/AzureServiceCall.java b/azure-client-runtime/src/main/java/com/microsoft/azure/AzureServiceCall.java
index 0bc20202495d4..e9c8728b67f97 100644
--- a/azure-client-runtime/src/main/java/com/microsoft/azure/AzureServiceCall.java
+++ b/azure-client-runtime/src/main/java/com/microsoft/azure/AzureServiceCall.java
@@ -117,7 +117,7 @@ public void onNext(ServiceResponse<Page<E>> serviceResponse) {
                 }
             }
             if (behavior == ListOperationCallback.PagingBehavior.STOP || serviceResponse.getBody().getNextPageLink() == null) {
-                serviceCall.set(new ServiceResponse<>(lastResponse.getBody().getItems(), lastResponse.getResponse()));
+                serviceCall.set(lastResponse.getBody().getItems());
             } else {
                 serviceCall.setSubscription(next.call(serviceResponse.getBody().getNextPageLink()).single().subscribe(this));
             }
diff --git a/client-runtime/src/main/java/com/microsoft/rest/ServiceCall.java b/client-runtime/src/main/java/com/microsoft/rest/ServiceCall.java
index d256c118a0305..949ef7b8879f2 100644
--- a/client-runtime/src/main/java/com/microsoft/rest/ServiceCall.java
+++ b/client-runtime/src/main/java/com/microsoft/rest/ServiceCall.java
@@ -20,7 +20,7 @@
  *
  * @param <T> the type of the returning object
  */
-public class ServiceCall<T> extends AbstractFuture<ServiceResponse<T>> {
+public class ServiceCall<T> extends AbstractFuture<T> {
     /**
      * The Retrofit method invocation.
      */
@@ -43,7 +43,7 @@ public static <T> ServiceCall<T> create(final Observable<ServiceResponse<T>> obs
             .subscribe(new Action1<ServiceResponse<T>>() {
                 @Override
                 public void call(ServiceResponse<T> t) {
-                    serviceCall.set(t);
+                    serviceCall.set(t.getBody());
                 }
             }, new Action1<Throwable>() {
                 @Override
@@ -70,9 +70,9 @@ public static <T> ServiceCall<T> create(final Observable<ServiceResponse<T>> obs
                 @Override
                 public void call(ServiceResponse<T> t) {
                     if (callback != null) {
-                        callback.success(t);
+                        callback.success(t.getBody());
                     }
-                    serviceCall.set(t);
+                    serviceCall.set(t.getBody());
                 }
             }, new Action1<Throwable>() {
                 @Override
@@ -103,9 +103,9 @@ public static <T, V> ServiceCall<T> createWithHeaders(final Observable<ServiceRe
                 @Override
                 public void call(ServiceResponse<T> t) {
                     if (callback != null) {
-                        callback.success(t);
+                        callback.success(t.getBody());
                     }
-                    serviceCall.set(t);
+                    serviceCall.set(t.getBody());
                 }
             }, new Action1<Throwable>() {
                 @Override
diff --git a/client-runtime/src/main/java/com/microsoft/rest/ServiceCallback.java b/client-runtime/src/main/java/com/microsoft/rest/ServiceCallback.java
index dd3791bbb2d19..c3961b880a80f 100644
--- a/client-runtime/src/main/java/com/microsoft/rest/ServiceCallback.java
+++ b/client-runtime/src/main/java/com/microsoft/rest/ServiceCallback.java
@@ -23,7 +23,7 @@ public abstract class ServiceCallback<T> {
     /**
      * Override this method to handle successful REST call results.
      *
-     * @param result the ServiceResponse holding the response.
+     * @param result the result object.
      */
-    public abstract void success(ServiceResponse<T> result);
+    public abstract void success(T result);
 }