Merge pull request #2 from Azure/master

Merge changes
jianghaolu · Sep 21, 2016 · adf7664 · adf7664
2 parents 6c30bd9 + 80e2202
commit adf7664
Show file tree

Hide file tree

Showing 41 changed files with 2,633 additions and 1,161 deletions.
diff --git a/.gitignore b/.gitignore
@@ -1,5 +1,8 @@
 *.class
 
+#External libs
+extlib/
+
 # Auth files
 *.auth
 *.azureauth

diff --git a/...raphy/src/test/java/com/microsoft/azure/keyvault/cryptography/test/AesCbcHmacShaTest.java b/...raphy/src/test/java/com/microsoft/azure/keyvault/cryptography/test/AesCbcHmacShaTest.java
diff --git a/azure-mgmt-batch/src/main/java/com/microsoft/azure/management/batch/ApplicationPackage.java b/azure-mgmt-batch/src/main/java/com/microsoft/azure/management/batch/ApplicationPackage.java
diff --git a/azure-mgmt-batch/src/main/java/com/microsoft/azure/management/batch/BatchAccount.java b/azure-mgmt-batch/src/main/java/com/microsoft/azure/management/batch/BatchAccount.java
@@ -9,7 +9,7 @@
 import com.microsoft.azure.management.apigeneration.LangDefinition;
 import com.microsoft.azure.management.apigeneration.LangMethodDefinition;
 import com.microsoft.azure.management.apigeneration.LangMethodDefinition.LangMethodType;
-import com.microsoft.azure.management.batch.implementation.AccountResourceInner;
+import com.microsoft.azure.management.batch.implementation.BatchAccountInner;
 import com.microsoft.azure.management.resources.fluentcore.arm.models.GroupableResource;
 import com.microsoft.azure.management.resources.fluentcore.arm.models.Resource;
 import com.microsoft.azure.management.resources.fluentcore.model.Appliable;
@@ -27,13 +27,13 @@ public interface BatchAccount extends
         GroupableResource,
         Refreshable<BatchAccount>,
         Updatable<BatchAccount.Update>,
-        Wrapper<AccountResourceInner> {
+        Wrapper<BatchAccountInner> {
 
     /**
      * @return the provisioned state of the resource. Possible values include:
      * 'Invalid', 'Creating', 'Deleting', 'Succeeded', 'Failed', 'Cancelled'
      */
-    AccountProvisioningState provisioningState();
+    ProvisioningState provisioningState();
 
     /**
      * @return Get the accountEndpoint value.

diff --git a/...ement/batch/AccountProvisioningState.java → ...e/management/batch/ProvisioningState.java b/...ement/batch/AccountProvisioningState.java → ...e/management/batch/ProvisioningState.java
@@ -12,9 +12,9 @@
 import com.fasterxml.jackson.annotation.JsonValue;
 
 /**
- * Defines values for AccountProvisioningState.
+ * Defines values for ProvisioningState.
  */
-public enum AccountProvisioningState {
+public enum ProvisioningState {
     /** Enum value Invalid. */
     INVALID("Invalid"),
 
@@ -33,23 +33,23 @@ public enum AccountProvisioningState {
     /** Enum value Cancelled. */
     CANCELLED("Cancelled");
 
-    /** The actual serialized value for a AccountProvisioningState instance. */
+    /** The actual serialized value for a ProvisioningState instance. */
     private String value;
 
-    AccountProvisioningState(String value) {
+    ProvisioningState(String value) {
         this.value = value;
     }
 
     /**
-     * Parses a serialized value to a AccountProvisioningState instance.
+     * Parses a serialized value to a ProvisioningState instance.
      *
      * @param value the serialized value to parse.
-     * @return the parsed AccountProvisioningState object, or null if unable to parse.
+     * @return the parsed ProvisioningState object, or null if unable to parse.
      */
     @JsonCreator
-    public static AccountProvisioningState fromString(String value) {
-        AccountProvisioningState[] items = AccountProvisioningState.values();
-        for (AccountProvisioningState item : items) {
+    public static ProvisioningState fromString(String value) {
+        ProvisioningState[] items = ProvisioningState.values();
+        for (ProvisioningState item : items) {
             if (item.toString().equalsIgnoreCase(value)) {
                 return item;
             }

diff --git a/...com/microsoft/azure/management/batch/implementation/AddApplicationPackageResultInner.java b/...com/microsoft/azure/management/batch/implementation/AddApplicationPackageResultInner.java
diff --git a/...h/src/main/java/com/microsoft/azure/management/batch/implementation/ApplicationInner.java b/...h/src/main/java/com/microsoft/azure/management/batch/implementation/ApplicationInner.java
@@ -9,7 +9,6 @@
 package com.microsoft.azure.management.batch.implementation;
 
 import java.util.List;
-import com.microsoft.azure.management.batch.ApplicationPackage;
 
 /**
  * Contains information about an application in a Batch account.
@@ -28,7 +27,7 @@ public class ApplicationInner {
     /**
      * The list of packages under this application.
      */
-    private List<ApplicationPackage> packages;
+    private List<ApplicationPackageInner> packages;
 
     /**
      * A value indicating whether packages within the application may be
@@ -87,7 +86,7 @@ public ApplicationInner withDisplayName(String displayName) {
      *
      * @return the packages value
      */
-    public List<ApplicationPackage> packages() {
+    public List<ApplicationPackageInner> packages() {
         return this.packages;
     }
 
@@ -97,7 +96,7 @@ public List<ApplicationPackage> packages() {
      * @param packages the packages value to set
      * @return the ApplicationInner object itself.
      */
-    public ApplicationInner withPackages(List<ApplicationPackage> packages) {
+    public ApplicationInner withPackages(List<ApplicationPackageInner> packages) {
         this.packages = packages;
         return this;
     }