Generated from 337e38d5ed772d8ee24f264d921f44b7620aadf0

Merge remote-tracking branch 'azure/master' into hkn/spring-app-location

sdk/appplatform/mgmt-v2019_05_01_preview/pom.xml

@@ -11,11 +11,11 @@
     <parent>
         <groupId>com.microsoft.azure</groupId>
         <artifactId>azure-arm-parent</artifactId>
-        <version>1.2.0</version>
+        <version>1.1.0</version>
         <relativePath>../../../pom.management.xml</relativePath>
     </parent>
     <artifactId>azure-mgmt-appplatform</artifactId>
-    <version>1.0.0-beta-1</version>
+    <version>1.0.0-beta</version>
     <packaging>jar</packaging>
     <name>Microsoft Azure SDK for AppPlatform Management</name>
     <description>This package contains Microsoft AppPlatform Management SDK.</description>

sdk/appplatform/mgmt-v2019_05_01_preview/src/main/java/com/microsoft/azure/management/appplatform/v2019_05_01_preview/AppResource.java

@@ -27,6 +27,11 @@ public interface AppResource extends HasInner<AppResourceInner>, Indexable, Upda
      */
     String id();
 
+    /**
+     * @return the location value.
+     */
+    String location();
+
     /**
      * @return the name value.
      */

sdk/appplatform/mgmt-v2019_05_01_preview/src/main/java/com/microsoft/azure/management/appplatform/v2019_05_01_preview/AppResourceProperties.java

