Return null on GET 404

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

@@ -66,6 +66,9 @@ public PagedList<BatchAccount> listByGroup(String resourceGroupName) {
 
     @Override
     protected BatchAccountImpl wrapModel(BatchAccountInner inner) {
+        if (inner == null) {
+            return null;
+        }
         return new BatchAccountImpl(
                 inner.name(),
                 inner,

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

@@ -79,6 +79,9 @@ protected AvailabilitySetImpl wrapModel(String name) {
 
     @Override
     protected AvailabilitySetImpl wrapModel(AvailabilitySetInner availabilitySetInner) {
+        if (availabilitySetInner == null) {
+            return null;
+        }
         return new AvailabilitySetImpl(availabilitySetInner.name(),
                 availabilitySetInner,
                 this.innerCollection,

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

@@ -27,6 +27,9 @@ public PagedList<VirtualMachineExtensionImageType> list() {
 
     @Override
     protected VirtualMachineExtensionImageTypeImpl wrapModel(VirtualMachineExtensionImageInner inner) {
+        if (inner == null) {
+            return null;
+        }
         return new VirtualMachineExtensionImageTypeImpl(this.client, this.publisher, inner);
     }
 }

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

@@ -29,6 +29,9 @@ public PagedList<VirtualMachineExtensionImageVersion> list() {
 
     @Override
     protected VirtualMachineExtensionImageVersionImpl wrapModel(VirtualMachineExtensionImageInner inner) {
+        if (inner == null) {
+            return null;
+        }
         return new VirtualMachineExtensionImageVersionImpl(this.client, this.type, inner);
     }
 }

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

@@ -28,6 +28,9 @@ class VirtualMachineOffersImpl
 
     @Override
     protected VirtualMachineOfferImpl wrapModel(VirtualMachineImageResourceInner inner) {
+        if (inner == null) {
+            return null;
+        }
         return new VirtualMachineOfferImpl(this.publisher, inner.name(), this.innerCollection);
     }
 

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

@@ -33,6 +33,9 @@ public PagedList<VirtualMachinePublisher> listByRegion(Region region) {
 
     @Override
     protected VirtualMachinePublisherImpl wrapModel(VirtualMachineImageResourceInner inner) {
+        if (inner == null) {
+            return null;
+        }
         return new VirtualMachinePublisherImpl(Region.fromName(inner.location()),
                 inner.name(),
                 this.imagesInnerCollection,

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

@@ -133,6 +133,9 @@ protected VirtualMachineScaleSetImpl wrapModel(String name) {
 
     @Override
     protected VirtualMachineScaleSetImpl wrapModel(VirtualMachineScaleSetInner inner) {
+        if (inner == null) {
+            return null;
+        }
         return new VirtualMachineScaleSetImpl(inner.name(),
                 inner,
                 this.innerCollection,

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

@@ -30,6 +30,9 @@ public PagedList<VirtualMachineSize> listByRegion(Region region) {
 
     @Override
     protected VirtualMachineSizeImpl wrapModel(VirtualMachineSizeInner inner) {
+        if (inner == null) {
+            return null;
+        }
         return new VirtualMachineSizeImpl(inner);
     }
 

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

@@ -36,6 +36,9 @@ public PagedList<VirtualMachineSku> list() {
 
     @Override
     protected VirtualMachineSkuImpl wrapModel(VirtualMachineImageResourceInner inner) {
+        if (inner == null) {
+            return null;
+        }
         return new VirtualMachineSkuImpl(this.offer, inner.name(), innerCollection);
     }
 }

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

@@ -161,6 +161,9 @@ protected VirtualMachineImpl wrapModel(String name) {
 
     @Override
     protected VirtualMachineImpl wrapModel(VirtualMachineInner virtualMachineInner) {
+        if (virtualMachineInner == null) {
+            return null;
+        }
         return new VirtualMachineImpl(virtualMachineInner.name(),
                 virtualMachineInner,
                 this.innerCollection,

azure-mgmt-graph-rbac/src/main/java/com/microsoft/azure/management/graphrbac/implementation/ServicePrincipalsImpl.java

@@ -58,6 +58,9 @@ protected ServicePrincipalImpl wrapModel(String appId) {
 
     @Override
     protected ServicePrincipalImpl wrapModel(ServicePrincipalInner servicePrincipalInner) {
+        if (servicePrincipalInner == null) {
+            return null;
+        }
         return new ServicePrincipalImpl(servicePrincipalInner, this.innerCollection);
     }
 

azure-mgmt-graph-rbac/src/main/java/com/microsoft/azure/management/graphrbac/implementation/UsersImpl.java

@@ -54,6 +54,9 @@ protected UserImpl wrapModel(String userPrincipalName) {
 
     @Override
     protected UserImpl wrapModel(UserInner userInner) {
+        if (userInner == null) {
+            return null;
+        }
         return new UserImpl(userInner, this.innerCollection);
     }
 

azure-mgmt-keyvault/src/main/java/com/microsoft/azure/management/keyvault/implementation/VaultsImpl.java

@@ -84,6 +84,9 @@ protected VaultImpl wrapModel(String name) {
 
     @Override
     protected VaultImpl wrapModel(VaultInner vaultInner) {
+        if (vaultInner == null) {
+            return null;
+        }
         return new VaultImpl(
                 vaultInner.name(),
                 vaultInner,

azure-mgmt-network/src/main/java/com/microsoft/azure/management/network/implementation/LoadBalancersImpl.java

@@ -70,6 +70,9 @@ protected LoadBalancerImpl wrapModel(String name) {
 
     @Override
     protected LoadBalancerImpl wrapModel(LoadBalancerInner inner) {
+        if (inner == null) {
+            return null;
+        }
         return new LoadBalancerImpl(
                 inner.name(),
                 inner,

azure-mgmt-network/src/main/java/com/microsoft/azure/management/network/implementation/NetworkInterfacesImpl.java

@@ -67,6 +67,9 @@ protected NetworkInterfaceImpl wrapModel(String name) {
 
     @Override
     protected NetworkInterfaceImpl wrapModel(NetworkInterfaceInner inner) {
+        if (inner == null) {
+            return null;
+        }
         return new NetworkInterfaceImpl(inner.name(),
                 inner,
                 this.innerCollection,

azure-mgmt-network/src/main/java/com/microsoft/azure/management/network/implementation/NetworkSecurityGroupsImpl.java

@@ -70,6 +70,9 @@ protected NetworkSecurityGroupImpl wrapModel(String name) {
 
     @Override
     protected NetworkSecurityGroupImpl wrapModel(NetworkSecurityGroupInner inner) {
+        if (inner == null) {
+            return null;
+        }
         return new NetworkSecurityGroupImpl(
                 inner.name(),
                 inner,

azure-mgmt-network/src/main/java/com/microsoft/azure/management/network/implementation/NetworksImpl.java

@@ -102,6 +102,9 @@ protected NetworkImpl wrapModel(String name) {
 
     @Override
     protected NetworkImpl wrapModel(VirtualNetworkInner inner) {
+        if (inner == null) {
+            return null;
+        }
         return new NetworkImpl(
                 inner.name(),
                 inner,

azure-mgmt-network/src/main/java/com/microsoft/azure/management/network/implementation/PublicIpAddressesImpl.java

@@ -76,6 +76,9 @@ protected PublicIpAddressImpl wrapModel(String name) {
 
     @Override
     protected PublicIpAddressImpl wrapModel(PublicIPAddressInner inner) {
+        if (inner == null) {
+            return null;
+        }
         return new PublicIpAddressImpl(
                 inner.id(),
                 inner,

azure-mgmt-redis/src/main/java/com/microsoft/azure/management/redis/implementation/RedisCachesImpl.java

@@ -73,6 +73,9 @@ protected RedisCacheImpl wrapModel(String name) {
 
     @Override
     protected RedisCacheImpl wrapModel(RedisResourceInner redisResourceInner) {
+        if (redisResourceInner == null) {
+            return null;
+        }
         return new RedisCacheImpl(
                 redisResourceInner.name(),
                 redisResourceInner,

azure-mgmt-resources/src/main/java/com/microsoft/azure/management/resources/fluentcore/utils/PagedListConverter.java

@@ -40,6 +40,14 @@ public abstract class PagedListConverter<U, V> {
      * @return the converted list
      */
     public PagedList<V> convert(final PagedList<U> uList) {
+        if (uList == null || uList.isEmpty()) {
+            return new PagedList<V>() {
+                @Override
+                public Page<V> nextPage(String s) throws RestException, IOException {
+                    return null;
+                }
+            };
+        }
         Page<U> uPage = uList.currentPage();
         PageImpl<V> vPage = new PageImpl<>();
         vPage.setNextPageLink(uPage.getNextPageLink());

azure-mgmt-resources/src/main/java/com/microsoft/azure/management/resources/implementation/DeploymentOperationsImpl.java

@@ -39,6 +39,9 @@ public DeploymentOperation getById(String operationId) {
 
     @Override
     protected DeploymentOperationImpl wrapModel(DeploymentOperationInner inner) {
+        if (inner == null) {
+            return null;
+        }
         return new DeploymentOperationImpl(inner, this.client);
     }
 }

azure-mgmt-resources/src/main/java/com/microsoft/azure/management/resources/implementation/FeaturesImpl.java

@@ -35,6 +35,9 @@ public Feature register(String resourceProviderName, String featureName) {
 
     @Override
     protected FeatureImpl wrapModel(FeatureResultInner inner) {
+        if (inner == null) {
+            return null;
+        }
         return new FeatureImpl(inner);
     }
 }

azure-mgmt-resources/src/main/java/com/microsoft/azure/management/resources/implementation/GenericResourcesImpl.java

@@ -6,7 +6,6 @@
 
 package com.microsoft.azure.management.resources.implementation;
 
-import com.microsoft.azure.CloudException;
 import com.microsoft.azure.PagedList;
 import com.microsoft.azure.management.resources.GenericResource;
 import com.microsoft.azure.management.resources.GenericResources;
@@ -86,7 +85,7 @@ public GenericResource get(
                 return resource;
             }
         }
-        throw new CloudException("Generic resource not found.");
+        return null;
     }
 
     @Override
@@ -153,6 +152,9 @@ protected GenericResourceImpl wrapModel(String id) {
 
     @Override
     protected GenericResourceImpl wrapModel(GenericResourceInner inner) {
+        if (inner == null) {
+            return null;
+        }
         return new GenericResourceImpl(
                 inner.id(),
                 inner,

azure-mgmt-resources/src/main/java/com/microsoft/azure/management/resources/implementation/ProvidersImpl.java

@@ -45,6 +45,9 @@ public Provider getByName(String resourceProviderNamespace) {
 
     @Override
     protected ProviderImpl wrapModel(ProviderInner inner) {
+        if (inner == null) {
+            return null;
+        }
         return new ProviderImpl(inner);
     }
 }

azure-mgmt-resources/src/main/java/com/microsoft/azure/management/resources/implementation/ResourceGroupsImpl.java

@@ -65,6 +65,9 @@ protected ResourceGroupImpl wrapModel(String name) {
 
     @Override
     protected ResourceGroupImpl wrapModel(ResourceGroupInner inner) {
+        if (inner == null) {
+            return null;
+        }
         return new ResourceGroupImpl(inner, serviceClient);
     }
 }

azure-mgmt-resources/src/main/java/com/microsoft/azure/management/resources/implementation/SubscriptionsImpl.java

@@ -37,6 +37,9 @@ public Subscription typeConvert(SubscriptionInner subscriptionInner) {
     // Gets a specific resource group
     public SubscriptionImpl getByName(String name) {
         SubscriptionInner subscription = client.get(name);
+        if (subscription == null) {
+            return null;
+        }
         return new SubscriptionImpl(subscription, client);
     }
 }

azure-mgmt-storage/src/main/java/com/microsoft/azure/management/storage/implementation/StorageAccountsImpl.java

@@ -75,6 +75,9 @@ protected StorageAccountImpl wrapModel(String name) {
 
     @Override
     protected StorageAccountImpl wrapModel(StorageAccountInner storageAccountInner) {
+        if (storageAccountInner == null) {
+            return null;
+        }
         return new StorageAccountImpl(
                 storageAccountInner.name(),
                 storageAccountInner,

azure-mgmt-storage/src/main/java/com/microsoft/azure/management/storage/implementation/UsagesImpl.java

@@ -23,6 +23,9 @@ public PagedList<StorageUsage> list() {
 
     @Override
     protected UsageImpl wrapModel(UsageInner usageInner) {
+        if (usageInner == null) {
+            return null;
+        }
         return new UsageImpl(usageInner);
     }
 }

azure-mgmt-website/src/main/java/com/microsoft/azure/management/website/implementation/AppServicePlansImpl.java

@@ -57,6 +57,9 @@ protected AppServicePlanImpl wrapModel(String name) {
 
     @Override
     protected AppServicePlanImpl wrapModel(AppServicePlanInner inner) {
+        if (inner == null) {
+            return null;
+        }
         return new AppServicePlanImpl(inner.name(), inner, innerCollection, myManager);
     }
 

azure-mgmt-website/src/main/java/com/microsoft/azure/management/website/implementation/CertificateOrdersImpl.java

@@ -58,6 +58,9 @@ protected CertificateOrderImpl wrapModel(String name) {
 
     @Override
     protected CertificateOrderImpl wrapModel(AppServiceCertificateOrderInner inner) {
+        if (inner == null) {
+            return null;
+        }
         return new CertificateOrderImpl(inner.name(), inner, innerCollection, myManager);
     }
 

azure-mgmt-website/src/main/java/com/microsoft/azure/management/website/implementation/CertificatesImpl.java

@@ -47,6 +47,9 @@ protected CertificateImpl wrapModel(String name) {
 
     @Override
     protected CertificateImpl wrapModel(CertificateInner inner) {
+        if (inner == null) {
+            return null;
+        }
         return new CertificateImpl(inner.name(), inner, innerCollection, myManager);
     }
 

azure-mgmt-website/src/main/java/com/microsoft/azure/management/website/implementation/WebAppsImpl.java

@@ -46,6 +46,9 @@ protected WebAppImpl wrapModel(String name) {
 
     @Override
     protected WebAppImpl wrapModel(SiteInner inner) {
+        if (inner == null) {
+            return null;
+        }
         return new WebAppImpl(inner.name(), inner, innerCollection, super.myManager);
     }