Remove ServiceResponse<> wrappers in most methods

azure-mgmt-batch/src/main/java/com/microsoft/azure/management/batch/implementation/SubscriptionsInner.java

@@ -65,10 +65,10 @@ interface SubscriptionsService {
      * @throws CloudException exception thrown from REST call
      * @throws IOException exception thrown from serialization/deserialization
      * @throws IllegalArgumentException exception thrown from invalid parameters
-     * @return the SubscriptionQuotasGetResultInner object wrapped in {@link ServiceResponse} if successful.
+     * @return the SubscriptionQuotasGetResultInner object if successful.
      */
-    public ServiceResponse<SubscriptionQuotasGetResultInner> getSubscriptionQuotas(String locationName) throws CloudException, IOException, IllegalArgumentException {
-        return getSubscriptionQuotasAsync(locationName).toBlocking().single();
+    public SubscriptionQuotasGetResultInner getSubscriptionQuotas(String locationName) throws CloudException, IOException, IllegalArgumentException {
+        return getSubscriptionQuotasWithServiceResponseAsync(locationName).toBlocking().single().getBody();
     }
 
     /**
@@ -79,7 +79,7 @@ public ServiceResponse<SubscriptionQuotasGetResultInner> getSubscriptionQuotas(S
      * @return the {@link ServiceCall} object
      */
     public ServiceCall<SubscriptionQuotasGetResultInner> getSubscriptionQuotasAsync(String locationName, final ServiceCallback<SubscriptionQuotasGetResultInner> serviceCallback) {
-        return ServiceCall.create(getSubscriptionQuotasAsync(locationName), serviceCallback);
+        return ServiceCall.create(getSubscriptionQuotasWithServiceResponseAsync(locationName), serviceCallback);
     }
 
     /**
@@ -88,7 +88,22 @@ public ServiceCall<SubscriptionQuotasGetResultInner> getSubscriptionQuotasAsync(
      * @param locationName The desired region for the quotas.
      * @return the observable to the SubscriptionQuotasGetResultInner object
      */
-    public Observable<ServiceResponse<SubscriptionQuotasGetResultInner>> getSubscriptionQuotasAsync(String locationName) {
+    public Observable<SubscriptionQuotasGetResultInner> getSubscriptionQuotasAsync(String locationName) {
+        return getSubscriptionQuotasWithServiceResponseAsync(locationName).map(new Func1<ServiceResponse<SubscriptionQuotasGetResultInner>, SubscriptionQuotasGetResultInner>() {
+            @Override
+            public SubscriptionQuotasGetResultInner call(ServiceResponse<SubscriptionQuotasGetResultInner> response) {
+                return response.getBody();
+            }
+        });
+    }
+
+    /**
+     * Gets the Batch service quotas for the specified suscription.
+     *
+     * @param locationName The desired region for the quotas.
+     * @return the observable to the SubscriptionQuotasGetResultInner object
+     */
+    public Observable<ServiceResponse<SubscriptionQuotasGetResultInner>> getSubscriptionQuotasWithServiceResponseAsync(String locationName) {
         if (locationName == null) {
             throw new IllegalArgumentException("Parameter locationName is required and cannot be null.");
         }

azure-mgmt-compute/src/main/java/com/microsoft/azure/management/compute/implementation/AvailabilitySetImpl.java

@@ -9,7 +9,6 @@
 import com.microsoft.azure.management.compute.AvailabilitySet;
 import com.microsoft.azure.management.compute.InstanceViewStatus;
 import com.microsoft.azure.management.resources.fluentcore.arm.models.implementation.GroupableResourceImpl;
-import com.microsoft.rest.ServiceResponse;
 import rx.Observable;
 import rx.functions.Func1;
 
@@ -73,8 +72,8 @@ public List<InstanceViewStatus> statuses() {
 
     @Override
     public AvailabilitySet refresh() throws Exception {
-        ServiceResponse<AvailabilitySetInner> response = client.get(this.resourceGroupName(), this.name());
-        this.setInner(response.getBody());
+        AvailabilitySetInner response = client.get(this.resourceGroupName(), this.name());
+        this.setInner(response);
         this.idOfVMsInSet = null;
         return this;
     }
@@ -102,10 +101,10 @@ public Observable<AvailabilitySet> applyAsync() {
     public Observable<AvailabilitySet> createResourceAsync() {
         final AvailabilitySetImpl self = this;
         return this.client.createOrUpdateAsync(resourceGroupName(), name(), inner())
-                .map(new Func1<ServiceResponse<AvailabilitySetInner>, AvailabilitySet>() {
+                .map(new Func1<AvailabilitySetInner, AvailabilitySet>() {
                     @Override
-                    public AvailabilitySet call(ServiceResponse<AvailabilitySetInner> availabilitySetInner) {
-                        self.setInner(availabilitySetInner.getBody());
+                    public AvailabilitySet call(AvailabilitySetInner availabilitySetInner) {
+                        self.setInner(availabilitySetInner);
                         idOfVMsInSet = null;
                         return self;
                     }

azure-mgmt-compute/src/main/java/com/microsoft/azure/management/compute/implementation/AvailabilitySetsImpl.java

@@ -13,7 +13,6 @@
 import com.microsoft.azure.management.resources.fluentcore.arm.collection.implementation.GroupableResourcesImpl;
 import com.microsoft.azure.management.resources.fluentcore.arm.models.implementation.GroupPagedList;
 import com.microsoft.rest.RestException;
-import com.microsoft.rest.ServiceResponse;
 
 import java.io.IOException;
 import java.util.List;
@@ -41,20 +40,20 @@ public PagedList<AvailabilitySet> list() throws CloudException, IOException {
         return new GroupPagedList<AvailabilitySet>(this.myManager.resourceManager().resourceGroups().list()) {
             @Override
             public List<AvailabilitySet> listNextGroup(String resourceGroupName) throws RestException, IOException {
-                return wrapList(innerCollection.list(resourceGroupName).getBody());
+                return wrapList(innerCollection.list(resourceGroupName));
             }
         };
     }
 
     @Override
     public PagedList<AvailabilitySet> listByGroup(String groupName) throws CloudException, IOException {
-        return wrapList(this.innerCollection.list(groupName).getBody());
+        return wrapList(this.innerCollection.list(groupName));
     }
 
     @Override
     public AvailabilitySetImpl getByGroup(String groupName, String name) throws CloudException, IOException {
-        ServiceResponse<AvailabilitySetInner> response = this.innerCollection.get(groupName, name);
-        return wrapModel(response.getBody());
+        AvailabilitySetInner response = this.innerCollection.get(groupName, name);
+        return wrapModel(response);
     }
 
     @Override