diff --git a/.travis.yml b/.travis.yml
index 241523deea44b..fe5b51cb2b8aa 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -6,5 +6,5 @@ jdk:
- openjdk7
script:
- mvn install -DskipTests=true
-- mvn -pl !azure-batch,!azure-mgmt-website checkstyle:check
+- mvn -pl !azure-batch checkstyle:check
- mvn -pl !azure-keyvault-cryptography,!azure-samples package javadoc:aggregate -DskipTests=true
diff --git a/azure-mgmt-website/pom.xml b/azure-mgmt-appservice/pom.xml
similarity index 94%
rename from azure-mgmt-website/pom.xml
rename to azure-mgmt-appservice/pom.xml
index 7f6e35b46e656..80df8341e23a2 100644
--- a/azure-mgmt-website/pom.xml
+++ b/azure-mgmt-appservice/pom.xml
@@ -12,12 +12,11 @@
../pom.xml
- azure-mgmt-website
+ azure-mgmt-appservicejar
- 1.0.0-SNAPSHOT
- Microsoft Azure SDK for Website Management
- This package contains Microsoft Azure Website Management SDK.
+ Microsoft Azure SDK for App Service Management
+ This package contains Microsoft Azure App Service Management SDK.https://github.com/Azure/azure-sdk-for-java
diff --git a/azure-mgmt-website/src/main/java/com/microsoft/azure/management/website/AccessControlEntryAction.java b/azure-mgmt-appservice/src/main/java/com/microsoft/azure/management/appservice/AccessControlEntryAction.java
similarity index 96%
rename from azure-mgmt-website/src/main/java/com/microsoft/azure/management/website/AccessControlEntryAction.java
rename to azure-mgmt-appservice/src/main/java/com/microsoft/azure/management/appservice/AccessControlEntryAction.java
index 4c13cf334a3f8..c5cbafc13210e 100644
--- a/azure-mgmt-website/src/main/java/com/microsoft/azure/management/website/AccessControlEntryAction.java
+++ b/azure-mgmt-appservice/src/main/java/com/microsoft/azure/management/appservice/AccessControlEntryAction.java
@@ -6,7 +6,7 @@
* Code generated by Microsoft (R) AutoRest Code Generator.
*/
-package com.microsoft.azure.management.website;
+package com.microsoft.azure.management.appservice;
import com.fasterxml.jackson.annotation.JsonCreator;
import com.fasterxml.jackson.annotation.JsonValue;
diff --git a/azure-mgmt-website/src/main/java/com/microsoft/azure/management/website/Address.java b/azure-mgmt-appservice/src/main/java/com/microsoft/azure/management/appservice/Address.java
similarity index 91%
rename from azure-mgmt-website/src/main/java/com/microsoft/azure/management/website/Address.java
rename to azure-mgmt-appservice/src/main/java/com/microsoft/azure/management/appservice/Address.java
index b4177c6f323ac..dbf1e1412c891 100644
--- a/azure-mgmt-website/src/main/java/com/microsoft/azure/management/website/Address.java
+++ b/azure-mgmt-appservice/src/main/java/com/microsoft/azure/management/appservice/Address.java
@@ -6,8 +6,9 @@
* Code generated by Microsoft (R) AutoRest Code Generator.
*/
-package com.microsoft.azure.management.website;
+package com.microsoft.azure.management.appservice;
+import com.fasterxml.jackson.annotation.JsonProperty;
/**
* Address information for domain registration.
@@ -16,6 +17,7 @@ public class Address {
/**
* Address 1.
*/
+ @JsonProperty(required = true)
private String address1;
/**
@@ -26,21 +28,25 @@ public class Address {
/**
* City.
*/
+ @JsonProperty(required = true)
private String city;
/**
* Country.
*/
+ @JsonProperty(required = true)
private String country;
/**
* Postal code.
*/
+ @JsonProperty(required = true)
private String postalCode;
/**
* State.
*/
+ @JsonProperty(required = true)
private String state;
/**
diff --git a/azure-mgmt-website/src/main/java/com/microsoft/azure/management/website/ApiDefinitionInfo.java b/azure-mgmt-appservice/src/main/java/com/microsoft/azure/management/appservice/ApiDefinitionInfo.java
similarity index 86%
rename from azure-mgmt-website/src/main/java/com/microsoft/azure/management/website/ApiDefinitionInfo.java
rename to azure-mgmt-appservice/src/main/java/com/microsoft/azure/management/appservice/ApiDefinitionInfo.java
index f971b997fdffd..04615926e64bc 100644
--- a/azure-mgmt-website/src/main/java/com/microsoft/azure/management/website/ApiDefinitionInfo.java
+++ b/azure-mgmt-appservice/src/main/java/com/microsoft/azure/management/appservice/ApiDefinitionInfo.java
@@ -6,11 +6,11 @@
* Code generated by Microsoft (R) AutoRest Code Generator.
*/
-package com.microsoft.azure.management.website;
+package com.microsoft.azure.management.appservice;
/**
- * Information about the formal API definition for the web app.
+ * Information about the formal API definition for the app.
*/
public class ApiDefinitionInfo {
/**
diff --git a/azure-mgmt-website/src/main/java/com/microsoft/azure/management/website/AppServiceCertificate.java b/azure-mgmt-appservice/src/main/java/com/microsoft/azure/management/appservice/AppServiceCertificate.java
similarity index 90%
rename from azure-mgmt-website/src/main/java/com/microsoft/azure/management/website/AppServiceCertificate.java
rename to azure-mgmt-appservice/src/main/java/com/microsoft/azure/management/appservice/AppServiceCertificate.java
index 4fc1ff2c6fc98..7552f2f5fa7c6 100644
--- a/azure-mgmt-website/src/main/java/com/microsoft/azure/management/website/AppServiceCertificate.java
+++ b/azure-mgmt-appservice/src/main/java/com/microsoft/azure/management/appservice/AppServiceCertificate.java
@@ -4,13 +4,13 @@
* license information.
*/
-package com.microsoft.azure.management.website;
+package com.microsoft.azure.management.appservice;
import com.microsoft.azure.management.resources.fluentcore.arm.models.GroupableResource;
import com.microsoft.azure.management.resources.fluentcore.model.Creatable;
import com.microsoft.azure.management.resources.fluentcore.model.Refreshable;
import com.microsoft.azure.management.resources.fluentcore.model.Wrapper;
-import com.microsoft.azure.management.website.implementation.CertificateInner;
+import com.microsoft.azure.management.appservice.implementation.CertificateInner;
import org.joda.time.DateTime;
import java.io.File;
@@ -41,7 +41,7 @@ public interface AppServiceCertificate extends
/**
* @return the pfx blob
*/
- String pfxBlob();
+ byte[] pfxBlob();
/**
* @return the app name
@@ -156,20 +156,18 @@ interface WithCertificate {
WithPfxFilePassword withPfxFileFromUrl(String url);
/**
- * Specifies the PFX certificate - key vault binding generated from
- * an app service certificate order purchase.
- * @param vaultId the id of the vault
- * @param secretName the name of the key vault secret
+ * Specifies the app service certificate.
+ * @param certificateOrder the app service certificate order
* @return the next stage of the app service certificate definition
*/
- WithCreate withCertificateOrderKeyVaultBinding(String vaultId, String secretName);
+ WithCreate withExistingCertificateOrder(AppServiceCertificateOrder certificateOrder);
}
/**
* An app service certificate definition allowing PFX certificate password to be set.
*/
interface WithPfxFilePassword {
/**
- * Specifies the password to the PFX certificate
+ * Specifies the password to the PFX certificate.
* @param password the PFX certificate password
* @return the next stage of the app service certificate definition
*/
diff --git a/azure-mgmt-website/src/main/java/com/microsoft/azure/management/website/AppServiceCertificateKeyVaultBinding.java b/azure-mgmt-appservice/src/main/java/com/microsoft/azure/management/appservice/AppServiceCertificateKeyVaultBinding.java
similarity index 85%
rename from azure-mgmt-website/src/main/java/com/microsoft/azure/management/website/AppServiceCertificateKeyVaultBinding.java
rename to azure-mgmt-appservice/src/main/java/com/microsoft/azure/management/appservice/AppServiceCertificateKeyVaultBinding.java
index 6f1bd89387009..aadb476bc46b8 100644
--- a/azure-mgmt-website/src/main/java/com/microsoft/azure/management/website/AppServiceCertificateKeyVaultBinding.java
+++ b/azure-mgmt-appservice/src/main/java/com/microsoft/azure/management/appservice/AppServiceCertificateKeyVaultBinding.java
@@ -4,11 +4,11 @@
* license information.
*/
-package com.microsoft.azure.management.website;
+package com.microsoft.azure.management.appservice;
import com.microsoft.azure.management.resources.fluentcore.arm.models.IndependentChildResource;
import com.microsoft.azure.management.resources.fluentcore.model.Wrapper;
-import com.microsoft.azure.management.website.implementation.AppServiceCertificateInner;
+import com.microsoft.azure.management.appservice.implementation.AppServiceCertificateInner;
/**
* An immutable client-side representation of an Azure App Service Certificate.
diff --git a/azure-mgmt-website/src/main/java/com/microsoft/azure/management/website/AppServiceCertificateOrder.java b/azure-mgmt-appservice/src/main/java/com/microsoft/azure/management/appservice/AppServiceCertificateOrder.java
similarity index 66%
rename from azure-mgmt-website/src/main/java/com/microsoft/azure/management/website/AppServiceCertificateOrder.java
rename to azure-mgmt-appservice/src/main/java/com/microsoft/azure/management/appservice/AppServiceCertificateOrder.java
index e575ba1c94324..cf1a36df317b7 100644
--- a/azure-mgmt-website/src/main/java/com/microsoft/azure/management/website/AppServiceCertificateOrder.java
+++ b/azure-mgmt-appservice/src/main/java/com/microsoft/azure/management/appservice/AppServiceCertificateOrder.java
@@ -4,16 +4,17 @@
* license information.
*/
-package com.microsoft.azure.management.website;
+package com.microsoft.azure.management.appservice;
import com.microsoft.azure.management.keyvault.Vault;
+import com.microsoft.azure.management.resources.fluentcore.arm.Region;
import com.microsoft.azure.management.resources.fluentcore.arm.models.GroupableResource;
import com.microsoft.azure.management.resources.fluentcore.model.Appliable;
import com.microsoft.azure.management.resources.fluentcore.model.Creatable;
import com.microsoft.azure.management.resources.fluentcore.model.Refreshable;
import com.microsoft.azure.management.resources.fluentcore.model.Updatable;
import com.microsoft.azure.management.resources.fluentcore.model.Wrapper;
-import com.microsoft.azure.management.website.implementation.AppServiceCertificateOrderInner;
+import com.microsoft.azure.management.appservice.implementation.AppServiceCertificateOrderInner;
import org.joda.time.DateTime;
import rx.Observable;
@@ -122,6 +123,19 @@ public interface AppServiceCertificateOrder extends
*/
Observable getKeyVaultBindingAsync();
+ /**
+ * Verifies the ownership of the domain by providing the Azure purchased domain.
+ * @param domain the Azure managed domain
+ */
+ void verifyDomainOwnership(AppServiceDomain domain);
+
+ /**
+ * Verifies the ownership of the domain by providing the Azure purchased domain.
+ * @param domain the Azure managed domain
+ * @return an Observable to the result
+ */
+ Observable verifyDomainOwnershipAsync(AppServiceDomain domain);
+
/**************************************************************
* Fluent interfaces to provision a App service certificate order
**************************************************************/
@@ -133,7 +147,8 @@ interface Definition extends
DefinitionStages.Blank,
DefinitionStages.WithHostName,
DefinitionStages.WithCertificateSku,
- DefinitionStages.WithValidYears,
+ DefinitionStages.WithDomainVerificationFromWebApp,
+ DefinitionStages.WithKeyVault,
DefinitionStages.WithCreate {
}
@@ -164,13 +179,75 @@ interface WithHostName {
*/
interface WithCertificateSku {
/**
- * Specifies the SKU of the certificate. Standard type will only provide
+ * Specifies the SKU of the certificate to be standard. It will only provide
* SSL support to the hostname, and www.hostname. Wildcard type will provide
* SSL support to any sub-domain under the hostname.
- * @param sku the SKU of the certificate
* @return the next stage of the app service certificate definition
*/
- WithValidYears withSku(CertificateProductType sku);
+ WithDomainVerificationFromWebApp withStandardSku();
+
+ /**
+ * Specifies the SKU of the certificate to be wildcard. It will provide
+ * SSL support to any sub-domain under the hostname.
+ * @return the next stage of the app service certificate definition
+ */
+ WithDomainVerification withWildcardSku();
+ }
+
+ /**
+ * An app service certificate order definition allowing domain verification method to be set.
+ */
+ interface WithDomainVerification {
+ /**
+ * Specifies the Azure managed domain to verify the ownership of the domain.
+ * @param domain the Azure managed domain
+ * @return the next stage of the app service certificate definition
+ */
+ WithKeyVault withDomainVerification(AppServiceDomain domain);
+ }
+
+ /**
+ * An app service certificate order definition allowing more domain verification methods to be set.
+ */
+ interface WithDomainVerificationFromWebApp extends WithDomainVerification {
+ /**
+ * Specifies the web app to verify the ownership of the domain. The web app needs to
+ * be bound to the hostname for the certificate.
+ * @param webApp the web app bound to the hostname
+ * @return the next stage of the app service certificate definition
+ */
+ WithKeyVault withWebAppVerification(WebAppBase> webApp);
+ }
+
+ /**
+ * An app service certificate order definition allowing more domain verification methods to be set.
+ */
+ interface WithKeyVault {
+ /**
+ * Specifies an existing key vault to store the certificate private key.
+ *
+ * The vault MUST allow 2 service principals to read/write secrets:
+ * f3c21649-0979-4721-ac85-b0216b2cf413 and abfa0a7c-a6b6-4736-8310-5855508787cd.
+ * If they don't have access, an attempt will be made to grant access. If you are
+ * logged in from an identity without access to the Active Directory Graph, this
+ * attempt will fail.
+ *
+ * @param vault the vault to store the private key
+ * @return the next stage of the app service certificate definition
+ */
+ WithCreate withExistingKeyVault(Vault vault);
+
+ /**
+ * Creates a new key vault to store the certificate private key.
+ *
+ * DO NOT use this method if you are logged in from an identity without access
+ * to the Active Directory Graph.
+ *
+ * @param vaultName the name of the new key vault
+ * @param region the region to create the vault
+ * @return the next stage of the app service certificate definition
+ */
+ WithCreate withNewKeyVault(String vaultName, Region region);
}
/**
@@ -204,6 +281,7 @@ interface WithAutoRenew {
*/
interface WithCreate extends
Creatable,
+ WithValidYears,
WithAutoRenew,
GroupableResource.DefinitionWithTags {
}
diff --git a/azure-mgmt-website/src/main/java/com/microsoft/azure/management/website/AppServiceCertificateOrders.java b/azure-mgmt-appservice/src/main/java/com/microsoft/azure/management/appservice/AppServiceCertificateOrders.java
similarity index 97%
rename from azure-mgmt-website/src/main/java/com/microsoft/azure/management/website/AppServiceCertificateOrders.java
rename to azure-mgmt-appservice/src/main/java/com/microsoft/azure/management/appservice/AppServiceCertificateOrders.java
index 4e711943e38ad..f2e6ccc088aa3 100644
--- a/azure-mgmt-website/src/main/java/com/microsoft/azure/management/website/AppServiceCertificateOrders.java
+++ b/azure-mgmt-appservice/src/main/java/com/microsoft/azure/management/appservice/AppServiceCertificateOrders.java
@@ -4,7 +4,7 @@
* license information.
*/
-package com.microsoft.azure.management.website;
+package com.microsoft.azure.management.appservice;
import com.microsoft.azure.management.resources.fluentcore.arm.collection.SupportsDeletingByGroup;
import com.microsoft.azure.management.resources.fluentcore.arm.collection.SupportsGettingByGroup;
diff --git a/azure-mgmt-website/src/main/java/com/microsoft/azure/management/website/AppServiceCertificates.java b/azure-mgmt-appservice/src/main/java/com/microsoft/azure/management/appservice/AppServiceCertificates.java
similarity index 95%
rename from azure-mgmt-website/src/main/java/com/microsoft/azure/management/website/AppServiceCertificates.java
rename to azure-mgmt-appservice/src/main/java/com/microsoft/azure/management/appservice/AppServiceCertificates.java
index 7a55a7f2bf75e..ed9a4083a1d94 100644
--- a/azure-mgmt-website/src/main/java/com/microsoft/azure/management/website/AppServiceCertificates.java
+++ b/azure-mgmt-appservice/src/main/java/com/microsoft/azure/management/appservice/AppServiceCertificates.java
@@ -4,7 +4,7 @@
* license information.
*/
-package com.microsoft.azure.management.website;
+package com.microsoft.azure.management.appservice;
import com.microsoft.azure.management.resources.fluentcore.arm.collection.SupportsDeletingByGroup;
import com.microsoft.azure.management.resources.fluentcore.arm.collection.SupportsGettingByGroup;
diff --git a/azure-mgmt-website/src/main/java/com/microsoft/azure/management/website/AppServiceDomain.java b/azure-mgmt-appservice/src/main/java/com/microsoft/azure/management/appservice/AppServiceDomain.java
similarity index 91%
rename from azure-mgmt-website/src/main/java/com/microsoft/azure/management/website/AppServiceDomain.java
rename to azure-mgmt-appservice/src/main/java/com/microsoft/azure/management/appservice/AppServiceDomain.java
index 594b2453aaa0c..0d40112c8df96 100644
--- a/azure-mgmt-website/src/main/java/com/microsoft/azure/management/website/AppServiceDomain.java
+++ b/azure-mgmt-appservice/src/main/java/com/microsoft/azure/management/appservice/AppServiceDomain.java
@@ -4,7 +4,7 @@
* license information.
*/
-package com.microsoft.azure.management.website;
+package com.microsoft.azure.management.appservice;
import com.microsoft.azure.management.resources.fluentcore.arm.models.GroupableResource;
import com.microsoft.azure.management.resources.fluentcore.arm.models.HasName;
@@ -13,8 +13,9 @@
import com.microsoft.azure.management.resources.fluentcore.model.Refreshable;
import com.microsoft.azure.management.resources.fluentcore.model.Updatable;
import com.microsoft.azure.management.resources.fluentcore.model.Wrapper;
-import com.microsoft.azure.management.website.implementation.DomainInner;
+import com.microsoft.azure.management.appservice.implementation.DomainInner;
import org.joda.time.DateTime;
+import rx.Observable;
import java.util.List;
import java.util.Map;
@@ -105,6 +106,20 @@ public interface AppServiceDomain extends
*/
DomainPurchaseConsent consent();
+ /**
+ * Verifies the ownership of the domain for a certificate order bound to this domain.
+ * @param certificateOrderName the name of the certificate order
+ * @param domainVerificationToken the domain verification token for the certificate order
+ */
+ void verifyDomainOwnership(String certificateOrderName, String domainVerificationToken);
+
+ /**
+ * Verifies the ownership of the domain for a certificate order bound to this domain.
+ * @param certificateOrderName the name of the certificate order
+ * @param domainVerificationToken the domain verification token for the certificate order
+ * @return the Observable to the result
+ */
+ Observable verifyDomainOwnershipAsync(String certificateOrderName, String domainVerificationToken);
/**************************************************************
* Fluent interfaces to provision a domain
diff --git a/azure-mgmt-website/src/main/java/com/microsoft/azure/management/website/AppServiceDomains.java b/azure-mgmt-appservice/src/main/java/com/microsoft/azure/management/appservice/AppServiceDomains.java
similarity index 94%
rename from azure-mgmt-website/src/main/java/com/microsoft/azure/management/website/AppServiceDomains.java
rename to azure-mgmt-appservice/src/main/java/com/microsoft/azure/management/appservice/AppServiceDomains.java
index 0b18bab1ed51b..198bca5d93a26 100644
--- a/azure-mgmt-website/src/main/java/com/microsoft/azure/management/website/AppServiceDomains.java
+++ b/azure-mgmt-appservice/src/main/java/com/microsoft/azure/management/appservice/AppServiceDomains.java
@@ -4,7 +4,7 @@
* license information.
*/
-package com.microsoft.azure.management.website;
+package com.microsoft.azure.management.appservice;
import com.microsoft.azure.PagedList;
import com.microsoft.azure.management.resources.fluentcore.arm.collection.SupportsDeletingByGroup;
@@ -25,7 +25,7 @@ public interface AppServiceDomains extends
SupportsDeletingById,
SupportsDeletingByGroup,
SupportsGettingByGroup,
- SupportsGettingById{
+ SupportsGettingById {
/**
* List the agreements for purchasing a domain with a specific top level extension.
*
diff --git a/azure-mgmt-website/src/main/java/com/microsoft/azure/management/website/AppServicePlan.java b/azure-mgmt-appservice/src/main/java/com/microsoft/azure/management/appservice/AppServicePlan.java
similarity index 97%
rename from azure-mgmt-website/src/main/java/com/microsoft/azure/management/website/AppServicePlan.java
rename to azure-mgmt-appservice/src/main/java/com/microsoft/azure/management/appservice/AppServicePlan.java
index b6af597bd0dc5..78e4919e933d1 100644
--- a/azure-mgmt-website/src/main/java/com/microsoft/azure/management/website/AppServicePlan.java
+++ b/azure-mgmt-appservice/src/main/java/com/microsoft/azure/management/appservice/AppServicePlan.java
@@ -4,7 +4,7 @@
* license information.
*/
-package com.microsoft.azure.management.website;
+package com.microsoft.azure.management.appservice;
import com.microsoft.azure.management.resources.fluentcore.arm.models.GroupableResource;
import com.microsoft.azure.management.resources.fluentcore.arm.models.HasName;
@@ -13,7 +13,7 @@
import com.microsoft.azure.management.resources.fluentcore.model.Refreshable;
import com.microsoft.azure.management.resources.fluentcore.model.Updatable;
import com.microsoft.azure.management.resources.fluentcore.model.Wrapper;
-import com.microsoft.azure.management.website.implementation.AppServicePlanInner;
+import com.microsoft.azure.management.appservice.implementation.AppServicePlanInner;
/**
* An immutable client-side representation of an Azure App Service Plan.
diff --git a/azure-mgmt-appservice/src/main/java/com/microsoft/azure/management/appservice/AppServicePlanRestrictions.java b/azure-mgmt-appservice/src/main/java/com/microsoft/azure/management/appservice/AppServicePlanRestrictions.java
new file mode 100644
index 0000000000000..b5c6dab36488e
--- /dev/null
+++ b/azure-mgmt-appservice/src/main/java/com/microsoft/azure/management/appservice/AppServicePlanRestrictions.java
@@ -0,0 +1,65 @@
+/**
+ * Copyright (c) Microsoft Corporation. All rights reserved.
+ * Licensed under the MIT License. See License.txt in the project root for
+ * license information.
+ *
+ * Code generated by Microsoft (R) AutoRest Code Generator.
+ */
+
+package com.microsoft.azure.management.appservice;
+
+import com.fasterxml.jackson.annotation.JsonCreator;
+import com.fasterxml.jackson.annotation.JsonValue;
+
+/**
+ * Defines values for AppServicePlanRestrictions.
+ */
+public enum AppServicePlanRestrictions {
+ /** Enum value None. */
+ NONE("None"),
+
+ /** Enum value Free. */
+ FREE("Free"),
+
+ /** Enum value Shared. */
+ SHARED("Shared"),
+
+ /** Enum value Basic. */
+ BASIC("Basic"),
+
+ /** Enum value Standard. */
+ STANDARD("Standard"),
+
+ /** Enum value Premium. */
+ PREMIUM("Premium");
+
+ /** The actual serialized value for a AppServicePlanRestrictions instance. */
+ private String value;
+
+ AppServicePlanRestrictions(String value) {
+ this.value = value;
+ }
+
+ /**
+ * Parses a serialized value to a AppServicePlanRestrictions instance.
+ *
+ * @param value the serialized value to parse.
+ * @return the parsed AppServicePlanRestrictions object, or null if unable to parse.
+ */
+ @JsonCreator
+ public static AppServicePlanRestrictions fromString(String value) {
+ AppServicePlanRestrictions[] items = AppServicePlanRestrictions.values();
+ for (AppServicePlanRestrictions item : items) {
+ if (item.toString().equalsIgnoreCase(value)) {
+ return item;
+ }
+ }
+ return null;
+ }
+
+ @JsonValue
+ @Override
+ public String toString() {
+ return this.value;
+ }
+}
diff --git a/azure-mgmt-website/src/main/java/com/microsoft/azure/management/website/AppServicePlans.java b/azure-mgmt-appservice/src/main/java/com/microsoft/azure/management/appservice/AppServicePlans.java
similarity index 74%
rename from azure-mgmt-website/src/main/java/com/microsoft/azure/management/website/AppServicePlans.java
rename to azure-mgmt-appservice/src/main/java/com/microsoft/azure/management/appservice/AppServicePlans.java
index 05c9fef68f2c8..c6c8958440eff 100644
--- a/azure-mgmt-website/src/main/java/com/microsoft/azure/management/website/AppServicePlans.java
+++ b/azure-mgmt-appservice/src/main/java/com/microsoft/azure/management/appservice/AppServicePlans.java
@@ -4,7 +4,7 @@
* license information.
*/
-package com.microsoft.azure.management.website;
+package com.microsoft.azure.management.appservice;
import com.microsoft.azure.management.resources.fluentcore.arm.collection.SupportsDeletingByGroup;
import com.microsoft.azure.management.resources.fluentcore.arm.collection.SupportsGettingByGroup;
@@ -12,6 +12,7 @@
import com.microsoft.azure.management.resources.fluentcore.arm.collection.SupportsListingByGroup;
import com.microsoft.azure.management.resources.fluentcore.collection.SupportsCreating;
import com.microsoft.azure.management.resources.fluentcore.collection.SupportsDeletingById;
+import rx.Observable;
/**
* Entry point for app service plan management API.
@@ -23,4 +24,11 @@ public interface AppServicePlans extends
SupportsGettingByGroup,
SupportsGettingById,
SupportsDeletingByGroup {
+ /**
+ * Gets the information about a resource from Azure based on the resource name and the name of its resource group.
+ *
+ * @param id the app service plan resource ID
+ * @return an immutable representation of the resource
+ */
+ Observable getByIdAsync(String id);
}
\ No newline at end of file
diff --git a/azure-mgmt-website/src/main/java/com/microsoft/azure/management/website/AppServicePricingTier.java b/azure-mgmt-appservice/src/main/java/com/microsoft/azure/management/appservice/AppServicePricingTier.java
similarity index 94%
rename from azure-mgmt-website/src/main/java/com/microsoft/azure/management/website/AppServicePricingTier.java
rename to azure-mgmt-appservice/src/main/java/com/microsoft/azure/management/appservice/AppServicePricingTier.java
index 4caa0f1c43b70..a12ad210ffdcb 100644
--- a/azure-mgmt-website/src/main/java/com/microsoft/azure/management/website/AppServicePricingTier.java
+++ b/azure-mgmt-appservice/src/main/java/com/microsoft/azure/management/appservice/AppServicePricingTier.java
@@ -4,7 +4,7 @@
* license information.
*/
-package com.microsoft.azure.management.website;
+package com.microsoft.azure.management.appservice;
import com.fasterxml.jackson.annotation.JsonValue;
@@ -48,6 +48,11 @@ public class AppServicePricingTier {
/** The actual serialized value for a SiteAvailabilityState instance. */
private SkuDescription skuDescription;
+ /**
+ * Creates a custom app service pricing tier.
+ * @param tier the tier name
+ * @param size the size of the plan
+ */
public AppServicePricingTier(String tier, String size) {
this.skuDescription = new SkuDescription()
.withName(size)
diff --git a/azure-mgmt-website/src/main/java/com/microsoft/azure/management/website/AppSetting.java b/azure-mgmt-appservice/src/main/java/com/microsoft/azure/management/appservice/AppSetting.java
similarity index 91%
rename from azure-mgmt-website/src/main/java/com/microsoft/azure/management/website/AppSetting.java
rename to azure-mgmt-appservice/src/main/java/com/microsoft/azure/management/appservice/AppSetting.java
index aa6c21736efca..7f389e1e7c58f 100644
--- a/azure-mgmt-website/src/main/java/com/microsoft/azure/management/website/AppSetting.java
+++ b/azure-mgmt-appservice/src/main/java/com/microsoft/azure/management/appservice/AppSetting.java
@@ -4,7 +4,7 @@
* license information.
*/
-package com.microsoft.azure.management.website;
+package com.microsoft.azure.management.appservice;
/**
* An immutable client-side representation of an app setting on a web app.
diff --git a/azure-mgmt-website/src/main/java/com/microsoft/azure/management/website/ApplicationLogsConfig.java b/azure-mgmt-appservice/src/main/java/com/microsoft/azure/management/appservice/ApplicationLogsConfig.java
similarity index 97%
rename from azure-mgmt-website/src/main/java/com/microsoft/azure/management/website/ApplicationLogsConfig.java
rename to azure-mgmt-appservice/src/main/java/com/microsoft/azure/management/appservice/ApplicationLogsConfig.java
index 3ee859ec88e30..607ea92c4b5ec 100644
--- a/azure-mgmt-website/src/main/java/com/microsoft/azure/management/website/ApplicationLogsConfig.java
+++ b/azure-mgmt-appservice/src/main/java/com/microsoft/azure/management/appservice/ApplicationLogsConfig.java
@@ -6,7 +6,7 @@
* Code generated by Microsoft (R) AutoRest Code Generator.
*/
-package com.microsoft.azure.management.website;
+package com.microsoft.azure.management.appservice;
/**
diff --git a/azure-mgmt-website/src/main/java/com/microsoft/azure/management/website/AutoHealActionType.java b/azure-mgmt-appservice/src/main/java/com/microsoft/azure/management/appservice/AutoHealActionType.java
similarity index 96%
rename from azure-mgmt-website/src/main/java/com/microsoft/azure/management/website/AutoHealActionType.java
rename to azure-mgmt-appservice/src/main/java/com/microsoft/azure/management/appservice/AutoHealActionType.java
index 967a00fce313e..73722ef77843c 100644
--- a/azure-mgmt-website/src/main/java/com/microsoft/azure/management/website/AutoHealActionType.java
+++ b/azure-mgmt-appservice/src/main/java/com/microsoft/azure/management/appservice/AutoHealActionType.java
@@ -6,7 +6,7 @@
* Code generated by Microsoft (R) AutoRest Code Generator.
*/
-package com.microsoft.azure.management.website;
+package com.microsoft.azure.management.appservice;
import com.fasterxml.jackson.annotation.JsonCreator;
import com.fasterxml.jackson.annotation.JsonValue;
diff --git a/azure-mgmt-website/src/main/java/com/microsoft/azure/management/website/AutoHealActions.java b/azure-mgmt-appservice/src/main/java/com/microsoft/azure/management/appservice/AutoHealActions.java
similarity index 80%
rename from azure-mgmt-website/src/main/java/com/microsoft/azure/management/website/AutoHealActions.java
rename to azure-mgmt-appservice/src/main/java/com/microsoft/azure/management/appservice/AutoHealActions.java
index ba04f1e75cc2f..5dad8b95a2f79 100644
--- a/azure-mgmt-website/src/main/java/com/microsoft/azure/management/website/AutoHealActions.java
+++ b/azure-mgmt-appservice/src/main/java/com/microsoft/azure/management/appservice/AutoHealActions.java
@@ -6,29 +6,26 @@
* Code generated by Microsoft (R) AutoRest Code Generator.
*/
-package com.microsoft.azure.management.website;
+package com.microsoft.azure.management.appservice;
-import com.fasterxml.jackson.annotation.JsonProperty;
/**
- * AutoHealActions - Describes the actions which can be
- * taken by the auto-heal module when a rule is triggered.
+ * Actions which to take by the auto-heal module when a rule is triggered.
*/
public class AutoHealActions {
/**
- * ActionType - predefined action to be taken. Possible values include:
- * 'Recycle', 'LogEvent', 'CustomAction'.
+ * Predefined action to be taken. Possible values include: 'Recycle',
+ * 'LogEvent', 'CustomAction'.
*/
- @JsonProperty(required = true)
private AutoHealActionType actionType;
/**
- * CustomAction - custom action to be taken.
+ * Custom action to be taken.
*/
private AutoHealCustomAction customAction;
/**
- * MinProcessExecutionTime - minimum time the process must execute
+ * Minimum time the process must execute
* before taking the action.
*/
private String minProcessExecutionTime;
diff --git a/azure-mgmt-website/src/main/java/com/microsoft/azure/management/website/AutoHealCustomAction.java b/azure-mgmt-appservice/src/main/java/com/microsoft/azure/management/appservice/AutoHealCustomAction.java
similarity index 91%
rename from azure-mgmt-website/src/main/java/com/microsoft/azure/management/website/AutoHealCustomAction.java
rename to azure-mgmt-appservice/src/main/java/com/microsoft/azure/management/appservice/AutoHealCustomAction.java
index 7c52f7e0d0205..fe0cd3170a4a8 100644
--- a/azure-mgmt-website/src/main/java/com/microsoft/azure/management/website/AutoHealCustomAction.java
+++ b/azure-mgmt-appservice/src/main/java/com/microsoft/azure/management/appservice/AutoHealCustomAction.java
@@ -6,11 +6,11 @@
* Code generated by Microsoft (R) AutoRest Code Generator.
*/
-package com.microsoft.azure.management.website;
+package com.microsoft.azure.management.appservice;
/**
- * AutoHealCustomAction - Describes the custom action to be executed
+ * Custom action to be executed
* when an auto heal rule is triggered.
*/
public class AutoHealCustomAction {
diff --git a/azure-mgmt-website/src/main/java/com/microsoft/azure/management/website/AutoHealRules.java b/azure-mgmt-appservice/src/main/java/com/microsoft/azure/management/appservice/AutoHealRules.java
similarity index 81%
rename from azure-mgmt-website/src/main/java/com/microsoft/azure/management/website/AutoHealRules.java
rename to azure-mgmt-appservice/src/main/java/com/microsoft/azure/management/appservice/AutoHealRules.java
index bafc6bcf25bf9..4fb3d86211178 100644
--- a/azure-mgmt-website/src/main/java/com/microsoft/azure/management/website/AutoHealRules.java
+++ b/azure-mgmt-appservice/src/main/java/com/microsoft/azure/management/appservice/AutoHealRules.java
@@ -6,21 +6,20 @@
* Code generated by Microsoft (R) AutoRest Code Generator.
*/
-package com.microsoft.azure.management.website;
+package com.microsoft.azure.management.appservice;
/**
- * AutoHealRules - describes the rules which can be defined for auto-heal.
+ * Rules that can be defined for auto-heal.
*/
public class AutoHealRules {
/**
- * Triggers - Conditions that describe when to execute the auto-heal
- * actions.
+ * Conditions that describe when to execute the auto-heal actions.
*/
private AutoHealTriggers triggers;
/**
- * Actions - Actions to be executed when a rule is triggered.
+ * Actions to be executed when a rule is triggered.
*/
private AutoHealActions actions;
diff --git a/azure-mgmt-website/src/main/java/com/microsoft/azure/management/website/AutoHealTriggers.java b/azure-mgmt-appservice/src/main/java/com/microsoft/azure/management/appservice/AutoHealTriggers.java
similarity index 87%
rename from azure-mgmt-website/src/main/java/com/microsoft/azure/management/website/AutoHealTriggers.java
rename to azure-mgmt-appservice/src/main/java/com/microsoft/azure/management/appservice/AutoHealTriggers.java
index d79281febafa1..a2ee6576a9caa 100644
--- a/azure-mgmt-website/src/main/java/com/microsoft/azure/management/website/AutoHealTriggers.java
+++ b/azure-mgmt-appservice/src/main/java/com/microsoft/azure/management/appservice/AutoHealTriggers.java
@@ -6,31 +6,31 @@
* Code generated by Microsoft (R) AutoRest Code Generator.
*/
-package com.microsoft.azure.management.website;
+package com.microsoft.azure.management.appservice;
import java.util.List;
/**
- * AutoHealTriggers - describes the triggers for auto-heal.
+ * Triggers for auto-heal.
*/
public class AutoHealTriggers {
/**
- * Requests - Defines a rule based on total requests.
+ * A rule based on total requests.
*/
private RequestsBasedTrigger requests;
/**
- * PrivateBytesInKB - Defines a rule based on private bytes.
+ * A rule based on private bytes.
*/
private Integer privateBytesInKB;
/**
- * StatusCodes - Defines a rule based on status codes.
+ * A rule based on status codes.
*/
private List statusCodes;
/**
- * SlowRequests - Defines a rule based on request execution time.
+ * A rule based on request execution time.
*/
private SlowRequestsBasedTrigger slowRequests;
diff --git a/azure-mgmt-website/src/main/java/com/microsoft/azure/management/website/AzureBlobStorageApplicationLogsConfig.java b/azure-mgmt-appservice/src/main/java/com/microsoft/azure/management/appservice/AzureBlobStorageApplicationLogsConfig.java
similarity index 97%
rename from azure-mgmt-website/src/main/java/com/microsoft/azure/management/website/AzureBlobStorageApplicationLogsConfig.java
rename to azure-mgmt-appservice/src/main/java/com/microsoft/azure/management/appservice/AzureBlobStorageApplicationLogsConfig.java
index 59974e9727dc8..f2df46bfb4b32 100644
--- a/azure-mgmt-website/src/main/java/com/microsoft/azure/management/website/AzureBlobStorageApplicationLogsConfig.java
+++ b/azure-mgmt-appservice/src/main/java/com/microsoft/azure/management/appservice/AzureBlobStorageApplicationLogsConfig.java
@@ -6,7 +6,7 @@
* Code generated by Microsoft (R) AutoRest Code Generator.
*/
-package com.microsoft.azure.management.website;
+package com.microsoft.azure.management.appservice;
/**
diff --git a/azure-mgmt-website/src/main/java/com/microsoft/azure/management/website/AzureBlobStorageHttpLogsConfig.java b/azure-mgmt-appservice/src/main/java/com/microsoft/azure/management/appservice/AzureBlobStorageHttpLogsConfig.java
similarity index 97%
rename from azure-mgmt-website/src/main/java/com/microsoft/azure/management/website/AzureBlobStorageHttpLogsConfig.java
rename to azure-mgmt-appservice/src/main/java/com/microsoft/azure/management/appservice/AzureBlobStorageHttpLogsConfig.java
index dbe65b53a73a6..89eadf3f38b06 100644
--- a/azure-mgmt-website/src/main/java/com/microsoft/azure/management/website/AzureBlobStorageHttpLogsConfig.java
+++ b/azure-mgmt-appservice/src/main/java/com/microsoft/azure/management/appservice/AzureBlobStorageHttpLogsConfig.java
@@ -6,7 +6,7 @@
* Code generated by Microsoft (R) AutoRest Code Generator.
*/
-package com.microsoft.azure.management.website;
+package com.microsoft.azure.management.appservice;
/**
diff --git a/azure-mgmt-website/src/main/java/com/microsoft/azure/management/website/AzureResourceType.java b/azure-mgmt-appservice/src/main/java/com/microsoft/azure/management/appservice/AzureResourceType.java
similarity index 96%
rename from azure-mgmt-website/src/main/java/com/microsoft/azure/management/website/AzureResourceType.java
rename to azure-mgmt-appservice/src/main/java/com/microsoft/azure/management/appservice/AzureResourceType.java
index 7a0eacc3a5478..f2764a7670f7a 100644
--- a/azure-mgmt-website/src/main/java/com/microsoft/azure/management/website/AzureResourceType.java
+++ b/azure-mgmt-appservice/src/main/java/com/microsoft/azure/management/appservice/AzureResourceType.java
@@ -6,7 +6,7 @@
* Code generated by Microsoft (R) AutoRest Code Generator.
*/
-package com.microsoft.azure.management.website;
+package com.microsoft.azure.management.appservice;
import com.fasterxml.jackson.annotation.JsonCreator;
import com.fasterxml.jackson.annotation.JsonValue;
diff --git a/azure-mgmt-website/src/main/java/com/microsoft/azure/management/website/AzureTableStorageApplicationLogsConfig.java b/azure-mgmt-appservice/src/main/java/com/microsoft/azure/management/appservice/AzureTableStorageApplicationLogsConfig.java
similarity index 84%
rename from azure-mgmt-website/src/main/java/com/microsoft/azure/management/website/AzureTableStorageApplicationLogsConfig.java
rename to azure-mgmt-appservice/src/main/java/com/microsoft/azure/management/appservice/AzureTableStorageApplicationLogsConfig.java
index f461187105f99..d4a1f8d62735d 100644
--- a/azure-mgmt-website/src/main/java/com/microsoft/azure/management/website/AzureTableStorageApplicationLogsConfig.java
+++ b/azure-mgmt-appservice/src/main/java/com/microsoft/azure/management/appservice/AzureTableStorageApplicationLogsConfig.java
@@ -6,11 +6,12 @@
* Code generated by Microsoft (R) AutoRest Code Generator.
*/
-package com.microsoft.azure.management.website;
+package com.microsoft.azure.management.appservice;
+import com.fasterxml.jackson.annotation.JsonProperty;
/**
- * Application logs to azure table storage configuration.
+ * Application logs to Azure table storage configuration.
*/
public class AzureTableStorageApplicationLogsConfig {
/**
@@ -20,8 +21,9 @@ public class AzureTableStorageApplicationLogsConfig {
private LogLevel level;
/**
- * SAS url to an azure table with add/query/delete permissions.
+ * SAS URL to an Azure table with add/query/delete permissions.
*/
+ @JsonProperty(required = true)
private String sasUrl;
/**
diff --git a/azure-mgmt-website/src/main/java/com/microsoft/azure/management/website/BackupItemStatus.java b/azure-mgmt-appservice/src/main/java/com/microsoft/azure/management/appservice/BackupItemStatus.java
similarity index 97%
rename from azure-mgmt-website/src/main/java/com/microsoft/azure/management/website/BackupItemStatus.java
rename to azure-mgmt-appservice/src/main/java/com/microsoft/azure/management/appservice/BackupItemStatus.java
index 65c0f8152b08b..958c36b87790c 100644
--- a/azure-mgmt-website/src/main/java/com/microsoft/azure/management/website/BackupItemStatus.java
+++ b/azure-mgmt-appservice/src/main/java/com/microsoft/azure/management/appservice/BackupItemStatus.java
@@ -6,7 +6,7 @@
* Code generated by Microsoft (R) AutoRest Code Generator.
*/
-package com.microsoft.azure.management.website;
+package com.microsoft.azure.management.appservice;
import com.fasterxml.jackson.annotation.JsonCreator;
import com.fasterxml.jackson.annotation.JsonValue;
diff --git a/azure-mgmt-website/src/main/java/com/microsoft/azure/management/website/BackupRestoreOperationType.java b/azure-mgmt-appservice/src/main/java/com/microsoft/azure/management/appservice/BackupRestoreOperationType.java
similarity index 96%
rename from azure-mgmt-website/src/main/java/com/microsoft/azure/management/website/BackupRestoreOperationType.java
rename to azure-mgmt-appservice/src/main/java/com/microsoft/azure/management/appservice/BackupRestoreOperationType.java
index 14bc38229db46..87018b4cd1924 100644
--- a/azure-mgmt-website/src/main/java/com/microsoft/azure/management/website/BackupRestoreOperationType.java
+++ b/azure-mgmt-appservice/src/main/java/com/microsoft/azure/management/appservice/BackupRestoreOperationType.java
@@ -6,7 +6,7 @@
* Code generated by Microsoft (R) AutoRest Code Generator.
*/
-package com.microsoft.azure.management.website;
+package com.microsoft.azure.management.appservice;
import com.fasterxml.jackson.annotation.JsonCreator;
import com.fasterxml.jackson.annotation.JsonValue;
diff --git a/azure-mgmt-website/src/main/java/com/microsoft/azure/management/website/BackupSchedule.java b/azure-mgmt-appservice/src/main/java/com/microsoft/azure/management/appservice/BackupSchedule.java
similarity index 80%
rename from azure-mgmt-website/src/main/java/com/microsoft/azure/management/website/BackupSchedule.java
rename to azure-mgmt-appservice/src/main/java/com/microsoft/azure/management/appservice/BackupSchedule.java
index bab4cf09782d4..52e1eeb229274 100644
--- a/azure-mgmt-website/src/main/java/com/microsoft/azure/management/website/BackupSchedule.java
+++ b/azure-mgmt-appservice/src/main/java/com/microsoft/azure/management/appservice/BackupSchedule.java
@@ -6,7 +6,7 @@
* Code generated by Microsoft (R) AutoRest Code Generator.
*/
-package com.microsoft.azure.management.website;
+package com.microsoft.azure.management.appservice;
import org.joda.time.DateTime;
import com.fasterxml.jackson.annotation.JsonProperty;
@@ -20,7 +20,8 @@ public class BackupSchedule {
* How often should be the backup executed (e.g. for weekly backup, this
* should be set to 7 and FrequencyUnit should be set to Day).
*/
- private Integer frequencyInterval;
+ @JsonProperty(required = true)
+ private int frequencyInterval;
/**
* How often should be the backup executed (e.g. for weekly backup, this
@@ -34,12 +35,14 @@ public class BackupSchedule {
* True if the retention policy should always keep at least one backup in
* the storage account, regardless how old it is; false otherwise.
*/
- private Boolean keepAtLeastOneBackup;
+ @JsonProperty(required = true)
+ private boolean keepAtLeastOneBackup;
/**
* After how many days backups should be deleted.
*/
- private Integer retentionPeriodInDays;
+ @JsonProperty(required = true)
+ private int retentionPeriodInDays;
/**
* When the schedule should start working.
@@ -47,8 +50,9 @@ public class BackupSchedule {
private DateTime startTime;
/**
- * The last time when this schedule was triggered.
+ * Last time when this schedule was triggered.
*/
+ @JsonProperty(access = JsonProperty.Access.WRITE_ONLY)
private DateTime lastExecutionTime;
/**
@@ -56,7 +60,7 @@ public class BackupSchedule {
*
* @return the frequencyInterval value
*/
- public Integer frequencyInterval() {
+ public int frequencyInterval() {
return this.frequencyInterval;
}
@@ -66,7 +70,7 @@ public Integer frequencyInterval() {
* @param frequencyInterval the frequencyInterval value to set
* @return the BackupSchedule object itself.
*/
- public BackupSchedule withFrequencyInterval(Integer frequencyInterval) {
+ public BackupSchedule withFrequencyInterval(int frequencyInterval) {
this.frequencyInterval = frequencyInterval;
return this;
}
@@ -96,7 +100,7 @@ public BackupSchedule withFrequencyUnit(FrequencyUnit frequencyUnit) {
*
* @return the keepAtLeastOneBackup value
*/
- public Boolean keepAtLeastOneBackup() {
+ public boolean keepAtLeastOneBackup() {
return this.keepAtLeastOneBackup;
}
@@ -106,7 +110,7 @@ public Boolean keepAtLeastOneBackup() {
* @param keepAtLeastOneBackup the keepAtLeastOneBackup value to set
* @return the BackupSchedule object itself.
*/
- public BackupSchedule withKeepAtLeastOneBackup(Boolean keepAtLeastOneBackup) {
+ public BackupSchedule withKeepAtLeastOneBackup(boolean keepAtLeastOneBackup) {
this.keepAtLeastOneBackup = keepAtLeastOneBackup;
return this;
}
@@ -116,7 +120,7 @@ public BackupSchedule withKeepAtLeastOneBackup(Boolean keepAtLeastOneBackup) {
*
* @return the retentionPeriodInDays value
*/
- public Integer retentionPeriodInDays() {
+ public int retentionPeriodInDays() {
return this.retentionPeriodInDays;
}
@@ -126,7 +130,7 @@ public Integer retentionPeriodInDays() {
* @param retentionPeriodInDays the retentionPeriodInDays value to set
* @return the BackupSchedule object itself.
*/
- public BackupSchedule withRetentionPeriodInDays(Integer retentionPeriodInDays) {
+ public BackupSchedule withRetentionPeriodInDays(int retentionPeriodInDays) {
this.retentionPeriodInDays = retentionPeriodInDays;
return this;
}
@@ -160,15 +164,4 @@ public DateTime lastExecutionTime() {
return this.lastExecutionTime;
}
- /**
- * Set the lastExecutionTime value.
- *
- * @param lastExecutionTime the lastExecutionTime value to set
- * @return the BackupSchedule object itself.
- */
- public BackupSchedule withLastExecutionTime(DateTime lastExecutionTime) {
- this.lastExecutionTime = lastExecutionTime;
- return this;
- }
-
}
diff --git a/azure-mgmt-website/src/main/java/com/microsoft/azure/management/website/BuiltInAuthenticationProvider.java b/azure-mgmt-appservice/src/main/java/com/microsoft/azure/management/appservice/BuiltInAuthenticationProvider.java
similarity index 97%
rename from azure-mgmt-website/src/main/java/com/microsoft/azure/management/website/BuiltInAuthenticationProvider.java
rename to azure-mgmt-appservice/src/main/java/com/microsoft/azure/management/appservice/BuiltInAuthenticationProvider.java
index 52a069caa502e..fbcdfae7df0d7 100644
--- a/azure-mgmt-website/src/main/java/com/microsoft/azure/management/website/BuiltInAuthenticationProvider.java
+++ b/azure-mgmt-appservice/src/main/java/com/microsoft/azure/management/appservice/BuiltInAuthenticationProvider.java
@@ -6,7 +6,7 @@
* Code generated by Microsoft (R) AutoRest Code Generator.
*/
-package com.microsoft.azure.management.website;
+package com.microsoft.azure.management.appservice;
import com.fasterxml.jackson.annotation.JsonCreator;
import com.fasterxml.jackson.annotation.JsonValue;
diff --git a/azure-mgmt-website/src/main/java/com/microsoft/azure/management/website/CertificateDetails.java b/azure-mgmt-appservice/src/main/java/com/microsoft/azure/management/appservice/CertificateDetails.java
similarity index 88%
rename from azure-mgmt-website/src/main/java/com/microsoft/azure/management/website/CertificateDetails.java
rename to azure-mgmt-appservice/src/main/java/com/microsoft/azure/management/appservice/CertificateDetails.java
index 382dec3659c44..2d01955c8e00d 100644
--- a/azure-mgmt-website/src/main/java/com/microsoft/azure/management/website/CertificateDetails.java
+++ b/azure-mgmt-appservice/src/main/java/com/microsoft/azure/management/appservice/CertificateDetails.java
@@ -4,10 +4,10 @@
* license information.
*/
-package com.microsoft.azure.management.website;
+package com.microsoft.azure.management.appservice;
import com.microsoft.azure.management.resources.fluentcore.model.Wrapper;
-import com.microsoft.azure.management.website.implementation.CertificateDetailsInner;
+import com.microsoft.azure.management.appservice.implementation.CertificateDetailsInner;
import org.joda.time.DateTime;
/**
diff --git a/azure-mgmt-website/src/main/java/com/microsoft/azure/management/website/CertificateOrderActionType.java b/azure-mgmt-appservice/src/main/java/com/microsoft/azure/management/appservice/CertificateOrderActionType.java
similarity index 91%
rename from azure-mgmt-website/src/main/java/com/microsoft/azure/management/website/CertificateOrderActionType.java
rename to azure-mgmt-appservice/src/main/java/com/microsoft/azure/management/appservice/CertificateOrderActionType.java
index b17ea06e44eaa..0a99519f40668 100644
--- a/azure-mgmt-website/src/main/java/com/microsoft/azure/management/website/CertificateOrderActionType.java
+++ b/azure-mgmt-appservice/src/main/java/com/microsoft/azure/management/appservice/CertificateOrderActionType.java
@@ -6,7 +6,7 @@
* Code generated by Microsoft (R) AutoRest Code Generator.
*/
-package com.microsoft.azure.management.website;
+package com.microsoft.azure.management.appservice;
import com.fasterxml.jackson.annotation.JsonCreator;
import com.fasterxml.jackson.annotation.JsonValue;
@@ -40,7 +40,13 @@ public enum CertificateOrderActionType {
ORG_VALIDATION_COMPLETE("OrgValidationComplete"),
/** Enum value SanDrop. */
- SAN_DROP("SanDrop");
+ SAN_DROP("SanDrop"),
+
+ /** Enum value FraudCleared. */
+ FRAUD_CLEARED("FraudCleared"),
+
+ /** Enum value Unknown. */
+ UNKNOWN("Unknown");
/** The actual serialized value for a CertificateOrderActionType instance. */
private String value;
diff --git a/azure-mgmt-website/src/main/java/com/microsoft/azure/management/website/CertificateOrderStatus.java b/azure-mgmt-appservice/src/main/java/com/microsoft/azure/management/appservice/CertificateOrderStatus.java
similarity index 97%
rename from azure-mgmt-website/src/main/java/com/microsoft/azure/management/website/CertificateOrderStatus.java
rename to azure-mgmt-appservice/src/main/java/com/microsoft/azure/management/appservice/CertificateOrderStatus.java
index e37408f01a278..e3b64891262fb 100644
--- a/azure-mgmt-website/src/main/java/com/microsoft/azure/management/website/CertificateOrderStatus.java
+++ b/azure-mgmt-appservice/src/main/java/com/microsoft/azure/management/appservice/CertificateOrderStatus.java
@@ -6,7 +6,7 @@
* Code generated by Microsoft (R) AutoRest Code Generator.
*/
-package com.microsoft.azure.management.website;
+package com.microsoft.azure.management.appservice;
import com.fasterxml.jackson.annotation.JsonCreator;
import com.fasterxml.jackson.annotation.JsonValue;
diff --git a/azure-mgmt-website/src/main/java/com/microsoft/azure/management/website/CertificateProductType.java b/azure-mgmt-appservice/src/main/java/com/microsoft/azure/management/appservice/CertificateProductType.java
similarity index 96%
rename from azure-mgmt-website/src/main/java/com/microsoft/azure/management/website/CertificateProductType.java
rename to azure-mgmt-appservice/src/main/java/com/microsoft/azure/management/appservice/CertificateProductType.java
index 1757a70718263..6ae02f18c4820 100644
--- a/azure-mgmt-website/src/main/java/com/microsoft/azure/management/website/CertificateProductType.java
+++ b/azure-mgmt-appservice/src/main/java/com/microsoft/azure/management/appservice/CertificateProductType.java
@@ -6,7 +6,7 @@
* Code generated by Microsoft (R) AutoRest Code Generator.
*/
-package com.microsoft.azure.management.website;
+package com.microsoft.azure.management.appservice;
import com.fasterxml.jackson.annotation.JsonCreator;
import com.fasterxml.jackson.annotation.JsonValue;
diff --git a/azure-mgmt-website/src/main/java/com/microsoft/azure/management/website/Channels.java b/azure-mgmt-appservice/src/main/java/com/microsoft/azure/management/appservice/Channels.java
similarity index 92%
rename from azure-mgmt-website/src/main/java/com/microsoft/azure/management/website/Channels.java
rename to azure-mgmt-appservice/src/main/java/com/microsoft/azure/management/appservice/Channels.java
index 76f4b553cc53d..d12a6f9c0a285 100644
--- a/azure-mgmt-website/src/main/java/com/microsoft/azure/management/website/Channels.java
+++ b/azure-mgmt-appservice/src/main/java/com/microsoft/azure/management/appservice/Channels.java
@@ -6,7 +6,7 @@
* Code generated by Microsoft (R) AutoRest Code Generator.
*/
-package com.microsoft.azure.management.website;
+package com.microsoft.azure.management.appservice;
import com.fasterxml.jackson.annotation.JsonCreator;
import com.fasterxml.jackson.annotation.JsonValue;
@@ -24,6 +24,9 @@ public enum Channels {
/** Enum value Email. */
EMAIL("Email"),
+ /** Enum value Webhook. */
+ WEBHOOK("Webhook"),
+
/** Enum value All. */
ALL("All");
diff --git a/azure-mgmt-website/src/main/java/com/microsoft/azure/management/website/CheckNameResourceTypes.java b/azure-mgmt-appservice/src/main/java/com/microsoft/azure/management/appservice/CheckNameResourceTypes.java
similarity index 97%
rename from azure-mgmt-website/src/main/java/com/microsoft/azure/management/website/CheckNameResourceTypes.java
rename to azure-mgmt-appservice/src/main/java/com/microsoft/azure/management/appservice/CheckNameResourceTypes.java
index a4552efa9d307..a8fa67bf491e0 100644
--- a/azure-mgmt-website/src/main/java/com/microsoft/azure/management/website/CheckNameResourceTypes.java
+++ b/azure-mgmt-appservice/src/main/java/com/microsoft/azure/management/appservice/CheckNameResourceTypes.java
@@ -6,7 +6,7 @@
* Code generated by Microsoft (R) AutoRest Code Generator.
*/
-package com.microsoft.azure.management.website;
+package com.microsoft.azure.management.appservice;
import com.fasterxml.jackson.annotation.JsonValue;
diff --git a/azure-mgmt-website/src/main/java/com/microsoft/azure/management/website/CloneAbilityResult.java b/azure-mgmt-appservice/src/main/java/com/microsoft/azure/management/appservice/CloneAbilityResult.java
similarity index 96%
rename from azure-mgmt-website/src/main/java/com/microsoft/azure/management/website/CloneAbilityResult.java
rename to azure-mgmt-appservice/src/main/java/com/microsoft/azure/management/appservice/CloneAbilityResult.java
index 7cbfb18d87c38..edae20e0fc7fc 100644
--- a/azure-mgmt-website/src/main/java/com/microsoft/azure/management/website/CloneAbilityResult.java
+++ b/azure-mgmt-appservice/src/main/java/com/microsoft/azure/management/appservice/CloneAbilityResult.java
@@ -6,7 +6,7 @@
* Code generated by Microsoft (R) AutoRest Code Generator.
*/
-package com.microsoft.azure.management.website;
+package com.microsoft.azure.management.appservice;
import com.fasterxml.jackson.annotation.JsonCreator;
import com.fasterxml.jackson.annotation.JsonValue;
diff --git a/azure-mgmt-website/src/main/java/com/microsoft/azure/management/website/CloningInfo.java b/azure-mgmt-appservice/src/main/java/com/microsoft/azure/management/appservice/CloningInfo.java
similarity index 85%
rename from azure-mgmt-website/src/main/java/com/microsoft/azure/management/website/CloningInfo.java
rename to azure-mgmt-appservice/src/main/java/com/microsoft/azure/management/appservice/CloningInfo.java
index a3fe2cee5bc7d..98fce486f1d29 100644
--- a/azure-mgmt-website/src/main/java/com/microsoft/azure/management/website/CloningInfo.java
+++ b/azure-mgmt-appservice/src/main/java/com/microsoft/azure/management/appservice/CloningInfo.java
@@ -6,40 +6,42 @@
* Code generated by Microsoft (R) AutoRest Code Generator.
*/
-package com.microsoft.azure.management.website;
+package com.microsoft.azure.management.appservice;
import java.util.Map;
import com.fasterxml.jackson.annotation.JsonProperty;
/**
- * Represents information needed for cloning operation.
+ * Information needed for cloning operation.
*/
public class CloningInfo {
/**
- * Correlation Id of cloning operation. This id ties multiple cloning
+ * Correlation ID of cloning operation. This ID ties multiple cloning
* operations
* together to use the same snapshot.
*/
private String correlationId;
/**
- * Overwrite destination web app.
+ * <code>true</code> to overwrite destination app; otherwise,
+ * <code>false</code>.
*/
private Boolean overwrite;
/**
- * If true, clone custom hostnames from source web app.
+ * <code>true</code> to clone custom hostnames from source
+ * app; otherwise, <code>false</code>.
*/
private Boolean cloneCustomHostNames;
/**
- * Clone source control from source web app.
+ * <code>true</code> to clone source control from source app;
+ * otherwise, <code>false</code>.
*/
private Boolean cloneSourceControl;
/**
- * ARM resource id of the source web app. Web app resource id is of the
- * form
+ * ARM resource ID of the source app. App resource ID is of the form
* /subscriptions/{subId}/resourceGroups/{resourceGroupName}/providers/Microsoft.Web/sites/{siteName}
* for production slots and
* /subscriptions/{subId}/resourceGroups/{resourceGroupName}/providers/Microsoft.Web/sites/{siteName}/slots/{slotName}
@@ -49,33 +51,34 @@ public class CloningInfo {
private String sourceWebAppId;
/**
- * Hosting environment.
+ * App Service Environment.
*/
private String hostingEnvironment;
/**
- * Application settings overrides for cloned web app. If specified these
- * settings will override the settings cloned
- * from source web app. If not specified, application settings
- * from source web app are retained.
+ * Application setting overrides for cloned app. If specified, these
+ * settings override the settings cloned
+ * from source app. Otherwise, application settings from source app are
+ * retained.
*/
private Map appSettingsOverrides;
/**
- * If specified configure load balancing for source and clone site.
+ * <code>true</code> to configure load balancing for source
+ * and destination app.
*/
private Boolean configureLoadBalancing;
/**
- * ARM resource id of the traffic manager profile to use if it exists.
- * Traffic manager resource id is of the form
+ * ARM resource ID of the Traffic Manager profile to use, if it exists.
+ * Traffic Manager resource ID is of the form
* /subscriptions/{subId}/resourceGroups/{resourceGroupName}/providers/Microsoft.Network/trafficManagerProfiles/{profileName}.
*/
private String trafficManagerProfileId;
/**
- * Name of traffic manager profile to create. This is only needed if
- * traffic manager profile does not already exist.
+ * Name of Traffic Manager profile to create. This is only needed if
+ * Traffic Manager profile does not already exist.
*/
private String trafficManagerProfileName;
diff --git a/azure-mgmt-website/src/main/java/com/microsoft/azure/management/website/ComputeModeOptions.java b/azure-mgmt-appservice/src/main/java/com/microsoft/azure/management/appservice/ComputeModeOptions.java
similarity index 96%
rename from azure-mgmt-website/src/main/java/com/microsoft/azure/management/website/ComputeModeOptions.java
rename to azure-mgmt-appservice/src/main/java/com/microsoft/azure/management/appservice/ComputeModeOptions.java
index ae57f78b0c0c3..5395671b5fa50 100644
--- a/azure-mgmt-website/src/main/java/com/microsoft/azure/management/website/ComputeModeOptions.java
+++ b/azure-mgmt-appservice/src/main/java/com/microsoft/azure/management/appservice/ComputeModeOptions.java
@@ -6,7 +6,7 @@
* Code generated by Microsoft (R) AutoRest Code Generator.
*/
-package com.microsoft.azure.management.website;
+package com.microsoft.azure.management.appservice;
import com.fasterxml.jackson.annotation.JsonCreator;
import com.fasterxml.jackson.annotation.JsonValue;
diff --git a/azure-mgmt-website/src/main/java/com/microsoft/azure/management/website/ConnStringValueTypePair.java b/azure-mgmt-appservice/src/main/java/com/microsoft/azure/management/appservice/ConnStringValueTypePair.java
similarity index 94%
rename from azure-mgmt-website/src/main/java/com/microsoft/azure/management/website/ConnStringValueTypePair.java
rename to azure-mgmt-appservice/src/main/java/com/microsoft/azure/management/appservice/ConnStringValueTypePair.java
index 30de41f369c60..46c07be25d688 100644
--- a/azure-mgmt-website/src/main/java/com/microsoft/azure/management/website/ConnStringValueTypePair.java
+++ b/azure-mgmt-appservice/src/main/java/com/microsoft/azure/management/appservice/ConnStringValueTypePair.java
@@ -6,7 +6,7 @@
* Code generated by Microsoft (R) AutoRest Code Generator.
*/
-package com.microsoft.azure.management.website;
+package com.microsoft.azure.management.appservice;
import com.fasterxml.jackson.annotation.JsonProperty;
@@ -17,6 +17,7 @@ public class ConnStringValueTypePair {
/**
* Value of pair.
*/
+ @JsonProperty(required = true)
private String value;
/**
diff --git a/azure-mgmt-website/src/main/java/com/microsoft/azure/management/website/ConnectionString.java b/azure-mgmt-appservice/src/main/java/com/microsoft/azure/management/appservice/ConnectionString.java
similarity index 92%
rename from azure-mgmt-website/src/main/java/com/microsoft/azure/management/website/ConnectionString.java
rename to azure-mgmt-appservice/src/main/java/com/microsoft/azure/management/appservice/ConnectionString.java
index 680961685158f..eb9dcd8a9021d 100644
--- a/azure-mgmt-website/src/main/java/com/microsoft/azure/management/website/ConnectionString.java
+++ b/azure-mgmt-appservice/src/main/java/com/microsoft/azure/management/appservice/ConnectionString.java
@@ -4,7 +4,7 @@
* license information.
*/
-package com.microsoft.azure.management.website;
+package com.microsoft.azure.management.appservice;
/**
* An immutable client-side representation of a connection string on a web app.
diff --git a/azure-mgmt-website/src/main/java/com/microsoft/azure/management/website/ConnectionStringType.java b/azure-mgmt-appservice/src/main/java/com/microsoft/azure/management/appservice/ConnectionStringType.java
similarity index 97%
rename from azure-mgmt-website/src/main/java/com/microsoft/azure/management/website/ConnectionStringType.java
rename to azure-mgmt-appservice/src/main/java/com/microsoft/azure/management/appservice/ConnectionStringType.java
index b9f247e545ccc..b1d3f91fdfd9c 100644
--- a/azure-mgmt-website/src/main/java/com/microsoft/azure/management/website/ConnectionStringType.java
+++ b/azure-mgmt-appservice/src/main/java/com/microsoft/azure/management/appservice/ConnectionStringType.java
@@ -6,7 +6,7 @@
* Code generated by Microsoft (R) AutoRest Code Generator.
*/
-package com.microsoft.azure.management.website;
+package com.microsoft.azure.management.appservice;
import com.fasterxml.jackson.annotation.JsonCreator;
import com.fasterxml.jackson.annotation.JsonValue;
diff --git a/azure-mgmt-website/src/main/java/com/microsoft/azure/management/website/Contact.java b/azure-mgmt-appservice/src/main/java/com/microsoft/azure/management/appservice/Contact.java
similarity index 92%
rename from azure-mgmt-website/src/main/java/com/microsoft/azure/management/website/Contact.java
rename to azure-mgmt-appservice/src/main/java/com/microsoft/azure/management/appservice/Contact.java
index 8b2eb31b523cc..7847ee100a63c 100644
--- a/azure-mgmt-website/src/main/java/com/microsoft/azure/management/website/Contact.java
+++ b/azure-mgmt-appservice/src/main/java/com/microsoft/azure/management/appservice/Contact.java
@@ -6,13 +6,15 @@
* Code generated by Microsoft (R) AutoRest Code Generator.
*/
-package com.microsoft.azure.management.website;
+package com.microsoft.azure.management.appservice;
+import com.fasterxml.jackson.annotation.JsonProperty;
/**
* Contact information for domain registration. If 'Domain Privacy' option is
- * not selected then the contact information will be be made publicly
- * available through the Whois directories as per ICANN requirements.
+ * not selected then the contact information is made publicly available
+ * through the Whois
+ * directories as per ICANN requirements.
*/
public class Contact {
/**
@@ -23,6 +25,7 @@ public class Contact {
/**
* Email address.
*/
+ @JsonProperty(required = true)
private String email;
/**
@@ -38,11 +41,13 @@ public class Contact {
/**
* First name.
*/
+ @JsonProperty(required = true)
private String nameFirst;
/**
* Last name.
*/
+ @JsonProperty(required = true)
private String nameLast;
/**
@@ -58,6 +63,7 @@ public class Contact {
/**
* Phone number.
*/
+ @JsonProperty(required = true)
private String phone;
/**
diff --git a/azure-mgmt-website/src/main/java/com/microsoft/azure/management/website/CorsSettings.java b/azure-mgmt-appservice/src/main/java/com/microsoft/azure/management/appservice/CorsSettings.java
similarity index 88%
rename from azure-mgmt-website/src/main/java/com/microsoft/azure/management/website/CorsSettings.java
rename to azure-mgmt-appservice/src/main/java/com/microsoft/azure/management/appservice/CorsSettings.java
index 2144b27112750..f405b4dbcee0c 100644
--- a/azure-mgmt-website/src/main/java/com/microsoft/azure/management/website/CorsSettings.java
+++ b/azure-mgmt-appservice/src/main/java/com/microsoft/azure/management/appservice/CorsSettings.java
@@ -6,19 +6,18 @@
* Code generated by Microsoft (R) AutoRest Code Generator.
*/
-package com.microsoft.azure.management.website;
+package com.microsoft.azure.management.appservice;
import java.util.List;
/**
- * Cross-Origin Resource Sharing (CORS) settings for the web app.
+ * Cross-Origin Resource Sharing (CORS) settings for the app.
*/
public class CorsSettings {
/**
* Gets or sets the list of origins that should be allowed to make
* cross-origin
- * calls (for example: http://example.com:12345). Use "*" to
- * allow all.
+ * calls (for example: http://example.com:12345). Use "*" to allow all.
*/
private List allowedOrigins;
diff --git a/azure-mgmt-website/src/main/java/com/microsoft/azure/management/website/CsmPublishingProfileOptions.java b/azure-mgmt-appservice/src/main/java/com/microsoft/azure/management/appservice/CsmPublishingProfileOptions.java
similarity index 72%
rename from azure-mgmt-website/src/main/java/com/microsoft/azure/management/website/CsmPublishingProfileOptions.java
rename to azure-mgmt-appservice/src/main/java/com/microsoft/azure/management/appservice/CsmPublishingProfileOptions.java
index 49279761a2385..45338a3412e50 100644
--- a/azure-mgmt-website/src/main/java/com/microsoft/azure/management/website/CsmPublishingProfileOptions.java
+++ b/azure-mgmt-appservice/src/main/java/com/microsoft/azure/management/appservice/CsmPublishingProfileOptions.java
@@ -6,7 +6,7 @@
* Code generated by Microsoft (R) AutoRest Code Generator.
*/
-package com.microsoft.azure.management.website;
+package com.microsoft.azure.management.appservice;
/**
@@ -17,16 +17,16 @@ public class CsmPublishingProfileOptions {
* Name of the format. Valid values are:
* FileZilla3
* WebDeploy -- default
- * Ftp.
+ * Ftp. Possible values include: 'FileZilla3', 'WebDeploy', 'Ftp'.
*/
- private String format;
+ private PublishingProfileFormat format;
/**
* Get the format value.
*
* @return the format value
*/
- public String format() {
+ public PublishingProfileFormat format() {
return this.format;
}
@@ -36,7 +36,7 @@ public String format() {
* @param format the format value to set
* @return the CsmPublishingProfileOptions object itself.
*/
- public CsmPublishingProfileOptions withFormat(String format) {
+ public CsmPublishingProfileOptions withFormat(PublishingProfileFormat format) {
this.format = format;
return this;
}
diff --git a/azure-mgmt-website/src/main/java/com/microsoft/azure/management/website/CustomHostNameDnsRecordType.java b/azure-mgmt-appservice/src/main/java/com/microsoft/azure/management/appservice/CustomHostNameDnsRecordType.java
similarity index 96%
rename from azure-mgmt-website/src/main/java/com/microsoft/azure/management/website/CustomHostNameDnsRecordType.java
rename to azure-mgmt-appservice/src/main/java/com/microsoft/azure/management/appservice/CustomHostNameDnsRecordType.java
index 4dda7d9eba20a..d7f08d3768526 100644
--- a/azure-mgmt-website/src/main/java/com/microsoft/azure/management/website/CustomHostNameDnsRecordType.java
+++ b/azure-mgmt-appservice/src/main/java/com/microsoft/azure/management/appservice/CustomHostNameDnsRecordType.java
@@ -6,7 +6,7 @@
* Code generated by Microsoft (R) AutoRest Code Generator.
*/
-package com.microsoft.azure.management.website;
+package com.microsoft.azure.management.appservice;
import com.fasterxml.jackson.annotation.JsonCreator;
import com.fasterxml.jackson.annotation.JsonValue;
diff --git a/azure-mgmt-website/src/main/java/com/microsoft/azure/management/website/DatabaseBackupSetting.java b/azure-mgmt-appservice/src/main/java/com/microsoft/azure/management/appservice/DatabaseBackupSetting.java
similarity index 79%
rename from azure-mgmt-website/src/main/java/com/microsoft/azure/management/website/DatabaseBackupSetting.java
rename to azure-mgmt-appservice/src/main/java/com/microsoft/azure/management/appservice/DatabaseBackupSetting.java
index 1ed5fa2e37107..0605c8309e925 100644
--- a/azure-mgmt-website/src/main/java/com/microsoft/azure/management/website/DatabaseBackupSetting.java
+++ b/azure-mgmt-appservice/src/main/java/com/microsoft/azure/management/appservice/DatabaseBackupSetting.java
@@ -6,20 +6,20 @@
* Code generated by Microsoft (R) AutoRest Code Generator.
*/
-package com.microsoft.azure.management.website;
+package com.microsoft.azure.management.appservice;
+import com.fasterxml.jackson.annotation.JsonProperty;
/**
- * Note: properties are serialized in JSON format and stored in DB.
- * if new properties are added they might not be in the previous
- * data rows
- * so please handle nulls.
+ * Database backup settings.
*/
public class DatabaseBackupSetting {
/**
- * SqlAzure / MySql.
+ * Database type (e.g. SqlAzure / MySql). Possible values include:
+ * 'SqlAzure', 'MySql', 'LocalMySql'.
*/
- private String databaseType;
+ @JsonProperty(required = true)
+ private DatabaseType databaseType;
/**
* The name property.
@@ -29,15 +29,14 @@ public class DatabaseBackupSetting {
/**
* Contains a connection string name that is linked to the
* SiteConfig.ConnectionStrings.
- * This is used during restore with overwrite connection
- * strings options.
+ * This is used during restore with overwrite connection strings options.
*/
private String connectionStringName;
/**
- * Contains a connection string to a database which is being backed
- * up/restored. If the restore should happen to a new database, the
- * database name inside is the new one.
+ * Contains a connection string to a database which is being backed up or
+ * restored. If the restore should happen to a new database, the database
+ * name inside is the new one.
*/
private String connectionString;
@@ -46,7 +45,7 @@ public class DatabaseBackupSetting {
*
* @return the databaseType value
*/
- public String databaseType() {
+ public DatabaseType databaseType() {
return this.databaseType;
}
@@ -56,7 +55,7 @@ public String databaseType() {
* @param databaseType the databaseType value to set
* @return the DatabaseBackupSetting object itself.
*/
- public DatabaseBackupSetting withDatabaseType(String databaseType) {
+ public DatabaseBackupSetting withDatabaseType(DatabaseType databaseType) {
this.databaseType = databaseType;
return this;
}
diff --git a/azure-mgmt-appservice/src/main/java/com/microsoft/azure/management/appservice/DatabaseType.java b/azure-mgmt-appservice/src/main/java/com/microsoft/azure/management/appservice/DatabaseType.java
new file mode 100644
index 0000000000000..53708167be2b0
--- /dev/null
+++ b/azure-mgmt-appservice/src/main/java/com/microsoft/azure/management/appservice/DatabaseType.java
@@ -0,0 +1,62 @@
+/**
+ * Copyright (c) Microsoft Corporation. All rights reserved.
+ * Licensed under the MIT License. See License.txt in the project root for
+ * license information.
+ *
+ * Code generated by Microsoft (R) AutoRest Code Generator.
+ */
+
+package com.microsoft.azure.management.appservice;
+
+import com.fasterxml.jackson.annotation.JsonValue;
+
+/**
+ * Defines values for DatabaseType.
+ */
+public final class DatabaseType {
+ /** Static value SqlAzure for DatabaseType. */
+ public static final DatabaseType SQL_AZURE = new DatabaseType("SqlAzure");
+
+ /** Static value MySql for DatabaseType. */
+ public static final DatabaseType MY_SQL = new DatabaseType("MySql");
+
+ /** Static value LocalMySql for DatabaseType. */
+ public static final DatabaseType LOCAL_MY_SQL = new DatabaseType("LocalMySql");
+
+ private String value;
+
+ /**
+ * Creates a custom value for DatabaseType.
+ * @param value the custom value
+ */
+ public DatabaseType(String value) {
+ this.value = value;
+ }
+
+ @JsonValue
+ @Override
+ public String toString() {
+ return value;
+ }
+
+ @Override
+ public int hashCode() {
+ return value.hashCode();
+ }
+
+ @Override
+ public boolean equals(Object obj) {
+ if (!(obj instanceof DatabaseType)) {
+ return false;
+ }
+ if (obj == this) {
+ return true;
+ }
+ DatabaseType rhs = (DatabaseType) obj;
+ if (value == null) {
+ return rhs.value == null;
+ } else {
+ return value.equals(rhs.value);
+ }
+ }
+}
diff --git a/azure-mgmt-website/src/main/java/com/microsoft/azure/management/website/DeploymentSlot.java b/azure-mgmt-appservice/src/main/java/com/microsoft/azure/management/appservice/DeploymentSlot.java
similarity index 98%
rename from azure-mgmt-website/src/main/java/com/microsoft/azure/management/website/DeploymentSlot.java
rename to azure-mgmt-appservice/src/main/java/com/microsoft/azure/management/appservice/DeploymentSlot.java
index 8ec3ddfab4c4a..ad629eb1501cc 100644
--- a/azure-mgmt-website/src/main/java/com/microsoft/azure/management/website/DeploymentSlot.java
+++ b/azure-mgmt-appservice/src/main/java/com/microsoft/azure/management/appservice/DeploymentSlot.java
@@ -4,7 +4,7 @@
* license information.
*/
-package com.microsoft.azure.management.website;
+package com.microsoft.azure.management.appservice;
import com.microsoft.azure.management.resources.fluentcore.arm.models.IndependentChildResource;
import com.microsoft.azure.management.resources.fluentcore.model.Updatable;
diff --git a/azure-mgmt-website/src/main/java/com/microsoft/azure/management/website/DeploymentSlots.java b/azure-mgmt-appservice/src/main/java/com/microsoft/azure/management/appservice/DeploymentSlots.java
similarity index 95%
rename from azure-mgmt-website/src/main/java/com/microsoft/azure/management/website/DeploymentSlots.java
rename to azure-mgmt-appservice/src/main/java/com/microsoft/azure/management/appservice/DeploymentSlots.java
index 83c93fb0ed434..94ee3850d8cd6 100644
--- a/azure-mgmt-website/src/main/java/com/microsoft/azure/management/website/DeploymentSlots.java
+++ b/azure-mgmt-appservice/src/main/java/com/microsoft/azure/management/appservice/DeploymentSlots.java
@@ -4,7 +4,7 @@
* license information.
*/
-package com.microsoft.azure.management.website;
+package com.microsoft.azure.management.appservice;
import com.microsoft.azure.management.resources.fluentcore.arm.collection.SupportsGettingById;
import com.microsoft.azure.management.resources.fluentcore.arm.collection.SupportsGettingByName;
diff --git a/azure-mgmt-website/src/main/java/com/microsoft/azure/management/website/DnsVerificationTestResult.java b/azure-mgmt-appservice/src/main/java/com/microsoft/azure/management/appservice/DnsVerificationTestResult.java
similarity index 96%
rename from azure-mgmt-website/src/main/java/com/microsoft/azure/management/website/DnsVerificationTestResult.java
rename to azure-mgmt-appservice/src/main/java/com/microsoft/azure/management/appservice/DnsVerificationTestResult.java
index f8b9456254f0a..7d28c8cce35dc 100644
--- a/azure-mgmt-website/src/main/java/com/microsoft/azure/management/website/DnsVerificationTestResult.java
+++ b/azure-mgmt-appservice/src/main/java/com/microsoft/azure/management/appservice/DnsVerificationTestResult.java
@@ -6,7 +6,7 @@
* Code generated by Microsoft (R) AutoRest Code Generator.
*/
-package com.microsoft.azure.management.website;
+package com.microsoft.azure.management.appservice;
import com.fasterxml.jackson.annotation.JsonCreator;
import com.fasterxml.jackson.annotation.JsonValue;
diff --git a/azure-mgmt-website/src/main/java/com/microsoft/azure/management/website/DomainContact.java b/azure-mgmt-appservice/src/main/java/com/microsoft/azure/management/appservice/DomainContact.java
similarity index 99%
rename from azure-mgmt-website/src/main/java/com/microsoft/azure/management/website/DomainContact.java
rename to azure-mgmt-appservice/src/main/java/com/microsoft/azure/management/appservice/DomainContact.java
index d122fe3e4629d..d998d712a311e 100644
--- a/azure-mgmt-website/src/main/java/com/microsoft/azure/management/website/DomainContact.java
+++ b/azure-mgmt-appservice/src/main/java/com/microsoft/azure/management/appservice/DomainContact.java
@@ -3,7 +3,7 @@
* Licensed under the MIT License. See License.txt in the project root for
* license information.
*/
-package com.microsoft.azure.management.website;
+package com.microsoft.azure.management.appservice;
import com.microsoft.azure.management.apigeneration.Fluent;
import com.microsoft.azure.management.resources.fluentcore.arm.CountryISOCode;
@@ -290,4 +290,4 @@ interface WithAttach extends
Contact build();
}
}
- }
+}
diff --git a/azure-mgmt-website/src/main/java/com/microsoft/azure/management/website/DomainLegalAgreement.java b/azure-mgmt-appservice/src/main/java/com/microsoft/azure/management/appservice/DomainLegalAgreement.java
similarity index 84%
rename from azure-mgmt-website/src/main/java/com/microsoft/azure/management/website/DomainLegalAgreement.java
rename to azure-mgmt-appservice/src/main/java/com/microsoft/azure/management/appservice/DomainLegalAgreement.java
index ca25bcbdf34ac..4102440990c07 100644
--- a/azure-mgmt-website/src/main/java/com/microsoft/azure/management/website/DomainLegalAgreement.java
+++ b/azure-mgmt-appservice/src/main/java/com/microsoft/azure/management/appservice/DomainLegalAgreement.java
@@ -4,11 +4,11 @@
* license information.
*/
-package com.microsoft.azure.management.website;
+package com.microsoft.azure.management.appservice;
import com.microsoft.azure.management.resources.fluentcore.model.Wrapper;
-import com.microsoft.azure.management.website.implementation.TldLegalAgreementInner;
+import com.microsoft.azure.management.appservice.implementation.TldLegalAgreementInner;
/**
* An immutable client-side representation of an Azure domain legal agreement.
diff --git a/azure-mgmt-website/src/main/java/com/microsoft/azure/management/website/DomainPurchaseConsent.java b/azure-mgmt-appservice/src/main/java/com/microsoft/azure/management/appservice/DomainPurchaseConsent.java
similarity index 89%
rename from azure-mgmt-website/src/main/java/com/microsoft/azure/management/website/DomainPurchaseConsent.java
rename to azure-mgmt-appservice/src/main/java/com/microsoft/azure/management/appservice/DomainPurchaseConsent.java
index 5c87cafdb4420..4c669b4387a98 100644
--- a/azure-mgmt-website/src/main/java/com/microsoft/azure/management/website/DomainPurchaseConsent.java
+++ b/azure-mgmt-appservice/src/main/java/com/microsoft/azure/management/appservice/DomainPurchaseConsent.java
@@ -6,19 +6,20 @@
* Code generated by Microsoft (R) AutoRest Code Generator.
*/
-package com.microsoft.azure.management.website;
+package com.microsoft.azure.management.appservice;
import java.util.List;
import org.joda.time.DateTime;
/**
- * Domain purchase consent object representing acceptance of applicable legal
+ * Domain purchase consent object, representing acceptance of applicable legal
* agreements.
*/
public class DomainPurchaseConsent {
/**
* List of applicable legal agreement keys. This list can be retrieved
- * using ListLegalAgreements Api under TopLevelDomain resource.
+ * using ListLegalAgreements API under
+ * <code>TopLevelDomain</code> resource.
*/
private List agreementKeys;
diff --git a/azure-mgmt-website/src/main/java/com/microsoft/azure/management/website/DomainStatus.java b/azure-mgmt-appservice/src/main/java/com/microsoft/azure/management/appservice/DomainStatus.java
similarity index 97%
rename from azure-mgmt-website/src/main/java/com/microsoft/azure/management/website/DomainStatus.java
rename to azure-mgmt-appservice/src/main/java/com/microsoft/azure/management/appservice/DomainStatus.java
index 1291b68d67030..ab69677d7ca17 100644
--- a/azure-mgmt-website/src/main/java/com/microsoft/azure/management/website/DomainStatus.java
+++ b/azure-mgmt-appservice/src/main/java/com/microsoft/azure/management/appservice/DomainStatus.java
@@ -6,7 +6,7 @@
* Code generated by Microsoft (R) AutoRest Code Generator.
*/
-package com.microsoft.azure.management.website;
+package com.microsoft.azure.management.appservice;
import com.fasterxml.jackson.annotation.JsonCreator;
import com.fasterxml.jackson.annotation.JsonValue;
diff --git a/azure-mgmt-website/src/main/java/com/microsoft/azure/management/website/DomainType.java b/azure-mgmt-appservice/src/main/java/com/microsoft/azure/management/appservice/DomainType.java
similarity index 96%
rename from azure-mgmt-website/src/main/java/com/microsoft/azure/management/website/DomainType.java
rename to azure-mgmt-appservice/src/main/java/com/microsoft/azure/management/appservice/DomainType.java
index f903da60c95cc..d6fb2639d9980 100644
--- a/azure-mgmt-website/src/main/java/com/microsoft/azure/management/website/DomainType.java
+++ b/azure-mgmt-appservice/src/main/java/com/microsoft/azure/management/appservice/DomainType.java
@@ -6,7 +6,7 @@
* Code generated by Microsoft (R) AutoRest Code Generator.
*/
-package com.microsoft.azure.management.website;
+package com.microsoft.azure.management.appservice;
import com.fasterxml.jackson.annotation.JsonCreator;
import com.fasterxml.jackson.annotation.JsonValue;
diff --git a/azure-mgmt-website/src/main/java/com/microsoft/azure/management/website/EnabledConfig.java b/azure-mgmt-appservice/src/main/java/com/microsoft/azure/management/appservice/EnabledConfig.java
similarity index 93%
rename from azure-mgmt-website/src/main/java/com/microsoft/azure/management/website/EnabledConfig.java
rename to azure-mgmt-appservice/src/main/java/com/microsoft/azure/management/appservice/EnabledConfig.java
index f896442d8eb40..912a66c84fa15 100644
--- a/azure-mgmt-website/src/main/java/com/microsoft/azure/management/website/EnabledConfig.java
+++ b/azure-mgmt-appservice/src/main/java/com/microsoft/azure/management/appservice/EnabledConfig.java
@@ -6,7 +6,7 @@
* Code generated by Microsoft (R) AutoRest Code Generator.
*/
-package com.microsoft.azure.management.website;
+package com.microsoft.azure.management.appservice;
/**
diff --git a/azure-mgmt-website/src/main/java/com/microsoft/azure/management/website/ErrorEntity.java b/azure-mgmt-appservice/src/main/java/com/microsoft/azure/management/appservice/ErrorEntity.java
similarity index 98%
rename from azure-mgmt-website/src/main/java/com/microsoft/azure/management/website/ErrorEntity.java
rename to azure-mgmt-appservice/src/main/java/com/microsoft/azure/management/appservice/ErrorEntity.java
index bc722f1a07752..330861b983efc 100644
--- a/azure-mgmt-website/src/main/java/com/microsoft/azure/management/website/ErrorEntity.java
+++ b/azure-mgmt-appservice/src/main/java/com/microsoft/azure/management/appservice/ErrorEntity.java
@@ -6,7 +6,7 @@
* Code generated by Microsoft (R) AutoRest Code Generator.
*/
-package com.microsoft.azure.management.website;
+package com.microsoft.azure.management.appservice;
import java.util.List;
diff --git a/azure-mgmt-website/src/main/java/com/microsoft/azure/management/website/Experiments.java b/azure-mgmt-appservice/src/main/java/com/microsoft/azure/management/appservice/Experiments.java
similarity index 82%
rename from azure-mgmt-website/src/main/java/com/microsoft/azure/management/website/Experiments.java
rename to azure-mgmt-appservice/src/main/java/com/microsoft/azure/management/appservice/Experiments.java
index deccdc2b71bda..a0233b82a20c6 100644
--- a/azure-mgmt-website/src/main/java/com/microsoft/azure/management/website/Experiments.java
+++ b/azure-mgmt-appservice/src/main/java/com/microsoft/azure/management/appservice/Experiments.java
@@ -6,16 +6,16 @@
* Code generated by Microsoft (R) AutoRest Code Generator.
*/
-package com.microsoft.azure.management.website;
+package com.microsoft.azure.management.appservice;
import java.util.List;
/**
- * Class containing Routing in production experiments.
+ * Routing rules in production experiments.
*/
public class Experiments {
/**
- * List of {Microsoft.Web.Hosting.Administration.RampUpRule} objects.
+ * List of ramp-up rules.
*/
private List rampUpRules;
diff --git a/azure-mgmt-website/src/main/java/com/microsoft/azure/management/website/FileSystemApplicationLogsConfig.java b/azure-mgmt-appservice/src/main/java/com/microsoft/azure/management/appservice/FileSystemApplicationLogsConfig.java
similarity index 94%
rename from azure-mgmt-website/src/main/java/com/microsoft/azure/management/website/FileSystemApplicationLogsConfig.java
rename to azure-mgmt-appservice/src/main/java/com/microsoft/azure/management/appservice/FileSystemApplicationLogsConfig.java
index 9fb350175ca8b..0a77d99d8b58b 100644
--- a/azure-mgmt-website/src/main/java/com/microsoft/azure/management/website/FileSystemApplicationLogsConfig.java
+++ b/azure-mgmt-appservice/src/main/java/com/microsoft/azure/management/appservice/FileSystemApplicationLogsConfig.java
@@ -6,7 +6,7 @@
* Code generated by Microsoft (R) AutoRest Code Generator.
*/
-package com.microsoft.azure.management.website;
+package com.microsoft.azure.management.appservice;
/**
diff --git a/azure-mgmt-website/src/main/java/com/microsoft/azure/management/website/FileSystemHttpLogsConfig.java b/azure-mgmt-appservice/src/main/java/com/microsoft/azure/management/appservice/FileSystemHttpLogsConfig.java
similarity index 94%
rename from azure-mgmt-website/src/main/java/com/microsoft/azure/management/website/FileSystemHttpLogsConfig.java
rename to azure-mgmt-appservice/src/main/java/com/microsoft/azure/management/appservice/FileSystemHttpLogsConfig.java
index 5687311d571a7..cf5e1603ef492 100644
--- a/azure-mgmt-website/src/main/java/com/microsoft/azure/management/website/FileSystemHttpLogsConfig.java
+++ b/azure-mgmt-appservice/src/main/java/com/microsoft/azure/management/appservice/FileSystemHttpLogsConfig.java
@@ -6,7 +6,7 @@
* Code generated by Microsoft (R) AutoRest Code Generator.
*/
-package com.microsoft.azure.management.website;
+package com.microsoft.azure.management.appservice;
/**
@@ -15,8 +15,7 @@
public class FileSystemHttpLogsConfig {
/**
* Maximum size in megabytes that http log files can use.
- * When reached old log files will be removed to make space
- * for new ones.
+ * When reached old log files will be removed to make space for new ones.
* Value can range between 25 and 100.
*/
private Integer retentionInMb;
diff --git a/azure-mgmt-website/src/main/java/com/microsoft/azure/management/website/FrequencyUnit.java b/azure-mgmt-appservice/src/main/java/com/microsoft/azure/management/appservice/FrequencyUnit.java
similarity index 96%
rename from azure-mgmt-website/src/main/java/com/microsoft/azure/management/website/FrequencyUnit.java
rename to azure-mgmt-appservice/src/main/java/com/microsoft/azure/management/appservice/FrequencyUnit.java
index 42fb3a3b905da..87d1fc08b4b44 100644
--- a/azure-mgmt-website/src/main/java/com/microsoft/azure/management/website/FrequencyUnit.java
+++ b/azure-mgmt-appservice/src/main/java/com/microsoft/azure/management/appservice/FrequencyUnit.java
@@ -6,7 +6,7 @@
* Code generated by Microsoft (R) AutoRest Code Generator.
*/
-package com.microsoft.azure.management.website;
+package com.microsoft.azure.management.appservice;
import com.fasterxml.jackson.annotation.JsonCreator;
import com.fasterxml.jackson.annotation.JsonValue;
diff --git a/azure-mgmt-appservice/src/main/java/com/microsoft/azure/management/appservice/GlobalCsmSkuDescription.java b/azure-mgmt-appservice/src/main/java/com/microsoft/azure/management/appservice/GlobalCsmSkuDescription.java
new file mode 100644
index 0000000000000..a5437c069e282
--- /dev/null
+++ b/azure-mgmt-appservice/src/main/java/com/microsoft/azure/management/appservice/GlobalCsmSkuDescription.java
@@ -0,0 +1,143 @@
+/**
+ * Copyright (c) Microsoft Corporation. All rights reserved.
+ * Licensed under the MIT License. See License.txt in the project root for
+ * license information.
+ *
+ * Code generated by Microsoft (R) AutoRest Code Generator.
+ */
+
+package com.microsoft.azure.management.appservice;
+
+import java.util.List;
+import com.microsoft.azure.management.appservice.implementation.CapabilityInner;
+
+/**
+ * A Global SKU Description.
+ */
+public class GlobalCsmSkuDescription {
+ /**
+ * Name of the resource SKU.
+ */
+ private String name;
+
+ /**
+ * Service Tier of the resource SKU.
+ */
+ private String tier;
+
+ /**
+ * Min, max, and default scale values of the SKU.
+ */
+ private SkuCapacity capacity;
+
+ /**
+ * Locations of the SKU.
+ */
+ private List locations;
+
+ /**
+ * Capabilities of the SKU, e.g., is traffic manager enabled?.
+ */
+ private List capabilities;
+
+ /**
+ * Get the name value.
+ *
+ * @return the name value
+ */
+ public String name() {
+ return this.name;
+ }
+
+ /**
+ * Set the name value.
+ *
+ * @param name the name value to set
+ * @return the GlobalCsmSkuDescription object itself.
+ */
+ public GlobalCsmSkuDescription withName(String name) {
+ this.name = name;
+ return this;
+ }
+
+ /**
+ * Get the tier value.
+ *
+ * @return the tier value
+ */
+ public String tier() {
+ return this.tier;
+ }
+
+ /**
+ * Set the tier value.
+ *
+ * @param tier the tier value to set
+ * @return the GlobalCsmSkuDescription object itself.
+ */
+ public GlobalCsmSkuDescription withTier(String tier) {
+ this.tier = tier;
+ return this;
+ }
+
+ /**
+ * Get the capacity value.
+ *
+ * @return the capacity value
+ */
+ public SkuCapacity capacity() {
+ return this.capacity;
+ }
+
+ /**
+ * Set the capacity value.
+ *
+ * @param capacity the capacity value to set
+ * @return the GlobalCsmSkuDescription object itself.
+ */
+ public GlobalCsmSkuDescription withCapacity(SkuCapacity capacity) {
+ this.capacity = capacity;
+ return this;
+ }
+
+ /**
+ * Get the locations value.
+ *
+ * @return the locations value
+ */
+ public List locations() {
+ return this.locations;
+ }
+
+ /**
+ * Set the locations value.
+ *
+ * @param locations the locations value to set
+ * @return the GlobalCsmSkuDescription object itself.
+ */
+ public GlobalCsmSkuDescription withLocations(List locations) {
+ this.locations = locations;
+ return this;
+ }
+
+ /**
+ * Get the capabilities value.
+ *
+ * @return the capabilities value
+ */
+ public List capabilities() {
+ return this.capabilities;
+ }
+
+ /**
+ * Set the capabilities value.
+ *
+ * @param capabilities the capabilities value to set
+ * @return the GlobalCsmSkuDescription object itself.
+ */
+ public GlobalCsmSkuDescription withCapabilities(List capabilities) {
+ this.capabilities = capabilities;
+ return this;
+ }
+
+}
diff --git a/azure-mgmt-website/src/main/java/com/microsoft/azure/management/website/HandlerMapping.java b/azure-mgmt-appservice/src/main/java/com/microsoft/azure/management/appservice/HandlerMapping.java
similarity index 92%
rename from azure-mgmt-website/src/main/java/com/microsoft/azure/management/website/HandlerMapping.java
rename to azure-mgmt-appservice/src/main/java/com/microsoft/azure/management/appservice/HandlerMapping.java
index 2a3bd1bbef8d9..8a66ee83d342f 100644
--- a/azure-mgmt-website/src/main/java/com/microsoft/azure/management/website/HandlerMapping.java
+++ b/azure-mgmt-appservice/src/main/java/com/microsoft/azure/management/appservice/HandlerMapping.java
@@ -6,14 +6,14 @@
* Code generated by Microsoft (R) AutoRest Code Generator.
*/
-package com.microsoft.azure.management.website;
+package com.microsoft.azure.management.appservice;
/**
* The IIS handler mappings used to define which handler processes HTTP
* requests with certain extension.
- * For example it is used to configure php-cgi.exe process to
- * handle all HTTP requests with *.php extension.
+ * For example, it is used to configure php-cgi.exe process to handle all
+ * HTTP requests with *.php extension.
*/
public class HandlerMapping {
/**
diff --git a/azure-mgmt-website/src/main/java/com/microsoft/azure/management/website/HostName.java b/azure-mgmt-appservice/src/main/java/com/microsoft/azure/management/appservice/HostName.java
similarity index 91%
rename from azure-mgmt-website/src/main/java/com/microsoft/azure/management/website/HostName.java
rename to azure-mgmt-appservice/src/main/java/com/microsoft/azure/management/appservice/HostName.java
index 4591be0e3d7fe..6e95a2843437c 100644
--- a/azure-mgmt-website/src/main/java/com/microsoft/azure/management/website/HostName.java
+++ b/azure-mgmt-appservice/src/main/java/com/microsoft/azure/management/appservice/HostName.java
@@ -6,7 +6,7 @@
* Code generated by Microsoft (R) AutoRest Code Generator.
*/
-package com.microsoft.azure.management.website;
+package com.microsoft.azure.management.appservice;
import java.util.List;
@@ -20,15 +20,15 @@ public class HostName {
private String name;
/**
- * List of sites the hostname is assigned to. This list will have more
- * than one site only if the hostname is pointing to a Traffic Manager.
+ * List of apps the hostname is assigned to. This list will have more than
+ * one app only if the hostname is pointing to a Traffic Manager.
*/
private List siteNames;
/**
* Name of the Azure resource the hostname is assigned to. If it is
- * assigned to a traffic manager then it will be the traffic manager name
- * otherwise it will be the website name.
+ * assigned to a Traffic Manager then it will be the Traffic Manager name
+ * otherwise it will be the app name.
*/
private String azureResourceName;
@@ -39,7 +39,7 @@ public class HostName {
private AzureResourceType azureResourceType;
/**
- * Type of the Dns record. Possible values include: 'CName', 'A'.
+ * Type of the DNS record. Possible values include: 'CName', 'A'.
*/
private CustomHostNameDnsRecordType customHostNameDnsRecordType;
diff --git a/azure-mgmt-website/src/main/java/com/microsoft/azure/management/website/HostNameBinding.java b/azure-mgmt-appservice/src/main/java/com/microsoft/azure/management/appservice/HostNameBinding.java
similarity index 97%
rename from azure-mgmt-website/src/main/java/com/microsoft/azure/management/website/HostNameBinding.java
rename to azure-mgmt-appservice/src/main/java/com/microsoft/azure/management/appservice/HostNameBinding.java
index e2bc99b0a15aa..20519039d2d1a 100644
--- a/azure-mgmt-website/src/main/java/com/microsoft/azure/management/website/HostNameBinding.java
+++ b/azure-mgmt-appservice/src/main/java/com/microsoft/azure/management/appservice/HostNameBinding.java
@@ -4,13 +4,13 @@
* license information.
*/
-package com.microsoft.azure.management.website;
+package com.microsoft.azure.management.appservice;
import com.microsoft.azure.management.resources.fluentcore.arm.models.ExternalChildResource;
import com.microsoft.azure.management.resources.fluentcore.arm.models.Resource;
import com.microsoft.azure.management.resources.fluentcore.model.Attachable;
import com.microsoft.azure.management.resources.fluentcore.model.Wrapper;
-import com.microsoft.azure.management.website.implementation.HostNameBindingInner;
+import com.microsoft.azure.management.appservice.implementation.HostNameBindingInner;
/**
* A host name binding object.
@@ -47,7 +47,7 @@ public interface HostNameBinding
/**
* @return custom DNS record type
*/
- CustomHostNameDnsRecordType DnsRecordType();
+ CustomHostNameDnsRecordType dnsRecordType();
/**
* @return the host name type
diff --git a/azure-mgmt-website/src/main/java/com/microsoft/azure/management/website/HostNameSslBinding.java b/azure-mgmt-appservice/src/main/java/com/microsoft/azure/management/appservice/HostNameSslBinding.java
similarity index 93%
rename from azure-mgmt-website/src/main/java/com/microsoft/azure/management/website/HostNameSslBinding.java
rename to azure-mgmt-appservice/src/main/java/com/microsoft/azure/management/appservice/HostNameSslBinding.java
index a0788bf197ad5..32cc987b12015 100644
--- a/azure-mgmt-website/src/main/java/com/microsoft/azure/management/website/HostNameSslBinding.java
+++ b/azure-mgmt-appservice/src/main/java/com/microsoft/azure/management/appservice/HostNameSslBinding.java
@@ -3,7 +3,7 @@
* Licensed under the MIT License. See License.txt in the project root for
* license information.
*/
-package com.microsoft.azure.management.website;
+package com.microsoft.azure.management.appservice;
import com.microsoft.azure.management.apigeneration.Fluent;
import com.microsoft.azure.management.keyvault.Vault;
@@ -86,19 +86,18 @@ interface WithCertificate {
WithSslType withPfxCertificateToUpload(File pfxFile, String password);
/**
- * Places a new App Service certificate order to use for the hostname
+ * Places a new App Service certificate order to use for the hostname.
* @param certificateOrderName the name of the certificate order
- * @param productType the sku of the certificate order
* @return the next stage of the hostname SSL binding definition
*/
- WithKeyVault withNewAppServiceCertificateOrder(String certificateOrderName, CertificateProductType productType);
+ WithKeyVault withNewStandardSslCertificateOrder(String certificateOrderName);
/**
* Specifies a ready-to-use certificate order to use. This is usually useful for reusing wildcard certificates.
* @param certificateOrder the ready-to-use certificate order
* @return the next stage of the hostname SSL binding definition
*/
- WithSslType withReadyToUseAppServiceCertificateOrder(AppServiceCertificateOrder certificateOrder);
+ WithSslType withExistingAppServiceCertificateOrder(AppServiceCertificateOrder certificateOrder);
}
/**
@@ -202,19 +201,18 @@ interface WithCertificate {
WithSslType withPfxCertificateToUpload(File pfxFile, String password);
/**
- * Places a new App Service certificate order to use for the hostname
+ * Places a new App Service certificate order to use for the hostname.
* @param certificateOrderName the name of the certificate order
- * @param productType the sku of the certificate order
* @return the next stage of the hostname SSL binding definition
*/
- WithKeyVault withNewAppServiceCertificateOrder(String certificateOrderName, CertificateProductType productType);
+ WithKeyVault withNewStandardSslCertificateOrder(String certificateOrderName);
/**
* Specifies a ready-to-use certificate order to use. This is usually useful for reusing wildcard certificates.
* @param certificateOrder the ready-to-use certificate order
* @return the next stage of the hostname SSL binding definition
*/
- WithSslType withReadyToUseAppServiceCertificateOrder(AppServiceCertificateOrder certificateOrder);
+ WithSslType withExistingAppServiceCertificateOrder(AppServiceCertificateOrder certificateOrder);
}
/**
diff --git a/azure-mgmt-website/src/main/java/com/microsoft/azure/management/website/HostNameSslState.java b/azure-mgmt-appservice/src/main/java/com/microsoft/azure/management/appservice/HostNameSslState.java
similarity index 88%
rename from azure-mgmt-website/src/main/java/com/microsoft/azure/management/website/HostNameSslState.java
rename to azure-mgmt-appservice/src/main/java/com/microsoft/azure/management/appservice/HostNameSslState.java
index 50b7b9de51d1a..b8f046070693e 100644
--- a/azure-mgmt-website/src/main/java/com/microsoft/azure/management/website/HostNameSslState.java
+++ b/azure-mgmt-appservice/src/main/java/com/microsoft/azure/management/appservice/HostNameSslState.java
@@ -6,16 +6,15 @@
* Code generated by Microsoft (R) AutoRest Code Generator.
*/
-package com.microsoft.azure.management.website;
+package com.microsoft.azure.management.appservice;
-import com.fasterxml.jackson.annotation.JsonProperty;
/**
- * Object that represents a SSL-enabled host name.
+ * SSL-enabled hostname.
*/
public class HostNameSslState {
/**
- * Host name.
+ * Hostname.
*/
private String name;
@@ -23,21 +22,20 @@ public class HostNameSslState {
* SSL type. Possible values include: 'Disabled', 'SniEnabled',
* 'IpBasedEnabled'.
*/
- @JsonProperty(required = true)
private SslState sslState;
/**
- * Virtual IP address assigned to the host name if IP based SSL is enabled.
+ * Virtual IP address assigned to the hostname if IP based SSL is enabled.
*/
private String virtualIP;
/**
- * SSL cert thumbprint.
+ * SSL certificate thumbprint.
*/
private String thumbprint;
/**
- * Set this flag to update existing host name.
+ * Set to <code>true</code> to update existing hostname.
*/
private Boolean toUpdate;
diff --git a/azure-mgmt-website/src/main/java/com/microsoft/azure/management/website/HostNameType.java b/azure-mgmt-appservice/src/main/java/com/microsoft/azure/management/appservice/HostNameType.java
similarity index 96%
rename from azure-mgmt-website/src/main/java/com/microsoft/azure/management/website/HostNameType.java
rename to azure-mgmt-appservice/src/main/java/com/microsoft/azure/management/appservice/HostNameType.java
index 1c6c6cc3fc457..57bc608fa3d98 100644
--- a/azure-mgmt-website/src/main/java/com/microsoft/azure/management/website/HostNameType.java
+++ b/azure-mgmt-appservice/src/main/java/com/microsoft/azure/management/appservice/HostNameType.java
@@ -6,7 +6,7 @@
* Code generated by Microsoft (R) AutoRest Code Generator.
*/
-package com.microsoft.azure.management.website;
+package com.microsoft.azure.management.appservice;
import com.fasterxml.jackson.annotation.JsonCreator;
import com.fasterxml.jackson.annotation.JsonValue;
diff --git a/azure-mgmt-website/src/main/java/com/microsoft/azure/management/website/HostingEnvironmentProfile.java b/azure-mgmt-appservice/src/main/java/com/microsoft/azure/management/appservice/HostingEnvironmentProfile.java
similarity index 53%
rename from azure-mgmt-website/src/main/java/com/microsoft/azure/management/website/HostingEnvironmentProfile.java
rename to azure-mgmt-appservice/src/main/java/com/microsoft/azure/management/appservice/HostingEnvironmentProfile.java
index 7832dd1376cb7..9da2b7be8c3be 100644
--- a/azure-mgmt-website/src/main/java/com/microsoft/azure/management/website/HostingEnvironmentProfile.java
+++ b/azure-mgmt-appservice/src/main/java/com/microsoft/azure/management/appservice/HostingEnvironmentProfile.java
@@ -6,28 +6,29 @@
* Code generated by Microsoft (R) AutoRest Code Generator.
*/
-package com.microsoft.azure.management.website;
+package com.microsoft.azure.management.appservice;
+import com.fasterxml.jackson.annotation.JsonProperty;
/**
- * Specification for a hostingEnvironment (App Service Environment) to use for
- * this resource.
+ * Specification for an App Service Environment to use for this resource.
*/
public class HostingEnvironmentProfile {
/**
- * Resource id of the hostingEnvironment (App Service Environment).
+ * Resource ID of the App Service Environment.
*/
private String id;
/**
- * Name of the hostingEnvironment (App Service Environment) (read only).
+ * Name of the App Service Environment.
*/
+ @JsonProperty(access = JsonProperty.Access.WRITE_ONLY)
private String name;
/**
- * Resource type of the hostingEnvironment (App Service Environment) (read
- * only).
+ * Resource type of the App Service Environment.
*/
+ @JsonProperty(access = JsonProperty.Access.WRITE_ONLY)
private String type;
/**
@@ -59,17 +60,6 @@ public String name() {
return this.name;
}
- /**
- * Set the name value.
- *
- * @param name the name value to set
- * @return the HostingEnvironmentProfile object itself.
- */
- public HostingEnvironmentProfile withName(String name) {
- this.name = name;
- return this;
- }
-
/**
* Get the type value.
*
@@ -79,15 +69,4 @@ public String type() {
return this.type;
}
- /**
- * Set the type value.
- *
- * @param type the type value to set
- * @return the HostingEnvironmentProfile object itself.
- */
- public HostingEnvironmentProfile withType(String type) {
- this.type = type;
- return this;
- }
-
}
diff --git a/azure-mgmt-website/src/main/java/com/microsoft/azure/management/website/HostingEnvironmentStatus.java b/azure-mgmt-appservice/src/main/java/com/microsoft/azure/management/appservice/HostingEnvironmentStatus.java
similarity index 96%
rename from azure-mgmt-website/src/main/java/com/microsoft/azure/management/website/HostingEnvironmentStatus.java
rename to azure-mgmt-appservice/src/main/java/com/microsoft/azure/management/appservice/HostingEnvironmentStatus.java
index 6c6a91deb5353..950f2885b79b9 100644
--- a/azure-mgmt-website/src/main/java/com/microsoft/azure/management/website/HostingEnvironmentStatus.java
+++ b/azure-mgmt-appservice/src/main/java/com/microsoft/azure/management/appservice/HostingEnvironmentStatus.java
@@ -6,7 +6,7 @@
* Code generated by Microsoft (R) AutoRest Code Generator.
*/
-package com.microsoft.azure.management.website;
+package com.microsoft.azure.management.appservice;
import com.fasterxml.jackson.annotation.JsonCreator;
import com.fasterxml.jackson.annotation.JsonValue;
diff --git a/azure-mgmt-website/src/main/java/com/microsoft/azure/management/website/HttpLogsConfig.java b/azure-mgmt-appservice/src/main/java/com/microsoft/azure/management/appservice/HttpLogsConfig.java
similarity index 96%
rename from azure-mgmt-website/src/main/java/com/microsoft/azure/management/website/HttpLogsConfig.java
rename to azure-mgmt-appservice/src/main/java/com/microsoft/azure/management/appservice/HttpLogsConfig.java
index 0d514c337716b..79b69e266f5b5 100644
--- a/azure-mgmt-website/src/main/java/com/microsoft/azure/management/website/HttpLogsConfig.java
+++ b/azure-mgmt-appservice/src/main/java/com/microsoft/azure/management/appservice/HttpLogsConfig.java
@@ -6,7 +6,7 @@
* Code generated by Microsoft (R) AutoRest Code Generator.
*/
-package com.microsoft.azure.management.website;
+package com.microsoft.azure.management.appservice;
/**
diff --git a/azure-mgmt-appservice/src/main/java/com/microsoft/azure/management/appservice/InAvailabilityReasonType.java b/azure-mgmt-appservice/src/main/java/com/microsoft/azure/management/appservice/InAvailabilityReasonType.java
new file mode 100644
index 0000000000000..d36a2638805bb
--- /dev/null
+++ b/azure-mgmt-appservice/src/main/java/com/microsoft/azure/management/appservice/InAvailabilityReasonType.java
@@ -0,0 +1,59 @@
+/**
+ * Copyright (c) Microsoft Corporation. All rights reserved.
+ * Licensed under the MIT License. See License.txt in the project root for
+ * license information.
+ *
+ * Code generated by Microsoft (R) AutoRest Code Generator.
+ */
+
+package com.microsoft.azure.management.appservice;
+
+import com.fasterxml.jackson.annotation.JsonValue;
+
+/**
+ * Defines values for InAvailabilityReasonType.
+ */
+public final class InAvailabilityReasonType {
+ /** Static value Invalid for InAvailabilityReasonType. */
+ public static final InAvailabilityReasonType INVALID = new InAvailabilityReasonType("Invalid");
+
+ /** Static value AlreadyExists for InAvailabilityReasonType. */
+ public static final InAvailabilityReasonType ALREADY_EXISTS = new InAvailabilityReasonType("AlreadyExists");
+
+ private String value;
+
+ /**
+ * Creates a custom value for InAvailabilityReasonType.
+ * @param value the custom value
+ */
+ public InAvailabilityReasonType(String value) {
+ this.value = value;
+ }
+
+ @JsonValue
+ @Override
+ public String toString() {
+ return value;
+ }
+
+ @Override
+ public int hashCode() {
+ return value.hashCode();
+ }
+
+ @Override
+ public boolean equals(Object obj) {
+ if (!(obj instanceof InAvailabilityReasonType)) {
+ return false;
+ }
+ if (obj == this) {
+ return true;
+ }
+ InAvailabilityReasonType rhs = (InAvailabilityReasonType) obj;
+ if (value == null) {
+ return rhs.value == null;
+ } else {
+ return value.equals(rhs.value);
+ }
+ }
+}
diff --git a/azure-mgmt-website/src/main/java/com/microsoft/azure/management/website/InternalLoadBalancingMode.java b/azure-mgmt-appservice/src/main/java/com/microsoft/azure/management/appservice/InternalLoadBalancingMode.java
similarity index 96%
rename from azure-mgmt-website/src/main/java/com/microsoft/azure/management/website/InternalLoadBalancingMode.java
rename to azure-mgmt-appservice/src/main/java/com/microsoft/azure/management/appservice/InternalLoadBalancingMode.java
index aefd9b9bb3eea..8b84a6c0cf875 100644
--- a/azure-mgmt-website/src/main/java/com/microsoft/azure/management/website/InternalLoadBalancingMode.java
+++ b/azure-mgmt-appservice/src/main/java/com/microsoft/azure/management/appservice/InternalLoadBalancingMode.java
@@ -6,7 +6,7 @@
* Code generated by Microsoft (R) AutoRest Code Generator.
*/
-package com.microsoft.azure.management.website;
+package com.microsoft.azure.management.appservice;
import com.fasterxml.jackson.annotation.JsonCreator;
import com.fasterxml.jackson.annotation.JsonValue;
diff --git a/azure-mgmt-website/src/main/java/com/microsoft/azure/management/website/IpSecurityRestriction.java b/azure-mgmt-appservice/src/main/java/com/microsoft/azure/management/appservice/IpSecurityRestriction.java
similarity index 93%
rename from azure-mgmt-website/src/main/java/com/microsoft/azure/management/website/IpSecurityRestriction.java
rename to azure-mgmt-appservice/src/main/java/com/microsoft/azure/management/appservice/IpSecurityRestriction.java
index 27ab7a3cc1ced..d40f0e99d73b1 100644
--- a/azure-mgmt-website/src/main/java/com/microsoft/azure/management/website/IpSecurityRestriction.java
+++ b/azure-mgmt-appservice/src/main/java/com/microsoft/azure/management/appservice/IpSecurityRestriction.java
@@ -6,12 +6,12 @@
* Code generated by Microsoft (R) AutoRest Code Generator.
*/
-package com.microsoft.azure.management.website;
+package com.microsoft.azure.management.appservice;
import com.fasterxml.jackson.annotation.JsonProperty;
/**
- * Represents an ip security restriction on a web app.
+ * IP security restriction on an app.
*/
public class IpSecurityRestriction {
/**
diff --git a/azure-mgmt-website/src/main/java/com/microsoft/azure/management/website/JavaVersion.java b/azure-mgmt-appservice/src/main/java/com/microsoft/azure/management/appservice/JavaVersion.java
similarity index 91%
rename from azure-mgmt-website/src/main/java/com/microsoft/azure/management/website/JavaVersion.java
rename to azure-mgmt-appservice/src/main/java/com/microsoft/azure/management/appservice/JavaVersion.java
index dc925068d9111..08b4cc7667d26 100644
--- a/azure-mgmt-website/src/main/java/com/microsoft/azure/management/website/JavaVersion.java
+++ b/azure-mgmt-appservice/src/main/java/com/microsoft/azure/management/appservice/JavaVersion.java
@@ -4,7 +4,7 @@
* license information.
*/
-package com.microsoft.azure.management.website;
+package com.microsoft.azure.management.appservice;
import com.fasterxml.jackson.annotation.JsonValue;
@@ -13,13 +13,13 @@
*/
public final class JavaVersion {
/** Static value 'Off' for JavaVersion. */
- public static final JavaVersion OFF = null;
+ public static final JavaVersion OFF = new JavaVersion("");
/** Static value Java 7 newest for JavaVersion. */
public static final JavaVersion JAVA_7_NEWEST = new JavaVersion("1.7");
/** Static value 1.7.0_51 for JavaVersion. */
- public static final JavaVersion JAVA_1_7_0_51= new JavaVersion("1.7.0_51");
+ public static final JavaVersion JAVA_1_7_0_51 = new JavaVersion("1.7.0_51");
/** Static value 1.7.0_71 for JavaVersion. */
public static final JavaVersion JAVA_1_7_0_71 = new JavaVersion("1.7.0_71");
diff --git a/azure-mgmt-website/src/main/java/com/microsoft/azure/management/website/KeyVaultSecretStatus.java b/azure-mgmt-appservice/src/main/java/com/microsoft/azure/management/appservice/KeyVaultSecretStatus.java
similarity index 97%
rename from azure-mgmt-website/src/main/java/com/microsoft/azure/management/website/KeyVaultSecretStatus.java
rename to azure-mgmt-appservice/src/main/java/com/microsoft/azure/management/appservice/KeyVaultSecretStatus.java
index 849dd9feefe2d..b10579bc5e438 100644
--- a/azure-mgmt-website/src/main/java/com/microsoft/azure/management/website/KeyVaultSecretStatus.java
+++ b/azure-mgmt-appservice/src/main/java/com/microsoft/azure/management/appservice/KeyVaultSecretStatus.java
@@ -6,7 +6,7 @@
* Code generated by Microsoft (R) AutoRest Code Generator.
*/
-package com.microsoft.azure.management.website;
+package com.microsoft.azure.management.appservice;
import com.fasterxml.jackson.annotation.JsonCreator;
import com.fasterxml.jackson.annotation.JsonValue;
diff --git a/azure-mgmt-website/src/main/java/com/microsoft/azure/management/website/LocalizableString.java b/azure-mgmt-appservice/src/main/java/com/microsoft/azure/management/appservice/LocalizableString.java
similarity index 89%
rename from azure-mgmt-website/src/main/java/com/microsoft/azure/management/website/LocalizableString.java
rename to azure-mgmt-appservice/src/main/java/com/microsoft/azure/management/appservice/LocalizableString.java
index 3ae7f80adfaa1..8926edd1a31e1 100644
--- a/azure-mgmt-website/src/main/java/com/microsoft/azure/management/website/LocalizableString.java
+++ b/azure-mgmt-appservice/src/main/java/com/microsoft/azure/management/appservice/LocalizableString.java
@@ -6,15 +6,15 @@
* Code generated by Microsoft (R) AutoRest Code Generator.
*/
-package com.microsoft.azure.management.website;
+package com.microsoft.azure.management.appservice;
/**
- * LocalizableString object containing the name and a localized value.
+ * Localizable string object containing the name and a localized value.
*/
public class LocalizableString {
/**
- * Non localized name.
+ * Non-localized name.
*/
private String value;
diff --git a/azure-mgmt-website/src/main/java/com/microsoft/azure/management/website/LogLevel.java b/azure-mgmt-appservice/src/main/java/com/microsoft/azure/management/appservice/LogLevel.java
similarity index 96%
rename from azure-mgmt-website/src/main/java/com/microsoft/azure/management/website/LogLevel.java
rename to azure-mgmt-appservice/src/main/java/com/microsoft/azure/management/appservice/LogLevel.java
index ea327ce0a469c..59a77bf5dec8a 100644
--- a/azure-mgmt-website/src/main/java/com/microsoft/azure/management/website/LogLevel.java
+++ b/azure-mgmt-appservice/src/main/java/com/microsoft/azure/management/appservice/LogLevel.java
@@ -6,7 +6,7 @@
* Code generated by Microsoft (R) AutoRest Code Generator.
*/
-package com.microsoft.azure.management.website;
+package com.microsoft.azure.management.appservice;
import com.fasterxml.jackson.annotation.JsonCreator;
import com.fasterxml.jackson.annotation.JsonValue;
diff --git a/azure-mgmt-website/src/main/java/com/microsoft/azure/management/website/ManagedPipelineMode.java b/azure-mgmt-appservice/src/main/java/com/microsoft/azure/management/appservice/ManagedPipelineMode.java
similarity index 96%
rename from azure-mgmt-website/src/main/java/com/microsoft/azure/management/website/ManagedPipelineMode.java
rename to azure-mgmt-appservice/src/main/java/com/microsoft/azure/management/appservice/ManagedPipelineMode.java
index 568eda113e7eb..52f564c3de3e2 100644
--- a/azure-mgmt-website/src/main/java/com/microsoft/azure/management/website/ManagedPipelineMode.java
+++ b/azure-mgmt-appservice/src/main/java/com/microsoft/azure/management/appservice/ManagedPipelineMode.java
@@ -6,7 +6,7 @@
* Code generated by Microsoft (R) AutoRest Code Generator.
*/
-package com.microsoft.azure.management.website;
+package com.microsoft.azure.management.appservice;
import com.fasterxml.jackson.annotation.JsonCreator;
import com.fasterxml.jackson.annotation.JsonValue;
diff --git a/azure-mgmt-website/src/main/java/com/microsoft/azure/management/website/MetricAvailabilily.java b/azure-mgmt-appservice/src/main/java/com/microsoft/azure/management/appservice/MetricAvailabilily.java
similarity index 85%
rename from azure-mgmt-website/src/main/java/com/microsoft/azure/management/website/MetricAvailabilily.java
rename to azure-mgmt-appservice/src/main/java/com/microsoft/azure/management/appservice/MetricAvailabilily.java
index fa875cbf29963..44cb52a0dce53 100644
--- a/azure-mgmt-website/src/main/java/com/microsoft/azure/management/website/MetricAvailabilily.java
+++ b/azure-mgmt-appservice/src/main/java/com/microsoft/azure/management/appservice/MetricAvailabilily.java
@@ -6,11 +6,11 @@
* Code generated by Microsoft (R) AutoRest Code Generator.
*/
-package com.microsoft.azure.management.website;
+package com.microsoft.azure.management.appservice;
/**
- * Class repesenting metrics availability and retention.
+ * Metric availability and retention.
*/
public class MetricAvailabilily {
/**
@@ -19,8 +19,7 @@ public class MetricAvailabilily {
private String timeGrain;
/**
- * Retention period for the current
- * {Microsoft.Web.Hosting.Administration.MetricAvailabilily.TimeGrain}.
+ * Retention period for the current time grain.
*/
private String retention;
diff --git a/azure-mgmt-website/src/main/java/com/microsoft/azure/management/website/NameValuePair.java b/azure-mgmt-appservice/src/main/java/com/microsoft/azure/management/appservice/NameValuePair.java
similarity index 95%
rename from azure-mgmt-website/src/main/java/com/microsoft/azure/management/website/NameValuePair.java
rename to azure-mgmt-appservice/src/main/java/com/microsoft/azure/management/appservice/NameValuePair.java
index 2893ca6bf8230..5e4945a2b0d77 100644
--- a/azure-mgmt-website/src/main/java/com/microsoft/azure/management/website/NameValuePair.java
+++ b/azure-mgmt-appservice/src/main/java/com/microsoft/azure/management/appservice/NameValuePair.java
@@ -6,7 +6,7 @@
* Code generated by Microsoft (R) AutoRest Code Generator.
*/
-package com.microsoft.azure.management.website;
+package com.microsoft.azure.management.appservice;
/**
diff --git a/azure-mgmt-website/src/main/java/com/microsoft/azure/management/website/NetFrameworkVersion.java b/azure-mgmt-appservice/src/main/java/com/microsoft/azure/management/appservice/NetFrameworkVersion.java
similarity index 96%
rename from azure-mgmt-website/src/main/java/com/microsoft/azure/management/website/NetFrameworkVersion.java
rename to azure-mgmt-appservice/src/main/java/com/microsoft/azure/management/appservice/NetFrameworkVersion.java
index db75a0d19b1a1..d1a5b5deb8c95 100644
--- a/azure-mgmt-website/src/main/java/com/microsoft/azure/management/website/NetFrameworkVersion.java
+++ b/azure-mgmt-appservice/src/main/java/com/microsoft/azure/management/appservice/NetFrameworkVersion.java
@@ -4,7 +4,7 @@
* license information.
*/
-package com.microsoft.azure.management.website;
+package com.microsoft.azure.management.appservice;
import com.fasterxml.jackson.annotation.JsonValue;
diff --git a/azure-mgmt-website/src/main/java/com/microsoft/azure/management/website/NetworkAccessControlEntry.java b/azure-mgmt-appservice/src/main/java/com/microsoft/azure/management/appservice/NetworkAccessControlEntry.java
similarity index 91%
rename from azure-mgmt-website/src/main/java/com/microsoft/azure/management/website/NetworkAccessControlEntry.java
rename to azure-mgmt-appservice/src/main/java/com/microsoft/azure/management/appservice/NetworkAccessControlEntry.java
index d79c7ff9ca714..d4074ede7679c 100644
--- a/azure-mgmt-website/src/main/java/com/microsoft/azure/management/website/NetworkAccessControlEntry.java
+++ b/azure-mgmt-appservice/src/main/java/com/microsoft/azure/management/appservice/NetworkAccessControlEntry.java
@@ -6,30 +6,30 @@
* Code generated by Microsoft (R) AutoRest Code Generator.
*/
-package com.microsoft.azure.management.website;
+package com.microsoft.azure.management.appservice;
/**
- * Network Access control entry.
+ * Network access control entry.
*/
public class NetworkAccessControlEntry {
/**
- * Possible values include: 'Permit', 'Deny'.
+ * Action object. Possible values include: 'Permit', 'Deny'.
*/
private AccessControlEntryAction action;
/**
- * The description property.
+ * Description.
*/
private String description;
/**
- * The order property.
+ * Order of precedence.
*/
private Integer order;
/**
- * The remoteSubnet property.
+ * Remote subnet.
*/
private String remoteSubnet;
diff --git a/azure-mgmt-website/src/main/java/com/microsoft/azure/management/website/NotificationLevel.java b/azure-mgmt-appservice/src/main/java/com/microsoft/azure/management/appservice/NotificationLevel.java
similarity index 96%
rename from azure-mgmt-website/src/main/java/com/microsoft/azure/management/website/NotificationLevel.java
rename to azure-mgmt-appservice/src/main/java/com/microsoft/azure/management/appservice/NotificationLevel.java
index d8ddc229c0a1d..fc498b094f307 100644
--- a/azure-mgmt-website/src/main/java/com/microsoft/azure/management/website/NotificationLevel.java
+++ b/azure-mgmt-appservice/src/main/java/com/microsoft/azure/management/appservice/NotificationLevel.java
@@ -6,7 +6,7 @@
* Code generated by Microsoft (R) AutoRest Code Generator.
*/
-package com.microsoft.azure.management.website;
+package com.microsoft.azure.management.appservice;
import com.fasterxml.jackson.annotation.JsonCreator;
import com.fasterxml.jackson.annotation.JsonValue;
diff --git a/azure-mgmt-website/src/main/java/com/microsoft/azure/management/website/OperationStatus.java b/azure-mgmt-appservice/src/main/java/com/microsoft/azure/management/appservice/OperationStatus.java
similarity index 96%
rename from azure-mgmt-website/src/main/java/com/microsoft/azure/management/website/OperationStatus.java
rename to azure-mgmt-appservice/src/main/java/com/microsoft/azure/management/appservice/OperationStatus.java
index a5e8231e3ea2d..b534ec15b1952 100644
--- a/azure-mgmt-website/src/main/java/com/microsoft/azure/management/website/OperationStatus.java
+++ b/azure-mgmt-appservice/src/main/java/com/microsoft/azure/management/appservice/OperationStatus.java
@@ -6,7 +6,7 @@
* Code generated by Microsoft (R) AutoRest Code Generator.
*/
-package com.microsoft.azure.management.website;
+package com.microsoft.azure.management.appservice;
import com.fasterxml.jackson.annotation.JsonCreator;
import com.fasterxml.jackson.annotation.JsonValue;
diff --git a/azure-mgmt-website/src/main/java/com/microsoft/azure/management/website/PerfMonSample.java b/azure-mgmt-appservice/src/main/java/com/microsoft/azure/management/appservice/PerfMonSample.java
similarity index 93%
rename from azure-mgmt-website/src/main/java/com/microsoft/azure/management/website/PerfMonSample.java
rename to azure-mgmt-appservice/src/main/java/com/microsoft/azure/management/appservice/PerfMonSample.java
index d5229dbc591bc..e3bde721a344d 100644
--- a/azure-mgmt-website/src/main/java/com/microsoft/azure/management/website/PerfMonSample.java
+++ b/azure-mgmt-appservice/src/main/java/com/microsoft/azure/management/appservice/PerfMonSample.java
@@ -6,12 +6,12 @@
* Code generated by Microsoft (R) AutoRest Code Generator.
*/
-package com.microsoft.azure.management.website;
+package com.microsoft.azure.management.appservice;
import org.joda.time.DateTime;
/**
- * Class representing a Perf Mon Sample.
+ * Performance monitor sample in a set.
*/
public class PerfMonSample {
/**
@@ -25,7 +25,7 @@ public class PerfMonSample {
private String instanceName;
/**
- * Value of Counter at certain time.
+ * Value of counter at a certain time.
*/
private Double value;
diff --git a/azure-mgmt-website/src/main/java/com/microsoft/azure/management/website/PerfMonSet.java b/azure-mgmt-appservice/src/main/java/com/microsoft/azure/management/appservice/PerfMonSet.java
similarity index 96%
rename from azure-mgmt-website/src/main/java/com/microsoft/azure/management/website/PerfMonSet.java
rename to azure-mgmt-appservice/src/main/java/com/microsoft/azure/management/appservice/PerfMonSet.java
index 7eef87c58deab..d8029610d9a48 100644
--- a/azure-mgmt-website/src/main/java/com/microsoft/azure/management/website/PerfMonSet.java
+++ b/azure-mgmt-appservice/src/main/java/com/microsoft/azure/management/appservice/PerfMonSet.java
@@ -6,13 +6,13 @@
* Code generated by Microsoft (R) AutoRest Code Generator.
*/
-package com.microsoft.azure.management.website;
+package com.microsoft.azure.management.appservice;
import org.joda.time.DateTime;
import java.util.List;
/**
- * Class containing metric information.
+ * Metric information.
*/
public class PerfMonSet {
/**
diff --git a/azure-mgmt-website/src/main/java/com/microsoft/azure/management/website/PhpVersion.java b/azure-mgmt-appservice/src/main/java/com/microsoft/azure/management/appservice/PhpVersion.java
similarity index 96%
rename from azure-mgmt-website/src/main/java/com/microsoft/azure/management/website/PhpVersion.java
rename to azure-mgmt-appservice/src/main/java/com/microsoft/azure/management/appservice/PhpVersion.java
index 6f51228899e59..4b92b5e45f475 100644
--- a/azure-mgmt-website/src/main/java/com/microsoft/azure/management/website/PhpVersion.java
+++ b/azure-mgmt-appservice/src/main/java/com/microsoft/azure/management/appservice/PhpVersion.java
@@ -4,7 +4,7 @@
* license information.
*/
-package com.microsoft.azure.management.website;
+package com.microsoft.azure.management.appservice;
import com.fasterxml.jackson.annotation.JsonValue;
diff --git a/azure-mgmt-website/src/main/java/com/microsoft/azure/management/website/PlatformArchitecture.java b/azure-mgmt-appservice/src/main/java/com/microsoft/azure/management/appservice/PlatformArchitecture.java
similarity index 88%
rename from azure-mgmt-website/src/main/java/com/microsoft/azure/management/website/PlatformArchitecture.java
rename to azure-mgmt-appservice/src/main/java/com/microsoft/azure/management/appservice/PlatformArchitecture.java
index b6c1deada80f8..47dc635a258b4 100644
--- a/azure-mgmt-website/src/main/java/com/microsoft/azure/management/website/PlatformArchitecture.java
+++ b/azure-mgmt-appservice/src/main/java/com/microsoft/azure/management/appservice/PlatformArchitecture.java
@@ -4,7 +4,7 @@
* license information.
*/
-package com.microsoft.azure.management.website;
+package com.microsoft.azure.management.appservice;
/**
* Defines values for app service platform architecture.
diff --git a/azure-mgmt-website/src/main/java/com/microsoft/azure/management/website/ProvisioningState.java b/azure-mgmt-appservice/src/main/java/com/microsoft/azure/management/appservice/ProvisioningState.java
similarity index 96%
rename from azure-mgmt-website/src/main/java/com/microsoft/azure/management/website/ProvisioningState.java
rename to azure-mgmt-appservice/src/main/java/com/microsoft/azure/management/appservice/ProvisioningState.java
index d478ebf10ff26..532466dacad0f 100644
--- a/azure-mgmt-website/src/main/java/com/microsoft/azure/management/website/ProvisioningState.java
+++ b/azure-mgmt-appservice/src/main/java/com/microsoft/azure/management/appservice/ProvisioningState.java
@@ -6,7 +6,7 @@
* Code generated by Microsoft (R) AutoRest Code Generator.
*/
-package com.microsoft.azure.management.website;
+package com.microsoft.azure.management.appservice;
import com.fasterxml.jackson.annotation.JsonCreator;
import com.fasterxml.jackson.annotation.JsonValue;
diff --git a/azure-mgmt-appservice/src/main/java/com/microsoft/azure/management/appservice/PublishingCredentials.java b/azure-mgmt-appservice/src/main/java/com/microsoft/azure/management/appservice/PublishingCredentials.java
new file mode 100644
index 0000000000000..4e5662f7ade6c
--- /dev/null
+++ b/azure-mgmt-appservice/src/main/java/com/microsoft/azure/management/appservice/PublishingCredentials.java
@@ -0,0 +1,27 @@
+/**
+ * Copyright (c) Microsoft Corporation. All rights reserved.
+ * Licensed under the MIT License. See License.txt in the project root for
+ * license information.
+ */
+package com.microsoft.azure.management.appservice;
+
+import com.microsoft.azure.management.apigeneration.Fluent;
+import com.microsoft.azure.management.resources.fluentcore.model.Wrapper;
+import com.microsoft.azure.management.appservice.implementation.UserInner;
+
+/**
+ * A credential for publishing to a web app.
+ */
+@Fluent
+public interface PublishingCredentials extends
+ Wrapper {
+ /**
+ * @return the username used for FTP and Git publishing.
+ */
+ String username();
+
+ /**
+ * @return the password used for FTP and Git publishing.
+ */
+ String password();
+}
diff --git a/azure-mgmt-appservice/src/main/java/com/microsoft/azure/management/appservice/PublishingProfileFormat.java b/azure-mgmt-appservice/src/main/java/com/microsoft/azure/management/appservice/PublishingProfileFormat.java
new file mode 100644
index 0000000000000..386c0feb1c4c8
--- /dev/null
+++ b/azure-mgmt-appservice/src/main/java/com/microsoft/azure/management/appservice/PublishingProfileFormat.java
@@ -0,0 +1,62 @@
+/**
+ * Copyright (c) Microsoft Corporation. All rights reserved.
+ * Licensed under the MIT License. See License.txt in the project root for
+ * license information.
+ *
+ * Code generated by Microsoft (R) AutoRest Code Generator.
+ */
+
+package com.microsoft.azure.management.appservice;
+
+import com.fasterxml.jackson.annotation.JsonValue;
+
+/**
+ * Defines values for PublishingProfileFormat.
+ */
+public final class PublishingProfileFormat {
+ /** Static value FileZilla3 for PublishingProfileFormat. */
+ public static final PublishingProfileFormat FILE_ZILLA3 = new PublishingProfileFormat("FileZilla3");
+
+ /** Static value WebDeploy for PublishingProfileFormat. */
+ public static final PublishingProfileFormat WEB_DEPLOY = new PublishingProfileFormat("WebDeploy");
+
+ /** Static value Ftp for PublishingProfileFormat. */
+ public static final PublishingProfileFormat FTP = new PublishingProfileFormat("Ftp");
+
+ private String value;
+
+ /**
+ * Creates a custom value for PublishingProfileFormat.
+ * @param value the custom value
+ */
+ public PublishingProfileFormat(String value) {
+ this.value = value;
+ }
+
+ @JsonValue
+ @Override
+ public String toString() {
+ return value;
+ }
+
+ @Override
+ public int hashCode() {
+ return value.hashCode();
+ }
+
+ @Override
+ public boolean equals(Object obj) {
+ if (!(obj instanceof PublishingProfileFormat)) {
+ return false;
+ }
+ if (obj == this) {
+ return true;
+ }
+ PublishingProfileFormat rhs = (PublishingProfileFormat) obj;
+ if (value == null) {
+ return rhs.value == null;
+ } else {
+ return value.equals(rhs.value);
+ }
+ }
+}
diff --git a/azure-mgmt-website/src/main/java/com/microsoft/azure/management/website/PythonVersion.java b/azure-mgmt-appservice/src/main/java/com/microsoft/azure/management/appservice/PythonVersion.java
similarity index 96%
rename from azure-mgmt-website/src/main/java/com/microsoft/azure/management/website/PythonVersion.java
rename to azure-mgmt-appservice/src/main/java/com/microsoft/azure/management/appservice/PythonVersion.java
index dd92538894df6..3591a3a062cfc 100644
--- a/azure-mgmt-website/src/main/java/com/microsoft/azure/management/website/PythonVersion.java
+++ b/azure-mgmt-appservice/src/main/java/com/microsoft/azure/management/appservice/PythonVersion.java
@@ -4,7 +4,7 @@
* license information.
*/
-package com.microsoft.azure.management.website;
+package com.microsoft.azure.management.appservice;
import com.fasterxml.jackson.annotation.JsonValue;
diff --git a/azure-mgmt-website/src/main/java/com/microsoft/azure/management/website/RampUpRule.java b/azure-mgmt-appservice/src/main/java/com/microsoft/azure/management/appservice/RampUpRule.java
similarity index 81%
rename from azure-mgmt-website/src/main/java/com/microsoft/azure/management/website/RampUpRule.java
rename to azure-mgmt-appservice/src/main/java/com/microsoft/azure/management/appservice/RampUpRule.java
index ab0c6279e3114..2b7eacfb34c2f 100644
--- a/azure-mgmt-website/src/main/java/com/microsoft/azure/management/website/RampUpRule.java
+++ b/azure-mgmt-appservice/src/main/java/com/microsoft/azure/management/appservice/RampUpRule.java
@@ -6,7 +6,7 @@
* Code generated by Microsoft (R) AutoRest Code Generator.
*/
-package com.microsoft.azure.management.website;
+package com.microsoft.azure.management.appservice;
/**
@@ -16,53 +16,47 @@
public class RampUpRule {
/**
* Hostname of a slot to which the traffic will be redirected if decided
- * to. E.g. mysite-stage.azurewebsites.net.
+ * to. E.g. myapp-stage.azurewebsites.net.
*/
private String actionHostName;
/**
* Percentage of the traffic which will be redirected to
- * {Microsoft.Web.Hosting.Administration.RampUpRule.ActionHostName}.
+ * <code>ActionHostName</code>.
*/
private Double reroutePercentage;
/**
- * [Optional] In auto ramp up scenario this is the step to to add/remove
- * from
- * {Microsoft.Web.Hosting.Administration.RampUpRule.ReroutePercentage}
- * until it reaches
- * {Microsoft.Web.Hosting.Administration.RampUpRule.MinReroutePercentage}
- * or
- * {Microsoft.Web.Hosting.Administration.RampUpRule.MaxReroutePercentage}.
- * Site metrics are checked every N minutes specificed in
- * {Microsoft.Web.Hosting.Administration.RampUpRule.ChangeIntervalInMinutes}.
- * Custom decision algorithm can be provided in TiPCallback
- * site extension which Url can be specified in
- * {Microsoft.Web.Hosting.Administration.RampUpRule.ChangeDecisionCallbackUrl}.
+ * In auto ramp up scenario this is the step to to add/remove from
+ * <code>ReroutePercentage</code> until it reaches
+ * <code>MinReroutePercentage</code> or
+ * <code>MaxReroutePercentage</code>. Site metrics are
+ * checked every N minutes specificed in
+ * <code>ChangeIntervalInMinutes</code>.
+ * Custom decision algorithm can be provided in TiPCallback site
+ * extension which URL can be specified in
+ * <code>ChangeDecisionCallbackUrl</code>.
*/
private Double changeStep;
/**
- * [Optional] Specifies interval in mimuntes to reevaluate
- * ReroutePercentage.
+ * Specifies interval in mimuntes to reevaluate ReroutePercentage.
*/
private Integer changeIntervalInMinutes;
/**
- * [Optional] Specifies lower boundary above which ReroutePercentage will
- * stay.
+ * Specifies lower boundary above which ReroutePercentage will stay.
*/
private Double minReroutePercentage;
/**
- * [Optional] Specifies upper boundary below which ReroutePercentage will
- * stay.
+ * Specifies upper boundary below which ReroutePercentage will stay.
*/
private Double maxReroutePercentage;
/**
* Custom decision algorithm can be provided in TiPCallback site extension
- * which Url can be specified. See TiPCallback site extension for the
+ * which URL can be specified. See TiPCallback site extension for the
* scaffold and contracts.
* https://www.siteextensions.net/packages/TiPCallback/.
*/
diff --git a/azure-mgmt-website/src/main/java/com/microsoft/azure/management/website/RemoteVisualStudioVersion.java b/azure-mgmt-appservice/src/main/java/com/microsoft/azure/management/appservice/RemoteVisualStudioVersion.java
similarity index 97%
rename from azure-mgmt-website/src/main/java/com/microsoft/azure/management/website/RemoteVisualStudioVersion.java
rename to azure-mgmt-appservice/src/main/java/com/microsoft/azure/management/appservice/RemoteVisualStudioVersion.java
index 41d00d6168384..c3dc8d1b0085d 100644
--- a/azure-mgmt-website/src/main/java/com/microsoft/azure/management/website/RemoteVisualStudioVersion.java
+++ b/azure-mgmt-appservice/src/main/java/com/microsoft/azure/management/appservice/RemoteVisualStudioVersion.java
@@ -4,7 +4,7 @@
* license information.
*/
-package com.microsoft.azure.management.website;
+package com.microsoft.azure.management.appservice;
import com.fasterxml.jackson.annotation.JsonValue;
diff --git a/azure-mgmt-website/src/main/java/com/microsoft/azure/management/website/RequestsBasedTrigger.java b/azure-mgmt-appservice/src/main/java/com/microsoft/azure/management/appservice/RequestsBasedTrigger.java
similarity index 92%
rename from azure-mgmt-website/src/main/java/com/microsoft/azure/management/website/RequestsBasedTrigger.java
rename to azure-mgmt-appservice/src/main/java/com/microsoft/azure/management/appservice/RequestsBasedTrigger.java
index e6c9886701d2d..a889037ef4e6d 100644
--- a/azure-mgmt-website/src/main/java/com/microsoft/azure/management/website/RequestsBasedTrigger.java
+++ b/azure-mgmt-appservice/src/main/java/com/microsoft/azure/management/appservice/RequestsBasedTrigger.java
@@ -6,11 +6,11 @@
* Code generated by Microsoft (R) AutoRest Code Generator.
*/
-package com.microsoft.azure.management.website;
+package com.microsoft.azure.management.appservice;
/**
- * RequestsBasedTrigger.
+ * Trigger based on total requests.
*/
public class RequestsBasedTrigger {
/**
@@ -19,7 +19,7 @@ public class RequestsBasedTrigger {
private Integer count;
/**
- * TimeInterval.
+ * Time interval.
*/
private String timeInterval;
diff --git a/azure-mgmt-appservice/src/main/java/com/microsoft/azure/management/appservice/ResourceMetricAvailability.java b/azure-mgmt-appservice/src/main/java/com/microsoft/azure/management/appservice/ResourceMetricAvailability.java
new file mode 100644
index 0000000000000..9da98eef591c1
--- /dev/null
+++ b/azure-mgmt-appservice/src/main/java/com/microsoft/azure/management/appservice/ResourceMetricAvailability.java
@@ -0,0 +1,47 @@
+/**
+ * Copyright (c) Microsoft Corporation. All rights reserved.
+ * Licensed under the MIT License. See License.txt in the project root for
+ * license information.
+ *
+ * Code generated by Microsoft (R) AutoRest Code Generator.
+ */
+
+package com.microsoft.azure.management.appservice;
+
+import com.fasterxml.jackson.annotation.JsonProperty;
+
+/**
+ * Metrics availability and retention.
+ */
+public class ResourceMetricAvailability {
+ /**
+ * Time grain .
+ */
+ @JsonProperty(access = JsonProperty.Access.WRITE_ONLY)
+ private String timeGrain;
+
+ /**
+ * Retention period for the current time grain.
+ */
+ @JsonProperty(access = JsonProperty.Access.WRITE_ONLY)
+ private String retention;
+
+ /**
+ * Get the timeGrain value.
+ *
+ * @return the timeGrain value
+ */
+ public String timeGrain() {
+ return this.timeGrain;
+ }
+
+ /**
+ * Get the retention value.
+ *
+ * @return the retention value
+ */
+ public String retention() {
+ return this.retention;
+ }
+
+}
diff --git a/azure-mgmt-website/src/main/java/com/microsoft/azure/management/website/ResourceMetricName.java b/azure-mgmt-appservice/src/main/java/com/microsoft/azure/management/appservice/ResourceMetricName.java
similarity index 91%
rename from azure-mgmt-website/src/main/java/com/microsoft/azure/management/website/ResourceMetricName.java
rename to azure-mgmt-appservice/src/main/java/com/microsoft/azure/management/appservice/ResourceMetricName.java
index 19206b4b1fe4e..384acc43d7b1c 100644
--- a/azure-mgmt-website/src/main/java/com/microsoft/azure/management/website/ResourceMetricName.java
+++ b/azure-mgmt-appservice/src/main/java/com/microsoft/azure/management/appservice/ResourceMetricName.java
@@ -6,12 +6,12 @@
* Code generated by Microsoft (R) AutoRest Code Generator.
*/
-package com.microsoft.azure.management.website;
+package com.microsoft.azure.management.appservice;
import com.fasterxml.jackson.annotation.JsonProperty;
/**
- * Name of a metric for any resource.
+ * Name of a metric for any resource .
*/
public class ResourceMetricName {
/**
diff --git a/azure-mgmt-website/src/main/java/com/microsoft/azure/management/website/ResourceMetricProperty.java b/azure-mgmt-appservice/src/main/java/com/microsoft/azure/management/appservice/ResourceMetricProperty.java
similarity index 96%
rename from azure-mgmt-website/src/main/java/com/microsoft/azure/management/website/ResourceMetricProperty.java
rename to azure-mgmt-appservice/src/main/java/com/microsoft/azure/management/appservice/ResourceMetricProperty.java
index a44e880314a14..74327e1e5a784 100644
--- a/azure-mgmt-website/src/main/java/com/microsoft/azure/management/website/ResourceMetricProperty.java
+++ b/azure-mgmt-appservice/src/main/java/com/microsoft/azure/management/appservice/ResourceMetricProperty.java
@@ -6,7 +6,7 @@
* Code generated by Microsoft (R) AutoRest Code Generator.
*/
-package com.microsoft.azure.management.website;
+package com.microsoft.azure.management.appservice;
/**
diff --git a/azure-mgmt-website/src/main/java/com/microsoft/azure/management/website/ResourceMetricValue.java b/azure-mgmt-appservice/src/main/java/com/microsoft/azure/management/appservice/ResourceMetricValue.java
similarity index 97%
rename from azure-mgmt-website/src/main/java/com/microsoft/azure/management/website/ResourceMetricValue.java
rename to azure-mgmt-appservice/src/main/java/com/microsoft/azure/management/appservice/ResourceMetricValue.java
index 40ee530079350..ea2f941381573 100644
--- a/azure-mgmt-website/src/main/java/com/microsoft/azure/management/website/ResourceMetricValue.java
+++ b/azure-mgmt-appservice/src/main/java/com/microsoft/azure/management/appservice/ResourceMetricValue.java
@@ -6,7 +6,7 @@
* Code generated by Microsoft (R) AutoRest Code Generator.
*/
-package com.microsoft.azure.management.website;
+package com.microsoft.azure.management.appservice;
import java.util.List;
import com.fasterxml.jackson.annotation.JsonProperty;
diff --git a/azure-mgmt-website/src/main/java/com/microsoft/azure/management/website/implementation/ResourceNameAvailabilityRequestInner.java b/azure-mgmt-appservice/src/main/java/com/microsoft/azure/management/appservice/ResourceNameAvailabilityRequest.java
similarity index 70%
rename from azure-mgmt-website/src/main/java/com/microsoft/azure/management/website/implementation/ResourceNameAvailabilityRequestInner.java
rename to azure-mgmt-appservice/src/main/java/com/microsoft/azure/management/appservice/ResourceNameAvailabilityRequest.java
index 5ad5fa8ebd4ba..f86d71b663075 100644
--- a/azure-mgmt-website/src/main/java/com/microsoft/azure/management/website/implementation/ResourceNameAvailabilityRequestInner.java
+++ b/azure-mgmt-appservice/src/main/java/com/microsoft/azure/management/appservice/ResourceNameAvailabilityRequest.java
@@ -6,23 +6,25 @@
* Code generated by Microsoft (R) AutoRest Code Generator.
*/
-package com.microsoft.azure.management.website.implementation;
+package com.microsoft.azure.management.appservice;
-import com.microsoft.azure.management.website.CheckNameResourceTypes;
+import com.fasterxml.jackson.annotation.JsonProperty;
/**
* Resource name availability request content.
*/
-public class ResourceNameAvailabilityRequestInner {
+public class ResourceNameAvailabilityRequest {
/**
* Resource name to verify.
*/
+ @JsonProperty(required = true)
private String name;
/**
* Resource type used for verification. Possible values include: 'Site',
* 'Slot', 'HostingEnvironment'.
*/
+ @JsonProperty(required = true)
private CheckNameResourceTypes type;
/**
@@ -43,9 +45,9 @@ public String name() {
* Set the name value.
*
* @param name the name value to set
- * @return the ResourceNameAvailabilityRequestInner object itself.
+ * @return the ResourceNameAvailabilityRequest object itself.
*/
- public ResourceNameAvailabilityRequestInner withName(String name) {
+ public ResourceNameAvailabilityRequest withName(String name) {
this.name = name;
return this;
}
@@ -63,9 +65,9 @@ public CheckNameResourceTypes type() {
* Set the type value.
*
* @param type the type value to set
- * @return the ResourceNameAvailabilityRequestInner object itself.
+ * @return the ResourceNameAvailabilityRequest object itself.
*/
- public ResourceNameAvailabilityRequestInner withType(CheckNameResourceTypes type) {
+ public ResourceNameAvailabilityRequest withType(CheckNameResourceTypes type) {
this.type = type;
return this;
}
@@ -83,9 +85,9 @@ public Boolean isFqdn() {
* Set the isFqdn value.
*
* @param isFqdn the isFqdn value to set
- * @return the ResourceNameAvailabilityRequestInner object itself.
+ * @return the ResourceNameAvailabilityRequest object itself.
*/
- public ResourceNameAvailabilityRequestInner withIsFqdn(Boolean isFqdn) {
+ public ResourceNameAvailabilityRequest withIsFqdn(Boolean isFqdn) {
this.isFqdn = isFqdn;
return this;
}
diff --git a/azure-mgmt-appservice/src/main/java/com/microsoft/azure/management/appservice/ResourceScopeType.java b/azure-mgmt-appservice/src/main/java/com/microsoft/azure/management/appservice/ResourceScopeType.java
new file mode 100644
index 0000000000000..398cb2522bd4c
--- /dev/null
+++ b/azure-mgmt-appservice/src/main/java/com/microsoft/azure/management/appservice/ResourceScopeType.java
@@ -0,0 +1,62 @@
+/**
+ * Copyright (c) Microsoft Corporation. All rights reserved.
+ * Licensed under the MIT License. See License.txt in the project root for
+ * license information.
+ *
+ * Code generated by Microsoft (R) AutoRest Code Generator.
+ */
+
+package com.microsoft.azure.management.appservice;
+
+import com.fasterxml.jackson.annotation.JsonValue;
+
+/**
+ * Defines values for ResourceScopeType.
+ */
+public final class ResourceScopeType {
+ /** Static value ServerFarm for ResourceScopeType. */
+ public static final ResourceScopeType SERVER_FARM = new ResourceScopeType("ServerFarm");
+
+ /** Static value Subscription for ResourceScopeType. */
+ public static final ResourceScopeType SUBSCRIPTION = new ResourceScopeType("Subscription");
+
+ /** Static value WebSite for ResourceScopeType. */
+ public static final ResourceScopeType WEB_SITE = new ResourceScopeType("WebSite");
+
+ private String value;
+
+ /**
+ * Creates a custom value for ResourceScopeType.
+ * @param value the custom value
+ */
+ public ResourceScopeType(String value) {
+ this.value = value;
+ }
+
+ @JsonValue
+ @Override
+ public String toString() {
+ return value;
+ }
+
+ @Override
+ public int hashCode() {
+ return value.hashCode();
+ }
+
+ @Override
+ public boolean equals(Object obj) {
+ if (!(obj instanceof ResourceScopeType)) {
+ return false;
+ }
+ if (obj == this) {
+ return true;
+ }
+ ResourceScopeType rhs = (ResourceScopeType) obj;
+ if (value == null) {
+ return rhs.value == null;
+ } else {
+ return value.equals(rhs.value);
+ }
+ }
+}
diff --git a/azure-mgmt-appservice/src/main/java/com/microsoft/azure/management/appservice/RouteType.java b/azure-mgmt-appservice/src/main/java/com/microsoft/azure/management/appservice/RouteType.java
new file mode 100644
index 0000000000000..a032a3323a7b6
--- /dev/null
+++ b/azure-mgmt-appservice/src/main/java/com/microsoft/azure/management/appservice/RouteType.java
@@ -0,0 +1,62 @@
+/**
+ * Copyright (c) Microsoft Corporation. All rights reserved.
+ * Licensed under the MIT License. See License.txt in the project root for
+ * license information.
+ *
+ * Code generated by Microsoft (R) AutoRest Code Generator.
+ */
+
+package com.microsoft.azure.management.appservice;
+
+import com.fasterxml.jackson.annotation.JsonValue;
+
+/**
+ * Defines values for RouteType.
+ */
+public final class RouteType {
+ /** Static value DEFAULT for RouteType. */
+ public static final RouteType DEFAULT = new RouteType("DEFAULT");
+
+ /** Static value INHERITED for RouteType. */
+ public static final RouteType INHERITED = new RouteType("INHERITED");
+
+ /** Static value STATIC for RouteType. */
+ public static final RouteType STATIC = new RouteType("STATIC");
+
+ private String value;
+
+ /**
+ * Creates a custom value for RouteType.
+ * @param value the custom value
+ */
+ public RouteType(String value) {
+ this.value = value;
+ }
+
+ @JsonValue
+ @Override
+ public String toString() {
+ return value;
+ }
+
+ @Override
+ public int hashCode() {
+ return value.hashCode();
+ }
+
+ @Override
+ public boolean equals(Object obj) {
+ if (!(obj instanceof RouteType)) {
+ return false;
+ }
+ if (obj == this) {
+ return true;
+ }
+ RouteType rhs = (RouteType) obj;
+ if (value == null) {
+ return rhs.value == null;
+ } else {
+ return value.equals(rhs.value);
+ }
+ }
+}
diff --git a/azure-mgmt-website/src/main/java/com/microsoft/azure/management/website/SiteAvailabilityState.java b/azure-mgmt-appservice/src/main/java/com/microsoft/azure/management/appservice/SiteAvailabilityState.java
similarity index 96%
rename from azure-mgmt-website/src/main/java/com/microsoft/azure/management/website/SiteAvailabilityState.java
rename to azure-mgmt-appservice/src/main/java/com/microsoft/azure/management/appservice/SiteAvailabilityState.java
index 4f5474d1acc0d..bc06c671a33b5 100644
--- a/azure-mgmt-website/src/main/java/com/microsoft/azure/management/website/SiteAvailabilityState.java
+++ b/azure-mgmt-appservice/src/main/java/com/microsoft/azure/management/appservice/SiteAvailabilityState.java
@@ -6,7 +6,7 @@
* Code generated by Microsoft (R) AutoRest Code Generator.
*/
-package com.microsoft.azure.management.website;
+package com.microsoft.azure.management.appservice;
import com.fasterxml.jackson.annotation.JsonCreator;
import com.fasterxml.jackson.annotation.JsonValue;
diff --git a/azure-mgmt-website/src/main/java/com/microsoft/azure/management/website/SiteCloneabilityCriterion.java b/azure-mgmt-appservice/src/main/java/com/microsoft/azure/management/appservice/SiteCloneabilityCriterion.java
similarity index 93%
rename from azure-mgmt-website/src/main/java/com/microsoft/azure/management/website/SiteCloneabilityCriterion.java
rename to azure-mgmt-appservice/src/main/java/com/microsoft/azure/management/appservice/SiteCloneabilityCriterion.java
index a89d8b7b11797..9fc88f1e13b0b 100644
--- a/azure-mgmt-website/src/main/java/com/microsoft/azure/management/website/SiteCloneabilityCriterion.java
+++ b/azure-mgmt-appservice/src/main/java/com/microsoft/azure/management/appservice/SiteCloneabilityCriterion.java
@@ -6,11 +6,11 @@
* Code generated by Microsoft (R) AutoRest Code Generator.
*/
-package com.microsoft.azure.management.website;
+package com.microsoft.azure.management.appservice;
/**
- * Represents a site cloneability criterion.
+ * An app cloneability criterion.
*/
public class SiteCloneabilityCriterion {
/**
diff --git a/azure-mgmt-website/src/main/java/com/microsoft/azure/management/website/SiteLimits.java b/azure-mgmt-appservice/src/main/java/com/microsoft/azure/management/appservice/SiteLimits.java
similarity index 95%
rename from azure-mgmt-website/src/main/java/com/microsoft/azure/management/website/SiteLimits.java
rename to azure-mgmt-appservice/src/main/java/com/microsoft/azure/management/appservice/SiteLimits.java
index 8ca792f1b5f20..7ec98823ef590 100644
--- a/azure-mgmt-website/src/main/java/com/microsoft/azure/management/website/SiteLimits.java
+++ b/azure-mgmt-appservice/src/main/java/com/microsoft/azure/management/appservice/SiteLimits.java
@@ -6,11 +6,11 @@
* Code generated by Microsoft (R) AutoRest Code Generator.
*/
-package com.microsoft.azure.management.website;
+package com.microsoft.azure.management.appservice;
/**
- * Represents metric limits set on a web app.
+ * Metric limits set on an app.
*/
public class SiteLimits {
/**
diff --git a/azure-mgmt-website/src/main/java/com/microsoft/azure/management/website/SiteLoadBalancing.java b/azure-mgmt-appservice/src/main/java/com/microsoft/azure/management/appservice/SiteLoadBalancing.java
similarity index 97%
rename from azure-mgmt-website/src/main/java/com/microsoft/azure/management/website/SiteLoadBalancing.java
rename to azure-mgmt-appservice/src/main/java/com/microsoft/azure/management/appservice/SiteLoadBalancing.java
index dac781b6b6b8f..9031bc83480f8 100644
--- a/azure-mgmt-website/src/main/java/com/microsoft/azure/management/website/SiteLoadBalancing.java
+++ b/azure-mgmt-appservice/src/main/java/com/microsoft/azure/management/appservice/SiteLoadBalancing.java
@@ -6,7 +6,7 @@
* Code generated by Microsoft (R) AutoRest Code Generator.
*/
-package com.microsoft.azure.management.website;
+package com.microsoft.azure.management.appservice;
import com.fasterxml.jackson.annotation.JsonCreator;
import com.fasterxml.jackson.annotation.JsonValue;
diff --git a/azure-mgmt-website/src/main/java/com/microsoft/azure/management/website/SiteMachineKey.java b/azure-mgmt-appservice/src/main/java/com/microsoft/azure/management/appservice/SiteMachineKey.java
similarity index 93%
rename from azure-mgmt-website/src/main/java/com/microsoft/azure/management/website/SiteMachineKey.java
rename to azure-mgmt-appservice/src/main/java/com/microsoft/azure/management/appservice/SiteMachineKey.java
index 5f158a9013526..cfaf687a8cf69 100644
--- a/azure-mgmt-website/src/main/java/com/microsoft/azure/management/website/SiteMachineKey.java
+++ b/azure-mgmt-appservice/src/main/java/com/microsoft/azure/management/appservice/SiteMachineKey.java
@@ -6,20 +6,20 @@
* Code generated by Microsoft (R) AutoRest Code Generator.
*/
-package com.microsoft.azure.management.website;
+package com.microsoft.azure.management.appservice;
/**
- * MachineKey of Azure web site.
+ * MachineKey of an app.
*/
public class SiteMachineKey {
/**
- * MachineKeyValidation.
+ * MachineKey validation.
*/
private String validation;
/**
- * ValidationKey.
+ * Validation key.
*/
private String validationKey;
@@ -29,7 +29,7 @@ public class SiteMachineKey {
private String decryption;
/**
- * DecryptionKey.
+ * Decryption key.
*/
private String decryptionKey;
diff --git a/azure-mgmt-website/src/main/java/com/microsoft/azure/management/website/SkuCapacity.java b/azure-mgmt-appservice/src/main/java/com/microsoft/azure/management/appservice/SkuCapacity.java
similarity index 86%
rename from azure-mgmt-website/src/main/java/com/microsoft/azure/management/website/SkuCapacity.java
rename to azure-mgmt-appservice/src/main/java/com/microsoft/azure/management/appservice/SkuCapacity.java
index 0f1e5e0e0b8a6..8525004c7796b 100644
--- a/azure-mgmt-website/src/main/java/com/microsoft/azure/management/website/SkuCapacity.java
+++ b/azure-mgmt-appservice/src/main/java/com/microsoft/azure/management/appservice/SkuCapacity.java
@@ -6,32 +6,32 @@
* Code generated by Microsoft (R) AutoRest Code Generator.
*/
-package com.microsoft.azure.management.website;
+package com.microsoft.azure.management.appservice;
import com.fasterxml.jackson.annotation.JsonProperty;
/**
- * Description of the App Service Plan scale options.
+ * Description of the App Service plan scale options.
*/
public class SkuCapacity {
/**
- * Minimum number of Workers for this App Service Plan SKU.
+ * Minimum number of workers for this App Service plan SKU.
*/
private Integer minimum;
/**
- * Maximum number of Workers for this App Service Plan SKU.
+ * Maximum number of workers for this App Service plan SKU.
*/
private Integer maximum;
/**
- * Default number of Workers for this App Service Plan SKU.
+ * Default number of workers for this App Service plan SKU.
*/
@JsonProperty(value = "default")
private Integer defaultProperty;
/**
- * Available scale configurations for an App Service Plan.
+ * Available scale configurations for an App Service plan.
*/
private String scaleType;
diff --git a/azure-mgmt-website/src/main/java/com/microsoft/azure/management/website/SkuDescription.java b/azure-mgmt-appservice/src/main/java/com/microsoft/azure/management/appservice/SkuDescription.java
similarity index 89%
rename from azure-mgmt-website/src/main/java/com/microsoft/azure/management/website/SkuDescription.java
rename to azure-mgmt-appservice/src/main/java/com/microsoft/azure/management/appservice/SkuDescription.java
index cdec843e08a6a..20d98fa7b0e76 100644
--- a/azure-mgmt-website/src/main/java/com/microsoft/azure/management/website/SkuDescription.java
+++ b/azure-mgmt-appservice/src/main/java/com/microsoft/azure/management/appservice/SkuDescription.java
@@ -6,32 +6,32 @@
* Code generated by Microsoft (R) AutoRest Code Generator.
*/
-package com.microsoft.azure.management.website;
+package com.microsoft.azure.management.appservice;
import java.util.List;
-import com.microsoft.azure.management.website.implementation.CapabilityInner;
+import com.microsoft.azure.management.appservice.implementation.CapabilityInner;
/**
- * Describes a sku for a scalable resource.
+ * Description of a SKU for a scalable resource.
*/
public class SkuDescription {
/**
- * Name of the resource sku.
+ * Name of the resource SKU.
*/
private String name;
/**
- * Service Tier of the resource sku.
+ * Service tier of the resource SKU.
*/
private String tier;
/**
- * Size specifier of the resource sku.
+ * Size specifier of the resource SKU.
*/
private String size;
/**
- * Family code of the resource sku.
+ * Family code of the resource SKU.
*/
private String family;
@@ -41,17 +41,17 @@ public class SkuDescription {
private Integer capacity;
/**
- * Min, max, and default scale values of the sku.
+ * Min, max, and default scale values of the SKU.
*/
private SkuCapacity skuCapacity;
/**
- * Locations of the sku.
+ * Locations of the SKU.
*/
private List locations;
/**
- * Capabilities of the sku, eg., is traffic manager enabled?.
+ * Capabilities of the SKU, e.g., is traffic manager enabled?.
*/
private List capabilities;
diff --git a/azure-mgmt-appservice/src/main/java/com/microsoft/azure/management/appservice/SkuName.java b/azure-mgmt-appservice/src/main/java/com/microsoft/azure/management/appservice/SkuName.java
new file mode 100644
index 0000000000000..b475c61754a69
--- /dev/null
+++ b/azure-mgmt-appservice/src/main/java/com/microsoft/azure/management/appservice/SkuName.java
@@ -0,0 +1,71 @@
+/**
+ * Copyright (c) Microsoft Corporation. All rights reserved.
+ * Licensed under the MIT License. See License.txt in the project root for
+ * license information.
+ *
+ * Code generated by Microsoft (R) AutoRest Code Generator.
+ */
+
+package com.microsoft.azure.management.appservice;
+
+import com.fasterxml.jackson.annotation.JsonValue;
+
+/**
+ * Defines values for SkuName.
+ */
+public final class SkuName {
+ /** Static value Free for SkuName. */
+ public static final SkuName FREE = new SkuName("Free");
+
+ /** Static value Shared for SkuName. */
+ public static final SkuName SHARED = new SkuName("Shared");
+
+ /** Static value Basic for SkuName. */
+ public static final SkuName BASIC = new SkuName("Basic");
+
+ /** Static value Standard for SkuName. */
+ public static final SkuName STANDARD = new SkuName("Standard");
+
+ /** Static value Premium for SkuName. */
+ public static final SkuName PREMIUM = new SkuName("Premium");
+
+ /** Static value Dynamic for SkuName. */
+ public static final SkuName DYNAMIC = new SkuName("Dynamic");
+
+ private String value;
+
+ /**
+ * Creates a custom value for SkuName.
+ * @param value the custom value
+ */
+ public SkuName(String value) {
+ this.value = value;
+ }
+
+ @JsonValue
+ @Override
+ public String toString() {
+ return value;
+ }
+
+ @Override
+ public int hashCode() {
+ return value.hashCode();
+ }
+
+ @Override
+ public boolean equals(Object obj) {
+ if (!(obj instanceof SkuName)) {
+ return false;
+ }
+ if (obj == this) {
+ return true;
+ }
+ SkuName rhs = (SkuName) obj;
+ if (value == null) {
+ return rhs.value == null;
+ } else {
+ return value.equals(rhs.value);
+ }
+ }
+}
diff --git a/azure-mgmt-appservice/src/main/java/com/microsoft/azure/management/appservice/SlotSwapStatus.java b/azure-mgmt-appservice/src/main/java/com/microsoft/azure/management/appservice/SlotSwapStatus.java
new file mode 100644
index 0000000000000..801b1bf1c476b
--- /dev/null
+++ b/azure-mgmt-appservice/src/main/java/com/microsoft/azure/management/appservice/SlotSwapStatus.java
@@ -0,0 +1,63 @@
+/**
+ * Copyright (c) Microsoft Corporation. All rights reserved.
+ * Licensed under the MIT License. See License.txt in the project root for
+ * license information.
+ *
+ * Code generated by Microsoft (R) AutoRest Code Generator.
+ */
+
+package com.microsoft.azure.management.appservice;
+
+import org.joda.time.DateTime;
+import com.fasterxml.jackson.annotation.JsonProperty;
+
+/**
+ * The status of the last successfull slot swap operation.
+ */
+public class SlotSwapStatus {
+ /**
+ * The time the last successful slot swap completed.
+ */
+ @JsonProperty(access = JsonProperty.Access.WRITE_ONLY)
+ private DateTime timestampUtc;
+
+ /**
+ * The source slot of the last swap operation.
+ */
+ @JsonProperty(access = JsonProperty.Access.WRITE_ONLY)
+ private String sourceSlotName;
+
+ /**
+ * The destination slot of the last swap operation.
+ */
+ @JsonProperty(access = JsonProperty.Access.WRITE_ONLY)
+ private String destinationSlotName;
+
+ /**
+ * Get the timestampUtc value.
+ *
+ * @return the timestampUtc value
+ */
+ public DateTime timestampUtc() {
+ return this.timestampUtc;
+ }
+
+ /**
+ * Get the sourceSlotName value.
+ *
+ * @return the sourceSlotName value
+ */
+ public String sourceSlotName() {
+ return this.sourceSlotName;
+ }
+
+ /**
+ * Get the destinationSlotName value.
+ *
+ * @return the destinationSlotName value
+ */
+ public String destinationSlotName() {
+ return this.destinationSlotName;
+ }
+
+}
diff --git a/azure-mgmt-website/src/main/java/com/microsoft/azure/management/website/SlowRequestsBasedTrigger.java b/azure-mgmt-appservice/src/main/java/com/microsoft/azure/management/appservice/SlowRequestsBasedTrigger.java
similarity index 93%
rename from azure-mgmt-website/src/main/java/com/microsoft/azure/management/website/SlowRequestsBasedTrigger.java
rename to azure-mgmt-appservice/src/main/java/com/microsoft/azure/management/appservice/SlowRequestsBasedTrigger.java
index 1cc8b41a4934e..8187d349307b3 100644
--- a/azure-mgmt-website/src/main/java/com/microsoft/azure/management/website/SlowRequestsBasedTrigger.java
+++ b/azure-mgmt-appservice/src/main/java/com/microsoft/azure/management/appservice/SlowRequestsBasedTrigger.java
@@ -6,15 +6,15 @@
* Code generated by Microsoft (R) AutoRest Code Generator.
*/
-package com.microsoft.azure.management.website;
+package com.microsoft.azure.management.appservice;
/**
- * SlowRequestsBasedTrigger.
+ * Trigger based on request execution time.
*/
public class SlowRequestsBasedTrigger {
/**
- * TimeTaken.
+ * Time taken.
*/
private String timeTaken;
@@ -24,7 +24,7 @@ public class SlowRequestsBasedTrigger {
private Integer count;
/**
- * TimeInterval.
+ * Time interval.
*/
private String timeInterval;
diff --git a/azure-mgmt-website/src/main/java/com/microsoft/azure/management/website/SslState.java b/azure-mgmt-appservice/src/main/java/com/microsoft/azure/management/appservice/SslState.java
similarity index 96%
rename from azure-mgmt-website/src/main/java/com/microsoft/azure/management/website/SslState.java
rename to azure-mgmt-appservice/src/main/java/com/microsoft/azure/management/appservice/SslState.java
index 4f557d80bf96e..450dbb0ad69a2 100644
--- a/azure-mgmt-website/src/main/java/com/microsoft/azure/management/website/SslState.java
+++ b/azure-mgmt-appservice/src/main/java/com/microsoft/azure/management/appservice/SslState.java
@@ -6,7 +6,7 @@
* Code generated by Microsoft (R) AutoRest Code Generator.
*/
-package com.microsoft.azure.management.website;
+package com.microsoft.azure.management.appservice;
import com.fasterxml.jackson.annotation.JsonCreator;
import com.fasterxml.jackson.annotation.JsonValue;
diff --git a/azure-mgmt-website/src/main/java/com/microsoft/azure/management/website/StatusCodesBasedTrigger.java b/azure-mgmt-appservice/src/main/java/com/microsoft/azure/management/appservice/StatusCodesBasedTrigger.java
similarity index 96%
rename from azure-mgmt-website/src/main/java/com/microsoft/azure/management/website/StatusCodesBasedTrigger.java
rename to azure-mgmt-appservice/src/main/java/com/microsoft/azure/management/appservice/StatusCodesBasedTrigger.java
index 826f35cc9d5d2..2d77387732953 100644
--- a/azure-mgmt-website/src/main/java/com/microsoft/azure/management/website/StatusCodesBasedTrigger.java
+++ b/azure-mgmt-appservice/src/main/java/com/microsoft/azure/management/appservice/StatusCodesBasedTrigger.java
@@ -6,11 +6,11 @@
* Code generated by Microsoft (R) AutoRest Code Generator.
*/
-package com.microsoft.azure.management.website;
+package com.microsoft.azure.management.appservice;
/**
- * StatusCodeBasedTrigger.
+ * Trigger based on status code.
*/
public class StatusCodesBasedTrigger {
/**
@@ -34,7 +34,7 @@ public class StatusCodesBasedTrigger {
private Integer count;
/**
- * TimeInterval.
+ * Time interval.
*/
private String timeInterval;
diff --git a/azure-mgmt-website/src/main/java/com/microsoft/azure/management/website/StatusOptions.java b/azure-mgmt-appservice/src/main/java/com/microsoft/azure/management/appservice/StatusOptions.java
similarity index 96%
rename from azure-mgmt-website/src/main/java/com/microsoft/azure/management/website/StatusOptions.java
rename to azure-mgmt-appservice/src/main/java/com/microsoft/azure/management/appservice/StatusOptions.java
index 055ba6724f5d4..98170bc9f28fd 100644
--- a/azure-mgmt-website/src/main/java/com/microsoft/azure/management/website/StatusOptions.java
+++ b/azure-mgmt-appservice/src/main/java/com/microsoft/azure/management/appservice/StatusOptions.java
@@ -6,7 +6,7 @@
* Code generated by Microsoft (R) AutoRest Code Generator.
*/
-package com.microsoft.azure.management.website;
+package com.microsoft.azure.management.appservice;
import com.fasterxml.jackson.annotation.JsonCreator;
import com.fasterxml.jackson.annotation.JsonValue;
diff --git a/azure-mgmt-website/src/main/java/com/microsoft/azure/management/website/TopLevelDomainAgreementOption.java b/azure-mgmt-appservice/src/main/java/com/microsoft/azure/management/appservice/TopLevelDomainAgreementOption.java
similarity index 80%
rename from azure-mgmt-website/src/main/java/com/microsoft/azure/management/website/TopLevelDomainAgreementOption.java
rename to azure-mgmt-appservice/src/main/java/com/microsoft/azure/management/appservice/TopLevelDomainAgreementOption.java
index 4a606b0654792..8b3403eb3dbfe 100644
--- a/azure-mgmt-website/src/main/java/com/microsoft/azure/management/website/TopLevelDomainAgreementOption.java
+++ b/azure-mgmt-appservice/src/main/java/com/microsoft/azure/management/appservice/TopLevelDomainAgreementOption.java
@@ -6,7 +6,7 @@
* Code generated by Microsoft (R) AutoRest Code Generator.
*/
-package com.microsoft.azure.management.website;
+package com.microsoft.azure.management.appservice;
/**
@@ -14,8 +14,9 @@
*/
public class TopLevelDomainAgreementOption {
/**
- * If true then the list of agreements will inclue agreements for domain
- * privacy as well.
+ * If <code>true</code>, then the list of agreements will
+ * include agreements for domain privacy as well; otherwise,
+ * <code>false</code>.
*/
private Boolean includePrivacy;
diff --git a/azure-mgmt-website/src/main/java/com/microsoft/azure/management/website/UnauthenticatedClientAction.java b/azure-mgmt-appservice/src/main/java/com/microsoft/azure/management/appservice/UnauthenticatedClientAction.java
similarity index 96%
rename from azure-mgmt-website/src/main/java/com/microsoft/azure/management/website/UnauthenticatedClientAction.java
rename to azure-mgmt-appservice/src/main/java/com/microsoft/azure/management/appservice/UnauthenticatedClientAction.java
index 55a039cde78e8..7376608dd94e0 100644
--- a/azure-mgmt-website/src/main/java/com/microsoft/azure/management/website/UnauthenticatedClientAction.java
+++ b/azure-mgmt-appservice/src/main/java/com/microsoft/azure/management/appservice/UnauthenticatedClientAction.java
@@ -6,7 +6,7 @@
* Code generated by Microsoft (R) AutoRest Code Generator.
*/
-package com.microsoft.azure.management.website;
+package com.microsoft.azure.management.appservice;
import com.fasterxml.jackson.annotation.JsonCreator;
import com.fasterxml.jackson.annotation.JsonValue;
diff --git a/azure-mgmt-website/src/main/java/com/microsoft/azure/management/website/UsageState.java b/azure-mgmt-appservice/src/main/java/com/microsoft/azure/management/appservice/UsageState.java
similarity index 96%
rename from azure-mgmt-website/src/main/java/com/microsoft/azure/management/website/UsageState.java
rename to azure-mgmt-appservice/src/main/java/com/microsoft/azure/management/appservice/UsageState.java
index ba066e82f864f..683fc996430b0 100644
--- a/azure-mgmt-website/src/main/java/com/microsoft/azure/management/website/UsageState.java
+++ b/azure-mgmt-appservice/src/main/java/com/microsoft/azure/management/appservice/UsageState.java
@@ -6,7 +6,7 @@
* Code generated by Microsoft (R) AutoRest Code Generator.
*/
-package com.microsoft.azure.management.website;
+package com.microsoft.azure.management.appservice;
import com.fasterxml.jackson.annotation.JsonCreator;
import com.fasterxml.jackson.annotation.JsonValue;
diff --git a/azure-mgmt-website/src/main/java/com/microsoft/azure/management/website/ValidateResourceTypes.java b/azure-mgmt-appservice/src/main/java/com/microsoft/azure/management/appservice/ValidateResourceTypes.java
similarity index 96%
rename from azure-mgmt-website/src/main/java/com/microsoft/azure/management/website/ValidateResourceTypes.java
rename to azure-mgmt-appservice/src/main/java/com/microsoft/azure/management/appservice/ValidateResourceTypes.java
index 4458cdcc73ceb..66a5bd54a70ef 100644
--- a/azure-mgmt-website/src/main/java/com/microsoft/azure/management/website/ValidateResourceTypes.java
+++ b/azure-mgmt-appservice/src/main/java/com/microsoft/azure/management/appservice/ValidateResourceTypes.java
@@ -6,7 +6,7 @@
* Code generated by Microsoft (R) AutoRest Code Generator.
*/
-package com.microsoft.azure.management.website;
+package com.microsoft.azure.management.appservice;
import com.fasterxml.jackson.annotation.JsonValue;
diff --git a/azure-mgmt-website/src/main/java/com/microsoft/azure/management/website/ValidateResponseError.java b/azure-mgmt-appservice/src/main/java/com/microsoft/azure/management/appservice/ValidateResponseError.java
similarity index 96%
rename from azure-mgmt-website/src/main/java/com/microsoft/azure/management/website/ValidateResponseError.java
rename to azure-mgmt-appservice/src/main/java/com/microsoft/azure/management/appservice/ValidateResponseError.java
index 40f5854a800e3..6514ef8e7d3fd 100644
--- a/azure-mgmt-website/src/main/java/com/microsoft/azure/management/website/ValidateResponseError.java
+++ b/azure-mgmt-appservice/src/main/java/com/microsoft/azure/management/appservice/ValidateResponseError.java
@@ -6,7 +6,7 @@
* Code generated by Microsoft (R) AutoRest Code Generator.
*/
-package com.microsoft.azure.management.website;
+package com.microsoft.azure.management.appservice;
/**
diff --git a/azure-mgmt-website/src/main/java/com/microsoft/azure/management/website/VirtualApplication.java b/azure-mgmt-appservice/src/main/java/com/microsoft/azure/management/appservice/VirtualApplication.java
similarity index 91%
rename from azure-mgmt-website/src/main/java/com/microsoft/azure/management/website/VirtualApplication.java
rename to azure-mgmt-appservice/src/main/java/com/microsoft/azure/management/appservice/VirtualApplication.java
index e0a1ffe2537e9..64a5a759a0edb 100644
--- a/azure-mgmt-website/src/main/java/com/microsoft/azure/management/website/VirtualApplication.java
+++ b/azure-mgmt-appservice/src/main/java/com/microsoft/azure/management/appservice/VirtualApplication.java
@@ -6,12 +6,12 @@
* Code generated by Microsoft (R) AutoRest Code Generator.
*/
-package com.microsoft.azure.management.website;
+package com.microsoft.azure.management.appservice;
import java.util.List;
/**
- * Virtual application under web app.
+ * Virtual application in an app.
*/
public class VirtualApplication {
/**
@@ -25,12 +25,13 @@ public class VirtualApplication {
private String physicalPath;
/**
- * Is preload enabled.
+ * <code>true</code> if preloading is enabled; otherwise,
+ * <code>false</code>.
*/
private Boolean preloadEnabled;
/**
- * Virtual Directories for virtual application.
+ * Virtual directories for virtual application.
*/
private List virtualDirectories;
diff --git a/azure-mgmt-website/src/main/java/com/microsoft/azure/management/website/VirtualDirectory.java b/azure-mgmt-appservice/src/main/java/com/microsoft/azure/management/appservice/VirtualDirectory.java
similarity index 96%
rename from azure-mgmt-website/src/main/java/com/microsoft/azure/management/website/VirtualDirectory.java
rename to azure-mgmt-appservice/src/main/java/com/microsoft/azure/management/appservice/VirtualDirectory.java
index 400cf6575d07c..60146ec2de282 100644
--- a/azure-mgmt-website/src/main/java/com/microsoft/azure/management/website/VirtualDirectory.java
+++ b/azure-mgmt-appservice/src/main/java/com/microsoft/azure/management/appservice/VirtualDirectory.java
@@ -6,7 +6,7 @@
* Code generated by Microsoft (R) AutoRest Code Generator.
*/
-package com.microsoft.azure.management.website;
+package com.microsoft.azure.management.appservice;
/**
diff --git a/azure-mgmt-website/src/main/java/com/microsoft/azure/management/website/VirtualIPMapping.java b/azure-mgmt-appservice/src/main/java/com/microsoft/azure/management/appservice/VirtualIPMapping.java
similarity index 95%
rename from azure-mgmt-website/src/main/java/com/microsoft/azure/management/website/VirtualIPMapping.java
rename to azure-mgmt-appservice/src/main/java/com/microsoft/azure/management/appservice/VirtualIPMapping.java
index bd16ce77d916f..309f687815542 100644
--- a/azure-mgmt-website/src/main/java/com/microsoft/azure/management/website/VirtualIPMapping.java
+++ b/azure-mgmt-appservice/src/main/java/com/microsoft/azure/management/appservice/VirtualIPMapping.java
@@ -6,11 +6,11 @@
* Code generated by Microsoft (R) AutoRest Code Generator.
*/
-package com.microsoft.azure.management.website;
+package com.microsoft.azure.management.appservice;
/**
- * Class that represents a VIP mapping.
+ * Virtual IP mapping.
*/
public class VirtualIPMapping {
/**
@@ -29,7 +29,7 @@ public class VirtualIPMapping {
private Integer internalHttpsPort;
/**
- * Is VIP mapping in use.
+ * Is virtual IP mapping in use.
*/
private Boolean inUse;
diff --git a/azure-mgmt-website/src/main/java/com/microsoft/azure/management/website/VirtualNetworkProfile.java b/azure-mgmt-appservice/src/main/java/com/microsoft/azure/management/appservice/VirtualNetworkProfile.java
similarity index 85%
rename from azure-mgmt-website/src/main/java/com/microsoft/azure/management/website/VirtualNetworkProfile.java
rename to azure-mgmt-appservice/src/main/java/com/microsoft/azure/management/appservice/VirtualNetworkProfile.java
index 271cc36cca272..7bebcc0f62049 100644
--- a/azure-mgmt-website/src/main/java/com/microsoft/azure/management/website/VirtualNetworkProfile.java
+++ b/azure-mgmt-appservice/src/main/java/com/microsoft/azure/management/appservice/VirtualNetworkProfile.java
@@ -6,33 +6,33 @@
* Code generated by Microsoft (R) AutoRest Code Generator.
*/
-package com.microsoft.azure.management.website;
+package com.microsoft.azure.management.appservice;
import com.fasterxml.jackson.annotation.JsonProperty;
/**
- * Specification for using a virtual network.
+ * Specification for using a Virtual Network.
*/
public class VirtualNetworkProfile {
/**
- * Resource id of the virtual network.
+ * Resource id of the Virtual Network.
*/
private String id;
/**
- * Name of the virtual network (read-only).
+ * Name of the Virtual Network (read-only).
*/
@JsonProperty(access = JsonProperty.Access.WRITE_ONLY)
private String name;
/**
- * Resource type of the virtual network (read-only).
+ * Resource type of the Virtual Network (read-only).
*/
@JsonProperty(access = JsonProperty.Access.WRITE_ONLY)
private String type;
/**
- * Subnet within the virtual network.
+ * Subnet within the Virtual Network.
*/
private String subnet;
diff --git a/azure-mgmt-appservice/src/main/java/com/microsoft/azure/management/appservice/WebApp.java b/azure-mgmt-appservice/src/main/java/com/microsoft/azure/management/appservice/WebApp.java
new file mode 100644
index 0000000000000..4115e7785a4f9
--- /dev/null
+++ b/azure-mgmt-appservice/src/main/java/com/microsoft/azure/management/appservice/WebApp.java
@@ -0,0 +1,147 @@
+/**
+ * Copyright (c) Microsoft Corporation. All rights reserved.
+ * Licensed under the MIT License. See License.txt in the project root for
+ * license information.
+ */
+
+package com.microsoft.azure.management.appservice;
+
+import com.microsoft.azure.management.resources.fluentcore.arm.models.GroupableResource;
+import com.microsoft.azure.management.resources.fluentcore.model.Updatable;
+
+/**
+ * An immutable client-side representation of an Azure Web App.
+ */
+public interface WebApp extends
+ WebAppBase,
+ Updatable {
+ /**
+ * @return the entry point to deployment slot management API under the web app
+ */
+ DeploymentSlots deploymentSlots();
+
+ /**************************************************************
+ * Fluent interfaces to provision a Web App
+ **************************************************************/
+
+ /**
+ * Container interface for all the definitions that need to be implemented.
+ */
+ interface Definition extends
+ DefinitionStages.Blank,
+ DefinitionStages.WithRegion,
+ DefinitionStages.WithAppServicePlan,
+ DefinitionStages.WithNewAppServicePlan {
+ }
+
+ /**
+ * Grouping of all the web app definition stages.
+ */
+ interface DefinitionStages {
+ /**
+ * A web app definition allowing resource group to be set.
+ */
+ interface Blank extends GroupableResource.DefinitionStages.WithGroup {
+ }
+
+ /**
+ * The first stage of the web app definition.
+ */
+ interface WithRegion extends GroupableResource.DefinitionWithRegion {
+ }
+
+ /**
+ * A web app definition allowing app service plan to be set.
+ */
+ interface WithAppServicePlan {
+ /**
+ * Creates a new app service plan to use.
+ * @return the next stage of the web app definition
+ * @param name the name of the app service plan
+ */
+ WithRegion withNewAppServicePlan(String name);
+
+ /**
+ * Uses an existing app service plan in the same resource group for the web app.
+ * @param appServicePlanName the name of the existing app service plan
+ * @return the next stage of the web app definition
+ */
+ WebAppBase.DefinitionStages.WithHostNameBinding withExistingAppServicePlan(String appServicePlanName);
+
+ /**
+ * Uses an existing app service plan for the web app.
+ * @param appServicePlan the existing app service plan
+ * @return the next stage of the web app definition
+ */
+ WebAppBase.DefinitionStages.WithHostNameBinding withExistingAppServicePlan(AppServicePlan appServicePlan);
+ }
+
+ /**
+ * As web app definition allowing more information of a new app service plan to be set.
+ */
+ interface WithNewAppServicePlan {
+ /**
+ * Creates a new free app service plan to use. No custom domains or SSL bindings are available in this plan.
+ * @return the next stage of the web app definition
+ */
+ WebAppBase.DefinitionStages.WithCreate withFreePricingTier();
+
+ /**
+ * Creates a new app service plan to use.
+ * @param pricingTier the pricing tier to use
+ * @return the next stage of the web app definition
+ */
+ WebAppBase.DefinitionStages.WithHostNameBinding withPricingTier(AppServicePricingTier pricingTier);
+ }
+ }
+
+ /**
+ * Grouping of all the web app update stages.
+ */
+ interface UpdateStages {
+ /**
+ * A web app update allowing app service plan to be set.
+ */
+ interface WithAppServicePlan {
+ /**
+ * Creates a new app service plan to use.
+ * @return the next stage of the web app update
+ * @param name the name of the app service plan
+ */
+ WithNewAppServicePlan withNewAppServicePlan(String name);
+
+ /**
+ * Uses an existing app service plan for the web app.
+ * @param appServicePlanName the name of the existing app service plan
+ * @return the next stage of the web app update
+ */
+ Update withExistingAppServicePlan(String appServicePlanName);
+ }
+
+ /**
+ * As web app update allowing more information of a new app service plan to be set.
+ */
+ interface WithNewAppServicePlan {
+ /**
+ * Creates a new free app service plan to use. No custom domains or SSL bindings are available in this plan.
+ * @return the next stage of the web app update
+ */
+ Update withFreePricingTier();
+
+ /**
+ * Creates a new app service plan to use.
+ * @param pricingTier the pricing tier to use
+ * @return the next stage of the web app update
+ */
+ Update withPricingTier(AppServicePricingTier pricingTier);
+ }
+ }
+
+ /**
+ * The template for a web app update operation, containing all the settings that can be modified.
+ */
+ interface Update extends
+ WebAppBase.Update,
+ UpdateStages.WithAppServicePlan {
+ }
+}
\ No newline at end of file
diff --git a/azure-mgmt-website/src/main/java/com/microsoft/azure/management/website/WebAppBase.java b/azure-mgmt-appservice/src/main/java/com/microsoft/azure/management/appservice/WebAppBase.java
similarity index 92%
rename from azure-mgmt-website/src/main/java/com/microsoft/azure/management/website/WebAppBase.java
rename to azure-mgmt-appservice/src/main/java/com/microsoft/azure/management/appservice/WebAppBase.java
index 0a5e478327a18..434aee93abbed 100644
--- a/azure-mgmt-website/src/main/java/com/microsoft/azure/management/website/WebAppBase.java
+++ b/azure-mgmt-appservice/src/main/java/com/microsoft/azure/management/appservice/WebAppBase.java
@@ -4,7 +4,7 @@
* license information.
*/
-package com.microsoft.azure.management.website;
+package com.microsoft.azure.management.appservice;
import com.microsoft.azure.management.resources.fluentcore.arm.models.GroupableResource;
import com.microsoft.azure.management.resources.fluentcore.arm.models.HasName;
@@ -12,8 +12,9 @@
import com.microsoft.azure.management.resources.fluentcore.model.Creatable;
import com.microsoft.azure.management.resources.fluentcore.model.Refreshable;
import com.microsoft.azure.management.resources.fluentcore.model.Wrapper;
-import com.microsoft.azure.management.website.implementation.SiteInner;
+import com.microsoft.azure.management.appservice.implementation.SiteInner;
import org.joda.time.DateTime;
+import rx.Observable;
import java.util.List;
import java.util.Map;
@@ -21,6 +22,7 @@
/**
* An immutable client-side representation of an Azure Web App or deployment slot.
+ * @param the fluent interface of the web app or deployment slot
*/
public interface WebAppBase> extends
HasName,
@@ -230,10 +232,43 @@ public interface WebAppBase> extends
*/
Map getHostNameBindings();
+ /**
+ * @return the app settings defined on the web app
+ */
Map getAppSettings();
+ /**
+ * @return the connection strings defined on the web app
+ */
Map getConnectionStrings();
+ /**
+ * @return the FTP and Git publishing credentials
+ */
+ PublishingCredentials getPublishingCredentials();
+
+ /**
+ * @return the source control information for the web app
+ */
+ WebAppSourceControl getSourceControl();
+
+ /**
+ * Verifies the ownership of the domain for a certificate order by verifying a hostname
+ * of the domain is bound to this web app.
+ * @param certificateOrderName the name of the certificate order
+ * @param domainVerificationToken the domain verification token for the certificate order
+ */
+ void verifyDomainOwnership(String certificateOrderName, String domainVerificationToken);
+
+ /**
+ * Verifies the ownership of the domain for a certificate order by verifying a hostname
+ * of the domain is bound to this web app.
+ * @param certificateOrderName the name of the certificate order
+ * @param domainVerificationToken the domain verification token for the certificate order
+ * @return the Observable to the result
+ */
+ Observable verifyDomainOwnershipAsync(String certificateOrderName, String domainVerificationToken);
+
/**
* Starts the web app or deployment slot.
*/
@@ -275,9 +310,9 @@ public interface WebAppBase> extends
/**
* Container interface for all the definitions that need to be implemented.
+ * @param the fluent interface of the web app or deployment slot
*/
interface Definition extends
- DefinitionStages.WithAppServicePlan,
DefinitionStages.WithHostNameSslBinding,
DefinitionStages.WithWebContainer {
}
@@ -286,33 +321,6 @@ interface Definition extends
* Grouping of all the site definition stages.
*/
interface DefinitionStages {
- /**
- * A web app definition allowing app service plan to be set.
- * @param the type of the resource, either a web app or a deployment slot
- */
- interface WithAppServicePlan {
- /**
- * Creates a new free app service plan to use. No custom domains or SSL bindings are available in this plan.
- * @return the next stage of the web app definition
- */
- WithCreate withNewFreeAppServicePlan();
-
- /**
- * Creates a new app service plan to use.
- * @param name the name of the app service plan
- * @param pricingTier the pricing tier to use
- * @return the next stage of the web app definition
- */
- WithHostNameBinding withNewAppServicePlan(String name, AppServicePricingTier pricingTier);
-
- /**
- * Uses an existing app service plan for the web app.
- * @param appServicePlanName the name of the existing app service plan
- * @return the next stage of the web app definition
- */
- WithHostNameBinding withExistingAppServicePlan(String appServicePlanName);
- }
-
/**
* A web app definition stage allowing host name binding to be specified.
* @param the type of the resource, either a web app or a deployment slot
@@ -587,6 +595,18 @@ interface WithConnectionString {
WithCreate withStickyConnectionString(String name, String value, ConnectionStringType type);
}
+ /**
+ * A web app definition stage allowing source control to be set.
+ * @param the type of the resource, either a web app or a deployment slot
+ */
+ interface WithSourceControl {
+ /**
+ * Starts the definition of a new source control.
+ * @return the first stage of a source control definition
+ */
+ WebAppSourceControl.DefinitionStages.Blank> defineSourceControl();
+ }
+
/**
* A site definition with sufficient inputs to create a new web app /
* deployments slot in the cloud, but exposing additional optional
@@ -601,7 +621,8 @@ interface WithCreate extends
WithClientCertEnabled,
WithSiteConfigs,
WithAppSettings,
- WithConnectionString {
+ WithConnectionString,
+ WithSourceControl {
}
}
@@ -609,33 +630,6 @@ interface WithCreate extends
* Grouping of all the web app update stages.
*/
interface UpdateStages {
- /**
- * The stage of the web app update allowing app service plan to be set.
- * @param the type of the resource, either a web app or a deployment slot
- */
- interface WithAppServicePlan {
- /**
- * Creates a new free app service plan to use. No custom domains or SSL bindings are available in this plan.
- * @return the next stage of web app update
- */
- Update withNewFreeAppServicePlan();
-
- /**
- * Creates a new app service plan to use.
- * @param name the name of the app service plan
- * @param pricingTier the pricing tier to use
- * @return the next stage of web app update
- */
- Update withNewAppServicePlan(String name, AppServicePricingTier pricingTier);
-
- /**
- * Uses an existing app service plan for the web app.
- * @param appServicePlanName the name of the existing app service plan
- * @return the next stage of web app update
- */
- Update withExistingAppServicePlan(String appServicePlanName);
- }
-
/**
* The stage of the web app update allowing host name binding to be set.
* @param the type of the resource, either a web app or a deployment slot
@@ -946,14 +940,32 @@ interface WithConnectionString {
*/
Update withConnectionStringStickiness(String name, boolean sticky);
}
+
+ /**
+ * A web app update stage allowing source control to be set.
+ * @param the type of the resource, either a web app or a deployment slot
+ */
+ interface WithSourceControl {
+ /**
+ * Starts the definition of a new source control.
+ * @return the first stage of a source control definition
+ */
+ WebAppSourceControl.UpdateDefinitionStages.Blank> defineSourceControl();
+
+ /**
+ * Removes source control for deployment from the web app.
+ * @return the next stage of the web app update
+ */
+ Update withoutSourceControl();
+ }
}
/**
* The template for a web app update operation, containing all the settings that can be modified.
+ * @param the fluent interface of the web app or deployment slot
*/
interface Update extends
Appliable,
- UpdateStages.WithAppServicePlan,
UpdateStages.WithHostNameBinding,
UpdateStages.WithHostNameSslBinding,
UpdateStages.WithClientAffinityEnabled,
@@ -962,6 +974,7 @@ interface Update extends
UpdateStages.WithSiteEnabled,
UpdateStages.WithSiteConfigs,
UpdateStages.WithAppSettings,
- UpdateStages.WithConnectionString {
+ UpdateStages.WithConnectionString,
+ UpdateStages.WithSourceControl {
}
}
\ No newline at end of file
diff --git a/azure-mgmt-appservice/src/main/java/com/microsoft/azure/management/appservice/WebAppSourceControl.java b/azure-mgmt-appservice/src/main/java/com/microsoft/azure/management/appservice/WebAppSourceControl.java
new file mode 100644
index 0000000000000..9a206cef752ab
--- /dev/null
+++ b/azure-mgmt-appservice/src/main/java/com/microsoft/azure/management/appservice/WebAppSourceControl.java
@@ -0,0 +1,350 @@
+/**
+ * Copyright (c) Microsoft Corporation. All rights reserved.
+ * Licensed under the MIT License. See License.txt in the project root for
+ * license information.
+ */
+package com.microsoft.azure.management.appservice;
+
+import com.microsoft.azure.management.apigeneration.Fluent;
+import com.microsoft.azure.management.resources.fluentcore.arm.models.ChildResource;
+import com.microsoft.azure.management.resources.fluentcore.model.Attachable;
+import com.microsoft.azure.management.resources.fluentcore.model.Wrapper;
+import com.microsoft.azure.management.appservice.implementation.SiteSourceControlInner;
+
+/**
+ * A web app source control in a web app.
+ */
+@Fluent
+public interface WebAppSourceControl extends
+ Wrapper,
+ ChildResource> {
+ /**
+ * @return the repository or source control url
+ */
+ String repositoryUrl();
+
+ /**
+ * @return the name of the branch to use for deployment
+ */
+ String branch();
+
+ /**
+ * @return whether to do manual or continuous integration
+ */
+ boolean isManualIntegration();
+
+ /**
+ * @return whether deployment rollback is enabled
+ */
+ boolean deploymentRollbackEnabled();
+
+ /**
+ * @return mercurial or Git repository type
+ */
+ RepositoryType repositoryType();
+
+ /**
+ * The entirety of a web app source control definition.
+ * @param the return type of the final {@link Attachable#attach()}
+ */
+ interface Definition extends
+ DefinitionStages.Blank,
+ DefinitionStages.WithAttach,
+ DefinitionStages.GitHubWithAttach,
+ DefinitionStages.WithRepositoryType,
+ DefinitionStages.WithExternalRepository,
+ DefinitionStages.WithBranch,
+ DefinitionStages.WithGitHubBranch {
+ }
+
+ /**
+ * Grouping of web app source control definition stages applicable as part of a web app creation.
+ */
+ interface DefinitionStages {
+ /**
+ * The first stage of a web app source control definition as part of a definition of a web app.
+ * @param the return type of the final {@link Attachable#attach()}
+ */
+ interface Blank extends WithRepositoryType {
+ }
+
+ /**
+ * A web app source control definition allowing repository type to be specified.
+ * @param the return type of the final {@link WithAttach#attach()}
+ */
+ interface WithRepositoryType {
+ /**
+ * Specifies the repository to be a public external repository, either Git or Mercurial.
+ * Continuous integration will not be turned on.
+ * @return
+ */
+ WithExternalRepository withPublicExternalRepository();
+
+ /**
+ * Specifies the repository to be a GitHub repository. Continuous integration
+ * will be turned on.
+ * This repository can be either public or private, but your GitHub access token
+ * must have enough privileges to add a webhook to the repository.
+ * @param organization the user name or organization name the GitHub repository belongs to, e.g. Azure
+ * @param repository the name of the repository, e.g. azure-sdk-for-java
+ * @return the next stage of the web app source control definition
+ */
+ WithBranch withGitHubRepository(String organization, String repository);
+
+ /**
+ * Specifies the repository to be a GitHub repository. Continuous integration
+ * will be turned on.
+ * This repository can be either public or private, but your GitHub access token
+ * must have enough privileges to add a webhook to the repository.
+ * @param url the URL pointing to the repository, e.g. https://github.com/Azure/azure-sdk-for-java
+ * @return the next stage of the web app source control definition
+ */
+ WithBranch withGitHubRepository(String url);
+
+ /**
+ * Specifies the repository to be the implicitly created GitHub repository on
+ * the web app's hosting file system. The username / password information can
+ * be acquired from {@link WebAppBase#getPublishingCredentials()}.
+ * @return the next stage of the web app source control definition
+ */
+ WithAttach withLocalGitRepository();
+ }
+
+ /**
+ * A web app source control definition stage allowing external source control information
+ * to be set.
+ * @param the return type of the final {@link WithAttach#attach()}
+ */
+ interface WithExternalRepository {
+ /**
+ * Specifies the repository to be a GIT repository.
+ * @return the next stage of the web app source control definition
+ */
+ WithBranch withGit(String url);
+
+ /**
+ * Specifies the repository to be a Mercurial repository.
+ * @return the next stage of the web app source control definition
+ */
+ WithBranch withMercurial(String url);
+ }
+
+ /**
+ * A web app source control definition allowing branch to be specified.
+ * @param the return type of the final {@link WithAttach#attach()}
+ */
+ interface WithBranch {
+ /**
+ * Specifies the branch in the repository to use.
+ * @param branch the branch to use
+ * @return the next stage of the web app source control definition
+ */
+ WithAttach withBranch(String branch);
+ }
+
+ /**
+ * A web app source control definition allowing branch to be specified.
+ * @param the return type of the final {@link WithAttach#attach()}
+ */
+ interface WithGitHubBranch {
+ /**
+ * Specifies the branch in the repository to use.
+ * @param branch the branch to use
+ * @return the next stage of the web app source control definition
+ */
+ GitHubWithAttach withBranch(String branch);
+ }
+
+ /**
+ * A web app source control definition allowing GitHub access token to be specified.
+ * @param the return type of the final {@link WithAttach#attach()}
+ */
+ interface WithGitHubAccessToken {
+ /**
+ * Specifies the GitHub personal access token. You can acquire one from
+ * https://github.com/settings/tokens.
+ * @param personalAccessToken the personal access token from GitHub.
+ * @return the next stage of the web app source control definition
+ */
+ GitHubWithAttach withGitHubAccessToken(String personalAccessToken);
+ }
+
+ /** The final stage of the web app source control definition.
+ *
+ * At this stage, any remaining optional settings can be specified, or the web app source control definition
+ * can be attached to the parent web app definition using {@link WithAttach#attach()}.
+ * @param the return type of {@link WithAttach#attach()}
+ */
+ interface WithAttach extends
+ Attachable.InDefinition {
+ }
+
+ /** The final stage of the web app source control definition that binds to a GitHub account.
+ *
+ * At this stage, any remaining optional settings can be specified, or the web app source control definition
+ * can be attached to the parent web app definition using {@link WithAttach#attach()}.
+ * @param the return type of {@link WithAttach#attach()}
+ */
+ interface GitHubWithAttach extends
+ WithAttach,
+ WithGitHubAccessToken {
+ }
+ }
+
+ /** The entirety of a web app source control definition as part of a web app update.
+ * @param the return type of the final {@link UpdateDefinitionStages.WithAttach#attach()}
+ */
+ interface UpdateDefinition extends
+ UpdateDefinitionStages.Blank,
+ UpdateDefinitionStages.WithAttach,
+ UpdateDefinitionStages.GitHubWithAttach,
+ UpdateDefinitionStages.WithRepositoryType,
+ UpdateDefinitionStages.WithExternalRepository,
+ UpdateDefinitionStages.WithBranch,
+ UpdateDefinitionStages.WithGitHubBranch {
+ }
+
+ /**
+ * Grouping of web app source control definition stages applicable as part of a web app update.
+ */
+ interface UpdateDefinitionStages {
+ /**
+ * The first stage of a web app source control definition as part of an update of a web app.
+ * @param the return type of the final {@link Attachable#attach()}
+ */
+ interface Blank extends WithRepositoryType {
+ }
+
+ /**
+ * A web app source control definition allowing repository type to be specified.
+ * @param the return type of the final {@link WithAttach#attach()}
+ */
+ interface WithRepositoryType {
+ /**
+ * Specifies the repository to be a public external repository, either Git or Mercurial.
+ * Continuous integration will not be turned on.
+ * @return
+ */
+ WithExternalRepository withPublicExternalRepository();
+
+ /**
+ * Specifies the repository to be a GitHub repository. Continuous integration
+ * will be turned on.
+ * This repository can be either public or private, but your GitHub access token
+ * must have enough privileges to add a webhook to the repository.
+ * @param organization the user name or organization name the GitHub repository belongs to, e.g. Azure
+ * @param repository the name of the repository, e.g. azure-sdk-for-java
+ * @return the next stage of the web app source control definition
+ */
+ WithBranch withGitHubRepository(String organization, String repository);
+
+ /**
+ * Specifies the repository to be a GitHub repository. Continuous integration
+ * will be turned on.
+ * This repository can be either public or private, but your GitHub access token
+ * must have enough privileges to add a webhook to the repository.
+ * @param url the URL pointing to the repository, e.g. https://github.com/Azure/azure-sdk-for-java
+ * @return the next stage of the web app source control definition
+ */
+ WithGitHubBranch withGitHubRepository(String url);
+
+ /**
+ * Specifies the repository to be the implicitly created GitHub repository on
+ * the web app's hosting file system. The username / password information can
+ * be acquired from {@link WebAppBase#getPublishingCredentials()}.
+ * @return the next stage of the web app source control definition
+ */
+ WithAttach withLocalGitRepository();
+ }
+
+ /**
+ * A web app source control definition allowing an external Git or
+ * Mercurial repository to be specified.
+ * @param the return type of the final {@link WithAttach#attach()}
+ */
+ interface WithExternalRepository {
+ /**
+ * Specifies the repository to be a GIT repository.
+ * @return the next stage of the web app source control definition
+ */
+ WithBranch withGit(String url);
+
+ /**
+ * Specifies the repository to be a Mercurial repository.
+ * @return the next stage of the web app source control definition
+ */
+ WithBranch withMercurial(String url);
+ }
+
+ /**
+ * A web app source control definition allowing branch to be specified.
+ * @param the return type of the final {@link WithAttach#attach()}
+ */
+ interface WithBranch {
+ /**
+ * Specifies the branch in the repository to use.
+ * @param branch the branch to use
+ * @return the next stage of the web app source control definition
+ */
+ WithAttach withBranch(String branch);
+ }
+
+ /**
+ * A web app source control definition allowing branch to be specified.
+ * @param the return type of the final {@link WithAttach#attach()}
+ */
+ interface WithGitHubBranch {
+ /**
+ * Specifies the branch in the repository to use.
+ * @param branch the branch to use
+ * @return the next stage of the web app source control definition
+ */
+ GitHubWithAttach withBranch(String branch);
+ }
+
+ /**
+ * A web app source control definition allowing GitHub access token to be specified.
+ * @param the return type of the final {@link WithAttach#attach()}
+ */
+ interface WithGitHubAccessToken {
+ /**
+ * Specifies the GitHub personal access token. You can acquire one from
+ * https://github.com/settings/tokens.
+ * @param personalAccessToken the personal access token from GitHub.
+ * @return the next stage of the web app source control definition
+ */
+ GitHubWithAttach withGitHubAccessToken(String personalAccessToken);
+ }
+
+ /** The final stage of the web app source control definition.
+ *
+ * At this stage, any remaining optional settings can be specified, or the web app source control definition
+ * can be attached to the parent web app update using {@link WithAttach#attach()}.
+ * @param the return type of {@link WithAttach#attach()}
+ */
+ interface WithAttach extends
+ Attachable.InUpdate {
+ }
+
+ /** The final stage of the web app source control definition that binds to a GitHub account.
+ *
+ * At this stage, any remaining optional settings can be specified, or the web app source control definition
+ * can be attached to the parent web app update using {@link WithAttach#attach()}.
+ * @param the return type of {@link WithAttach#attach()}
+ */
+ interface GitHubWithAttach extends
+ WithAttach,
+ WithGitHubAccessToken {
+ }
+ }
+
+ /**
+ * The type of a repository.
+ */
+ enum RepositoryType {
+ /** Git repository. */
+ GIT,
+ /** Mercurial repository. */
+ MERCURIAL
+ }
+ }
diff --git a/azure-mgmt-website/src/main/java/com/microsoft/azure/management/website/WebApps.java b/azure-mgmt-appservice/src/main/java/com/microsoft/azure/management/appservice/WebApps.java
similarity index 95%
rename from azure-mgmt-website/src/main/java/com/microsoft/azure/management/website/WebApps.java
rename to azure-mgmt-appservice/src/main/java/com/microsoft/azure/management/appservice/WebApps.java
index 42a60bb4f2e85..a608a99320b29 100644
--- a/azure-mgmt-website/src/main/java/com/microsoft/azure/management/website/WebApps.java
+++ b/azure-mgmt-appservice/src/main/java/com/microsoft/azure/management/appservice/WebApps.java
@@ -4,7 +4,7 @@
* license information.
*/
-package com.microsoft.azure.management.website;
+package com.microsoft.azure.management.appservice;
import com.microsoft.azure.management.resources.fluentcore.arm.collection.SupportsDeletingByGroup;
import com.microsoft.azure.management.resources.fluentcore.arm.collection.SupportsGettingByGroup;
diff --git a/azure-mgmt-website/src/main/java/com/microsoft/azure/management/website/WebContainer.java b/azure-mgmt-appservice/src/main/java/com/microsoft/azure/management/appservice/WebContainer.java
similarity index 93%
rename from azure-mgmt-website/src/main/java/com/microsoft/azure/management/website/WebContainer.java
rename to azure-mgmt-appservice/src/main/java/com/microsoft/azure/management/appservice/WebContainer.java
index 208fe03da9ab3..a17c6181beb0c 100644
--- a/azure-mgmt-website/src/main/java/com/microsoft/azure/management/website/WebContainer.java
+++ b/azure-mgmt-appservice/src/main/java/com/microsoft/azure/management/appservice/WebContainer.java
@@ -4,7 +4,7 @@
* license information.
*/
-package com.microsoft.azure.management.website;
+package com.microsoft.azure.management.appservice;
import com.fasterxml.jackson.annotation.JsonValue;
@@ -16,7 +16,7 @@ public final class WebContainer {
public static final WebContainer TOMCAT_7_0_NEWEST = new WebContainer("tomcat 7.0");
/** Static value tomcat 7.0.50 for WebContainer. */
- public static final WebContainer TOMCAT_7_0_50= new WebContainer("tomcat 7.0.50");
+ public static final WebContainer TOMCAT_7_0_50 = new WebContainer("tomcat 7.0.50");
/** Static value tomcat 7.0.62 for WebContainer. */
public static final WebContainer TOMCAT_7_0_62 = new WebContainer("tomcat 7.0.62");
diff --git a/azure-mgmt-website/src/main/java/com/microsoft/azure/management/website/WorkerSizeOptions.java b/azure-mgmt-appservice/src/main/java/com/microsoft/azure/management/appservice/WorkerSizeOptions.java
similarity index 96%
rename from azure-mgmt-website/src/main/java/com/microsoft/azure/management/website/WorkerSizeOptions.java
rename to azure-mgmt-appservice/src/main/java/com/microsoft/azure/management/appservice/WorkerSizeOptions.java
index ebc9b98ba3496..09ff0ae5d7d6d 100644
--- a/azure-mgmt-website/src/main/java/com/microsoft/azure/management/website/WorkerSizeOptions.java
+++ b/azure-mgmt-appservice/src/main/java/com/microsoft/azure/management/appservice/WorkerSizeOptions.java
@@ -6,7 +6,7 @@
* Code generated by Microsoft (R) AutoRest Code Generator.
*/
-package com.microsoft.azure.management.website;
+package com.microsoft.azure.management.appservice;
import com.fasterxml.jackson.annotation.JsonCreator;
import com.fasterxml.jackson.annotation.JsonValue;
diff --git a/azure-mgmt-website/src/main/java/com/microsoft/azure/management/website/implementation/AddressResponseInner.java b/azure-mgmt-appservice/src/main/java/com/microsoft/azure/management/appservice/implementation/AddressResponseInner.java
similarity index 87%
rename from azure-mgmt-website/src/main/java/com/microsoft/azure/management/website/implementation/AddressResponseInner.java
rename to azure-mgmt-appservice/src/main/java/com/microsoft/azure/management/appservice/implementation/AddressResponseInner.java
index cb4c58cfd1277..850ce2d6df187 100644
--- a/azure-mgmt-website/src/main/java/com/microsoft/azure/management/website/implementation/AddressResponseInner.java
+++ b/azure-mgmt-appservice/src/main/java/com/microsoft/azure/management/appservice/implementation/AddressResponseInner.java
@@ -6,23 +6,23 @@
* Code generated by Microsoft (R) AutoRest Code Generator.
*/
-package com.microsoft.azure.management.website.implementation;
+package com.microsoft.azure.management.appservice.implementation;
import java.util.List;
-import com.microsoft.azure.management.website.VirtualIPMapping;
+import com.microsoft.azure.management.appservice.VirtualIPMapping;
/**
- * Describes main public ip address and any extra vips.
+ * Describes main public IP address and any extra virtual IPs.
*/
public class AddressResponseInner {
/**
- * Main public vip.
+ * Main public virtual IP.
*/
private String serviceIpAddress;
/**
- * VNET internal ip address of the hostingEnvironment (App Service
- * Environment) if it is in internal load-balancing mode.
+ * Virtual Network internal IP address of the App Service Environment if
+ * it is in internal load-balancing mode.
*/
private String internalIpAddress;
@@ -32,7 +32,7 @@ public class AddressResponseInner {
private List outboundIpAddresses;
/**
- * Additional vips.
+ * Additional virtual IPs.
*/
private List vipMappings;
diff --git a/azure-mgmt-website/src/main/java/com/microsoft/azure/management/website/implementation/AppServiceCertificateImpl.java b/azure-mgmt-appservice/src/main/java/com/microsoft/azure/management/appservice/implementation/AppServiceCertificateImpl.java
similarity index 62%
rename from azure-mgmt-website/src/main/java/com/microsoft/azure/management/website/implementation/AppServiceCertificateImpl.java
rename to azure-mgmt-appservice/src/main/java/com/microsoft/azure/management/appservice/implementation/AppServiceCertificateImpl.java
index 5db951e6cf2d0..0291c5e47b1ff 100644
--- a/azure-mgmt-website/src/main/java/com/microsoft/azure/management/website/implementation/AppServiceCertificateImpl.java
+++ b/azure-mgmt-appservice/src/main/java/com/microsoft/azure/management/appservice/implementation/AppServiceCertificateImpl.java
@@ -4,14 +4,15 @@
* license information.
*/
-package com.microsoft.azure.management.website.implementation;
+package com.microsoft.azure.management.appservice.implementation;
-import com.google.common.io.BaseEncoding;
import com.microsoft.azure.management.resources.fluentcore.arm.models.implementation.GroupableResourceImpl;
import com.microsoft.azure.management.resources.fluentcore.utils.Utils;
-import com.microsoft.azure.management.website.AppServiceCertificate;
-import com.microsoft.azure.management.website.AppServicePlan;
-import com.microsoft.azure.management.website.HostingEnvironmentProfile;
+import com.microsoft.azure.management.appservice.AppServiceCertificate;
+import com.microsoft.azure.management.appservice.AppServiceCertificateKeyVaultBinding;
+import com.microsoft.azure.management.appservice.AppServiceCertificateOrder;
+import com.microsoft.azure.management.appservice.AppServicePlan;
+import com.microsoft.azure.management.appservice.HostingEnvironmentProfile;
import org.joda.time.DateTime;
import rx.Observable;
import rx.functions.Func1;
@@ -38,6 +39,7 @@ class AppServiceCertificateImpl
private final CertificatesInner client;
private String pfxFileUrl;
+ private AppServiceCertificateOrder certificateOrder;
AppServiceCertificateImpl(String name, CertificateInner innerObject, final CertificatesInner client, AppServiceManager manager) {
super(name, innerObject, manager);
@@ -60,7 +62,7 @@ public List hostNames() {
}
@Override
- public String pfxBlob() {
+ public byte[] pfxBlob() {
return inner().pfxBlob();
}
@@ -127,23 +129,35 @@ public AppServiceCertificate refresh() {
@Override
public Observable createResourceAsync() {
- Observable pfxString = Observable.just(pfxBlob());
+ Observable pfxBytes = Observable.just(null);
if (pfxFileUrl != null) {
- pfxString = Utils.downloadFileAsync(pfxFileUrl, myManager.restClient().retrofit())
- .map(new Func1() {
+ pfxBytes = Utils.downloadFileAsync(pfxFileUrl, myManager.restClient().retrofit())
+ .map(new Func1() {
@Override
- public String call(byte[] bytes) {
- return BaseEncoding.base64().encode(bytes);
+ public Void call(byte[] bytes) {
+ inner().withPfxBlob(bytes);
+ return null;
}
});
}
- return pfxString.flatMap(new Func1>() {
- @Override
- public Observable call(String s) {
- inner().withPfxBlob(s);
- return client.createOrUpdateAsync(resourceGroupName(), name(), inner());
- }
- }).map(innerToFluentMap(this));
+ Observable keyVaultBinding = Observable.just(null);
+ if (certificateOrder != null) {
+ keyVaultBinding = certificateOrder.getKeyVaultBindingAsync()
+ .map(new Func1() {
+ @Override
+ public Void call(AppServiceCertificateKeyVaultBinding keyVaultBinding) {
+ inner().withKeyVaultId(keyVaultBinding.keyVaultId()).withKeyVaultSecretName(keyVaultBinding.keyVaultSecretName());
+ return null;
+ }
+ });
+ }
+ return pfxBytes.concatWith(keyVaultBinding).last()
+ .flatMap(new Func1>() {
+ @Override
+ public Observable call(Void aVoid) {
+ return client.createOrUpdateAsync(resourceGroupName(), name(), inner());
+ }
+ }).map(innerToFluentMap(this));
}
@Override
@@ -158,8 +172,7 @@ public AppServiceCertificateImpl withPfxFile(File file) {
@Override
public AppServiceCertificateImpl withPfxByteArray(byte[] pfxByteArray) {
- String base64String = BaseEncoding.base64().encode(pfxByteArray);
- inner().withPfxBlob(base64String);
+ inner().withPfxBlob(pfxByteArray);
return this;
}
@@ -170,13 +183,13 @@ public AppServiceCertificateImpl withPfxFileFromUrl(String url) {
}
@Override
- public AppServiceCertificateImpl withCertificateOrderKeyVaultBinding(String vaultId, String secretName) {
- inner().withKeyVaultId(vaultId).withKeyVaultSecretName(secretName);
+ public AppServiceCertificateImpl withExistingCertificateOrder(AppServiceCertificateOrder certificateOrder) {
+ this.certificateOrder = certificateOrder;
return this;
}
@Override
- public AppServiceCertificate.DefinitionStages.WithCreate withPfxPassword(String password) {
+ public AppServiceCertificateImpl withPfxPassword(String password) {
inner().withPassword(password);
return this;
}
diff --git a/azure-mgmt-website/src/main/java/com/microsoft/azure/management/website/implementation/AppServiceCertificateInner.java b/azure-mgmt-appservice/src/main/java/com/microsoft/azure/management/appservice/implementation/AppServiceCertificateInner.java
similarity index 78%
rename from azure-mgmt-website/src/main/java/com/microsoft/azure/management/website/implementation/AppServiceCertificateInner.java
rename to azure-mgmt-appservice/src/main/java/com/microsoft/azure/management/appservice/implementation/AppServiceCertificateInner.java
index 3d77751b2ef9c..0ae0082830808 100644
--- a/azure-mgmt-website/src/main/java/com/microsoft/azure/management/website/implementation/AppServiceCertificateInner.java
+++ b/azure-mgmt-appservice/src/main/java/com/microsoft/azure/management/appservice/implementation/AppServiceCertificateInner.java
@@ -6,16 +6,15 @@
* Code generated by Microsoft (R) AutoRest Code Generator.
*/
-package com.microsoft.azure.management.website.implementation;
+package com.microsoft.azure.management.appservice.implementation;
-import com.microsoft.azure.management.website.KeyVaultSecretStatus;
+import com.microsoft.azure.management.appservice.KeyVaultSecretStatus;
import com.fasterxml.jackson.annotation.JsonProperty;
import com.microsoft.rest.serializer.JsonFlatten;
import com.microsoft.azure.Resource;
/**
- * Class representing the Key Vault container for certificate purchased
- * through Azure.
+ * Key Vault container for a certificate that is purchased through Azure.
*/
@JsonFlatten
public class AppServiceCertificateInner extends Resource {
@@ -39,7 +38,7 @@ public class AppServiceCertificateInner extends Resource {
* 'KeyVaultSecretDoesNotExist', 'UnknownError', 'ExternalPrivateKey',
* 'Unknown'.
*/
- @JsonProperty(value = "properties.provisioningState")
+ @JsonProperty(value = "properties.provisioningState", access = JsonProperty.Access.WRITE_ONLY)
private KeyVaultSecretStatus provisioningState;
/**
@@ -91,15 +90,4 @@ public KeyVaultSecretStatus provisioningState() {
return this.provisioningState;
}
- /**
- * Set the provisioningState value.
- *
- * @param provisioningState the provisioningState value to set
- * @return the AppServiceCertificateInner object itself.
- */
- public AppServiceCertificateInner withProvisioningState(KeyVaultSecretStatus provisioningState) {
- this.provisioningState = provisioningState;
- return this;
- }
-
}
diff --git a/azure-mgmt-website/src/main/java/com/microsoft/azure/management/website/implementation/AppServiceCertificateKeyVaultBindingImpl.java b/azure-mgmt-appservice/src/main/java/com/microsoft/azure/management/appservice/implementation/AppServiceCertificateKeyVaultBindingImpl.java
similarity index 86%
rename from azure-mgmt-website/src/main/java/com/microsoft/azure/management/website/implementation/AppServiceCertificateKeyVaultBindingImpl.java
rename to azure-mgmt-appservice/src/main/java/com/microsoft/azure/management/appservice/implementation/AppServiceCertificateKeyVaultBindingImpl.java
index 2e10987a6c5bf..f6e5407a2295a 100644
--- a/azure-mgmt-website/src/main/java/com/microsoft/azure/management/website/implementation/AppServiceCertificateKeyVaultBindingImpl.java
+++ b/azure-mgmt-appservice/src/main/java/com/microsoft/azure/management/appservice/implementation/AppServiceCertificateKeyVaultBindingImpl.java
@@ -4,13 +4,13 @@
* license information.
*/
-package com.microsoft.azure.management.website.implementation;
+package com.microsoft.azure.management.appservice.implementation;
import com.microsoft.azure.management.resources.fluentcore.arm.models.implementation.IndependentChildResourceImpl;
-import com.microsoft.azure.management.website.AppServiceCertificateKeyVaultBinding;
-import com.microsoft.azure.management.website.AppServiceCertificateOrder;
-import com.microsoft.azure.management.website.AppServicePlan;
-import com.microsoft.azure.management.website.KeyVaultSecretStatus;
+import com.microsoft.azure.management.appservice.AppServiceCertificateKeyVaultBinding;
+import com.microsoft.azure.management.appservice.AppServiceCertificateOrder;
+import com.microsoft.azure.management.appservice.AppServicePlan;
+import com.microsoft.azure.management.appservice.KeyVaultSecretStatus;
import rx.Observable;
import rx.functions.Func1;
diff --git a/azure-mgmt-website/src/main/java/com/microsoft/azure/management/website/implementation/AppServiceCertificateOrderImpl.java b/azure-mgmt-appservice/src/main/java/com/microsoft/azure/management/appservice/implementation/AppServiceCertificateOrderImpl.java
similarity index 53%
rename from azure-mgmt-website/src/main/java/com/microsoft/azure/management/website/implementation/AppServiceCertificateOrderImpl.java
rename to azure-mgmt-appservice/src/main/java/com/microsoft/azure/management/appservice/implementation/AppServiceCertificateOrderImpl.java
index 0eaaec9eaafb5..bfb97ca33bbdd 100644
--- a/azure-mgmt-website/src/main/java/com/microsoft/azure/management/website/implementation/AppServiceCertificateOrderImpl.java
+++ b/azure-mgmt-appservice/src/main/java/com/microsoft/azure/management/appservice/implementation/AppServiceCertificateOrderImpl.java
@@ -4,24 +4,25 @@
* license information.
*/
-package com.microsoft.azure.management.website.implementation;
+package com.microsoft.azure.management.appservice.implementation;
import com.microsoft.azure.Page;
+import com.microsoft.azure.management.keyvault.SecretPermissions;
import com.microsoft.azure.management.keyvault.Vault;
+import com.microsoft.azure.management.resources.fluentcore.arm.Region;
import com.microsoft.azure.management.resources.fluentcore.arm.models.implementation.GroupableResourceImpl;
import com.microsoft.azure.management.resources.fluentcore.utils.Utils;
-import com.microsoft.azure.management.website.AppServiceCertificateKeyVaultBinding;
-import com.microsoft.azure.management.website.AppServiceCertificateOrder;
-import com.microsoft.azure.management.website.AppServicePlan;
-import com.microsoft.azure.management.website.CertificateOrderStatus;
-import com.microsoft.azure.management.website.CertificateProductType;
+import com.microsoft.azure.management.appservice.AppServiceCertificateKeyVaultBinding;
+import com.microsoft.azure.management.appservice.AppServiceCertificateOrder;
+import com.microsoft.azure.management.appservice.AppServiceDomain;
+import com.microsoft.azure.management.appservice.AppServicePlan;
+import com.microsoft.azure.management.appservice.CertificateOrderStatus;
+import com.microsoft.azure.management.appservice.CertificateProductType;
+import com.microsoft.azure.management.appservice.WebAppBase;
import org.joda.time.DateTime;
import rx.Observable;
import rx.functions.Func1;
-import java.util.HashMap;
-import java.util.Map;
-
/**
* The implementation for {@link AppServicePlan}.
*/
@@ -38,28 +39,20 @@ class AppServiceCertificateOrderImpl
AppServiceCertificateOrder.Update {
final AppServiceCertificateOrdersInner client;
- private Map keyVaultBindings;
+
+ private WebAppBase> domainVerifyWebApp;
+ private AppServiceDomain domainVerifyDomain;
+ private Observable bindingVault;
AppServiceCertificateOrderImpl(String key, AppServiceCertificateOrderInner innerObject, final AppServiceCertificateOrdersInner client, AppServiceManager manager) {
super(key, innerObject, manager);
this.client = client;
- this.withRegion("global");
- keyVaultBindings = new HashMap<>();
- if (inner().certificates() != null) {
- for (Map.Entry binding: inner().certificates().entrySet()) {
- keyVaultBindings.put(binding.getKey(), new AppServiceCertificateKeyVaultBindingImpl(binding.getValue(), this));
- }
- }
+ this.withRegion("global").withValidYears(1);
}
@Override
public AppServiceCertificateOrder refresh() {
this.setInner(client.get(resourceGroupName(), name()));
- if (inner().certificates() != null) {
- for (Map.Entry binding: inner().certificates().entrySet()) {
- keyVaultBindings.put(binding.getKey(), new AppServiceCertificateKeyVaultBindingImpl(binding.getValue(), this));
- }
- }
return this;
}
@@ -85,6 +78,16 @@ public AppServiceCertificateKeyVaultBinding call(Page verifyDomainOwnershipAsync(AppServiceDomain domain) {
+ return domain.verifyDomainOwnershipAsync(name(), domainVerificationToken());
+ }
+
@Override
public String distinguishedName() {
return inner().distinguishedName();
@@ -122,6 +125,9 @@ public CertificateOrderStatus status() {
@Override
public CertificateDetailsImpl signedCertificate() {
+ if (inner().signedCertificate() == null) {
+ return null;
+ }
return new CertificateDetailsImpl(inner().signedCertificate());
}
@@ -132,11 +138,17 @@ public String certificateSigningRequest() {
@Override
public CertificateDetailsImpl intermediate() {
+ if (inner().intermediate() == null) {
+ return null;
+ }
return new CertificateDetailsImpl(inner().intermediate());
}
@Override
public CertificateDetailsImpl root() {
+ if (inner().root() == null) {
+ return null;
+ }
return new CertificateDetailsImpl(inner().root());
}
@@ -183,8 +195,14 @@ public AppServiceCertificateOrderImpl withHostName(String hostName) {
}
@Override
- public AppServiceCertificateOrderImpl withSku(CertificateProductType sku) {
- inner().withProductType(sku);
+ public AppServiceCertificateOrderImpl withStandardSku() {
+ inner().withProductType(CertificateProductType.STANDARD_DOMAIN_VALIDATED_SSL);
+ return this;
+ }
+
+ @Override
+ public AppServiceCertificateOrderImpl withWildcardSku() {
+ inner().withProductType(CertificateProductType.STANDARD_DOMAIN_VALIDATED_WILD_CARD_SSL);
return this;
}
@@ -196,8 +214,40 @@ public AppServiceCertificateOrderImpl withValidYears(int years) {
@Override
public Observable createResourceAsync() {
+ final AppServiceCertificateOrder self = this;
return client.createOrUpdateAsync(resourceGroupName(), name(), inner())
- .map(innerToFluentMap(this));
+ .map(innerToFluentMap(this))
+ .flatMap(new Func1>() {
+ @Override
+ public Observable call(AppServiceCertificateOrder certificateOrder) {
+ if (domainVerifyWebApp != null) {
+ return domainVerifyWebApp.verifyDomainOwnershipAsync(name(), domainVerificationToken());
+ } else if (domainVerifyDomain != null) {
+ return domainVerifyDomain.verifyDomainOwnershipAsync(name(), domainVerificationToken());
+ } else {
+ throw new IllegalArgumentException(
+ "Please specify a non-null web app or domain to verify the domain ownership "
+ + "for hostname " + distinguishedName());
+ }
+ }
+ })
+ .flatMap(new Func1>() {
+ @Override
+ public Observable call(Void aVoid) {
+ return bindingVault.flatMap(new Func1>() {
+ @Override
+ public Observable call(Vault vault) {
+ return createKeyVaultBindingAsync(name(), vault);
+ }
+ });
+ }
+ })
+ .map(new Func1() {
+ @Override
+ public AppServiceCertificateOrder call(AppServiceCertificateKeyVaultBinding appServiceCertificateKeyVaultBinding) {
+ return self;
+ }
+ });
}
@Override
@@ -205,4 +255,39 @@ public AppServiceCertificateOrderImpl withAutoRenew(boolean enabled) {
inner().withAutoRenew(enabled);
return this;
}
+
+ @Override
+ public AppServiceCertificateOrderImpl withDomainVerification(AppServiceDomain domain) {
+ this.domainVerifyDomain = domain;
+ return this;
+ }
+
+ @Override
+ public AppServiceCertificateOrderImpl withWebAppVerification(WebAppBase> webApp) {
+ this.domainVerifyWebApp = webApp;
+ return this;
+ }
+
+ @Override
+ public AppServiceCertificateOrderImpl withExistingKeyVault(Vault vault) {
+ this.bindingVault = Observable.just(vault);
+ return this;
+ }
+
+ @Override
+ public AppServiceCertificateOrderImpl withNewKeyVault(String vaultName, Region region) {
+ this.bindingVault = myManager.keyVaultManager().vaults().define(vaultName)
+ .withRegion(region)
+ .withExistingResourceGroup(resourceGroupName())
+ .defineAccessPolicy()
+ .forServicePrincipal("f3c21649-0979-4721-ac85-b0216b2cf413")
+ .allowSecretPermissions(SecretPermissions.GET, SecretPermissions.SET, SecretPermissions.DELETE)
+ .attach()
+ .defineAccessPolicy()
+ .forServicePrincipal("abfa0a7c-a6b6-4736-8310-5855508787cd")
+ .allowSecretPermissions(SecretPermissions.GET)
+ .attach()
+ .createAsync();
+ return this;
+ }
}
\ No newline at end of file
diff --git a/azure-mgmt-website/src/main/java/com/microsoft/azure/management/website/implementation/AppServiceCertificateOrderInner.java b/azure-mgmt-appservice/src/main/java/com/microsoft/azure/management/appservice/implementation/AppServiceCertificateOrderInner.java
similarity index 67%
rename from azure-mgmt-website/src/main/java/com/microsoft/azure/management/website/implementation/AppServiceCertificateOrderInner.java
rename to azure-mgmt-appservice/src/main/java/com/microsoft/azure/management/appservice/implementation/AppServiceCertificateOrderInner.java
index 9df800b8c1b0a..3ca7db6716244 100644
--- a/azure-mgmt-website/src/main/java/com/microsoft/azure/management/website/implementation/AppServiceCertificateOrderInner.java
+++ b/azure-mgmt-appservice/src/main/java/com/microsoft/azure/management/appservice/implementation/AppServiceCertificateOrderInner.java
@@ -6,19 +6,19 @@
* Code generated by Microsoft (R) AutoRest Code Generator.
*/
-package com.microsoft.azure.management.website.implementation;
+package com.microsoft.azure.management.appservice.implementation;
import java.util.Map;
-import com.microsoft.azure.management.website.CertificateProductType;
-import com.microsoft.azure.management.website.ProvisioningState;
-import com.microsoft.azure.management.website.CertificateOrderStatus;
+import com.microsoft.azure.management.appservice.CertificateProductType;
+import com.microsoft.azure.management.appservice.ProvisioningState;
+import com.microsoft.azure.management.appservice.CertificateOrderStatus;
import org.joda.time.DateTime;
import com.fasterxml.jackson.annotation.JsonProperty;
import com.microsoft.rest.serializer.JsonFlatten;
import com.microsoft.azure.Resource;
/**
- * Certificate purchase order.
+ * SSL certificate purchase order.
*/
@JsonFlatten
public class AppServiceCertificateOrderInner extends Resource {
@@ -35,9 +35,9 @@ public class AppServiceCertificateOrderInner extends Resource {
private String distinguishedName;
/**
- * Domain Verification Token.
+ * Domain verification token.
*/
- @JsonProperty(value = "properties.domainVerificationToken")
+ @JsonProperty(value = "properties.domainVerificationToken", access = JsonProperty.Access.WRITE_ONLY)
private String domainVerificationToken;
/**
@@ -47,7 +47,7 @@ public class AppServiceCertificateOrderInner extends Resource {
private Integer validityInYears;
/**
- * Certificate Key Size.
+ * Certificate key size.
*/
@JsonProperty(value = "properties.keySize")
private Integer keySize;
@@ -60,7 +60,9 @@ public class AppServiceCertificateOrderInner extends Resource {
private CertificateProductType productType;
/**
- * Auto renew.
+ * <code>true</code> if the certificate should be
+ * automatically renewed when it expires; otherwise,
+ * <code>false</code>.
*/
@JsonProperty(value = "properties.autoRenew")
private Boolean autoRenew;
@@ -69,7 +71,7 @@ public class AppServiceCertificateOrderInner extends Resource {
* Status of certificate order. Possible values include: 'Succeeded',
* 'Failed', 'Canceled', 'InProgress', 'Deleting'.
*/
- @JsonProperty(value = "properties.provisioningState")
+ @JsonProperty(value = "properties.provisioningState", access = JsonProperty.Access.WRITE_ONLY)
private ProvisioningState provisioningState;
/**
@@ -77,13 +79,13 @@ public class AppServiceCertificateOrderInner extends Resource {
* 'Issued', 'Revoked', 'Canceled', 'Denied', 'Pendingrevocation',
* 'PendingRekey', 'Unused', 'Expired', 'NotSubmitted'.
*/
- @JsonProperty(value = "properties.status")
+ @JsonProperty(value = "properties.status", access = JsonProperty.Access.WRITE_ONLY)
private CertificateOrderStatus status;
/**
* Signed certificate.
*/
- @JsonProperty(value = "properties.signedCertificate")
+ @JsonProperty(value = "properties.signedCertificate", access = JsonProperty.Access.WRITE_ONLY)
private CertificateDetailsInner signedCertificate;
/**
@@ -95,35 +97,36 @@ public class AppServiceCertificateOrderInner extends Resource {
/**
* Intermediate certificate.
*/
- @JsonProperty(value = "properties.intermediate")
+ @JsonProperty(value = "properties.intermediate", access = JsonProperty.Access.WRITE_ONLY)
private CertificateDetailsInner intermediate;
/**
* Root certificate.
*/
- @JsonProperty(value = "properties.root")
+ @JsonProperty(value = "properties.root", access = JsonProperty.Access.WRITE_ONLY)
private CertificateDetailsInner root;
/**
* Current serial number of the certificate.
*/
- @JsonProperty(value = "properties.serialNumber")
+ @JsonProperty(value = "properties.serialNumber", access = JsonProperty.Access.WRITE_ONLY)
private String serialNumber;
/**
* Certificate last issuance time.
*/
- @JsonProperty(value = "properties.lastCertificateIssuanceTime")
+ @JsonProperty(value = "properties.lastCertificateIssuanceTime", access = JsonProperty.Access.WRITE_ONLY)
private DateTime lastCertificateIssuanceTime;
/**
* Certificate expiration time.
*/
- @JsonProperty(value = "properties.expirationTime")
+ @JsonProperty(value = "properties.expirationTime", access = JsonProperty.Access.WRITE_ONLY)
private DateTime expirationTime;
/**
- * Is Private Key External.
+ * <code>true</code> if private key is external; otherwise,
+ * <code>false</code>.
*/
@JsonProperty(value = "properties.isPrivateKeyExternal")
private Boolean isPrivateKeyExternal;
@@ -177,17 +180,6 @@ public String domainVerificationToken() {
return this.domainVerificationToken;
}
- /**
- * Set the domainVerificationToken value.
- *
- * @param domainVerificationToken the domainVerificationToken value to set
- * @return the AppServiceCertificateOrderInner object itself.
- */
- public AppServiceCertificateOrderInner withDomainVerificationToken(String domainVerificationToken) {
- this.domainVerificationToken = domainVerificationToken;
- return this;
- }
-
/**
* Get the validityInYears value.
*
@@ -277,17 +269,6 @@ public ProvisioningState provisioningState() {
return this.provisioningState;
}
- /**
- * Set the provisioningState value.
- *
- * @param provisioningState the provisioningState value to set
- * @return the AppServiceCertificateOrderInner object itself.
- */
- public AppServiceCertificateOrderInner withProvisioningState(ProvisioningState provisioningState) {
- this.provisioningState = provisioningState;
- return this;
- }
-
/**
* Get the status value.
*
@@ -297,17 +278,6 @@ public CertificateOrderStatus status() {
return this.status;
}
- /**
- * Set the status value.
- *
- * @param status the status value to set
- * @return the AppServiceCertificateOrderInner object itself.
- */
- public AppServiceCertificateOrderInner withStatus(CertificateOrderStatus status) {
- this.status = status;
- return this;
- }
-
/**
* Get the signedCertificate value.
*
@@ -317,17 +287,6 @@ public CertificateDetailsInner signedCertificate() {
return this.signedCertificate;
}
- /**
- * Set the signedCertificate value.
- *
- * @param signedCertificate the signedCertificate value to set
- * @return the AppServiceCertificateOrderInner object itself.
- */
- public AppServiceCertificateOrderInner withSignedCertificate(CertificateDetailsInner signedCertificate) {
- this.signedCertificate = signedCertificate;
- return this;
- }
-
/**
* Get the csr value.
*
@@ -357,17 +316,6 @@ public CertificateDetailsInner intermediate() {
return this.intermediate;
}
- /**
- * Set the intermediate value.
- *
- * @param intermediate the intermediate value to set
- * @return the AppServiceCertificateOrderInner object itself.
- */
- public AppServiceCertificateOrderInner withIntermediate(CertificateDetailsInner intermediate) {
- this.intermediate = intermediate;
- return this;
- }
-
/**
* Get the root value.
*
@@ -377,17 +325,6 @@ public CertificateDetailsInner root() {
return this.root;
}
- /**
- * Set the root value.
- *
- * @param root the root value to set
- * @return the AppServiceCertificateOrderInner object itself.
- */
- public AppServiceCertificateOrderInner withRoot(CertificateDetailsInner root) {
- this.root = root;
- return this;
- }
-
/**
* Get the serialNumber value.
*
@@ -397,17 +334,6 @@ public String serialNumber() {
return this.serialNumber;
}
- /**
- * Set the serialNumber value.
- *
- * @param serialNumber the serialNumber value to set
- * @return the AppServiceCertificateOrderInner object itself.
- */
- public AppServiceCertificateOrderInner withSerialNumber(String serialNumber) {
- this.serialNumber = serialNumber;
- return this;
- }
-
/**
* Get the lastCertificateIssuanceTime value.
*
@@ -417,17 +343,6 @@ public DateTime lastCertificateIssuanceTime() {
return this.lastCertificateIssuanceTime;
}
- /**
- * Set the lastCertificateIssuanceTime value.
- *
- * @param lastCertificateIssuanceTime the lastCertificateIssuanceTime value to set
- * @return the AppServiceCertificateOrderInner object itself.
- */
- public AppServiceCertificateOrderInner withLastCertificateIssuanceTime(DateTime lastCertificateIssuanceTime) {
- this.lastCertificateIssuanceTime = lastCertificateIssuanceTime;
- return this;
- }
-
/**
* Get the expirationTime value.
*
@@ -437,17 +352,6 @@ public DateTime expirationTime() {
return this.expirationTime;
}
- /**
- * Set the expirationTime value.
- *
- * @param expirationTime the expirationTime value to set
- * @return the AppServiceCertificateOrderInner object itself.
- */
- public AppServiceCertificateOrderInner withExpirationTime(DateTime expirationTime) {
- this.expirationTime = expirationTime;
- return this;
- }
-
/**
* Get the isPrivateKeyExternal value.
*
diff --git a/azure-mgmt-website/src/main/java/com/microsoft/azure/management/website/implementation/AppServiceCertificateOrdersImpl.java b/azure-mgmt-appservice/src/main/java/com/microsoft/azure/management/appservice/implementation/AppServiceCertificateOrdersImpl.java
similarity index 90%
rename from azure-mgmt-website/src/main/java/com/microsoft/azure/management/website/implementation/AppServiceCertificateOrdersImpl.java
rename to azure-mgmt-appservice/src/main/java/com/microsoft/azure/management/appservice/implementation/AppServiceCertificateOrdersImpl.java
index d75811293ea79..07e15cd682598 100644
--- a/azure-mgmt-website/src/main/java/com/microsoft/azure/management/website/implementation/AppServiceCertificateOrdersImpl.java
+++ b/azure-mgmt-appservice/src/main/java/com/microsoft/azure/management/appservice/implementation/AppServiceCertificateOrdersImpl.java
@@ -4,13 +4,13 @@
* license information.
*/
-package com.microsoft.azure.management.website.implementation;
+package com.microsoft.azure.management.appservice.implementation;
import com.microsoft.azure.PagedList;
import com.microsoft.azure.management.resources.fluentcore.arm.collection.implementation.GroupableResourcesImpl;
-import com.microsoft.azure.management.website.AppServicePlans;
-import com.microsoft.azure.management.website.AppServiceCertificateOrder;
-import com.microsoft.azure.management.website.AppServiceCertificateOrders;
+import com.microsoft.azure.management.appservice.AppServicePlans;
+import com.microsoft.azure.management.appservice.AppServiceCertificateOrder;
+import com.microsoft.azure.management.appservice.AppServiceCertificateOrders;
import rx.Observable;
import rx.functions.Func1;
diff --git a/azure-mgmt-website/src/main/java/com/microsoft/azure/management/website/implementation/AppServiceCertificateOrdersInner.java b/azure-mgmt-appservice/src/main/java/com/microsoft/azure/management/appservice/implementation/AppServiceCertificateOrdersInner.java
similarity index 78%
rename from azure-mgmt-website/src/main/java/com/microsoft/azure/management/website/implementation/AppServiceCertificateOrdersInner.java
rename to azure-mgmt-appservice/src/main/java/com/microsoft/azure/management/appservice/implementation/AppServiceCertificateOrdersInner.java
index 1af3d515c4680..d143bdbf724bd 100644
--- a/azure-mgmt-website/src/main/java/com/microsoft/azure/management/website/implementation/AppServiceCertificateOrdersInner.java
+++ b/azure-mgmt-appservice/src/main/java/com/microsoft/azure/management/appservice/implementation/AppServiceCertificateOrdersInner.java
@@ -6,8 +6,9 @@
* Code generated by Microsoft (R) AutoRest Code Generator.
*/
-package com.microsoft.azure.management.website.implementation;
+package com.microsoft.azure.management.appservice.implementation;
+import retrofit2.Retrofit;
import com.google.common.reflect.TypeToken;
import com.microsoft.azure.AzureServiceCall;
import com.microsoft.azure.AzureServiceResponseBuilder;
@@ -19,23 +20,21 @@
import com.microsoft.rest.ServiceCallback;
import com.microsoft.rest.ServiceResponse;
import com.microsoft.rest.Validator;
+import java.io.IOException;
+import java.util.List;
import okhttp3.ResponseBody;
-import retrofit2.Response;
-import retrofit2.Retrofit;
import retrofit2.http.Body;
import retrofit2.http.GET;
-import retrofit2.http.HTTP;
import retrofit2.http.Header;
import retrofit2.http.Headers;
+import retrofit2.http.HTTP;
+import retrofit2.http.Path;
import retrofit2.http.POST;
import retrofit2.http.PUT;
-import retrofit2.http.Path;
import retrofit2.http.Query;
-import rx.Observable;
+import retrofit2.Response;
import rx.functions.Func1;
-
-import java.io.IOException;
-import java.util.List;
+import rx.Observable;
/**
* An instance of this class provides access to all the operations defined
@@ -121,7 +120,7 @@ interface AppServiceCertificateOrdersService {
@Headers("Content-Type: application/json; charset=utf-8")
@POST("subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.CertificateRegistration/certificateOrders/{name}/resendEmail")
- Observable> resendCertificateEmail(@Path("resourceGroupName") String resourceGroupName, @Path("name") String name, @Path("subscriptionId") String subscriptionId, @Query("api-version") String apiVersion, @Header("accept-language") String acceptLanguage, @Header("User-Agent") String userAgent);
+ Observable> resendEmail(@Path("resourceGroupName") String resourceGroupName, @Path("name") String name, @Path("subscriptionId") String subscriptionId, @Query("api-version") String apiVersion, @Header("accept-language") String acceptLanguage, @Header("User-Agent") String userAgent);
@Headers("Content-Type: application/json; charset=utf-8")
@POST("subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.CertificateRegistration/certificateOrders/{name}/retrieveCertificateActions")
@@ -150,8 +149,8 @@ interface AppServiceCertificateOrdersService {
}
/**
- * Lists all domains in a subscription.
- * Lists all domains in a subscription.
+ * List all certificate orders in a subscription.
+ * List all certificate orders in a subscription.
*
* @return the PagedList<AppServiceCertificateOrderInner> object if successful.
*/
@@ -166,8 +165,8 @@ public Page nextPage(String nextPageLink) {
}
/**
- * Lists all domains in a subscription.
- * Lists all domains in a subscription.
+ * List all certificate orders in a subscription.
+ * List all certificate orders in a subscription.
*
* @param serviceCallback the async ServiceCallback to handle successful and failed responses.
* @return the {@link ServiceCall} object
@@ -185,8 +184,8 @@ public Observable>> call(S
}
/**
- * Lists all domains in a subscription.
- * Lists all domains in a subscription.
+ * List all certificate orders in a subscription.
+ * List all certificate orders in a subscription.
*
* @return the observable to the PagedList<AppServiceCertificateOrderInner> object
*/
@@ -201,8 +200,8 @@ public Page call(ServiceResponse>> call(S
}
/**
- * Lists all domains in a subscription.
- * Lists all domains in a subscription.
+ * List all certificate orders in a subscription.
+ * List all certificate orders in a subscription.
*
* @return the PagedList<AppServiceCertificateOrderInner> object wrapped in {@link ServiceResponse} if successful.
*/
@@ -253,52 +252,51 @@ private ServiceResponse> listDelegate(
}
/**
- * Validate certificate purchase information.
- * Validate certificate purchase information.
+ * Validate information for a certificate order.
+ * Validate information for a certificate order.
*
- * @param appServiceCertificateOrder Certificate order
- * @return the Object object if successful.
+ * @param appServiceCertificateOrder Information for a certificate order.
*/
- public Object validatePurchaseInformation(AppServiceCertificateOrderInner appServiceCertificateOrder) {
- return validatePurchaseInformationWithServiceResponseAsync(appServiceCertificateOrder).toBlocking().single().getBody();
+ public void validatePurchaseInformation(AppServiceCertificateOrderInner appServiceCertificateOrder) {
+ validatePurchaseInformationWithServiceResponseAsync(appServiceCertificateOrder).toBlocking().single().getBody();
}
/**
- * Validate certificate purchase information.
- * Validate certificate purchase information.
+ * Validate information for a certificate order.
+ * Validate information for a certificate order.
*
- * @param appServiceCertificateOrder Certificate order
+ * @param appServiceCertificateOrder Information for a certificate order.
* @param serviceCallback the async ServiceCallback to handle successful and failed responses.
* @return the {@link ServiceCall} object
*/
- public ServiceCall