Merge remote-tracking branch 'upstream/master' into martin-internals

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

@@ -162,7 +162,7 @@ public interface VirtualMachine extends
     /**
      * @return the size of the operating system disk in GB
      */
-    Integer osDiskSize();
+    int osDiskSize();
 
     /**
      * @return the list of data disks attached to this virtual machine

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

@@ -17,25 +17,25 @@ public interface VirtualMachineSize {
     /**
      * @return the Number of cores supported by a VM size
      */
-    Integer numberOfCores();
+    int numberOfCores();
 
     /**
      * @return the OS disk size allowed by a VM size
      */
-    Integer osDiskSizeInMB();
+    int osDiskSizeInMB();
 
     /**
      * @return resource disk size allowed by a VM size
      */
-    Integer resourceDiskSizeInMB();
+    int resourceDiskSizeInMB();
 
     /**
      * @return the memory size supported by a VM size
      */
-    Integer memoryInMB();
+    int memoryInMB();
 
     /**
      * @return the maximum number of data disks allowed by a VM size
      */
-    Integer maxDataDiskCount();
+    int maxDataDiskCount();
 }

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

@@ -13,7 +13,7 @@
 import java.util.UUID;
 
 /**
- * Represents data disk of a virtual machine.
+ * The implementation for {@link DataDisk} and its create and update interfaces.
  */
 class DataDiskImpl
     extends ChildResourceImpl<com.microsoft.azure.management.compute.implementation.api.DataDisk, VirtualMachine>

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