@@ -29,7 +29,7 @@ public class AppResourceProperties {
 
     /**
      * Provisioning state of the App. Possible values include: 'Succeeded',
-     * 'Failed'.
+     * 'Failed', 'Creating', 'Updating'.
      */
     @JsonProperty(value = "provisioningState", access = JsonProperty.Access.WRITE_ONLY)
     private AppResourceProvisioningState provisioningState;
@@ -88,7 +88,7 @@ public String url() {
     }
 
     /**
-     * Get provisioning state of the App. Possible values include: 'Succeeded', 'Failed'.
+     * Get provisioning state of the App. Possible values include: 'Succeeded', 'Failed', 'Creating', 'Updating'.
      *
      * @return the provisioningState value
      */

sdk/appplatform/mgmt-v2019_05_01_preview/src/main/java/com/microsoft/azure/management/appplatform/v2019_05_01_preview/AppResourceProvisioningState.java

@@ -22,6 +22,12 @@ public final class AppResourceProvisioningState extends ExpandableStringEnum<App
     /** Static value Failed for AppResourceProvisioningState. */
     public static final AppResourceProvisioningState FAILED = fromString("Failed");
 
+    /** Static value Creating for AppResourceProvisioningState. */
+    public static final AppResourceProvisioningState CREATING = fromString("Creating");
+
+    /** Static value Updating for AppResourceProvisioningState. */
+    public static final AppResourceProvisioningState UPDATING = fromString("Updating");
+
     /**
      * Creates or finds a AppResourceProvisioningState from its string representation.
      * @param name a name to look for

sdk/appplatform/mgmt-v2019_05_01_preview/src/main/java/com/microsoft/azure/management/appplatform/v2019_05_01_preview/DeploymentResourceProperties.java

@@ -36,15 +36,14 @@ public class DeploymentResourceProperties {
 
     /**
      * Provisioning state of the Deployment. Possible values include:
-     * 'Creating', 'Processing', 'Succeeded', 'Failed'.
+     * 'Creating', 'Updating', 'Succeeded', 'Failed'.
      */
     @JsonProperty(value = "provisioningState", access = JsonProperty.Access.WRITE_ONLY)
     private DeploymentResourceProvisioningState provisioningState;
 
     /**
      * Status of the Deployment. Possible values include: 'Unknown', 'Stopped',
-     * 'Running', 'Failed', 'Processing', 'Allocating', 'Upgrading',
-     * 'Compiling'.
+     * 'Running', 'Failed', 'Allocating', 'Upgrading', 'Compiling'.
      */
     @JsonProperty(value = "status", access = JsonProperty.Access.WRITE_ONLY)
     private DeploymentResourceStatus status;
@@ -117,7 +116,7 @@ public DeploymentResourceProperties withDeploymentSettings(DeploymentSettings de
     }
 
     /**
-     * Get provisioning state of the Deployment. Possible values include: 'Creating', 'Processing', 'Succeeded', 'Failed'.
+     * Get provisioning state of the Deployment. Possible values include: 'Creating', 'Updating', 'Succeeded', 'Failed'.
      *
      * @return the provisioningState value
      */
@@ -126,7 +125,7 @@ public DeploymentResourceProvisioningState provisioningState() {
     }
 
     /**
-     * Get status of the Deployment. Possible values include: 'Unknown', 'Stopped', 'Running', 'Failed', 'Processing', 'Allocating', 'Upgrading', 'Compiling'.
+     * Get status of the Deployment. Possible values include: 'Unknown', 'Stopped', 'Running', 'Failed', 'Allocating', 'Upgrading', 'Compiling'.
      *
      * @return the status value
      */

sdk/appplatform/mgmt-v2019_05_01_preview/src/main/java/com/microsoft/azure/management/appplatform/v2019_05_01_preview/DeploymentResourceProvisioningState.java

@@ -19,8 +19,8 @@ public final class DeploymentResourceProvisioningState extends ExpandableStringE
     /** Static value Creating for DeploymentResourceProvisioningState. */
     public static final DeploymentResourceProvisioningState CREATING = fromString("Creating");
 
-    /** Static value Processing for DeploymentResourceProvisioningState. */
-    public static final DeploymentResourceProvisioningState PROCESSING = fromString("Processing");
+    /** Static value Updating for DeploymentResourceProvisioningState. */
+    public static final DeploymentResourceProvisioningState UPDATING = fromString("Updating");
 
     /** Static value Succeeded for DeploymentResourceProvisioningState. */
     public static final DeploymentResourceProvisioningState SUCCEEDED = fromString("Succeeded");

sdk/appplatform/mgmt-v2019_05_01_preview/src/main/java/com/microsoft/azure/management/appplatform/v2019_05_01_preview/DeploymentResourceStatus.java

@@ -28,9 +28,6 @@ public final class DeploymentResourceStatus extends ExpandableStringEnum<Deploym
     /** Static value Failed for DeploymentResourceStatus. */
     public static final DeploymentResourceStatus FAILED = fromString("Failed");
 
-    /** Static value Processing for DeploymentResourceStatus. */
-    public static final DeploymentResourceStatus PROCESSING = fromString("Processing");
-
     /** Static value Allocating for DeploymentResourceStatus. */
     public static final DeploymentResourceStatus ALLOCATING = fromString("Allocating");
 

sdk/appplatform/mgmt-v2019_05_01_preview/src/main/java/com/microsoft/azure/management/appplatform/v2019_05_01_preview/Services.java

@@ -10,6 +10,7 @@
 
 import rx.Completable;
 import rx.Observable;
+import com.microsoft.azure.management.appplatform.v2019_05_01_preview.implementation.ServiceResourceInner;
 
 /**
  * Type representing Services.
@@ -30,10 +31,11 @@ public interface Services {
      *
      * @param resourceGroupName The name of the resource group that contains the resource. You can obtain this value from the Azure Resource Manager API or the portal.
      * @param serviceName The name of the Service resource.
+     * @param resource Parameters for the create or update operation
      * @throws IllegalArgumentException thrown if parameters fail the validation
      * @return the observable for the request
      */
-    Observable<ServiceResource> createOrUpdateAsync(String resourceGroupName, String serviceName);
+    Observable<ServiceResource> createOrUpdateAsync(String resourceGroupName, String serviceName, ServiceResourceInner resource);
 
     /**
      * Operation to delete a Service.
@@ -50,10 +52,11 @@ public interface Services {
      *
      * @param resourceGroupName The name of the resource group that contains the resource. You can obtain this value from the Azure Resource Manager API or the portal.
      * @param serviceName The name of the Service resource.
+     * @param resource Parameters for the update operation
      * @throws IllegalArgumentException thrown if parameters fail the validation
      * @return the observable for the request
      */
-    Observable<ServiceResource> updateAsync(String resourceGroupName, String serviceName);
+    Observable<ServiceResource> updateAsync(String resourceGroupName, String serviceName, ServiceResourceInner resource);
 
     /**
      * Regenerate a test key for a Service.

sdk/appplatform/mgmt-v2019_05_01_preview/src/main/java/com/microsoft/azure/management/appplatform/v2019_05_01_preview/implementation/AppPlatformManagementClientImpl.java

@@ -10,6 +10,8 @@
 
 import com.microsoft.azure.AzureClient;
 import com.microsoft.azure.AzureServiceClient;
+import com.microsoft.azure.LongRunningFinalState;
+import com.microsoft.azure.LongRunningOperationOptions;
 import com.microsoft.rest.credentials.ServiceClientCredentials;
 import com.microsoft.rest.RestClient;
 

sdk/appplatform/mgmt-v2019_05_01_preview/src/main/java/com/microsoft/azure/management/appplatform/v2019_05_01_preview/implementation/AppResourceImpl.java

@@ -102,6 +102,11 @@ public String id() {
         return this.inner().id();
     }
 
+    @Override
+    public String location() {
+        return this.inner().location();
+    }
+
     @Override
     public String name() {
         return this.inner().name();

sdk/appplatform/mgmt-v2019_05_01_preview/src/main/java/com/microsoft/azure/management/appplatform/v2019_05_01_preview/implementation/AppResourceInner.java

@@ -22,6 +22,13 @@ public class AppResourceInner extends ProxyResource {
     @JsonProperty(value = "properties")
     private AppResourceProperties properties;
 
+    /**
+     * The GEO location of the application, always the same with its parent
+     * resource.
+     */
+    @JsonProperty(value = "location", access = JsonProperty.Access.WRITE_ONLY)
+    private String location;
+
     /**
      * Get properties of the App resource.
      *
@@ -42,4 +49,13 @@ public AppResourceInner withProperties(AppResourceProperties properties) {
         return this;
     }
 
+    /**
+     * Get the GEO location of the application, always the same with its parent resource.
+     *
+     * @return the location value
+     */
+    public String location() {
+        return this.location;
+    }
+
 }