[Ready for review] Graph & Key Vault MGMT

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

@@ -25,12 +25,12 @@ public interface Vault extends
         Updatable<Vault.Update>,
         Wrapper<VaultInner> {
     /**
-     * @return The URI of the vault for performing operations on keys and secrets.
+     * @return the URI of the vault for performing operations on keys and secrets.
      */
     String vaultUri();
 
     /**
-     * @return The Azure Active Directory tenant ID that should be used for
+     * @return the Azure Active Directory tenant ID that should be used for
      * authenticating requests to the key vault.
      */
     String tenantId();
@@ -41,29 +41,29 @@ public interface Vault extends
     Sku sku();
 
     /**
-     * @return An array of 0 to 16 identities that have access to the key vault. All
+     * @return an array of 0 to 16 identities that have access to the key vault. All
      * identities in the array must use the same tenant ID as the key vault's
      * tenant ID.
      */
     List<AccessPolicy> accessPolicies();
 
     /**
-     * @return Property to specify whether Azure Virtual Machines are permitted to
+     * @return whether Azure Virtual Machines are permitted to
      * retrieve certificates stored as secrets from the key vault.
      */
-    Boolean enabledForDeployment();
+    boolean enabledForDeployment();
 
     /**
-     * @return Property to specify whether Azure Disk Encryption is permitted to
+     * @return whether Azure Disk Encryption is permitted to
      * retrieve secrets from the vault and unwrap keys.
      */
-    Boolean enabledForDiskEncryption();
+    boolean enabledForDiskEncryption();
 
     /**
-     * @return Property to specify whether Azure Resource Manager is permitted to
+     * @return whether Azure Resource Manager is permitted to
      * retrieve secrets from the key vault.
      */
-    Boolean enabledForTemplateDeployment();
+    boolean enabledForTemplateDeployment();
 
     /**************************************************************
      * Fluent interfaces to provision a Vault
@@ -144,42 +144,42 @@ interface WithConfigurations {
              *
              * @return the next stage of key vault definition
              */
-            WithCreate enableDeployment();
+            WithCreate withDeploymentEnabled();
 
             /**
              * Enable Azure Disk Encryption to retrieve secrets from the vault and unwrap keys.
              *
              * @return the next stage of key vault definition
              */
-            WithCreate enableDiskEncryption();
+            WithCreate withDiskEncryptionEnabled();
 
             /**
              * Enable Azure Resource Manager to retrieve secrets from the key vault.
              *
              * @return the next stage of key vault definition
              */
-            WithCreate enableTemplateDeployment();
+            WithCreate withTemplateDeploymentEnabled();
 
             /**
              * Disable Azure Virtual Machines to retrieve certificates stored as secrets from the key vault.
              *
              * @return the next stage of key vault definition
              */
-            WithCreate disableDeployment();
+            WithCreate withDeploymentDisabled();
 
             /**
              * Disable Azure Disk Encryption to retrieve secrets from the vault and unwrap keys.
              *
              * @return the next stage of key vault definition
              */
-            WithCreate disableDiskEncryption();
+            WithCreate withDiskEncryptionDisabled();
 
             /**
              * Disable Azure Resource Manager to retrieve secrets from the key vault.
              *
              * @return the next stage of key vault definition
              */
-            WithCreate disableTemplateDeployment();
+            WithCreate withTemplateDeploymentDisabled();
         }
 
         /**
@@ -245,42 +245,42 @@ interface WithConfigurations {
              *
              * @return the key vault update stage
              */
-            Update enableDeployment();
+            Update withDeploymentEnabled();
 
             /**
              * Enable Azure Disk Encryption to retrieve secrets from the vault and unwrap keys.
              *
              * @return the key vault update stage
              */
-            Update enableDiskEncryption();
+            Update withDiskEncryptionEnabled();
 
             /**
              * Enable Azure Resource Manager to retrieve secrets from the key vault.
              *
              * @return the key vault update stage
              */
-            Update enableTemplateDeployment();
+            Update withTemplateDeploymentEnabled();
 
             /**
              * Disable Azure Virtual Machines to retrieve certificates stored as secrets from the key vault.
              *
              * @return the key vault update stage
              */
-            Update disableDeployment();
+            Update withDeploymentDisabled();
 
             /**
              * Disable Azure Disk Encryption to retrieve secrets from the vault and unwrap keys.
              *
              * @return the next stage of key vault definition
              */
-            Update disableDiskEncryption();
+            Update withDiskEncryptionDisabled();
 
             /**
              * Disable Azure Resource Manager to retrieve secrets from the key vault.
              *
              * @return the key vault update stage
              */
-            Update disableTemplateDeployment();
+            Update withTemplateDeploymentDisabled();
         }
     }
 

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

@@ -91,25 +91,25 @@ public List<AccessPolicy> accessPolicies() {
     }
 
     @Override
-    public Boolean enabledForDeployment() {
-        if (inner().properties() == null) {
-            return null;
+    public boolean enabledForDeployment() {
+        if (inner().properties() == null || inner().properties().enabledForDeployment() == null) {
+            return false;
         }
         return inner().properties().enabledForDeployment();
     }
 
     @Override
-    public Boolean enabledForDiskEncryption() {
-        if (inner().properties() == null) {
-            return null;
+    public boolean enabledForDiskEncryption() {
+        if (inner().properties() == null || inner().properties().enabledForDiskEncryption() == null) {
+            return false;
         }
         return inner().properties().enabledForDiskEncryption();
     }
 
     @Override
-    public Boolean enabledForTemplateDeployment() {
-        if (inner().properties() == null) {
-            return null;
+    public boolean enabledForTemplateDeployment() {
+        if (inner().properties() == null || inner().properties().enabledForTemplateDeployment()) {
+            return false;
         }
         return inner().properties().enabledForTemplateDeployment();
     }
@@ -153,37 +153,37 @@ public AccessPolicyImpl updateAccessPolicy(String objectId) {
     }
 
     @Override
-    public VaultImpl enableDeployment() {
+    public VaultImpl withDeploymentEnabled() {
         inner().properties().withEnabledForDeployment(true);
         return this;
     }
 
     @Override
-    public VaultImpl enableDiskEncryption() {
+    public VaultImpl withDiskEncryptionEnabled() {
         inner().properties().withEnabledForDiskEncryption(true);
         return this;
     }
 
     @Override
-    public VaultImpl enableTemplateDeployment() {
+    public VaultImpl withTemplateDeploymentEnabled() {
         inner().properties().withEnabledForTemplateDeployment(true);
         return this;
     }
 
     @Override
-    public VaultImpl disableDeployment() {
+    public VaultImpl withDeploymentDisabled() {
         inner().properties().withEnabledForDeployment(false);
         return this;
     }
 
     @Override
-    public VaultImpl disableDiskEncryption() {
+    public VaultImpl withDiskEncryptionDisabled() {
         inner().properties().withEnabledForDiskEncryption(false);
         return this;
     }
 
     @Override
-    public VaultImpl disableTemplateDeployment() {
+    public VaultImpl withTemplateDeploymentDisabled() {
         inner().properties().withEnabledForTemplateDeployment(false);
         return this;
     }