@@ -7,7 +7,7 @@
 import com.microsoft.azure.management.resources.fluentcore.arm.Region;
 
 /**
- * The implementation for {@link VirtualMachineImage.Offer}.
+ * The implementation for {@link Offer}.
  */
 class OfferImpl implements Offer {
     private final Publisher publisher;

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

@@ -17,7 +17,7 @@
 import java.io.IOException;
 
 /**
- * The implementation for {@link VirtualMachineImagePublishers}.
+ * The implementation for {@link Offers}.
  */
 class OffersImpl
         extends ReadableWrappersImpl<Offer, OfferImpl, VirtualMachineImageResourceInner>

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

@@ -11,7 +11,7 @@
 import com.microsoft.azure.management.resources.fluentcore.arm.Region;
 
 /**
- * The implementation for {@link VirtualMachineImage.Publisher}.
+ * The implementation for {@link Publisher}.
  */
 class PublisherImpl
         implements Publisher {

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

@@ -17,7 +17,7 @@
 import java.util.List;
 
 /**
- * The implementation for {@link VirtualMachineImagePublishers}.
+ * The implementation for {@link Publishers}.
  */
 class PublishersImpl
         extends ReadableWrappersImpl<Publisher, PublisherImpl, VirtualMachineImageResourceInner>

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

@@ -14,7 +14,7 @@
 import java.util.List;
 
 /**
- * The implementation for {@link VirtualMachineImage.Sku}.
+ * The implementation for {@link Sku}.
  */
 class SkuImpl
         implements Sku {

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

@@ -17,7 +17,7 @@
 import java.io.IOException;
 
 /**
- * The implementation for {@link VirtualMachineImagePublishers}.
+ * The implementation for {@link Skus}.
  */
 class SkusImpl
         extends ReadableWrappersImpl<Sku, SkuImpl, VirtualMachineImageResourceInner>

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

@@ -65,7 +65,7 @@
 import java.util.UUID;
 
 /**
- * The type representing Azure virtual machine.
+ * The implementation for {@link VirtualMachine} and its create and update interfaces.
  */
 class VirtualMachineImpl
         extends GroupableResourceImpl<VirtualMachine, VirtualMachineInner, VirtualMachineImpl>
@@ -731,7 +731,12 @@ public CachingTypes osDiskCachingType() {
     }
 
     @Override
-    public Integer osDiskSize() {
+    public int osDiskSize() {
+        if (inner().storageProfile().osDisk().diskSizeGB() == null) {
+            // Server returns OS disk size as 0 for auto-created disks for which
+            // size was not explicitly set by the user.
+            return 0;
+        }
         return inner().storageProfile().osDisk().diskSizeGB();
     }
 

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

@@ -24,27 +24,27 @@ public String name() {
     }
 
     @Override
-    public Integer numberOfCores() {
+    public int numberOfCores() {
         return innerModel.numberOfCores();
     }
 
     @Override
-    public Integer osDiskSizeInMB() {
+    public int osDiskSizeInMB() {
         return innerModel.osDiskSizeInMB();
     }
 
     @Override
-    public Integer resourceDiskSizeInMB() {
+    public int resourceDiskSizeInMB() {
         return innerModel.resourceDiskSizeInMB();
     }
 
     @Override
-    public Integer memoryInMB() {
+    public int memoryInMB() {
         return innerModel.memoryInMB();
     }
 
     @Override
-    public Integer maxDataDiskCount() {
+    public int maxDataDiskCount() {
         return innerModel.maxDataDiskCount();
     }
 }

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

@@ -24,8 +24,7 @@
 import java.util.Map.Entry;
 
 /**
- * Internal virtual network implementation of the fluent interface.
- * (Internal use only)
+ * Implementation for {@link Network} and its create and update interfaces.
  */
 class NetworkImpl
     extends GroupableResourceImpl<Network, VirtualNetworkInner, NetworkImpl>

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

@@ -34,7 +34,7 @@
 import java.util.List;
 
 /**
- * The type representing Azure network interface.
+ *  Implementation for {@link NetworkInterface} and its create and update interfaces.
  */
 class NetworkInterfaceImpl
         extends GroupableResourceImpl<NetworkInterface, NetworkInterfaceInner, NetworkInterfaceImpl>

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

@@ -16,7 +16,7 @@
 import java.util.ArrayList;
 
 /**
- * The type representing Azure network interfaces.
+ *  Implementation for {@link NetworkInterfaces}.
  */
 class NetworkInterfacesImpl
         extends GroupableResourcesImpl<NetworkInterface, NetworkInterfaceImpl, NetworkInterfaceInner, NetworkInterfacesInner>

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

@@ -23,8 +23,7 @@
 import java.util.List;
 
 /**
- * Implementation of the NetworkSecurityGroup interface.
- * (Internal use only)
+ *  Implementation for {@link NetworkSecurityGroup} and its create and update interfaces.
  */
 class NetworkSecurityGroupImpl
     extends GroupableResourceImpl<NetworkSecurityGroup, NetworkSecurityGroupInner, NetworkSecurityGroupImpl>

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

@@ -20,8 +20,7 @@
 import java.util.ArrayList;
 
 /**
- * Implementation of the NetworkSecurityGroups interface.
- * (Internal use only)
+ *  Implementation for {@link NetworkSecurityGroups}.
  */
 class NetworkSecurityGroupsImpl
         extends GroupableResourcesImpl<NetworkSecurityGroup, NetworkSecurityGroupImpl, NetworkSecurityGroupInner, NetworkSecurityGroupsInner>

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

@@ -11,7 +11,7 @@
 import com.microsoft.azure.management.resources.fluentcore.arm.models.implementation.ChildResourceImpl;
 
 /**
- * Implementation of the NetworkSecurityRule interface.
+ *  Implementation for {@link NetworkSecurityRule} and its create and update interfaces.
  */
 class NetworkSecurityRuleImpl
     extends ChildResourceImpl<SecurityRuleInner, NetworkSecurityGroupImpl>

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

@@ -22,8 +22,7 @@
 import java.util.ArrayList;
 
 /**
- * Implementation of the Networks interface.
- * (Internal use only)
+ *  Implementation for {@link Networks}.
  */
 class NetworksImpl
         extends GroupableResourcesImpl<Network, NetworkImpl, VirtualNetworkInner, VirtualNetworksInner>

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

@@ -16,7 +16,7 @@
 import java.util.List;
 
 /**
- * Represents an Ip configuration of a network interface.
+ *  Implementation for {@link NicIpConfiguration} and its create and update interfaces.
  */
 class NicIpConfigurationImpl
         extends ChildResourceImpl<NetworkInterfaceIPConfiguration, NetworkInterfaceImpl>

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

@@ -18,8 +18,7 @@
 import com.microsoft.rest.ServiceResponse;
 
 /**
- * Implementation of the PublicIPAddress interface.
- * (Internal use only)
+ *  Implementation for {@link PublicIpAddress} and its create and update interfaces.
  */
 class PublicIpAddressImpl
     extends GroupableResourceImpl<PublicIpAddress, PublicIPAddressInner, PublicIpAddressImpl>

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

@@ -19,8 +19,7 @@
 import java.io.IOException;
 
 /**
- * Implementation of the PublicIpAddresses interface.
- * (Internal use only)
+ *  Implementation for {@link PublicIpAddresses}.
  */
 class PublicIpAddressesImpl
         extends GroupableResourcesImpl<PublicIpAddress, PublicIpAddressImpl, PublicIPAddressInner, PublicIPAddressesInner>

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

@@ -11,8 +11,7 @@
 import com.microsoft.azure.management.resources.fluentcore.arm.models.implementation.ChildResourceImpl;
 
 /**
- * Implementation of the Subnet interface.
- * (Internal use only)
+ *  Implementation for {@link Subnet} and its create and update interfaces.
  */
 class SubnetImpl
     extends ChildResourceImpl<SubnetInner, NetworkImpl>

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

@@ -39,7 +39,7 @@
 import java.util.List;
 
 /**
- * The implementation of Deployment and its parent interfaces.
+ * The implementation of {@link Deployment} and its nested interfaces.
  */
 final class DeploymentImpl extends
         CreatableUpdatableImpl<Deployment, DeploymentExtendedInner, DeploymentImpl>

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

@@ -15,7 +15,7 @@
 import org.joda.time.DateTime;
 
 /**
- * The implementation of DeploymentOperation and its parent interfaces.
+ * The implementation of {@link DeploymentOperation}.
  */
 final class DeploymentOperationImpl extends
         IndexableRefreshableWrapperImpl<DeploymentOperation, DeploymentOperationInner>

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

@@ -18,7 +18,7 @@
 import java.io.IOException;
 
 /**
- * The implementation of DeploymentOperations and its parent interfaces.
+ * The implementation of {@link DeploymentOperations}.
  */
 final class DeploymentOperationsImpl
         implements DeploymentOperations {

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

@@ -23,7 +23,7 @@
 import java.util.List;
 
 /**
- * The implementation for Deployments and its parent interfaces.
+ * The implementation for {@link Deployments}.
  */
 final class DeploymentsImpl
     implements Deployments {

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

@@ -11,7 +11,7 @@
 import com.microsoft.azure.management.resources.implementation.api.FeatureResultInner;
 
 /**
- * The implementation of Feature and its parent interfaces.
+ * The implementation of {@link Feature}.
  */
 final class FeatureImpl extends
         IndexableWrapperImpl<FeatureResultInner>

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

@@ -16,7 +16,7 @@
 import java.io.IOException;
 
 /**
- * The implementation of Features and its parent interfaces.
+ * The implementation of {@link Features}.
  */
 final class FeaturesImpl
         implements Features {

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

@@ -17,7 +17,7 @@
 import java.io.IOException;
 
 /**
- * The implementation of Features.InResourceProvider and its parent interfaces.
+ * The implementation of {@link Features.InResourceProvider}.
  */
 final class FeaturesInResourceProviderImpl
         implements Features.InResourceProvider {

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

@@ -17,7 +17,7 @@
 import com.microsoft.rest.ServiceCallback;
 
 /**
- * The implementation for GenericResource and its nested interfaces.
+ * The implementation for {@link GenericResource} and its nested interfaces.
  */
 final class GenericResourceImpl
     extends GroupableResourceImpl<GenericResource, GenericResourceInner, GenericResourceImpl>

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

@@ -23,8 +23,7 @@
 import java.util.List;
 
 /**
- * Implementation of the GenericResouces interface.
- * (Internal use only)
+ * Implementation of the {@link GenericResources}.
  */
 final class GenericResourcesImpl
     extends GroupableResourcesImpl<GenericResource, GenericResourceImpl, GenericResourceInner, ResourcesInner>

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

@@ -11,7 +11,7 @@
 import com.microsoft.azure.management.resources.implementation.api.LocationInner;
 
 /**
- * The implementation of Location and its parent interfaces.
+ * The implementation of {@link Location}.
  */
 final class LocationImpl extends
         IndexableWrapperImpl<LocationInner>

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

@@ -14,7 +14,7 @@
 import java.util.List;
 
 /**
- * The implementation of Provider and its parent interfaces.
+ * The implementation of {@link Provider}.
  */
 final class ProviderImpl extends
         IndexableWrapperImpl<ProviderInner>

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

@@ -17,7 +17,7 @@
 import java.io.IOException;
 
 /**
- * The implementation for Providers and its parent interfaces.
+ * The implementation for {@link Providers}.
  */
 final class ProvidersImpl
         implements Providers {

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

@@ -29,7 +29,7 @@
 import java.util.Map;
 
 /**
- * An instance of this class provides access to a resource group in Azure.
+ * The implementation for {@link ResourceGroup} and its create and update interfaces.
  */
 class ResourceGroupImpl extends
         CreatableUpdatableImpl<ResourceGroup, ResourceGroupInner, ResourceGroupImpl>

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

@@ -18,7 +18,7 @@
 import java.io.IOException;
 
 /**
- * The implementation for ResourceGroups and its parent interfaces.
+ * The implementation for {@link ResourceGroups} and its parent interfaces.
  */
 final class ResourceGroupsImpl
         extends CreatableWrappersImpl<ResourceGroup, ResourceGroupImpl, ResourceGroupInner>