fixing regression in Resources Mgr after swagger regeneration/update

Azure · Feb 23, 2017 · ddf2f20 · ddf2f20
1 parent fd5915a
commit ddf2f20
Show file tree

Hide file tree

Showing 4 changed files with 337 additions and 286 deletions.
diff --git a/...ain/java/com/microsoft/azure/management/resources/implementation/ResourceGroupsInner.java b/...ain/java/com/microsoft/azure/management/resources/implementation/ResourceGroupsInner.java
@@ -344,7 +344,8 @@ private ServiceResponse<PageImpl<GenericResourceInner>> listByResourceGroupDeleg
      * @return the boolean object if successful.
      */
     public boolean checkExistence(String resourceGroupName) {
-        return checkExistenceWithServiceResponseAsync(resourceGroupName).toBlocking().single().body();
+        Boolean result = checkExistenceWithServiceResponseAsync(resourceGroupName).toBlocking().single().body();
+        return (result != null) ? result.booleanValue() : false;
     }
 
     /**

diff --git a/...src/main/java/com/microsoft/azure/management/resources/implementation/ResourcesInner.java b/...src/main/java/com/microsoft/azure/management/resources/implementation/ResourcesInner.java
@@ -1113,7 +1113,8 @@ private ServiceResponse<GenericResourceInner> getDelegate(Response<ResponseBody>
      * @return the boolean object if successful.
      */
     public boolean checkExistenceById(String resourceId, String apiVersion) {
-        return checkExistenceByIdWithServiceResponseAsync(resourceId, apiVersion).toBlocking().single().body();
+        Boolean result = checkExistenceByIdWithServiceResponseAsync(resourceId, apiVersion).toBlocking().single().body();
+        return (result != null) ? result.booleanValue() : false;
     }
 
     /**

diff --git a/...sources/src/test/java/com/microsoft/azure/management/resources/GenericResourcesTests.java b/...sources/src/test/java/com/microsoft/azure/management/resources/GenericResourcesTests.java
@@ -85,5 +85,6 @@ public void canCreateUpdateMoveResource() throws Exception {
         // Delete
         genericResources.deleteById(resource.id());
         Assert.assertFalse(genericResources.checkExistence(newRgName, resource.resourceProviderNamespace(), resource.parentResourcePath(), resource.resourceType(), resource.name(), resource.apiVersion()));
+        Assert.assertFalse(genericResources.checkExistenceById(resource.id()));
     }
 }
diff --git a/azure-mgmt-resources/src/test/resources/session-records/canCreateUpdateMoveResource.json b/azure-mgmt-resources/src/test/resources/session-records/canCreateUpdateMoveResource.json