From d0956b7c4754b919cadefb691b5bdd0b38ab5dbd Mon Sep 17 00:00:00 2001 From: Jianghao Lu Date: Wed, 23 Nov 2016 14:33:31 -0800 Subject: [PATCH 01/10] Web app cannot be created in a different region than its plan --- .../management/website/AppServicePlans.java | 9 + .../azure/management/website/WebApp.java | 94 +++- .../azure/management/website/WebAppBase.java | 56 --- .../implementation/AppServicePlansImpl.java | 13 +- .../implementation/WebAppBaseImpl.java | 444 +++++++++--------- .../website/implementation/WebAppImpl.java | 41 +- .../management/website/WebAppsTests.java | 3 +- 7 files changed, 366 insertions(+), 294 deletions(-) diff --git a/azure-mgmt-website/src/main/java/com/microsoft/azure/management/website/AppServicePlans.java b/azure-mgmt-website/src/main/java/com/microsoft/azure/management/website/AppServicePlans.java index 05c9fef68f2c8..1c3722877d968 100644 --- a/azure-mgmt-website/src/main/java/com/microsoft/azure/management/website/AppServicePlans.java +++ b/azure-mgmt-website/src/main/java/com/microsoft/azure/management/website/AppServicePlans.java @@ -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,12 @@ 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 resourceGroupName the name of the resource group the resource is in + * @param name the name of the resource. (Note, this is not the ID) + * @return an immutable representation of the resource + */ + Observable getByGroupAsync(String resourceGroupName, String name); } \ No newline at end of file diff --git a/azure-mgmt-website/src/main/java/com/microsoft/azure/management/website/WebApp.java b/azure-mgmt-website/src/main/java/com/microsoft/azure/management/website/WebApp.java index bc980c1e0e688..b989c0c72384b 100644 --- a/azure-mgmt-website/src/main/java/com/microsoft/azure/management/website/WebApp.java +++ b/azure-mgmt-website/src/main/java/com/microsoft/azure/management/website/WebApp.java @@ -29,30 +29,112 @@ public interface WebApp extends */ interface Definition extends DefinitionStages.Blank, - DefinitionStages.WithGroup { + 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 Blank extends GroupableResource.DefinitionWithRegion { + interface WithRegion extends GroupableResource.DefinitionWithRegion { } /** - * A web app definition allowing resource group to be set. + * A web app definition allowing app service plan to be set. */ - interface WithGroup extends GroupableResource.DefinitionStages.WithGroup< - WebAppBase.DefinitionStages.WithAppServicePlan> { + 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 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); + } + + /** + * 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 { + 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-website/src/main/java/com/microsoft/azure/management/website/WebAppBase.java index 0a5e478327a18..864b9661c6bd3 100644 --- a/azure-mgmt-website/src/main/java/com/microsoft/azure/management/website/WebAppBase.java +++ b/azure-mgmt-website/src/main/java/com/microsoft/azure/management/website/WebAppBase.java @@ -277,7 +277,6 @@ public interface WebAppBase> extends * Container interface for all the definitions that need to be implemented. */ interface Definition extends - DefinitionStages.WithAppServicePlan, DefinitionStages.WithHostNameSslBinding, DefinitionStages.WithWebContainer { } @@ -286,33 +285,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 @@ -609,33 +581,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 @@ -953,7 +898,6 @@ interface WithConnectionString { */ interface Update extends Appliable, - UpdateStages.WithAppServicePlan, UpdateStages.WithHostNameBinding, UpdateStages.WithHostNameSslBinding, UpdateStages.WithClientAffinityEnabled, diff --git a/azure-mgmt-website/src/main/java/com/microsoft/azure/management/website/implementation/AppServicePlansImpl.java b/azure-mgmt-website/src/main/java/com/microsoft/azure/management/website/implementation/AppServicePlansImpl.java index 9814c51d577ac..fec026e6bdf7b 100644 --- a/azure-mgmt-website/src/main/java/com/microsoft/azure/management/website/implementation/AppServicePlansImpl.java +++ b/azure-mgmt-website/src/main/java/com/microsoft/azure/management/website/implementation/AppServicePlansImpl.java @@ -31,7 +31,7 @@ class AppServicePlansImpl @Override public AppServicePlan getByGroup(String groupName, String name) { - return wrapModel(innerCollection.get(groupName, name)); + return getByGroupAsync(groupName, name).toBlocking().single(); } @Override @@ -67,4 +67,15 @@ protected AppServicePlanImpl wrapModel(AppServicePlanInner inner) { public AppServicePlanImpl define(String name) { return wrapModel(name); } + + @Override + public Observable getByGroupAsync(String resourceGroupName, String name) { + return innerCollection.getAsync(resourceGroupName, name) + .map(new Func1() { + @Override + public AppServicePlan call(AppServicePlanInner appServicePlanInner) { + return wrapModel(appServicePlanInner); + } + }); + } } \ No newline at end of file diff --git a/azure-mgmt-website/src/main/java/com/microsoft/azure/management/website/implementation/WebAppBaseImpl.java b/azure-mgmt-website/src/main/java/com/microsoft/azure/management/website/implementation/WebAppBaseImpl.java index f862a9e786058..e3caa7a253056 100644 --- a/azure-mgmt-website/src/main/java/com/microsoft/azure/management/website/implementation/WebAppBaseImpl.java +++ b/azure-mgmt-website/src/main/java/com/microsoft/azure/management/website/implementation/WebAppBaseImpl.java @@ -10,12 +10,10 @@ import com.google.common.collect.Maps; import com.google.common.collect.Sets; import com.microsoft.azure.management.resources.fluentcore.arm.models.implementation.GroupableResourceImpl; -import com.microsoft.azure.management.resources.fluentcore.utils.ResourceNamer; import com.microsoft.azure.management.resources.fluentcore.utils.Utils; import com.microsoft.azure.management.website.AppServiceCertificate; import com.microsoft.azure.management.website.AppServiceDomain; import com.microsoft.azure.management.website.AppServicePlan; -import com.microsoft.azure.management.website.AppServicePricingTier; import com.microsoft.azure.management.website.AppSetting; import com.microsoft.azure.management.website.AzureResourceType; import com.microsoft.azure.management.website.CloningInfo; @@ -40,6 +38,7 @@ import com.microsoft.azure.management.website.WebContainer; import org.joda.time.DateTime; import rx.Observable; +import rx.functions.Action1; import rx.functions.Func1; import rx.functions.FuncN; @@ -418,246 +417,235 @@ public Observable createResourceAsync() { if (hostNameSslStateMap.size() > 0) { inner().withHostNameSslStates(new ArrayList<>(hostNameSslStateMap.values())); } - if (inner().siteConfig() != null & inner().siteConfig().location() == null) { - inner().siteConfig().withLocation(inner().location()); + Observable locationObs = Observable.just(inner().location()); + if (inner().location() == null) { + locationObs = myManager.appServicePlans().getByGroupAsync(resourceGroupName(), inner().serverFarmId()) + .map(new Func1() { + @Override + public String call(AppServicePlan appServicePlan) { + return appServicePlan.regionName(); + } + }); } + locationObs = locationObs.doOnNext(new Action1() { + @Override + public void call(String s) { + inner().withLocation(s); + if (inner().siteConfig() != null && inner().siteConfig().location() == null) { + inner().siteConfig().withLocation(s); + } + } + }); // Construct web app observable - return createOrUpdateInner(inner()) - // Submit hostname bindings - .flatMap(new Func1>() { - @Override - public Observable call(final SiteInner site) { - List> bindingObservables = new ArrayList<>(); - for (HostNameBindingImpl binding: hostNameBindingsToCreate.values()) { - bindingObservables.add(binding.createAsync()); + return locationObs.flatMap(new Func1>() { + @Override + public Observable call(String s) { + return createOrUpdateInner(inner()); + } + }) + // Submit hostname bindings + .flatMap(new Func1>() { + @Override + public Observable call(final SiteInner site) { + List> bindingObservables = new ArrayList<>(); + for (HostNameBindingImpl binding: hostNameBindingsToCreate.values()) { + bindingObservables.add(binding.createAsync()); + } + for (String binding: hostNameBindingsToDelete) { + bindingObservables.add(deleteHostNameBinding(binding).map(new Func1() { + @Override + public HostNameBinding call(Object o) { + return null; + } + })); + } + if (bindingObservables.isEmpty()) { + return Observable.just(site); + } else { + return Observable.zip(bindingObservables, new FuncN() { + @Override + public SiteInner call(Object... args) { + return site; } - for (String binding: hostNameBindingsToDelete) { - bindingObservables.add(deleteHostNameBinding(binding).map(new Func1() { + }); + } + } + }) + // refresh after hostname bindings + .flatMap(new Func1>() { + @Override + public Observable call(SiteInner site) { + return getInner(); + } + }) + .flatMap(new Func1>() { + @Override + public Observable call(final SiteInner siteInner) { + List> certs = new ArrayList<>(); + for (final HostNameSslBindingImpl binding : sslBindingsToCreate.values()) { + certs.add(binding.newCertificate()); + siteInner.hostNameSslStates().add(binding.inner().withToUpdate(true)); + } + if (certs.isEmpty()) { + return Observable.just(siteInner); + } else { + return Observable.zip(certs, new FuncN() { + @Override + public SiteInner call(Object... args) { + return siteInner; + } + }); + } + } + }) + // refresh after hostname SSL bindings + .flatMap(new Func1>() { + @Override + public Observable call(SiteInner site) { + return createOrUpdateInner(inner()); + } + }) + // submit config + .flatMap(new Func1>() { + @Override + public Observable call(final SiteInner siteInner) { + if (inner().siteConfig() == null) { + return Observable.just(siteInner); + } + return createOrUpdateSiteConfig(inner().siteConfig()) + .flatMap(new Func1>() { + @Override + public Observable call(SiteConfigInner siteConfigInner) { + siteInner.withSiteConfig(siteConfigInner); + return Observable.just(siteInner); + } + }); + } + }) + // app settings + .flatMap(new Func1>() { + @Override + public Observable call(final SiteInner inner) { + Observable observable = Observable.just(inner); + if (!appSettingsToAdd.isEmpty() || !appSettingsToRemove.isEmpty()) { + observable = listAppSettings() + .flatMap(new Func1>() { @Override - public HostNameBinding call(Object o) { - return null; + public Observable call(StringDictionaryInner stringDictionaryInner) { + if (stringDictionaryInner == null) { + stringDictionaryInner = new StringDictionaryInner(); + stringDictionaryInner.withLocation(regionName()); + } + if (stringDictionaryInner.properties() == null) { + stringDictionaryInner.withProperties(new HashMap()); + } + stringDictionaryInner.properties().putAll(appSettingsToAdd); + for (String appSettingKey : appSettingsToRemove) { + stringDictionaryInner.properties().remove(appSettingKey); + } + return updateAppSettings(stringDictionaryInner); } - })); - } - if (bindingObservables.isEmpty()) { - return Observable.just(site); - } else { - return Observable.zip(bindingObservables, new FuncN() { + }).map(new Func1() { @Override - public SiteInner call(Object... args) { - return site; + public SiteInner call(StringDictionaryInner stringDictionaryInner) { + return inner; } }); - } - } - }) - // refresh after hostname bindings - .flatMap(new Func1>() { - @Override - public Observable call(SiteInner site) { - return getInner(); - } - }) - .flatMap(new Func1>() { - @Override - public Observable call(final SiteInner siteInner) { - List> certs = new ArrayList<>(); - for (final HostNameSslBindingImpl binding : sslBindingsToCreate.values()) { - certs.add(binding.newCertificate()); - siteInner.hostNameSslStates().add(binding.inner().withToUpdate(true)); - } - if (certs.isEmpty()) { - return Observable.just(siteInner); - } else { - return Observable.zip(certs, new FuncN() { + } + return observable; + } + }) + // connection strings + .flatMap(new Func1>() { + @Override + public Observable call(final SiteInner inner) { + Observable observable = Observable.just(inner); + if (!connectionStringsToAdd.isEmpty() || !connectionStringsToRemove.isEmpty()) { + observable = listConnectionStrings() + .flatMap(new Func1>() { + @Override + public Observable call(ConnectionStringDictionaryInner dictionaryInner) { + if (dictionaryInner == null) { + dictionaryInner = new ConnectionStringDictionaryInner(); + dictionaryInner.withLocation(regionName()); + } + if (dictionaryInner.properties() == null) { + dictionaryInner.withProperties(new HashMap()); + } + dictionaryInner.properties().putAll(connectionStringsToAdd); + for (String connectionString : connectionStringsToRemove) { + dictionaryInner.properties().remove(connectionString); + } + return updateConnectionStrings(dictionaryInner); + } + }).map(new Func1() { @Override - public SiteInner call(Object... args) { - return siteInner; + public SiteInner call(ConnectionStringDictionaryInner stringDictionaryInner) { + return inner; } }); - } - } - }) - // refresh after hostname SSL bindings - .flatMap(new Func1>() { - @Override - public Observable call(SiteInner site) { - return createOrUpdateInner(inner()); - } - }) - // submit config - .flatMap(new Func1>() { - @Override - public Observable call(final SiteInner siteInner) { - if (inner().siteConfig() == null) { - return Observable.just(siteInner); - } - return createOrUpdateSiteConfig(inner().siteConfig()) - .flatMap(new Func1>() { - @Override - public Observable call(SiteConfigInner siteConfigInner) { - siteInner.withSiteConfig(siteConfigInner); - return Observable.just(siteInner); + } + return observable; + } + }) + // app setting & connection string stickiness + .flatMap(new Func1>() { + @Override + public Observable call(final SiteInner inner) { + Observable observable = Observable.just(inner); + if (!appSettingStickiness.isEmpty() || !connectionStringStickiness.isEmpty()) { + observable = listSlotConfigurations() + .flatMap(new Func1>() { + @Override + public Observable call(SlotConfigNamesResourceInner slotConfigNamesResourceInner) { + if (slotConfigNamesResourceInner == null) { + slotConfigNamesResourceInner = new SlotConfigNamesResourceInner(); + slotConfigNamesResourceInner.withLocation(regionName()); } - }); - } - }) - // app settings - .flatMap(new Func1>() { - @Override - public Observable call(final SiteInner inner) { - Observable observable = Observable.just(inner); - if (!appSettingsToAdd.isEmpty() || !appSettingsToRemove.isEmpty()) { - observable = listAppSettings() - .flatMap(new Func1>() { - @Override - public Observable call(StringDictionaryInner stringDictionaryInner) { - if (stringDictionaryInner == null) { - stringDictionaryInner = new StringDictionaryInner(); - stringDictionaryInner.withLocation(regionName()); - } - if (stringDictionaryInner.properties() == null) { - stringDictionaryInner.withProperties(new HashMap()); - } - stringDictionaryInner.properties().putAll(appSettingsToAdd); - for (String appSettingKey : appSettingsToRemove) { - stringDictionaryInner.properties().remove(appSettingKey); - } - return updateAppSettings(stringDictionaryInner); - } - }).map(new Func1() { - @Override - public SiteInner call(StringDictionaryInner stringDictionaryInner) { - return inner; - } - }); - } - return observable; - } - }) - // connection strings - .flatMap(new Func1>() { - @Override - public Observable call(final SiteInner inner) { - Observable observable = Observable.just(inner); - if (!connectionStringsToAdd.isEmpty() || !connectionStringsToRemove.isEmpty()) { - observable = listConnectionStrings() - .flatMap(new Func1>() { - @Override - public Observable call(ConnectionStringDictionaryInner dictionaryInner) { - if (dictionaryInner == null) { - dictionaryInner = new ConnectionStringDictionaryInner(); - dictionaryInner.withLocation(regionName()); - } - if (dictionaryInner.properties() == null) { - dictionaryInner.withProperties(new HashMap()); - } - dictionaryInner.properties().putAll(connectionStringsToAdd); - for (String connectionString : connectionStringsToRemove) { - dictionaryInner.properties().remove(connectionString); - } - return updateConnectionStrings(dictionaryInner); - } - }).map(new Func1() { - @Override - public SiteInner call(ConnectionStringDictionaryInner stringDictionaryInner) { - return inner; - } - }); - } - return observable; - } - }) - // app setting & connection string stickiness - .flatMap(new Func1>() { - @Override - public Observable call(final SiteInner inner) { - Observable observable = Observable.just(inner); - if (!appSettingStickiness.isEmpty() || !connectionStringStickiness.isEmpty()) { - observable = listSlotConfigurations() - .flatMap(new Func1>() { - @Override - public Observable call(SlotConfigNamesResourceInner slotConfigNamesResourceInner) { - if (slotConfigNamesResourceInner == null) { - slotConfigNamesResourceInner = new SlotConfigNamesResourceInner(); - slotConfigNamesResourceInner.withLocation(regionName()); - } - if (slotConfigNamesResourceInner.appSettingNames() == null) { - slotConfigNamesResourceInner.withAppSettingNames(new ArrayList()); - } - if (slotConfigNamesResourceInner.connectionStringNames() == null) { - slotConfigNamesResourceInner.withConnectionStringNames(new ArrayList()); - } - Set stickyAppSettingKeys = new HashSet<>(slotConfigNamesResourceInner.appSettingNames()); - Set stickyConnectionStringNames = new HashSet<>(slotConfigNamesResourceInner.connectionStringNames()); - for (Map.Entry stickiness : appSettingStickiness.entrySet()) { - if (stickiness.getValue()) { - stickyAppSettingKeys.add(stickiness.getKey()); - } else { - stickyAppSettingKeys.remove(stickiness.getKey()); - } - } - for (Map.Entry stickiness : connectionStringStickiness.entrySet()) { - if (stickiness.getValue()) { - stickyConnectionStringNames.add(stickiness.getKey()); - } else { - stickyConnectionStringNames.remove(stickiness.getKey()); - } - } - slotConfigNamesResourceInner.withAppSettingNames(new ArrayList<>(stickyAppSettingKeys)); - slotConfigNamesResourceInner.withConnectionStringNames(new ArrayList<>(stickyConnectionStringNames)); - return updateSlotConfigurations(slotConfigNamesResourceInner); + if (slotConfigNamesResourceInner.appSettingNames() == null) { + slotConfigNamesResourceInner.withAppSettingNames(new ArrayList()); + } + if (slotConfigNamesResourceInner.connectionStringNames() == null) { + slotConfigNamesResourceInner.withConnectionStringNames(new ArrayList()); + } + Set stickyAppSettingKeys = new HashSet<>(slotConfigNamesResourceInner.appSettingNames()); + Set stickyConnectionStringNames = new HashSet<>(slotConfigNamesResourceInner.connectionStringNames()); + for (Map.Entry stickiness : appSettingStickiness.entrySet()) { + if (stickiness.getValue()) { + stickyAppSettingKeys.add(stickiness.getKey()); + } else { + stickyAppSettingKeys.remove(stickiness.getKey()); } - }).map(new Func1() { - @Override - public SiteInner call(SlotConfigNamesResourceInner slotConfigNamesResourceInner) { - return inner; + } + for (Map.Entry stickiness : connectionStringStickiness.entrySet()) { + if (stickiness.getValue()) { + stickyConnectionStringNames.add(stickiness.getKey()); + } else { + stickyConnectionStringNames.remove(stickiness.getKey()); } - }); - } - return observable; - } - }) - // convert from inner - .map(new Func1() { - @Override - public FluentT call(SiteInner siteInner) { - setInner(siteInner); - return normalizeProperties(); - } - }); - } - - @Override - @SuppressWarnings("unchecked") - public FluentImplT withNewFreeAppServicePlan() { - String appServicePlanName = ResourceNamer.randomResourceName(name(), 10); - AppServicePlan.DefinitionStages.WithCreate creatable = myManager.appServicePlans().define(appServicePlanName) - .withRegion(region()) - .withNewResourceGroup(resourceGroupName()) - .withPricingTier(AppServicePricingTier.FREE_F1); - addCreatableDependency(creatable); - inner().withServerFarmId(appServicePlanName); - return (FluentImplT) this; - } - - @Override - @SuppressWarnings("unchecked") - public FluentImplT withNewAppServicePlan(String name, AppServicePricingTier pricingTier) { - AppServicePlan.DefinitionStages.WithCreate creatable = myManager.appServicePlans().define(name) - .withRegion(region()) - .withNewResourceGroup(resourceGroupName()) - .withPricingTier(pricingTier); - addCreatableDependency(creatable); - inner().withServerFarmId(name); - return (FluentImplT) this; - } - - @Override - @SuppressWarnings("unchecked") - public FluentImplT withExistingAppServicePlan(String appServicePlanName) { - inner().withServerFarmId(appServicePlanName); - return (FluentImplT) this; + } + slotConfigNamesResourceInner.withAppSettingNames(new ArrayList<>(stickyAppSettingKeys)); + slotConfigNamesResourceInner.withConnectionStringNames(new ArrayList<>(stickyConnectionStringNames)); + return updateSlotConfigurations(slotConfigNamesResourceInner); + } + }).map(new Func1() { + @Override + public SiteInner call(SlotConfigNamesResourceInner slotConfigNamesResourceInner) { + return inner; + } + }); + } + return observable; + } + }) + // convert from inner + .map(new Func1() { + @Override + public FluentT call(SiteInner siteInner) { + setInner(siteInner); + return normalizeProperties(); + } + }); } WebAppBaseImpl withNewHostNameSslBinding(final HostNameSslBindingImpl hostNameSslBinding) { diff --git a/azure-mgmt-website/src/main/java/com/microsoft/azure/management/website/implementation/WebAppImpl.java b/azure-mgmt-website/src/main/java/com/microsoft/azure/management/website/implementation/WebAppImpl.java index bc11cf61b5570..34bf14688760a 100644 --- a/azure-mgmt-website/src/main/java/com/microsoft/azure/management/website/implementation/WebAppImpl.java +++ b/azure-mgmt-website/src/main/java/com/microsoft/azure/management/website/implementation/WebAppImpl.java @@ -8,6 +8,9 @@ import com.google.common.base.Function; import com.google.common.collect.Maps; +import com.microsoft.azure.management.resources.fluentcore.model.Wrapper; +import com.microsoft.azure.management.resources.implementation.ResourceGroupInner; +import com.microsoft.azure.management.website.AppServicePricingTier; import com.microsoft.azure.management.website.DeploymentSlots; import com.microsoft.azure.management.website.HostNameBinding; import com.microsoft.azure.management.website.WebApp; @@ -26,9 +29,11 @@ class WebAppImpl implements WebApp, WebApp.Definition, - WebApp.Update { + WebApp.Update, + WebApp.UpdateStages.WithNewAppServicePlan { private DeploymentSlots deploymentSlots; + private AppServicePlanImpl appServicePlan; WebAppImpl(String name, SiteInner innerObject, SiteConfigInner configObject, final WebAppsInner client, AppServiceManager manager) { super(name, innerObject, configObject, client, manager); @@ -142,4 +147,38 @@ public WebAppImpl refresh() { this.setInner(client.get(resourceGroupName(), name())); return this; } + + @Override + public WebAppImpl withNewAppServicePlan(String name) { + appServicePlan = (AppServicePlanImpl) myManager.appServicePlans().define(name); + inner().withServerFarmId(name); + return this; + } + + @Override + public WebAppImpl withFreePricingTier() { + return withPricingTier(AppServicePricingTier.FREE_F1); + } + + @Override + @SuppressWarnings("unchecked") + public WebAppImpl withPricingTier(AppServicePricingTier pricingTier) { + appServicePlan = appServicePlan + .withRegion(region()) + .withPricingTier(pricingTier); + if (super.creatableGroup != null) { + appServicePlan = appServicePlan.withNewResourceGroup(resourceGroupName()); + ((Wrapper) super.creatableGroup).inner().withLocation(regionName()); + } else { + appServicePlan = appServicePlan.withExistingResourceGroup(resourceGroupName()); + } + addCreatableDependency(appServicePlan); + return this; + } + + @Override + public WebAppImpl withExistingAppServicePlan(String appServicePlanName) { + inner().withServerFarmId(appServicePlanName); + return this; + } } \ No newline at end of file diff --git a/azure-mgmt-website/src/test/java/com/microsoft/azure/management/website/WebAppsTests.java b/azure-mgmt-website/src/test/java/com/microsoft/azure/management/website/WebAppsTests.java index 4a31e2fd613b8..9433ead39a9bf 100644 --- a/azure-mgmt-website/src/test/java/com/microsoft/azure/management/website/WebAppsTests.java +++ b/azure-mgmt-website/src/test/java/com/microsoft/azure/management/website/WebAppsTests.java @@ -7,7 +7,6 @@ package com.microsoft.azure.management.website; import com.microsoft.azure.management.resources.ResourceGroup; -import com.microsoft.azure.management.resources.fluentcore.arm.Region; import org.junit.AfterClass; import org.junit.Assert; import org.junit.BeforeClass; @@ -31,8 +30,8 @@ public static void cleanup() throws Exception { @Test public void canCRUDWebApp() throws Exception { AppServiceDomain domain = appServiceManager.domains().getByGroup(RG_NAME, "graph-webapp-319.com"); + WebApp webApp = appServiceManager.webApps().define(WEBAPP_NAME) - .withRegion(Region.US_WEST) .withExistingResourceGroup(RG_NAME) .withExistingAppServicePlan("java-plan-323") .withManagedHostnameBindings(domain, "pineapple") From 4a74dee194ba8364e03da93d72e96a321087d176 Mon Sep 17 00:00:00 2001 From: Jianghao Lu Date: Mon, 28 Nov 2016 11:41:25 -0800 Subject: [PATCH 02/10] Add a simple app service sample --- azure-mgmt-website/pom.xml | 1 - .../website/implementation/DomainsInner.java | 1 + .../implementation/WebAppBaseImpl.java | 63 +++--- azure-samples/pom.xml | 5 + .../azure/management/samples/Utils.java | 122 +++++++++-- .../website/samples/ManageAppService.java | 192 ++++++++++++++++++ .../website/samples/package-info.java | 8 + azure/pom.xml | 5 + .../com/microsoft/azure/management/Azure.java | 18 ++ 9 files changed, 367 insertions(+), 48 deletions(-) create mode 100644 azure-samples/src/main/java/com/microsoft/azure/management/website/samples/ManageAppService.java create mode 100644 azure-samples/src/main/java/com/microsoft/azure/management/website/samples/package-info.java diff --git a/azure-mgmt-website/pom.xml b/azure-mgmt-website/pom.xml index 7f6e35b46e656..afa64b489887c 100644 --- a/azure-mgmt-website/pom.xml +++ b/azure-mgmt-website/pom.xml @@ -14,7 +14,6 @@ azure-mgmt-website jar - 1.0.0-SNAPSHOT Microsoft Azure SDK for Website Management This package contains Microsoft Azure Website Management SDK. diff --git a/azure-mgmt-website/src/main/java/com/microsoft/azure/management/website/implementation/DomainsInner.java b/azure-mgmt-website/src/main/java/com/microsoft/azure/management/website/implementation/DomainsInner.java index 004629f81b619..705a255975ef6 100644 --- a/azure-mgmt-website/src/main/java/com/microsoft/azure/management/website/implementation/DomainsInner.java +++ b/azure-mgmt-website/src/main/java/com/microsoft/azure/management/website/implementation/DomainsInner.java @@ -1132,6 +1132,7 @@ public Observable> call(Response response) private ServiceResponse deleteDelegate(Response response) throws CloudException, IOException, IllegalArgumentException { return new AzureServiceResponseBuilder(this.client.mapperAdapter()) + .register(200, new TypeToken() { }.getType()) .register(204, new TypeToken() { }.getType()) .registerError(CloudException.class) .build(response); diff --git a/azure-mgmt-website/src/main/java/com/microsoft/azure/management/website/implementation/WebAppBaseImpl.java b/azure-mgmt-website/src/main/java/com/microsoft/azure/management/website/implementation/WebAppBaseImpl.java index e3caa7a253056..695fc7bccf81d 100644 --- a/azure-mgmt-website/src/main/java/com/microsoft/azure/management/website/implementation/WebAppBaseImpl.java +++ b/azure-mgmt-website/src/main/java/com/microsoft/azure/management/website/implementation/WebAppBaseImpl.java @@ -38,7 +38,6 @@ import com.microsoft.azure.management.website.WebContainer; import org.joda.time.DateTime; import rx.Observable; -import rx.functions.Action1; import rx.functions.Func1; import rx.functions.FuncN; @@ -372,7 +371,8 @@ public Map getAppSettings() { return Maps.asMap(inner.properties().keySet(), new Function() { @Override public AppSetting apply(String input) { - return new AppSettingImpl(input, inner.properties().get(input), slotConfigs.appSettingNames().contains(input)); + return new AppSettingImpl(input, inner.properties().get(input), + slotConfigs.appSettingNames() != null && slotConfigs.appSettingNames().contains(input)); } }); } @@ -423,19 +423,11 @@ public Observable createResourceAsync() { .map(new Func1() { @Override public String call(AppServicePlan appServicePlan) { + inner().withLocation(appServicePlan.regionName()); return appServicePlan.regionName(); } }); } - locationObs = locationObs.doOnNext(new Action1() { - @Override - public void call(String s) { - inner().withLocation(s); - if (inner().siteConfig() != null && inner().siteConfig().location() == null) { - inner().siteConfig().withLocation(s); - } - } - }); // Construct web app observable return locationObs.flatMap(new Func1>() { @Override @@ -443,6 +435,25 @@ public Observable call(String s) { return createOrUpdateInner(inner()); } }) + // submit config + .flatMap(new Func1>() { + @Override + public Observable call(final SiteInner siteInner) { + if (inner().siteConfig() == null) { + return Observable.just(siteInner); + } else if (inner().siteConfig().location() == null) { + inner().siteConfig().withLocation(inner().location()); + } + return createOrUpdateSiteConfig(inner().siteConfig()) + .flatMap(new Func1>() { + @Override + public Observable call(SiteConfigInner siteConfigInner) { + siteInner.withSiteConfig(siteConfigInner); + return Observable.just(siteInner); + } + }); + } + }) // Submit hostname bindings .flatMap(new Func1>() { @Override @@ -478,6 +489,7 @@ public Observable call(SiteInner site) { return getInner(); } }) + // Submit SSL bindings .flatMap(new Func1>() { @Override public Observable call(final SiteInner siteInner) { @@ -494,34 +506,15 @@ public Observable call(final SiteInner siteInner) { public SiteInner call(Object... args) { return siteInner; } + }).flatMap(new Func1>() { + @Override + public Observable call(SiteInner inner) { + return createOrUpdateInner(inner); + } }); } } }) - // refresh after hostname SSL bindings - .flatMap(new Func1>() { - @Override - public Observable call(SiteInner site) { - return createOrUpdateInner(inner()); - } - }) - // submit config - .flatMap(new Func1>() { - @Override - public Observable call(final SiteInner siteInner) { - if (inner().siteConfig() == null) { - return Observable.just(siteInner); - } - return createOrUpdateSiteConfig(inner().siteConfig()) - .flatMap(new Func1>() { - @Override - public Observable call(SiteConfigInner siteConfigInner) { - siteInner.withSiteConfig(siteConfigInner); - return Observable.just(siteInner); - } - }); - } - }) // app settings .flatMap(new Func1>() { @Override diff --git a/azure-samples/pom.xml b/azure-samples/pom.xml index a9871d5e81cc5..5a995eabe7816 100644 --- a/azure-samples/pom.xml +++ b/azure-samples/pom.xml @@ -74,6 +74,11 @@ azure-mgmt-compute 1.0.0-beta4-SNAPSHOT + + com.microsoft.azure + azure-mgmt-website + 1.0.0-beta4-SNAPSHOT + com.microsoft.azure api-annotations diff --git a/azure-samples/src/main/java/com/microsoft/azure/management/samples/Utils.java b/azure-samples/src/main/java/com/microsoft/azure/management/samples/Utils.java index 5b9b0b151ce2b..3560da3fc7e3c 100644 --- a/azure-samples/src/main/java/com/microsoft/azure/management/samples/Utils.java +++ b/azure-samples/src/main/java/com/microsoft/azure/management/samples/Utils.java @@ -19,36 +19,46 @@ import com.microsoft.azure.management.compute.VirtualMachineExtension; import com.microsoft.azure.management.keyvault.AccessPolicy; import com.microsoft.azure.management.keyvault.Vault; +import com.microsoft.azure.management.network.LoadBalancer; +import com.microsoft.azure.management.network.LoadBalancerBackend; +import com.microsoft.azure.management.network.LoadBalancerFrontend; +import com.microsoft.azure.management.network.LoadBalancerHttpProbe; +import com.microsoft.azure.management.network.LoadBalancerInboundNatPool; +import com.microsoft.azure.management.network.LoadBalancerInboundNatRule; +import com.microsoft.azure.management.network.LoadBalancerPrivateFrontend; +import com.microsoft.azure.management.network.LoadBalancerProbe; +import com.microsoft.azure.management.network.LoadBalancerPublicFrontend; +import com.microsoft.azure.management.network.LoadBalancerTcpProbe; +import com.microsoft.azure.management.network.LoadBalancingRule; import com.microsoft.azure.management.network.Network; import com.microsoft.azure.management.network.NetworkInterface; import com.microsoft.azure.management.network.NetworkSecurityGroup; import com.microsoft.azure.management.network.NetworkSecurityRule; import com.microsoft.azure.management.network.PublicIpAddress; import com.microsoft.azure.management.network.Subnet; -import com.microsoft.azure.management.network.LoadBalancer; -import com.microsoft.azure.management.network.LoadBalancerTcpProbe; -import com.microsoft.azure.management.network.LoadBalancingRule; -import com.microsoft.azure.management.network.LoadBalancerInboundNatPool; -import com.microsoft.azure.management.network.LoadBalancerInboundNatRule; -import com.microsoft.azure.management.network.LoadBalancerFrontend; -import com.microsoft.azure.management.network.LoadBalancerBackend; -import com.microsoft.azure.management.network.LoadBalancerProbe; -import com.microsoft.azure.management.network.LoadBalancerHttpProbe; -import com.microsoft.azure.management.network.LoadBalancerPublicFrontend; -import com.microsoft.azure.management.network.LoadBalancerPrivateFrontend; import com.microsoft.azure.management.redis.RedisAccessKeys; import com.microsoft.azure.management.redis.RedisCache; import com.microsoft.azure.management.redis.RedisCachePremium; import com.microsoft.azure.management.redis.ScheduleEntry; import com.microsoft.azure.management.storage.StorageAccount; import com.microsoft.azure.management.storage.StorageAccountKey; +import com.microsoft.azure.management.website.AppServiceCertificateOrder; +import com.microsoft.azure.management.website.AppServiceDomain; +import com.microsoft.azure.management.website.AppServicePlan; +import com.microsoft.azure.management.website.AppSetting; +import com.microsoft.azure.management.website.ConnectionString; +import com.microsoft.azure.management.website.Contact; +import com.microsoft.azure.management.website.HostNameBinding; +import com.microsoft.azure.management.website.HostNameSslState; +import com.microsoft.azure.management.website.SslState; +import com.microsoft.azure.management.website.WebAppBase; import java.io.IOException; +import java.util.ArrayList; import java.util.Calendar; import java.util.List; import java.util.Map; import java.util.Set; -import java.util.ArrayList; import java.util.UUID; /** @@ -637,6 +647,94 @@ public static void print(BatchAccount batchAccount) { .toString()); } + /** + * Print app service domain. + * @param resource an app service domain + */ + public static void print(AppServiceDomain resource) { + StringBuilder builder = new StringBuilder().append("Domain: ").append(resource.id()) + .append("Name: ").append(resource.name()) + .append("\n\tResource group: ").append(resource.resourceGroupName()) + .append("\n\tRegion: ").append(resource.region()) + .append("\n\tCreated time: ").append(resource.createdTime()) + .append("\n\tExpiration time: ").append(resource.expirationTime()) + .append("\n\tContact: "); + Contact contact = resource.registrantContact(); + if (contact == null) { + builder = builder.append("Private"); + } else { + builder = builder.append("\n\t\tName: ").append(contact.nameFirst() + " " + contact.nameLast()); + } + builder = builder.append("\n\tName servers: "); + for (String nameServer: resource.nameServers()) { + builder = builder.append("\n\t\t" + nameServer); + } + System.out.println(builder.toString()); + } + + /** + * Print app service certificate order. + * @param resource an app service certificate order + */ + public static void print(AppServiceCertificateOrder resource) { + StringBuilder builder = new StringBuilder().append("App service certificate order: ").append(resource.id()) + .append("Name: ").append(resource.name()) + .append("\n\tResource group: ").append(resource.resourceGroupName()) + .append("\n\tRegion: ").append(resource.region()) + .append("\n\tDistinguished name: ").append(resource.distinguishedName()) + .append("\n\tProduct type: ").append(resource.productType()) + .append("\n\tValid years: ").append(resource.validityInYears()) + .append("\n\tStatus: ").append(resource.status()) + .append("\n\tIssuance time: ").append(resource.lastCertificateIssuanceTime()) + .append("\n\tSigned certificate: ").append(resource.signedCertificate() == null ? null : resource.signedCertificate().thumbprint()); + System.out.println(builder.toString()); + } + + /** + * Print app service plan. + * @param resource an app service plan + */ + public static void print(AppServicePlan resource) { + StringBuilder builder = new StringBuilder().append("App service certificate order: ").append(resource.id()) + .append("Name: ").append(resource.name()) + .append("\n\tResource group: ").append(resource.resourceGroupName()) + .append("\n\tRegion: ").append(resource.region()) + .append("\n\tPricing tier: ").append(resource.pricingTier()); + System.out.println(builder.toString()); + } + + /** + * Print a web app. + * @param resource a web app + */ + public static void print(WebAppBase resource) { + StringBuilder builder = new StringBuilder().append("Web app: ").append(resource.id()) + .append("Name: ").append(resource.name()) + .append("\n\tResource group: ").append(resource.resourceGroupName()) + .append("\n\tRegion: ").append(resource.region()) + .append("\n\tDefault hostname: ").append(resource.defaultHostName()) + .append("\n\tApp service plan: ").append(resource.appServicePlanId()) + .append("\n\tHost name bindings: "); + for (HostNameBinding binding: resource.getHostNameBindings().values()) { + builder = builder.append("\n\t\t" + binding.toString()); + } + builder = builder.append("\n\tSSL bindings: "); + for (HostNameSslState binding: resource.hostNameSslStates().values()) { + builder = builder.append("\n\t\t" + binding.name() + ": " + binding.sslState()); + if (binding.sslState() != null && binding.sslState() != SslState.DISABLED) { + builder = builder.append(" - " + binding.thumbprint()); + } + } + builder = builder.append("\n\tApp settings: "); + for (AppSetting setting: resource.getAppSettings().values()) { + builder = builder.append("\n\t\t" + setting.key() + ": " + setting.value() + (setting.sticky() ? " - slot setting" : "")); + } + builder = builder.append("\n\tConnection strings: "); + for (ConnectionString conn: resource.getConnectionStrings().values()) { + builder = builder.append("\n\t\t" + conn.name() + ": " + conn.value() + " - " + conn.type() + (conn.sticky() ? " - slot setting" : "")); + } + System.out.println(builder.toString()); + } /** * Creates and returns a randomized name based on the prefix file for use by the sample. diff --git a/azure-samples/src/main/java/com/microsoft/azure/management/website/samples/ManageAppService.java b/azure-samples/src/main/java/com/microsoft/azure/management/website/samples/ManageAppService.java new file mode 100644 index 0000000000000..4af585ef106eb --- /dev/null +++ b/azure-samples/src/main/java/com/microsoft/azure/management/website/samples/ManageAppService.java @@ -0,0 +1,192 @@ +/** + * + * 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.website.samples; + +import com.microsoft.azure.management.Azure; +import com.microsoft.azure.management.resources.fluentcore.arm.CountryISOCode; +import com.microsoft.azure.management.resources.fluentcore.arm.CountryPhoneCode; +import com.microsoft.azure.management.resources.fluentcore.arm.Region; +import com.microsoft.azure.management.resources.fluentcore.utils.ResourceNamer; +import com.microsoft.azure.management.samples.Utils; +import com.microsoft.azure.management.website.AppServiceDomain; +import com.microsoft.azure.management.website.AppServicePricingTier; +import com.microsoft.azure.management.website.CertificateProductType; +import com.microsoft.azure.management.website.CustomHostNameDnsRecordType; +import com.microsoft.azure.management.website.WebApp; +import okhttp3.OkHttpClient; +import okhttp3.Request; +import okhttp3.logging.HttpLoggingInterceptor; + +import java.io.File; +import java.io.IOException; + +/** + * Azure App Service sample for managing web apps - + * - Create 2 web apps under the same new app service plan + * - Authorize an application + * - Update a key vault + * - alter configurations + * - change permissions + * - Create another key vault + * - List key vaults + * - Delete a key vault. + */ +public final class ManageAppService { + + private static OkHttpClient httpClient; + + /** + * Main entry point. + * @param args the parameters + */ + public static void main(String[] args) { + final String app1Name = ResourceNamer.randomResourceName("webapp1", 20); + final String app2Name = ResourceNamer.randomResourceName("webapp2", 20); + final String planName = ResourceNamer.randomResourceName("jplan", 15); + final String domainName = ResourceNamer.randomResourceName("jsdk", 10) + ".com"; + final String certName = ResourceNamer.randomResourceName("democrt", 20); + final String vaultName = ResourceNamer.randomResourceName("demovault", 20); + final String rgName = ResourceNamer.randomResourceName("rgNEMV", 24); + + try { + + //============================================================= + // Authenticate + + final File credFile = new File(System.getenv("AZURE_AUTH_LOCATION")); + + Azure azure = Azure + .configure() + .withLogLevel(HttpLoggingInterceptor.Level.BODY) + .authenticate(credFile) + .withDefaultSubscription(); + + // Print selected subscription + System.out.println("Selected subscription: " + azure.subscriptionId()); + try { + + + //============================================================ + // Create a web app with a new app service plan + + System.out.println("Creating web app " + app1Name + "..."); + + WebApp app1 = azure.webApps() + .define(app1Name) + .withNewResourceGroup(rgName) + .withNewAppServicePlan(planName) + .withRegion(Region.US_WEST) + .withPricingTier(AppServicePricingTier.STANDARD_S1) + .create(); + + System.out.println("Created web app " + app1.name()); + Utils.print(app1); + + //============================================================ + // Create a second web app with the same app service plan + + System.out.println("Creating another web app " + app2Name + "..."); + + WebApp app2 = azure.webApps() + .define(app2Name) + .withExistingResourceGroup(rgName) + .withExistingAppServicePlan(planName) + .create(); + + System.out.println("Created web app " + app2.name()); + Utils.print(app2); + + //============================================================ + // Purchase a domain (will be canceled for a full refund) + + System.out.println("Purchasing a domain " + domainName + "..."); + + AppServiceDomain domain = azure.appServices().domains() + .define(domainName) + .withExistingResourceGroup(rgName) + .defineRegistrantContact() + .withFirstName("Microsoft") + .withLastName("Azure") + .withEmail("azure@outlook.com") + .withAddressLine1("1 Microsoft Way") + .withCity("Redmond") + .withStateOrProvince("Washington") + .withCountry(CountryISOCode.UNITED_STATES) + .withPostalCode("98052") + .withPhoneCountryCode(CountryPhoneCode.UNITED_STATES) + .withPhoneNumber("4258828080") + .attach() + .create(); + + System.out.println("Purchased domain " + domain.name()); + Utils.print(domain); + + //============================================================ + // Bind domain to web app 1 + + System.out.println("Binding https://app1." + domainName + " to web app " + app1Name + "..."); + + app1.update() + .defineHostnameBinding() + .withAzureManagedDomain(domain) + .withSubDomain("app1") + .withDnsRecordType(CustomHostNameDnsRecordType.CNAME) + .attach() + .defineSslBinding() + .forHostname("app1." + domainName) + .withNewAppServiceCertificateOrder(certName, CertificateProductType.STANDARD_DOMAIN_VALIDATED_SSL) + .withNewKeyVault(vaultName) + .withSniBasedSsl() + .attach() + .apply(); + + System.out.println("Finish binding https://app1." + domainName + " to web app " + app1Name + "..."); + Utils.print(app1); + + System.out.println("CURLing https://app1." + domainName); + System.out.println(curl("https://app1." + domainName)); + + //============================================================ + // Bind domain to web app 2 and also purchase a certificate + + System.out.println("Binding www." + domainName + " to web app " + app1Name + "..."); + + } catch (Exception e) { + System.err.println(e.getMessage()); + e.printStackTrace(); + } finally { + try { + System.out.println("Deleting Resource Group: " + rgName); + azure.resourceGroups().deleteByName(rgName); + System.out.println("Deleted Resource Group: " + rgName); + } catch (NullPointerException npe) { + System.out.println("Did not create any resources in Azure. No clean up is necessary"); + } catch (Exception g) { + g.printStackTrace(); + } + } + + } catch (Exception e) { + System.out.println(e.getMessage()); + e.printStackTrace(); + } + } + + private static String curl(String url) { + Request request = new Request.Builder().url(url).get().build(); + try { + return httpClient.newCall(request).execute().body().string(); + } catch (IOException e) { + return null; + } + } + + private ManageAppService() { + httpClient = new OkHttpClient.Builder().build(); + } +} diff --git a/azure-samples/src/main/java/com/microsoft/azure/management/website/samples/package-info.java b/azure-samples/src/main/java/com/microsoft/azure/management/website/samples/package-info.java new file mode 100644 index 0000000000000..22a373de8ca9b --- /dev/null +++ b/azure-samples/src/main/java/com/microsoft/azure/management/website/samples/package-info.java @@ -0,0 +1,8 @@ +// Copyright (c) Microsoft Corporation. All rights reserved. +// Licensed under the MIT License. See License.txt in the project root for +// license information. + +/** + * This package contains the classes for azure app service samples. + */ +package com.microsoft.azure.management.website.samples; diff --git a/azure/pom.xml b/azure/pom.xml index af0a463750acf..3a6ec941e05ea 100644 --- a/azure/pom.xml +++ b/azure/pom.xml @@ -104,6 +104,11 @@ azure-mgmt-redis 1.0.0-beta4-SNAPSHOT + + com.microsoft.azure + azure-mgmt-website + 1.0.0-beta4-SNAPSHOT + junit junit diff --git a/azure/src/main/java/com/microsoft/azure/management/Azure.java b/azure/src/main/java/com/microsoft/azure/management/Azure.java index 223d899588e5f..0b4c02d45ef87 100644 --- a/azure/src/main/java/com/microsoft/azure/management/Azure.java +++ b/azure/src/main/java/com/microsoft/azure/management/Azure.java @@ -57,6 +57,8 @@ import com.microsoft.azure.management.storage.implementation.StorageManager; import com.microsoft.azure.management.trafficmanager.TrafficManagerProfiles; import com.microsoft.azure.management.trafficmanager.implementation.TrafficManager; +import com.microsoft.azure.management.website.WebApps; +import com.microsoft.azure.management.website.implementation.AppServiceManager; import java.io.File; import java.io.IOException; @@ -75,6 +77,7 @@ public final class Azure { private final RedisManager redisManager; private final CdnManager cdnManager; private final DnsZoneManager dnsZoneManager; + private final AppServiceManager appServiceManager; private final SqlServerManager sqlServerManager; private final String subscriptionId; @@ -282,6 +285,7 @@ private Azure(RestClient restClient, String subscriptionId, String tenantId) { this.redisManager = RedisManager.authenticate(restClient, subscriptionId); this.cdnManager = CdnManager.authenticate(restClient, subscriptionId); this.dnsZoneManager = DnsZoneManager.authenticate(restClient, subscriptionId); + this.appServiceManager = AppServiceManager.authenticate(restClient, tenantId, subscriptionId); this.sqlServerManager = SqlServerManager.authenticate(restClient, subscriptionId); this.subscriptionId = subscriptionId; } @@ -489,6 +493,20 @@ public DnsZones dnsZones() { return dnsZoneManager.zones(); } + /** + * @return entry point to managing web apps. + */ + public WebApps webApps() { + return appServiceManager.webApps(); + } + + /** + * @return entry point to managing app services. + */ + public AppServiceManager appServices() { + return appServiceManager; + } + /** * @return entry point to managing Sql server. */ From e7f203393ba7aa729b0311b68296d28c9c83f949 Mon Sep 17 00:00:00 2001 From: Jianghao Lu Date: Wed, 30 Nov 2016 17:24:49 -0800 Subject: [PATCH 03/10] Supports deploying from Github, Git, Mercurial --- .../management/website/DomainContact.java | 2 +- .../azure/management/website/JavaVersion.java | 2 +- .../website/PublishingCredentials.java | 27 ++ .../azure/management/website/WebAppBase.java | 40 +- .../website/WebAppSourceControl.java | 345 ++++++++++++++++++ .../implementation/DeploymentSlotImpl.java | 30 ++ .../PublishingCredentialsImpl.java | 32 ++ .../implementation/WebAppBaseImpl.java | 91 ++++- .../website/implementation/WebAppImpl.java | 30 ++ .../WebAppSourceControlImpl.java | 148 ++++++++ .../website/implementation/WebAppsInner.java | 4 +- .../website/samples/ManageAppService.java | 9 + 12 files changed, 745 insertions(+), 15 deletions(-) create mode 100644 azure-mgmt-website/src/main/java/com/microsoft/azure/management/website/PublishingCredentials.java create mode 100644 azure-mgmt-website/src/main/java/com/microsoft/azure/management/website/WebAppSourceControl.java create mode 100644 azure-mgmt-website/src/main/java/com/microsoft/azure/management/website/implementation/PublishingCredentialsImpl.java create mode 100644 azure-mgmt-website/src/main/java/com/microsoft/azure/management/website/implementation/WebAppSourceControlImpl.java diff --git a/azure-mgmt-website/src/main/java/com/microsoft/azure/management/website/DomainContact.java b/azure-mgmt-website/src/main/java/com/microsoft/azure/management/website/DomainContact.java index d122fe3e4629d..8c1e838288862 100644 --- a/azure-mgmt-website/src/main/java/com/microsoft/azure/management/website/DomainContact.java +++ b/azure-mgmt-website/src/main/java/com/microsoft/azure/management/website/DomainContact.java @@ -290,4 +290,4 @@ interface WithAttach extends Contact build(); } } - } +} diff --git a/azure-mgmt-website/src/main/java/com/microsoft/azure/management/website/JavaVersion.java b/azure-mgmt-website/src/main/java/com/microsoft/azure/management/website/JavaVersion.java index dc925068d9111..4716d196b5b83 100644 --- a/azure-mgmt-website/src/main/java/com/microsoft/azure/management/website/JavaVersion.java +++ b/azure-mgmt-website/src/main/java/com/microsoft/azure/management/website/JavaVersion.java @@ -13,7 +13,7 @@ */ 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"); diff --git a/azure-mgmt-website/src/main/java/com/microsoft/azure/management/website/PublishingCredentials.java b/azure-mgmt-website/src/main/java/com/microsoft/azure/management/website/PublishingCredentials.java new file mode 100644 index 0000000000000..d97bee39342fb --- /dev/null +++ b/azure-mgmt-website/src/main/java/com/microsoft/azure/management/website/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.website; + +import com.microsoft.azure.management.apigeneration.Fluent; +import com.microsoft.azure.management.resources.fluentcore.model.Wrapper; +import com.microsoft.azure.management.website.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-website/src/main/java/com/microsoft/azure/management/website/WebAppBase.java b/azure-mgmt-website/src/main/java/com/microsoft/azure/management/website/WebAppBase.java index 864b9661c6bd3..73740ad947353 100644 --- a/azure-mgmt-website/src/main/java/com/microsoft/azure/management/website/WebAppBase.java +++ b/azure-mgmt-website/src/main/java/com/microsoft/azure/management/website/WebAppBase.java @@ -234,6 +234,10 @@ public interface WebAppBase> extends Map getConnectionStrings(); + PublishingCredentials getPublishingCredentials(); + + WebAppSourceControl getSourceControl(); + /** * Starts the web app or deployment slot. */ @@ -559,6 +563,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 @@ -573,7 +589,8 @@ interface WithCreate extends WithClientCertEnabled, WithSiteConfigs, WithAppSettings, - WithConnectionString { + WithConnectionString, + WithSourceControl { } } @@ -891,6 +908,24 @@ 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(); + } } /** @@ -906,6 +941,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-website/src/main/java/com/microsoft/azure/management/website/WebAppSourceControl.java b/azure-mgmt-website/src/main/java/com/microsoft/azure/management/website/WebAppSourceControl.java new file mode 100644 index 0000000000000..0e1ebcb28e71f --- /dev/null +++ b/azure-mgmt-website/src/main/java/com/microsoft/azure/management/website/WebAppSourceControl.java @@ -0,0 +1,345 @@ +/** + * 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.website; + +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.website.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(); + } + + 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/implementation/DeploymentSlotImpl.java b/azure-mgmt-website/src/main/java/com/microsoft/azure/management/website/implementation/DeploymentSlotImpl.java index 814c4fea36cf7..719c438cc6d68 100644 --- a/azure-mgmt-website/src/main/java/com/microsoft/azure/management/website/implementation/DeploymentSlotImpl.java +++ b/azure-mgmt-website/src/main/java/com/microsoft/azure/management/website/implementation/DeploymentSlotImpl.java @@ -10,8 +10,11 @@ import com.google.common.collect.Maps; import com.microsoft.azure.management.website.DeploymentSlot; import com.microsoft.azure.management.website.HostNameBinding; +import com.microsoft.azure.management.website.PublishingCredentials; import com.microsoft.azure.management.website.WebApp; +import com.microsoft.azure.management.website.WebAppSourceControl; import rx.Observable; +import rx.functions.Func1; import java.util.ArrayList; import java.util.List; @@ -158,6 +161,11 @@ Observable updateSlotConfigurations(SlotConfigName return client.updateSlotConfigurationNamesAsync(resourceGroupName(), parent().name(), inner); } + @Override + Observable createOrUpdateSourceControl(SiteSourceControlInner inner) { + return client.createOrUpdateSourceControlSlotAsync(resourceGroupName(), parent().name(), name(), inner); + } + @Override public void swap(String slotName) { client.swapSlotsSlot(resourceGroupName(), parent().name(), name(), new CsmSlotEntityInner().withTargetSlot(slotName)); @@ -172,4 +180,26 @@ public void applySlotConfigurations(String slotName) { public void resetSlotConfigurations() { client.resetSlotConfigurationSlot(resourceGroupName(), parent().name(), name()); } + + @Override + Observable deleteSourceControl() { + return client.deleteSourceControlSlotAsync(resourceGroupName(), parent().name(), name()).map(new Func1() { + @Override + public Void call(Object o) { + return null; + } + }); + } + + @Override + public PublishingCredentials getPublishingCredentials() { + UserInner inner = client.listPublishingCredentialsSlot(resourceGroupName(), parent().name(), name()); + return new PublishingCredentialsImpl(inner); + } + + @Override + public WebAppSourceControl getSourceControl() { + SiteSourceControlInner siteSourceControlInner = client.getSourceControlSlot(resourceGroupName(), parent().name(), name()); + return new WebAppSourceControlImpl<>(siteSourceControlInner, this, myManager); + } } \ No newline at end of file diff --git a/azure-mgmt-website/src/main/java/com/microsoft/azure/management/website/implementation/PublishingCredentialsImpl.java b/azure-mgmt-website/src/main/java/com/microsoft/azure/management/website/implementation/PublishingCredentialsImpl.java new file mode 100644 index 0000000000000..ede4b56327c9d --- /dev/null +++ b/azure-mgmt-website/src/main/java/com/microsoft/azure/management/website/implementation/PublishingCredentialsImpl.java @@ -0,0 +1,32 @@ +/** + * 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.website.implementation; + +import com.microsoft.azure.management.apigeneration.Fluent; +import com.microsoft.azure.management.resources.fluentcore.model.implementation.WrapperImpl; +import com.microsoft.azure.management.website.PublishingCredentials; + +/** + * A credential for publishing to a web app. + */ +@Fluent +class PublishingCredentialsImpl extends + WrapperImpl + implements PublishingCredentials { + PublishingCredentialsImpl(UserInner innerObject) { + super(innerObject); + } + + @Override + public String username() { + return inner().publishingUserName(); + } + + @Override + public String password() { + return inner().publishingPassword(); + } +} diff --git a/azure-mgmt-website/src/main/java/com/microsoft/azure/management/website/implementation/WebAppBaseImpl.java b/azure-mgmt-website/src/main/java/com/microsoft/azure/management/website/implementation/WebAppBaseImpl.java index 695fc7bccf81d..ef3f0955b795d 100644 --- a/azure-mgmt-website/src/main/java/com/microsoft/azure/management/website/implementation/WebAppBaseImpl.java +++ b/azure-mgmt-website/src/main/java/com/microsoft/azure/management/website/implementation/WebAppBaseImpl.java @@ -82,6 +82,8 @@ abstract class WebAppBaseImpl< private Map connectionStringsToAdd; private List connectionStringsToRemove; private Map connectionStringStickiness; + private WebAppSourceControlImpl sourceControl; + private boolean sourceControlToDelete; WebAppBaseImpl(String name, SiteInner innerObject, SiteConfigInner configObject, final WebAppsInner client, AppServiceManager manager) { super(name, innerObject, manager); @@ -94,12 +96,14 @@ abstract class WebAppBaseImpl< private FluentT normalizeProperties() { this.hostNameBindingsToCreate = new HashMap<>(); this.hostNameBindingsToDelete = new ArrayList<>(); - appSettingsToAdd = new HashMap<>(); - appSettingsToRemove = new ArrayList<>(); - appSettingStickiness = new HashMap<>(); - connectionStringsToAdd = new HashMap<>(); - connectionStringsToRemove = new ArrayList<>(); - connectionStringStickiness = new HashMap<>(); + this.appSettingsToAdd = new HashMap<>(); + this.appSettingsToRemove = new ArrayList<>(); + this.appSettingStickiness = new HashMap<>(); + this.connectionStringsToAdd = new HashMap<>(); + this.connectionStringsToRemove = new ArrayList<>(); + this.connectionStringStickiness = new HashMap<>(); + this.sourceControl = null; + this.sourceControlToDelete = false; this.sslBindingsToCreate = new HashMap<>(); if (inner().hostNames() != null) { this.hostNamesSet = Sets.newHashSet(inner().hostNames()); @@ -412,6 +416,10 @@ public ConnectionString apply(String input) { abstract Observable updateSlotConfigurations(SlotConfigNamesResourceInner inner); + abstract Observable createOrUpdateSourceControl(SiteSourceControlInner inner); + + abstract Observable deleteSourceControl(); + @Override public Observable createResourceAsync() { if (hostNameSslStateMap.size() > 0) { @@ -423,11 +431,23 @@ public Observable createResourceAsync() { .map(new Func1() { @Override public String call(AppServicePlan appServicePlan) { - inner().withLocation(appServicePlan.regionName()); return appServicePlan.regionName(); } }); } + locationObs = locationObs.map(new Func1() { + @Override + public String call(String s) { + inner().withLocation(s); + if (sourceControl != null) { + sourceControl.inner().withLocation(s); + } + if (inner().siteConfig() != null) { + inner().siteConfig().withLocation(s); + } + return s; + } + }); // Construct web app observable return locationObs.flatMap(new Func1>() { @Override @@ -441,8 +461,6 @@ public Observable call(String s) { public Observable call(final SiteInner siteInner) { if (inner().siteConfig() == null) { return Observable.just(siteInner); - } else if (inner().siteConfig().location() == null) { - inner().siteConfig().withLocation(inner().location()); } return createOrUpdateSiteConfig(inner().siteConfig()) .flatMap(new Func1>() { @@ -631,6 +649,43 @@ public SiteInner call(SlotConfigNamesResourceInner slotConfigNamesResourceInner) return observable; } }) + // create source control + .flatMap(new Func1>() { + @Override + public Observable call(final SiteInner inner) { + if (sourceControl == null || sourceControlToDelete) { + return Observable.just(inner); + } + return sourceControl.registerGithubAccessToken() + .flatMap(new Func1>() { + @Override + public Observable call(SourceControlInner sourceControlInner) { + return createOrUpdateSourceControl(sourceControl.inner()); + } + }) + .map(new Func1() { + @Override + public SiteInner call(SiteSourceControlInner siteSourceControlInner) { + return inner; + } + }); + } + }) + // delete source control + .flatMap(new Func1>() { + @Override + public Observable call(final SiteInner inner) { + if (!sourceControlToDelete) { + return Observable.just(inner); + } + return deleteSourceControl().map(new Func1() { + @Override + public SiteInner call(Void aVoid) { + return inner; + } + }); + } + }) // convert from inner .map(new Func1() { @Override @@ -990,4 +1045,22 @@ public FluentImplT withConnectionStringStickiness(String name, boolean stickines connectionStringStickiness.put(name, stickiness); return (FluentImplT) this; } + + @SuppressWarnings("unchecked") + FluentImplT withSourceControl(WebAppSourceControlImpl sourceControl) { + this.sourceControl = sourceControl; + return (FluentImplT) this; + } + + @Override + public WebAppSourceControlImpl defineSourceControl() { + return new WebAppSourceControlImpl<>(new SiteSourceControlInner(), this, myManager); + } + + @Override + @SuppressWarnings("unchecked") + public FluentImplT withoutSourceControl() { + sourceControlToDelete = true; + return (FluentImplT) this; + } } \ No newline at end of file diff --git a/azure-mgmt-website/src/main/java/com/microsoft/azure/management/website/implementation/WebAppImpl.java b/azure-mgmt-website/src/main/java/com/microsoft/azure/management/website/implementation/WebAppImpl.java index 34bf14688760a..e44eaaac9e16c 100644 --- a/azure-mgmt-website/src/main/java/com/microsoft/azure/management/website/implementation/WebAppImpl.java +++ b/azure-mgmt-website/src/main/java/com/microsoft/azure/management/website/implementation/WebAppImpl.java @@ -13,8 +13,11 @@ import com.microsoft.azure.management.website.AppServicePricingTier; import com.microsoft.azure.management.website.DeploymentSlots; import com.microsoft.azure.management.website.HostNameBinding; +import com.microsoft.azure.management.website.PublishingCredentials; import com.microsoft.azure.management.website.WebApp; +import com.microsoft.azure.management.website.WebAppSourceControl; import rx.Observable; +import rx.functions.Func1; import java.util.ArrayList; import java.util.Collections; @@ -89,6 +92,21 @@ Observable updateSlotConfigurations(SlotConfigName return client.updateSlotConfigurationNamesAsync(resourceGroupName(), name(), inner); } + @Override + Observable createOrUpdateSourceControl(SiteSourceControlInner inner) { + return client.createOrUpdateSourceControlAsync(resourceGroupName(), name(), inner); + } + + @Override + Observable deleteSourceControl() { + return client.deleteSourceControlAsync(resourceGroupName(), name()).map(new Func1() { + @Override + public Void call(Object o) { + return null; + } + }); + } + @Override public DeploymentSlots deploymentSlots() { if (deploymentSlots == null) { @@ -112,6 +130,18 @@ public String apply(HostNameBinding input) { })); } + @Override + public PublishingCredentials getPublishingCredentials() { + UserInner inner = client.listPublishingCredentials(resourceGroupName(), name()); + return new PublishingCredentialsImpl(inner); + } + + @Override + public WebAppSourceControl getSourceControl() { + SiteSourceControlInner siteSourceControlInner = client.getSourceControl(resourceGroupName(), name()); + return new WebAppSourceControlImpl<>(siteSourceControlInner, this, myManager); + } + @Override public void start() { client.start(resourceGroupName(), name()); diff --git a/azure-mgmt-website/src/main/java/com/microsoft/azure/management/website/implementation/WebAppSourceControlImpl.java b/azure-mgmt-website/src/main/java/com/microsoft/azure/management/website/implementation/WebAppSourceControlImpl.java new file mode 100644 index 0000000000000..406fd7659b271 --- /dev/null +++ b/azure-mgmt-website/src/main/java/com/microsoft/azure/management/website/implementation/WebAppSourceControlImpl.java @@ -0,0 +1,148 @@ +/** + * 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.website.implementation; + +import com.microsoft.azure.management.apigeneration.LangDefinition; +import com.microsoft.azure.management.resources.fluentcore.model.implementation.IndexableWrapperImpl; +import com.microsoft.azure.management.resources.fluentcore.utils.Utils; +import com.microsoft.azure.management.website.WebAppBase; +import com.microsoft.azure.management.website.WebAppSourceControl; +import retrofit2.http.Body; +import retrofit2.http.Headers; +import retrofit2.http.PUT; +import retrofit2.http.Path; +import retrofit2.http.Query; +import rx.Observable; + +/** + * Implementation for {@link WebAppSourceControl} and its create and update interfaces. + */ +@LangDefinition +class WebAppSourceControlImpl< + FluentT extends WebAppBase, + FluentImplT extends WebAppBaseImpl> + extends IndexableWrapperImpl + implements + WebAppSourceControl, + WebAppSourceControl.Definition>, + WebAppSourceControl.UpdateDefinition> { + + private WebAppBaseImpl parent; + private String githubAccessToken; + private SourceControlService sourceControlService; + + WebAppSourceControlImpl(SiteSourceControlInner inner, WebAppBaseImpl parent, AppServiceManager manager) { + super(inner); + this.parent = parent; + this.sourceControlService = manager.restClient().retrofit().create(SourceControlService.class); + } + + @Override + public String name() { + return inner().name(); + } + + @Override + public String repositoryUrl() { + return inner().repoUrl(); + } + + @Override + public String branch() { + return inner().branch(); + } + + @Override + public boolean isManualIntegration() { + return Utils.toPrimitiveBoolean(inner().isManualIntegration()); + } + + @Override + public boolean deploymentRollbackEnabled() { + return Utils.toPrimitiveBoolean(inner().deploymentRollbackEnabled()); + } + + @Override + public RepositoryType repositoryType() { + if (inner().isMercurial() == null) { + return null; + } else { + return inner().isMercurial() ? RepositoryType.MERCURIAL : RepositoryType.GIT; + } + } + + @Override + public FluentImplT attach() { + parent().withSourceControl(this); + return parent(); + } + + @Override + public WebAppSourceControlImpl withGit(String url) { + inner().withIsMercurial(false).withRepoUrl(url); + return this; + } + + @Override + public WebAppSourceControlImpl withMercurial(String url) { + inner().withIsMercurial(true).withRepoUrl(url); + return this; + } + + @Override + @SuppressWarnings("unchecked") + public FluentImplT parent() { + return (FluentImplT) parent; + } + + @Override + public WebAppSourceControlImpl withBranch(String branch) { + inner().withBranch(branch); + return this; + } + + @Override + public WebAppSourceControlImpl withPublicExternalRepository() { + inner().withIsManualIntegration(true); + return this; + } + + @Override + public WebAppSourceControlImpl withGitHubRepository(String organization, String repository) { + return withGitHubRepository(String.format("https://github.com/%s/%s", organization, repository)); + } + + @Override + public WebAppSourceControlImpl withGitHubRepository(String url) { + inner().withRepoUrl(url).withIsMercurial(false).withIsManualIntegration(false); + return this; + } + + @Override + public WebAppSourceControlImpl withLocalGitRepository() { + inner().withRepoUrl(null).withBranch(null).withIsMercurial(false).withIsManualIntegration(false); + return this; + } + + @Override + public WebAppSourceControlImpl withGitHubAccessToken(String personalAccessToken) { + this.githubAccessToken = personalAccessToken; + return this; + } + + Observable registerGithubAccessToken() { + if (githubAccessToken == null) { + return Observable.just(null); + } + return sourceControlService.updateSourceControl("Github", new SourceControlInner().withToken(githubAccessToken), "2016-03-01"); + } + + private interface SourceControlService { + @Headers("Content-Type: application/json; charset=utf-8") + @PUT("/providers/Microsoft.Web/sourcecontrols/{sourceControlIdentifier}") + Observable updateSourceControl(@Path("sourceControlIdentifier") String sourceControlIdentifier, @Body SourceControlInner sourceControl, @Query("api-version") String apiVersion); + } +} diff --git a/azure-mgmt-website/src/main/java/com/microsoft/azure/management/website/implementation/WebAppsInner.java b/azure-mgmt-website/src/main/java/com/microsoft/azure/management/website/implementation/WebAppsInner.java index f1cf128d4c6a6..7dae24f7e0dcd 100644 --- a/azure-mgmt-website/src/main/java/com/microsoft/azure/management/website/implementation/WebAppsInner.java +++ b/azure-mgmt-website/src/main/java/com/microsoft/azure/management/website/implementation/WebAppsInner.java @@ -19670,7 +19670,7 @@ public Observable> call(Response updateSourceControlSlotDelegate(Response response) throws CloudException, IOException, IllegalArgumentException { return new AzureServiceResponseBuilder(this.client.mapperAdapter()) - .register(200, new TypeToken() { }.getType()) + .register(201, new TypeToken() { }.getType()) .registerError(CloudException.class) .build(response); } @@ -21588,7 +21588,7 @@ public Observable> call(Response createOrUpdateSourceControlDelegate(Response response) throws CloudException, IOException, IllegalArgumentException { return new AzureServiceResponseBuilder(this.client.mapperAdapter()) - .register(200, new TypeToken() { }.getType()) + .register(201, new TypeToken() { }.getType()) .registerError(CloudException.class) .build(response); } diff --git a/azure-samples/src/main/java/com/microsoft/azure/management/website/samples/ManageAppService.java b/azure-samples/src/main/java/com/microsoft/azure/management/website/samples/ManageAppService.java index 4af585ef106eb..b8c0222dadb91 100644 --- a/azure-samples/src/main/java/com/microsoft/azure/management/website/samples/ManageAppService.java +++ b/azure-samples/src/main/java/com/microsoft/azure/management/website/samples/ManageAppService.java @@ -66,6 +66,15 @@ public static void main(String[] args) { .authenticate(credFile) .withDefaultSubscription(); + azure.webApps().getByGroup("javacsmrg319", "java-webapp-319") + .update() + .defineSourceControl() + .withPublicExternalRepository() + .withGit("https://github.com/jianghaolu/azure-site-test") + .withBranch("master") + .attach() + .apply(); + // Print selected subscription System.out.println("Selected subscription: " + azure.subscriptionId()); try { From 2ab66992f1383645990133834ae4552f02c79277 Mon Sep 17 00:00:00 2001 From: Jianghao Lu Date: Thu, 1 Dec 2016 00:53:04 -0800 Subject: [PATCH 04/10] Regenerate from swagger 8f3244d --- .../azure/management/website/Address.java | 6 + .../management/website/ApiDefinitionInfo.java | 2 +- .../website/AppServiceCertificate.java | 2 +- .../website/AppServicePlanRestrictions.java | 65 + .../azure/management/website/ArmPlan.java | 141 - .../management/website/AutoHealActions.java | 13 +- .../website/AutoHealCustomAction.java | 2 +- .../management/website/AutoHealRules.java | 7 +- .../management/website/AutoHealTriggers.java | 10 +- ...zureTableStorageApplicationLogsConfig.java | 6 +- .../management/website/BackupSchedule.java | 35 +- .../website/CertificateOrderActionType.java | 8 +- .../azure/management/website/Channels.java | 3 + .../azure/management/website/CloningInfo.java | 37 +- .../website/ConnStringValueTypePair.java | 1 + .../azure/management/website/Contact.java | 10 +- .../management/website/CorsSettings.java | 5 +- .../website/CsmPublishingProfileOptions.java | 8 +- .../website/DatabaseBackupSetting.java | 25 +- .../management/website/DatabaseType.java | 62 + .../website/DomainPurchaseConsent.java | 5 +- .../azure/management/website/Experiments.java | 4 +- .../website/FileSystemHttpLogsConfig.java | 3 +- .../website/GlobalCsmSkuDescription.java | 143 + .../management/website/HandlerMapping.java | 4 +- .../azure/management/website/HostName.java | 10 +- .../management/website/HostNameSslState.java | 12 +- .../website/HostingEnvironmentProfile.java | 35 +- .../website/InAvailabilityReasonType.java | 59 + .../website/IpSecurityRestriction.java | 2 +- .../management/website/LocalizableString.java | 4 +- .../website/MetricAvailabilily.java | 5 +- .../website/NetworkAccessControlEntry.java | 10 +- .../management/website/PerfMonSample.java | 4 +- .../azure/management/website/PerfMonSet.java | 2 +- .../website/PublishingProfileFormat.java | 62 + .../azure/management/website/RampUpRule.java | 36 +- .../website/RequestsBasedTrigger.java | 4 +- .../website/ResourceMetricAvailability.java | 47 + .../website/ResourceMetricName.java | 2 +- ...a => ResourceNameAvailabilityRequest.java} | 20 +- .../management/website/ResourceScopeType.java | 62 + .../azure/management/website/RouteType.java | 62 + .../website/SiteCloneabilityCriterion.java | 2 +- .../azure/management/website/SiteLimits.java | 2 +- .../management/website/SiteMachineKey.java | 8 +- .../azure/management/website/SkuCapacity.java | 10 +- .../management/website/SkuDescription.java | 16 +- .../azure/management/website/SkuName.java | 71 + .../management/website/SlotSwapStatus.java | 63 + .../website/SlowRequestsBasedTrigger.java | 6 +- .../website/StatusCodesBasedTrigger.java | 4 +- .../TopLevelDomainAgreementOption.java | 5 +- .../website/ValidateProperties.java | 117 - .../website/VirtualApplication.java | 7 +- .../management/website/VirtualIPMapping.java | 4 +- .../website/VirtualNetworkProfile.java | 10 +- .../implementation/AddressResponseInner.java | 10 +- .../AppServiceCertificateImpl.java | 22 +- .../AppServiceCertificateInner.java | 16 +- .../AppServiceCertificateOrderInner.java | 130 +- .../AppServiceCertificateOrdersInner.java | 718 +- .../AppServiceEnvironmentInner.java | 333 +- .../AppServiceEnvironmentsInner.java | 3817 ++-- .../implementation/AppServicePlanInner.java | 159 +- .../implementation/AppServicePlansInner.java | 2398 +-- .../implementation/BackupItemInner.java | 192 +- .../implementation/CapabilityInner.java | 8 +- .../CertificateDetailsInner.java | 117 +- .../implementation/CertificateEmailInner.java | 2 +- .../implementation/CertificateInner.java | 256 +- .../CertificateOrderActionInner.java | 7 +- .../implementation/CertificatesInner.java | 664 +- .../ClassicMobileServiceInner.java | 46 - .../CsmMoveResourceEnvelopeInner.java | 4 +- .../CsmSiteRecoveryEntityInner.java | 15 +- .../implementation/CsmSlotEntityInner.java | 17 +- .../website/implementation/CsrInner.java | 6 +- .../CustomHostnameAnalysisResultInner.java | 105 +- .../implementation/DeletedSiteInner.java | 335 +- .../implementation/DeletedWebAppsInner.java | 508 + .../implementation/DeploymentInner.java | 10 +- .../implementation/DeploymentSlotImpl.java | 4 +- .../DomainAvailablilityCheckResultInner.java | 8 +- .../DomainControlCenterSsoRequestInner.java | 41 +- .../website/implementation/DomainInner.java | 102 +- .../DomainOwnershipIdentifierInner.java | 46 + .../DomainRegistrationInputInner.java | 476 - .../website/implementation/DomainsInner.java | 1148 +- .../implementation/GeoRegionInner.java | 39 +- .../implementation/HostNameBindingInner.java | 6 +- .../HostingEnvironmentDiagnosticsInner.java | 2 +- .../implementation/HybridConnectionInner.java | 6 +- .../HybridConnectionKeyInner.java | 26 +- .../HybridConnectionLimitsInner.java | 51 + .../implementation/IdentifierInner.java | 46 + .../implementation/MetricDefinitionInner.java | 67 +- .../MigrateMySqlRequestInner.java | 4 +- .../implementation/NetworkFeaturesInner.java | 65 +- .../implementation/OperationInner.java | 8 +- .../implementation/PerfMonResponseInner.java | 8 +- .../implementation/PremierAddOnInner.java | 229 + .../PremierAddOnOfferInner.java | 309 + .../PremierAddOnRequestInner.java | 144 - .../implementation/PushSettingsInner.java | 13 +- .../implementation/RecommendationInner.java | 56 +- .../RecommendationRuleInner.java | 37 +- .../implementation/RecommendationsInner.java | 635 +- .../implementation/RecoverResponseInner.java | 15 +- .../RelayServiceConnectionEntityInner.java | 2 +- .../ResourceMetricDefinitionInner.java | 130 + .../implementation/ResourceMetricInner.java | 2 +- .../ResourceNameAvailabilityInner.java | 29 +- .../implementation/RestoreRequestInner.java | 28 +- .../implementation/RestoreResponseInner.java | 17 +- .../implementation/SiteAuthSettingsInner.java | 151 +- .../implementation/SiteCloneabilityInner.java | 15 +- .../implementation/SiteConfigInner.java | 75 +- .../website/implementation/SiteInner.java | 320 +- .../implementation/SiteInstanceInner.java | 15 +- .../implementation/SiteLogsConfigInner.java | 4 +- .../SitePhpErrorLogFlagInner.java | 124 + .../SiteSourceControlInner.java | 14 +- .../website/implementation/SkuInfoInner.java | 8 +- .../website/implementation/SkuInfosInner.java | 68 + .../implementation/SlotDifferenceInner.java | 108 +- .../website/implementation/SnapshotInner.java | 15 +- .../implementation/SourceControlInner.java | 12 +- .../implementation/StampCapacityInner.java | 13 +- .../StorageMigrationOptionsInner.java | 8 +- .../StorageMigrationResponseInner.java | 19 +- .../TldLegalAgreementInner.java | 8 +- .../implementation/TopLevelDomainInner.java | 26 +- .../implementation/TopLevelDomainsInner.java | 173 +- .../website/implementation/UsageInner.java | 123 +- .../website/implementation/UserInner.java | 8 +- .../implementation/ValidateRequestInner.java | 134 +- .../implementation/ValidateResponseInner.java | 2 +- .../implementation/VnetGatewayInner.java | 8 +- .../website/implementation/VnetInfoInner.java | 53 +- .../implementation/VnetRouteInner.java | 26 +- .../implementation/WebAppBaseImpl.java | 2 +- .../website/implementation/WebAppImpl.java | 2 +- .../website/implementation/WebAppsInner.java | 15473 ++++++++-------- .../WebSiteManagementClientImpl.java | 996 +- .../implementation/WorkerPoolInner.java | 19 +- 146 files changed, 17451 insertions(+), 15635 deletions(-) create mode 100644 azure-mgmt-website/src/main/java/com/microsoft/azure/management/website/AppServicePlanRestrictions.java delete mode 100644 azure-mgmt-website/src/main/java/com/microsoft/azure/management/website/ArmPlan.java create mode 100644 azure-mgmt-website/src/main/java/com/microsoft/azure/management/website/DatabaseType.java create mode 100644 azure-mgmt-website/src/main/java/com/microsoft/azure/management/website/GlobalCsmSkuDescription.java create mode 100644 azure-mgmt-website/src/main/java/com/microsoft/azure/management/website/InAvailabilityReasonType.java create mode 100644 azure-mgmt-website/src/main/java/com/microsoft/azure/management/website/PublishingProfileFormat.java create mode 100644 azure-mgmt-website/src/main/java/com/microsoft/azure/management/website/ResourceMetricAvailability.java rename azure-mgmt-website/src/main/java/com/microsoft/azure/management/website/{implementation/ResourceNameAvailabilityRequestInner.java => ResourceNameAvailabilityRequest.java} (70%) create mode 100644 azure-mgmt-website/src/main/java/com/microsoft/azure/management/website/ResourceScopeType.java create mode 100644 azure-mgmt-website/src/main/java/com/microsoft/azure/management/website/RouteType.java create mode 100644 azure-mgmt-website/src/main/java/com/microsoft/azure/management/website/SkuName.java create mode 100644 azure-mgmt-website/src/main/java/com/microsoft/azure/management/website/SlotSwapStatus.java delete mode 100644 azure-mgmt-website/src/main/java/com/microsoft/azure/management/website/ValidateProperties.java delete mode 100644 azure-mgmt-website/src/main/java/com/microsoft/azure/management/website/implementation/ClassicMobileServiceInner.java create mode 100644 azure-mgmt-website/src/main/java/com/microsoft/azure/management/website/implementation/DeletedWebAppsInner.java create mode 100644 azure-mgmt-website/src/main/java/com/microsoft/azure/management/website/implementation/DomainOwnershipIdentifierInner.java delete mode 100644 azure-mgmt-website/src/main/java/com/microsoft/azure/management/website/implementation/DomainRegistrationInputInner.java create mode 100644 azure-mgmt-website/src/main/java/com/microsoft/azure/management/website/implementation/HybridConnectionLimitsInner.java create mode 100644 azure-mgmt-website/src/main/java/com/microsoft/azure/management/website/implementation/IdentifierInner.java create mode 100644 azure-mgmt-website/src/main/java/com/microsoft/azure/management/website/implementation/PremierAddOnInner.java create mode 100644 azure-mgmt-website/src/main/java/com/microsoft/azure/management/website/implementation/PremierAddOnOfferInner.java delete mode 100644 azure-mgmt-website/src/main/java/com/microsoft/azure/management/website/implementation/PremierAddOnRequestInner.java create mode 100644 azure-mgmt-website/src/main/java/com/microsoft/azure/management/website/implementation/ResourceMetricDefinitionInner.java create mode 100644 azure-mgmt-website/src/main/java/com/microsoft/azure/management/website/implementation/SitePhpErrorLogFlagInner.java create mode 100644 azure-mgmt-website/src/main/java/com/microsoft/azure/management/website/implementation/SkuInfosInner.java diff --git a/azure-mgmt-website/src/main/java/com/microsoft/azure/management/website/Address.java b/azure-mgmt-website/src/main/java/com/microsoft/azure/management/website/Address.java index b4177c6f323ac..a72936e2cced4 100644 --- a/azure-mgmt-website/src/main/java/com/microsoft/azure/management/website/Address.java +++ b/azure-mgmt-website/src/main/java/com/microsoft/azure/management/website/Address.java @@ -8,6 +8,7 @@ package com.microsoft.azure.management.website; +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-website/src/main/java/com/microsoft/azure/management/website/ApiDefinitionInfo.java index f971b997fdffd..d6359e0538ef6 100644 --- a/azure-mgmt-website/src/main/java/com/microsoft/azure/management/website/ApiDefinitionInfo.java +++ b/azure-mgmt-website/src/main/java/com/microsoft/azure/management/website/ApiDefinitionInfo.java @@ -10,7 +10,7 @@ /** - * 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-website/src/main/java/com/microsoft/azure/management/website/AppServiceCertificate.java index 4fc1ff2c6fc98..686a0394d9cc1 100644 --- a/azure-mgmt-website/src/main/java/com/microsoft/azure/management/website/AppServiceCertificate.java +++ b/azure-mgmt-website/src/main/java/com/microsoft/azure/management/website/AppServiceCertificate.java @@ -41,7 +41,7 @@ public interface AppServiceCertificate extends /** * @return the pfx blob */ - String pfxBlob(); + byte[] pfxBlob(); /** * @return the app name diff --git a/azure-mgmt-website/src/main/java/com/microsoft/azure/management/website/AppServicePlanRestrictions.java b/azure-mgmt-website/src/main/java/com/microsoft/azure/management/website/AppServicePlanRestrictions.java new file mode 100644 index 0000000000000..a719a639b2802 --- /dev/null +++ b/azure-mgmt-website/src/main/java/com/microsoft/azure/management/website/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.website; + +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/ArmPlan.java b/azure-mgmt-website/src/main/java/com/microsoft/azure/management/website/ArmPlan.java deleted file mode 100644 index 91411f868a579..0000000000000 --- a/azure-mgmt-website/src/main/java/com/microsoft/azure/management/website/ArmPlan.java +++ /dev/null @@ -1,141 +0,0 @@ -/** - * 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.website; - - -/** - * The plan object in an ARM, represents a marketplace plan. - */ -public class ArmPlan { - /** - * The name. - */ - private String name; - - /** - * The publisher. - */ - private String publisher; - - /** - * The product. - */ - private String product; - - /** - * The promotion code. - */ - private String promotionCode; - - /** - * Version of product. - */ - private String version; - - /** - * 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 ArmPlan object itself. - */ - public ArmPlan withName(String name) { - this.name = name; - return this; - } - - /** - * Get the publisher value. - * - * @return the publisher value - */ - public String publisher() { - return this.publisher; - } - - /** - * Set the publisher value. - * - * @param publisher the publisher value to set - * @return the ArmPlan object itself. - */ - public ArmPlan withPublisher(String publisher) { - this.publisher = publisher; - return this; - } - - /** - * Get the product value. - * - * @return the product value - */ - public String product() { - return this.product; - } - - /** - * Set the product value. - * - * @param product the product value to set - * @return the ArmPlan object itself. - */ - public ArmPlan withProduct(String product) { - this.product = product; - return this; - } - - /** - * Get the promotionCode value. - * - * @return the promotionCode value - */ - public String promotionCode() { - return this.promotionCode; - } - - /** - * Set the promotionCode value. - * - * @param promotionCode the promotionCode value to set - * @return the ArmPlan object itself. - */ - public ArmPlan withPromotionCode(String promotionCode) { - this.promotionCode = promotionCode; - return this; - } - - /** - * Get the version value. - * - * @return the version value - */ - public String version() { - return this.version; - } - - /** - * Set the version value. - * - * @param version the version value to set - * @return the ArmPlan object itself. - */ - public ArmPlan withVersion(String version) { - this.version = version; - return this; - } - -} diff --git a/azure-mgmt-website/src/main/java/com/microsoft/azure/management/website/AutoHealActions.java b/azure-mgmt-website/src/main/java/com/microsoft/azure/management/website/AutoHealActions.java index ba04f1e75cc2f..44e93e313c297 100644 --- a/azure-mgmt-website/src/main/java/com/microsoft/azure/management/website/AutoHealActions.java +++ b/azure-mgmt-website/src/main/java/com/microsoft/azure/management/website/AutoHealActions.java @@ -8,27 +8,24 @@ package com.microsoft.azure.management.website; -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-website/src/main/java/com/microsoft/azure/management/website/AutoHealCustomAction.java index 7c52f7e0d0205..530a41f3262d7 100644 --- a/azure-mgmt-website/src/main/java/com/microsoft/azure/management/website/AutoHealCustomAction.java +++ b/azure-mgmt-website/src/main/java/com/microsoft/azure/management/website/AutoHealCustomAction.java @@ -10,7 +10,7 @@ /** - * 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-website/src/main/java/com/microsoft/azure/management/website/AutoHealRules.java index bafc6bcf25bf9..8436a090ab546 100644 --- a/azure-mgmt-website/src/main/java/com/microsoft/azure/management/website/AutoHealRules.java +++ b/azure-mgmt-website/src/main/java/com/microsoft/azure/management/website/AutoHealRules.java @@ -10,17 +10,16 @@ /** - * 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-website/src/main/java/com/microsoft/azure/management/website/AutoHealTriggers.java index d79281febafa1..078ae64a622bc 100644 --- a/azure-mgmt-website/src/main/java/com/microsoft/azure/management/website/AutoHealTriggers.java +++ b/azure-mgmt-website/src/main/java/com/microsoft/azure/management/website/AutoHealTriggers.java @@ -11,26 +11,26 @@ 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/AzureTableStorageApplicationLogsConfig.java b/azure-mgmt-website/src/main/java/com/microsoft/azure/management/website/AzureTableStorageApplicationLogsConfig.java index f461187105f99..a206865f2e041 100644 --- a/azure-mgmt-website/src/main/java/com/microsoft/azure/management/website/AzureTableStorageApplicationLogsConfig.java +++ b/azure-mgmt-website/src/main/java/com/microsoft/azure/management/website/AzureTableStorageApplicationLogsConfig.java @@ -8,9 +8,10 @@ package com.microsoft.azure.management.website; +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/BackupSchedule.java b/azure-mgmt-website/src/main/java/com/microsoft/azure/management/website/BackupSchedule.java index bab4cf09782d4..4a705231b0705 100644 --- a/azure-mgmt-website/src/main/java/com/microsoft/azure/management/website/BackupSchedule.java +++ b/azure-mgmt-website/src/main/java/com/microsoft/azure/management/website/BackupSchedule.java @@ -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/CertificateOrderActionType.java b/azure-mgmt-website/src/main/java/com/microsoft/azure/management/website/CertificateOrderActionType.java index b17ea06e44eaa..1fc4156e2af57 100644 --- a/azure-mgmt-website/src/main/java/com/microsoft/azure/management/website/CertificateOrderActionType.java +++ b/azure-mgmt-website/src/main/java/com/microsoft/azure/management/website/CertificateOrderActionType.java @@ -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/Channels.java b/azure-mgmt-website/src/main/java/com/microsoft/azure/management/website/Channels.java index 76f4b553cc53d..025c7d5a5d8a0 100644 --- a/azure-mgmt-website/src/main/java/com/microsoft/azure/management/website/Channels.java +++ b/azure-mgmt-website/src/main/java/com/microsoft/azure/management/website/Channels.java @@ -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/CloningInfo.java b/azure-mgmt-website/src/main/java/com/microsoft/azure/management/website/CloningInfo.java index a3fe2cee5bc7d..826d6850292eb 100644 --- a/azure-mgmt-website/src/main/java/com/microsoft/azure/management/website/CloningInfo.java +++ b/azure-mgmt-website/src/main/java/com/microsoft/azure/management/website/CloningInfo.java @@ -12,34 +12,36 @@ 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/ConnStringValueTypePair.java b/azure-mgmt-website/src/main/java/com/microsoft/azure/management/website/ConnStringValueTypePair.java index 30de41f369c60..e2a79b3061901 100644 --- a/azure-mgmt-website/src/main/java/com/microsoft/azure/management/website/ConnStringValueTypePair.java +++ b/azure-mgmt-website/src/main/java/com/microsoft/azure/management/website/ConnStringValueTypePair.java @@ -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/Contact.java b/azure-mgmt-website/src/main/java/com/microsoft/azure/management/website/Contact.java index 8b2eb31b523cc..50c407ecb9676 100644 --- a/azure-mgmt-website/src/main/java/com/microsoft/azure/management/website/Contact.java +++ b/azure-mgmt-website/src/main/java/com/microsoft/azure/management/website/Contact.java @@ -8,11 +8,13 @@ package com.microsoft.azure.management.website; +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-website/src/main/java/com/microsoft/azure/management/website/CorsSettings.java index 2144b27112750..663960db86502 100644 --- a/azure-mgmt-website/src/main/java/com/microsoft/azure/management/website/CorsSettings.java +++ b/azure-mgmt-website/src/main/java/com/microsoft/azure/management/website/CorsSettings.java @@ -11,14 +11,13 @@ 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-website/src/main/java/com/microsoft/azure/management/website/CsmPublishingProfileOptions.java index 49279761a2385..c8497cbc9a8f1 100644 --- a/azure-mgmt-website/src/main/java/com/microsoft/azure/management/website/CsmPublishingProfileOptions.java +++ b/azure-mgmt-website/src/main/java/com/microsoft/azure/management/website/CsmPublishingProfileOptions.java @@ -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/DatabaseBackupSetting.java b/azure-mgmt-website/src/main/java/com/microsoft/azure/management/website/DatabaseBackupSetting.java index 1ed5fa2e37107..1ed69476fc604 100644 --- a/azure-mgmt-website/src/main/java/com/microsoft/azure/management/website/DatabaseBackupSetting.java +++ b/azure-mgmt-website/src/main/java/com/microsoft/azure/management/website/DatabaseBackupSetting.java @@ -8,18 +8,18 @@ package com.microsoft.azure.management.website; +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-website/src/main/java/com/microsoft/azure/management/website/DatabaseType.java b/azure-mgmt-website/src/main/java/com/microsoft/azure/management/website/DatabaseType.java new file mode 100644 index 0000000000000..6439eb13e8f2b --- /dev/null +++ b/azure-mgmt-website/src/main/java/com/microsoft/azure/management/website/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.website; + +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/DomainPurchaseConsent.java b/azure-mgmt-website/src/main/java/com/microsoft/azure/management/website/DomainPurchaseConsent.java index 5c87cafdb4420..538a89b01b057 100644 --- a/azure-mgmt-website/src/main/java/com/microsoft/azure/management/website/DomainPurchaseConsent.java +++ b/azure-mgmt-website/src/main/java/com/microsoft/azure/management/website/DomainPurchaseConsent.java @@ -12,13 +12,14 @@ 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/Experiments.java b/azure-mgmt-website/src/main/java/com/microsoft/azure/management/website/Experiments.java index deccdc2b71bda..1728f89a02f3f 100644 --- a/azure-mgmt-website/src/main/java/com/microsoft/azure/management/website/Experiments.java +++ b/azure-mgmt-website/src/main/java/com/microsoft/azure/management/website/Experiments.java @@ -11,11 +11,11 @@ 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/FileSystemHttpLogsConfig.java b/azure-mgmt-website/src/main/java/com/microsoft/azure/management/website/FileSystemHttpLogsConfig.java index 5687311d571a7..dd945a9ff7148 100644 --- a/azure-mgmt-website/src/main/java/com/microsoft/azure/management/website/FileSystemHttpLogsConfig.java +++ b/azure-mgmt-website/src/main/java/com/microsoft/azure/management/website/FileSystemHttpLogsConfig.java @@ -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/GlobalCsmSkuDescription.java b/azure-mgmt-website/src/main/java/com/microsoft/azure/management/website/GlobalCsmSkuDescription.java new file mode 100644 index 0000000000000..5e32064d8fe7f --- /dev/null +++ b/azure-mgmt-website/src/main/java/com/microsoft/azure/management/website/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.website; + +import java.util.List; +import com.microsoft.azure.management.website.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-website/src/main/java/com/microsoft/azure/management/website/HandlerMapping.java index 2a3bd1bbef8d9..f2a12e7937a5b 100644 --- a/azure-mgmt-website/src/main/java/com/microsoft/azure/management/website/HandlerMapping.java +++ b/azure-mgmt-website/src/main/java/com/microsoft/azure/management/website/HandlerMapping.java @@ -12,8 +12,8 @@ /** * 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-website/src/main/java/com/microsoft/azure/management/website/HostName.java index 4591be0e3d7fe..69e2dc9ad360a 100644 --- a/azure-mgmt-website/src/main/java/com/microsoft/azure/management/website/HostName.java +++ b/azure-mgmt-website/src/main/java/com/microsoft/azure/management/website/HostName.java @@ -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/HostNameSslState.java b/azure-mgmt-website/src/main/java/com/microsoft/azure/management/website/HostNameSslState.java index 50b7b9de51d1a..fd4151cf80581 100644 --- a/azure-mgmt-website/src/main/java/com/microsoft/azure/management/website/HostNameSslState.java +++ b/azure-mgmt-website/src/main/java/com/microsoft/azure/management/website/HostNameSslState.java @@ -8,14 +8,13 @@ package com.microsoft.azure.management.website; -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/HostingEnvironmentProfile.java b/azure-mgmt-website/src/main/java/com/microsoft/azure/management/website/HostingEnvironmentProfile.java index 7832dd1376cb7..e7f52b8165386 100644 --- a/azure-mgmt-website/src/main/java/com/microsoft/azure/management/website/HostingEnvironmentProfile.java +++ b/azure-mgmt-website/src/main/java/com/microsoft/azure/management/website/HostingEnvironmentProfile.java @@ -8,26 +8,27 @@ package com.microsoft.azure.management.website; +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/InAvailabilityReasonType.java b/azure-mgmt-website/src/main/java/com/microsoft/azure/management/website/InAvailabilityReasonType.java new file mode 100644 index 0000000000000..e21422db3cc69 --- /dev/null +++ b/azure-mgmt-website/src/main/java/com/microsoft/azure/management/website/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.website; + +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/IpSecurityRestriction.java b/azure-mgmt-website/src/main/java/com/microsoft/azure/management/website/IpSecurityRestriction.java index 27ab7a3cc1ced..f73907619abca 100644 --- a/azure-mgmt-website/src/main/java/com/microsoft/azure/management/website/IpSecurityRestriction.java +++ b/azure-mgmt-website/src/main/java/com/microsoft/azure/management/website/IpSecurityRestriction.java @@ -11,7 +11,7 @@ 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/LocalizableString.java b/azure-mgmt-website/src/main/java/com/microsoft/azure/management/website/LocalizableString.java index 3ae7f80adfaa1..561ca247f82b5 100644 --- a/azure-mgmt-website/src/main/java/com/microsoft/azure/management/website/LocalizableString.java +++ b/azure-mgmt-website/src/main/java/com/microsoft/azure/management/website/LocalizableString.java @@ -10,11 +10,11 @@ /** - * 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/MetricAvailabilily.java b/azure-mgmt-website/src/main/java/com/microsoft/azure/management/website/MetricAvailabilily.java index fa875cbf29963..8ee244377d936 100644 --- a/azure-mgmt-website/src/main/java/com/microsoft/azure/management/website/MetricAvailabilily.java +++ b/azure-mgmt-website/src/main/java/com/microsoft/azure/management/website/MetricAvailabilily.java @@ -10,7 +10,7 @@ /** - * 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/NetworkAccessControlEntry.java b/azure-mgmt-website/src/main/java/com/microsoft/azure/management/website/NetworkAccessControlEntry.java index d79c7ff9ca714..47b01cdbd681d 100644 --- a/azure-mgmt-website/src/main/java/com/microsoft/azure/management/website/NetworkAccessControlEntry.java +++ b/azure-mgmt-website/src/main/java/com/microsoft/azure/management/website/NetworkAccessControlEntry.java @@ -10,26 +10,26 @@ /** - * 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/PerfMonSample.java b/azure-mgmt-website/src/main/java/com/microsoft/azure/management/website/PerfMonSample.java index d5229dbc591bc..08e5ae2284e8e 100644 --- a/azure-mgmt-website/src/main/java/com/microsoft/azure/management/website/PerfMonSample.java +++ b/azure-mgmt-website/src/main/java/com/microsoft/azure/management/website/PerfMonSample.java @@ -11,7 +11,7 @@ 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-website/src/main/java/com/microsoft/azure/management/website/PerfMonSet.java index 7eef87c58deab..7cf18fb0f85e0 100644 --- a/azure-mgmt-website/src/main/java/com/microsoft/azure/management/website/PerfMonSet.java +++ b/azure-mgmt-website/src/main/java/com/microsoft/azure/management/website/PerfMonSet.java @@ -12,7 +12,7 @@ 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/PublishingProfileFormat.java b/azure-mgmt-website/src/main/java/com/microsoft/azure/management/website/PublishingProfileFormat.java new file mode 100644 index 0000000000000..2ca4ba6e1aa72 --- /dev/null +++ b/azure-mgmt-website/src/main/java/com/microsoft/azure/management/website/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.website; + +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/RampUpRule.java b/azure-mgmt-website/src/main/java/com/microsoft/azure/management/website/RampUpRule.java index ab0c6279e3114..1032995861fa9 100644 --- a/azure-mgmt-website/src/main/java/com/microsoft/azure/management/website/RampUpRule.java +++ b/azure-mgmt-website/src/main/java/com/microsoft/azure/management/website/RampUpRule.java @@ -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/RequestsBasedTrigger.java b/azure-mgmt-website/src/main/java/com/microsoft/azure/management/website/RequestsBasedTrigger.java index e6c9886701d2d..df9979a92cc51 100644 --- a/azure-mgmt-website/src/main/java/com/microsoft/azure/management/website/RequestsBasedTrigger.java +++ b/azure-mgmt-website/src/main/java/com/microsoft/azure/management/website/RequestsBasedTrigger.java @@ -10,7 +10,7 @@ /** - * 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-website/src/main/java/com/microsoft/azure/management/website/ResourceMetricAvailability.java b/azure-mgmt-website/src/main/java/com/microsoft/azure/management/website/ResourceMetricAvailability.java new file mode 100644 index 0000000000000..cbf30177cb82b --- /dev/null +++ b/azure-mgmt-website/src/main/java/com/microsoft/azure/management/website/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.website; + +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-website/src/main/java/com/microsoft/azure/management/website/ResourceMetricName.java index 19206b4b1fe4e..d4cb0f6cfb95b 100644 --- a/azure-mgmt-website/src/main/java/com/microsoft/azure/management/website/ResourceMetricName.java +++ b/azure-mgmt-website/src/main/java/com/microsoft/azure/management/website/ResourceMetricName.java @@ -11,7 +11,7 @@ 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/implementation/ResourceNameAvailabilityRequestInner.java b/azure-mgmt-website/src/main/java/com/microsoft/azure/management/website/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-website/src/main/java/com/microsoft/azure/management/website/ResourceNameAvailabilityRequest.java index 5ad5fa8ebd4ba..81ad6f9f39a4f 100644 --- a/azure-mgmt-website/src/main/java/com/microsoft/azure/management/website/implementation/ResourceNameAvailabilityRequestInner.java +++ b/azure-mgmt-website/src/main/java/com/microsoft/azure/management/website/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.website; -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-website/src/main/java/com/microsoft/azure/management/website/ResourceScopeType.java b/azure-mgmt-website/src/main/java/com/microsoft/azure/management/website/ResourceScopeType.java new file mode 100644 index 0000000000000..1ecaec5ef788f --- /dev/null +++ b/azure-mgmt-website/src/main/java/com/microsoft/azure/management/website/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.website; + +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-website/src/main/java/com/microsoft/azure/management/website/RouteType.java b/azure-mgmt-website/src/main/java/com/microsoft/azure/management/website/RouteType.java new file mode 100644 index 0000000000000..d2612f7c77466 --- /dev/null +++ b/azure-mgmt-website/src/main/java/com/microsoft/azure/management/website/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.website; + +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/SiteCloneabilityCriterion.java b/azure-mgmt-website/src/main/java/com/microsoft/azure/management/website/SiteCloneabilityCriterion.java index a89d8b7b11797..158834d5fc3f6 100644 --- a/azure-mgmt-website/src/main/java/com/microsoft/azure/management/website/SiteCloneabilityCriterion.java +++ b/azure-mgmt-website/src/main/java/com/microsoft/azure/management/website/SiteCloneabilityCriterion.java @@ -10,7 +10,7 @@ /** - * 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-website/src/main/java/com/microsoft/azure/management/website/SiteLimits.java index 8ca792f1b5f20..125385dc9a1cb 100644 --- a/azure-mgmt-website/src/main/java/com/microsoft/azure/management/website/SiteLimits.java +++ b/azure-mgmt-website/src/main/java/com/microsoft/azure/management/website/SiteLimits.java @@ -10,7 +10,7 @@ /** - * 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/SiteMachineKey.java b/azure-mgmt-website/src/main/java/com/microsoft/azure/management/website/SiteMachineKey.java index 5f158a9013526..e546f2e719d5f 100644 --- a/azure-mgmt-website/src/main/java/com/microsoft/azure/management/website/SiteMachineKey.java +++ b/azure-mgmt-website/src/main/java/com/microsoft/azure/management/website/SiteMachineKey.java @@ -10,16 +10,16 @@ /** - * 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-website/src/main/java/com/microsoft/azure/management/website/SkuCapacity.java index 0f1e5e0e0b8a6..32292cde10d47 100644 --- a/azure-mgmt-website/src/main/java/com/microsoft/azure/management/website/SkuCapacity.java +++ b/azure-mgmt-website/src/main/java/com/microsoft/azure/management/website/SkuCapacity.java @@ -11,27 +11,27 @@ 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-website/src/main/java/com/microsoft/azure/management/website/SkuDescription.java index cdec843e08a6a..fb69891f293c4 100644 --- a/azure-mgmt-website/src/main/java/com/microsoft/azure/management/website/SkuDescription.java +++ b/azure-mgmt-website/src/main/java/com/microsoft/azure/management/website/SkuDescription.java @@ -12,26 +12,26 @@ import com.microsoft.azure.management.website.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-website/src/main/java/com/microsoft/azure/management/website/SkuName.java b/azure-mgmt-website/src/main/java/com/microsoft/azure/management/website/SkuName.java new file mode 100644 index 0000000000000..8e2bfef3378d8 --- /dev/null +++ b/azure-mgmt-website/src/main/java/com/microsoft/azure/management/website/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.website; + +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-website/src/main/java/com/microsoft/azure/management/website/SlotSwapStatus.java b/azure-mgmt-website/src/main/java/com/microsoft/azure/management/website/SlotSwapStatus.java new file mode 100644 index 0000000000000..25dd41076037c --- /dev/null +++ b/azure-mgmt-website/src/main/java/com/microsoft/azure/management/website/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.website; + +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-website/src/main/java/com/microsoft/azure/management/website/SlowRequestsBasedTrigger.java index 1cc8b41a4934e..cbf68366f5abe 100644 --- a/azure-mgmt-website/src/main/java/com/microsoft/azure/management/website/SlowRequestsBasedTrigger.java +++ b/azure-mgmt-website/src/main/java/com/microsoft/azure/management/website/SlowRequestsBasedTrigger.java @@ -10,11 +10,11 @@ /** - * 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/StatusCodesBasedTrigger.java b/azure-mgmt-website/src/main/java/com/microsoft/azure/management/website/StatusCodesBasedTrigger.java index 826f35cc9d5d2..e9bb1704fe00a 100644 --- a/azure-mgmt-website/src/main/java/com/microsoft/azure/management/website/StatusCodesBasedTrigger.java +++ b/azure-mgmt-website/src/main/java/com/microsoft/azure/management/website/StatusCodesBasedTrigger.java @@ -10,7 +10,7 @@ /** - * 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/TopLevelDomainAgreementOption.java b/azure-mgmt-website/src/main/java/com/microsoft/azure/management/website/TopLevelDomainAgreementOption.java index 4a606b0654792..a4a0395aaba4d 100644 --- a/azure-mgmt-website/src/main/java/com/microsoft/azure/management/website/TopLevelDomainAgreementOption.java +++ b/azure-mgmt-website/src/main/java/com/microsoft/azure/management/website/TopLevelDomainAgreementOption.java @@ -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/ValidateProperties.java b/azure-mgmt-website/src/main/java/com/microsoft/azure/management/website/ValidateProperties.java deleted file mode 100644 index c162c38891a13..0000000000000 --- a/azure-mgmt-website/src/main/java/com/microsoft/azure/management/website/ValidateProperties.java +++ /dev/null @@ -1,117 +0,0 @@ -/** - * 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.website; - - -/** - * Site properties used for validation. - */ -public class ValidateProperties { - /** - * ARM resource id of an app service plan that would host the web app. - */ - private String serverFarmId; - - /** - * Name of the target SKU for the server farm. - */ - private String skuName; - - /** - * Target capacity of the server farm (number of VM's). - */ - private Integer capacity; - - /** - * Name of app service environment where site or server farm should be - * created. - */ - private String hostingEnvironment; - - /** - * Get the serverFarmId value. - * - * @return the serverFarmId value - */ - public String serverFarmId() { - return this.serverFarmId; - } - - /** - * Set the serverFarmId value. - * - * @param serverFarmId the serverFarmId value to set - * @return the ValidateProperties object itself. - */ - public ValidateProperties withServerFarmId(String serverFarmId) { - this.serverFarmId = serverFarmId; - return this; - } - - /** - * Get the skuName value. - * - * @return the skuName value - */ - public String skuName() { - return this.skuName; - } - - /** - * Set the skuName value. - * - * @param skuName the skuName value to set - * @return the ValidateProperties object itself. - */ - public ValidateProperties withSkuName(String skuName) { - this.skuName = skuName; - return this; - } - - /** - * Get the capacity value. - * - * @return the capacity value - */ - public Integer capacity() { - return this.capacity; - } - - /** - * Set the capacity value. - * - * @param capacity the capacity value to set - * @return the ValidateProperties object itself. - */ - public ValidateProperties withCapacity(Integer capacity) { - this.capacity = capacity; - return this; - } - - /** - * Get the hostingEnvironment value. - * - * @return the hostingEnvironment value - */ - public String hostingEnvironment() { - return this.hostingEnvironment; - } - - /** - * Set the hostingEnvironment value. - * - * @param hostingEnvironment the hostingEnvironment value to set - * @return the ValidateProperties object itself. - */ - public ValidateProperties withHostingEnvironment(String hostingEnvironment) { - this.hostingEnvironment = hostingEnvironment; - return this; - } - -} diff --git a/azure-mgmt-website/src/main/java/com/microsoft/azure/management/website/VirtualApplication.java b/azure-mgmt-website/src/main/java/com/microsoft/azure/management/website/VirtualApplication.java index e0a1ffe2537e9..4f96d44707d0f 100644 --- a/azure-mgmt-website/src/main/java/com/microsoft/azure/management/website/VirtualApplication.java +++ b/azure-mgmt-website/src/main/java/com/microsoft/azure/management/website/VirtualApplication.java @@ -11,7 +11,7 @@ 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/VirtualIPMapping.java b/azure-mgmt-website/src/main/java/com/microsoft/azure/management/website/VirtualIPMapping.java index bd16ce77d916f..091fdd5d91850 100644 --- a/azure-mgmt-website/src/main/java/com/microsoft/azure/management/website/VirtualIPMapping.java +++ b/azure-mgmt-website/src/main/java/com/microsoft/azure/management/website/VirtualIPMapping.java @@ -10,7 +10,7 @@ /** - * 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-website/src/main/java/com/microsoft/azure/management/website/VirtualNetworkProfile.java index 271cc36cca272..5a595d50c7c30 100644 --- a/azure-mgmt-website/src/main/java/com/microsoft/azure/management/website/VirtualNetworkProfile.java +++ b/azure-mgmt-website/src/main/java/com/microsoft/azure/management/website/VirtualNetworkProfile.java @@ -11,28 +11,28 @@ 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-website/src/main/java/com/microsoft/azure/management/website/implementation/AddressResponseInner.java b/azure-mgmt-website/src/main/java/com/microsoft/azure/management/website/implementation/AddressResponseInner.java index cb4c58cfd1277..efb9723cb37ea 100644 --- a/azure-mgmt-website/src/main/java/com/microsoft/azure/management/website/implementation/AddressResponseInner.java +++ b/azure-mgmt-website/src/main/java/com/microsoft/azure/management/website/implementation/AddressResponseInner.java @@ -12,17 +12,17 @@ import com.microsoft.azure.management.website.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-website/src/main/java/com/microsoft/azure/management/website/implementation/AppServiceCertificateImpl.java index 5db951e6cf2d0..a0fc752ff7407 100644 --- a/azure-mgmt-website/src/main/java/com/microsoft/azure/management/website/implementation/AppServiceCertificateImpl.java +++ b/azure-mgmt-website/src/main/java/com/microsoft/azure/management/website/implementation/AppServiceCertificateImpl.java @@ -6,7 +6,6 @@ package com.microsoft.azure.management.website.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; @@ -60,7 +59,7 @@ public List hostNames() { } @Override - public String pfxBlob() { + public byte[] pfxBlob() { return inner().pfxBlob(); } @@ -127,19 +126,13 @@ public AppServiceCertificate refresh() { @Override public Observable createResourceAsync() { - Observable pfxString = Observable.just(pfxBlob()); + Observable pfxBytes = Observable.just(pfxBlob()); if (pfxFileUrl != null) { - pfxString = Utils.downloadFileAsync(pfxFileUrl, myManager.restClient().retrofit()) - .map(new Func1() { - @Override - public String call(byte[] bytes) { - return BaseEncoding.base64().encode(bytes); - } - }); + pfxBytes = Utils.downloadFileAsync(pfxFileUrl, myManager.restClient().retrofit()); } - return pfxString.flatMap(new Func1>() { + return pfxBytes.flatMap(new Func1>() { @Override - public Observable call(String s) { + public Observable call(byte[] s) { inner().withPfxBlob(s); return client.createOrUpdateAsync(resourceGroupName(), name(), inner()); } @@ -158,8 +151,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; } @@ -176,7 +168,7 @@ public AppServiceCertificateImpl withCertificateOrderKeyVaultBinding(String vaul } @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-website/src/main/java/com/microsoft/azure/management/website/implementation/AppServiceCertificateInner.java index 3d77751b2ef9c..c7d8328edb59b 100644 --- a/azure-mgmt-website/src/main/java/com/microsoft/azure/management/website/implementation/AppServiceCertificateInner.java +++ b/azure-mgmt-website/src/main/java/com/microsoft/azure/management/website/implementation/AppServiceCertificateInner.java @@ -14,8 +14,7 @@ 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/AppServiceCertificateOrderInner.java b/azure-mgmt-website/src/main/java/com/microsoft/azure/management/website/implementation/AppServiceCertificateOrderInner.java index 9df800b8c1b0a..976f9f1f27cc3 100644 --- a/azure-mgmt-website/src/main/java/com/microsoft/azure/management/website/implementation/AppServiceCertificateOrderInner.java +++ b/azure-mgmt-website/src/main/java/com/microsoft/azure/management/website/implementation/AppServiceCertificateOrderInner.java @@ -18,7 +18,7 @@ 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/AppServiceCertificateOrdersInner.java b/azure-mgmt-website/src/main/java/com/microsoft/azure/management/website/implementation/AppServiceCertificateOrdersInner.java index 1af3d515c4680..ae2dbcc1f430f 100644 --- a/azure-mgmt-website/src/main/java/com/microsoft/azure/management/website/implementation/AppServiceCertificateOrdersInner.java +++ b/azure-mgmt-website/src/main/java/com/microsoft/azure/management/website/implementation/AppServiceCertificateOrdersInner.java @@ -8,6 +8,7 @@ package com.microsoft.azure.management.website.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 validatePurchaseInformationAsync(AppServiceCertificateOrderInner appServiceCertificateOrder, final ServiceCallback serviceCallback) { + public ServiceCall validatePurchaseInformationAsync(AppServiceCertificateOrderInner appServiceCertificateOrder, final ServiceCallback serviceCallback) { return ServiceCall.create(validatePurchaseInformationWithServiceResponseAsync(appServiceCertificateOrder), serviceCallback); } /** - * 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 observable to the Object object + * @param appServiceCertificateOrder Information for a certificate order. + * @return the {@link ServiceResponse} object if successful. */ - public Observable validatePurchaseInformationAsync(AppServiceCertificateOrderInner appServiceCertificateOrder) { - return validatePurchaseInformationWithServiceResponseAsync(appServiceCertificateOrder).map(new Func1, Object>() { + public Observable validatePurchaseInformationAsync(AppServiceCertificateOrderInner appServiceCertificateOrder) { + return validatePurchaseInformationWithServiceResponseAsync(appServiceCertificateOrder).map(new Func1, Void>() { @Override - public Object call(ServiceResponse response) { + public Void call(ServiceResponse response) { return response.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 - * @return the observable to the Object object + * @param appServiceCertificateOrder Information for a certificate order. + * @return the {@link ServiceResponse} object if successful. */ - public Observable> validatePurchaseInformationWithServiceResponseAsync(AppServiceCertificateOrderInner appServiceCertificateOrder) { + public Observable> validatePurchaseInformationWithServiceResponseAsync(AppServiceCertificateOrderInner appServiceCertificateOrder) { if (this.client.subscriptionId() == null) { throw new IllegalArgumentException("Parameter this.client.subscriptionId() is required and cannot be null."); } @@ -308,11 +306,11 @@ public Observable> validatePurchaseInformationWithServic Validator.validate(appServiceCertificateOrder); final String apiVersion = "2015-08-01"; return service.validatePurchaseInformation(this.client.subscriptionId(), appServiceCertificateOrder, apiVersion, this.client.acceptLanguage(), this.client.userAgent()) - .flatMap(new Func1, Observable>>() { + .flatMap(new Func1, Observable>>() { @Override - public Observable> call(Response response) { + public Observable> call(Response response) { try { - ServiceResponse clientResponse = validatePurchaseInformationDelegate(response); + ServiceResponse clientResponse = validatePurchaseInformationDelegate(response); return Observable.just(clientResponse); } catch (Throwable t) { return Observable.error(t); @@ -321,10 +319,9 @@ public Observable> call(Response response) }); } - private ServiceResponse validatePurchaseInformationDelegate(Response response) throws CloudException, IOException, IllegalArgumentException { - return new AzureServiceResponseBuilder(this.client.mapperAdapter()) - .register(200, new TypeToken() { }.getType()) - .registerError(CloudException.class) + private ServiceResponse validatePurchaseInformationDelegate(Response response) throws CloudException, IOException, IllegalArgumentException { + return new AzureServiceResponseBuilder(this.client.mapperAdapter()) + .register(204, new TypeToken() { }.getType()) .build(response); } @@ -332,7 +329,7 @@ private ServiceResponse validatePurchaseInformationDelegate(Response listByResourceGroup(final String resourceGroupName) { @@ -349,7 +346,7 @@ public Page nextPage(String nextPageLink) { * Get certificate orders in a resource group. * Get certificate orders in a resource group. * - * @param resourceGroupName Azure resource group name + * @param resourceGroupName Name of the resource group to which the resource belongs. * @param serviceCallback the async ServiceCallback to handle successful and failed responses. * @return the {@link ServiceCall} object */ @@ -369,7 +366,7 @@ public Observable>> call(S * Get certificate orders in a resource group. * Get certificate orders in a resource group. * - * @param resourceGroupName Azure resource group name + * @param resourceGroupName Name of the resource group to which the resource belongs. * @return the observable to the PagedList<AppServiceCertificateOrderInner> object */ public Observable> listByResourceGroupAsync(final String resourceGroupName) { @@ -386,7 +383,7 @@ public Page call(ServiceResponse>> listByResourceGroupWithServiceResponseAsync(final String resourceGroupName) { @@ -407,7 +404,7 @@ public Observable>> call(S * Get certificate orders in a resource group. * Get certificate orders in a resource group. * - ServiceResponse> * @param resourceGroupName Azure resource group name + ServiceResponse> * @param resourceGroupName Name of the resource group to which the resource belongs. * @return the PagedList<AppServiceCertificateOrderInner> object wrapped in {@link ServiceResponse} if successful. */ public Observable>> listByResourceGroupSinglePageAsync(final String resourceGroupName) { @@ -440,11 +437,11 @@ private ServiceResponse> listByResourc } /** - * List all certificates associated with a certificate order (only one certificate can be associated with an order at a time). - * List all certificates associated with a certificate order (only one certificate can be associated with an order at a time). + * List all certificates associated with a certificate order. + * List all certificates associated with a certificate order. * - * @param resourceGroupName Azure resource group name - * @param certificateOrderName Certificate name + * @param resourceGroupName Name of the resource group to which the resource belongs. + * @param certificateOrderName Name of the certificate order. * @return the PagedList<AppServiceCertificateInner> object if successful. */ public PagedList listCertificates(final String resourceGroupName, final String certificateOrderName) { @@ -458,11 +455,11 @@ public Page nextPage(String nextPageLink) { } /** - * List all certificates associated with a certificate order (only one certificate can be associated with an order at a time). - * List all certificates associated with a certificate order (only one certificate can be associated with an order at a time). + * List all certificates associated with a certificate order. + * List all certificates associated with a certificate order. * - * @param resourceGroupName Azure resource group name - * @param certificateOrderName Certificate name + * @param resourceGroupName Name of the resource group to which the resource belongs. + * @param certificateOrderName Name of the certificate order. * @param serviceCallback the async ServiceCallback to handle successful and failed responses. * @return the {@link ServiceCall} object */ @@ -479,11 +476,11 @@ public Observable>> call(String } /** - * List all certificates associated with a certificate order (only one certificate can be associated with an order at a time). - * List all certificates associated with a certificate order (only one certificate can be associated with an order at a time). + * List all certificates associated with a certificate order. + * List all certificates associated with a certificate order. * - * @param resourceGroupName Azure resource group name - * @param certificateOrderName Certificate name + * @param resourceGroupName Name of the resource group to which the resource belongs. + * @param certificateOrderName Name of the certificate order. * @return the observable to the PagedList<AppServiceCertificateInner> object */ public Observable> listCertificatesAsync(final String resourceGroupName, final String certificateOrderName) { @@ -497,11 +494,11 @@ public Page call(ServiceResponse>> listCertificatesWithServiceResponseAsync(final String resourceGroupName, final String certificateOrderName) { @@ -519,11 +516,11 @@ public Observable>> call(Servic } /** - * List all certificates associated with a certificate order (only one certificate can be associated with an order at a time). - * List all certificates associated with a certificate order (only one certificate can be associated with an order at a time). + * List all certificates associated with a certificate order. + * List all certificates associated with a certificate order. * - ServiceResponse> * @param resourceGroupName Azure resource group name - ServiceResponse> * @param certificateOrderName Certificate name + ServiceResponse> * @param resourceGroupName Name of the resource group to which the resource belongs. + ServiceResponse> * @param certificateOrderName Name of the certificate order. * @return the PagedList<AppServiceCertificateInner> object wrapped in {@link ServiceResponse} if successful. */ public Observable>> listCertificatesSinglePageAsync(final String resourceGroupName, final String certificateOrderName) { @@ -559,12 +556,12 @@ private ServiceResponse> listCertificatesDe } /** - * Get certificate associated with the certificate order. - * Get certificate associated with the certificate order. + * Get the certificate associated with a certificate order. + * Get the certificate associated with a certificate order. * - * @param resourceGroupName Azure resource group name - * @param certificateOrderName Certificate name - * @param name Certificate name + * @param resourceGroupName Name of the resource group to which the resource belongs. + * @param certificateOrderName Name of the certificate order. + * @param name Name of the certificate. * @return the AppServiceCertificateInner object if successful. */ public AppServiceCertificateInner getCertificate(String resourceGroupName, String certificateOrderName, String name) { @@ -572,12 +569,12 @@ public AppServiceCertificateInner getCertificate(String resourceGroupName, Strin } /** - * Get certificate associated with the certificate order. - * Get certificate associated with the certificate order. + * Get the certificate associated with a certificate order. + * Get the certificate associated with a certificate order. * - * @param resourceGroupName Azure resource group name - * @param certificateOrderName Certificate name - * @param name Certificate name + * @param resourceGroupName Name of the resource group to which the resource belongs. + * @param certificateOrderName Name of the certificate order. + * @param name Name of the certificate. * @param serviceCallback the async ServiceCallback to handle successful and failed responses. * @return the {@link ServiceCall} object */ @@ -586,12 +583,12 @@ public ServiceCall getCertificateAsync(String resour } /** - * Get certificate associated with the certificate order. - * Get certificate associated with the certificate order. + * Get the certificate associated with a certificate order. + * Get the certificate associated with a certificate order. * - * @param resourceGroupName Azure resource group name - * @param certificateOrderName Certificate name - * @param name Certificate name + * @param resourceGroupName Name of the resource group to which the resource belongs. + * @param certificateOrderName Name of the certificate order. + * @param name Name of the certificate. * @return the observable to the AppServiceCertificateInner object */ public Observable getCertificateAsync(String resourceGroupName, String certificateOrderName, String name) { @@ -604,12 +601,12 @@ public AppServiceCertificateInner call(ServiceResponse> getCertificateWithServiceResponseAsync(String resourceGroupName, String certificateOrderName, String name) { @@ -648,13 +645,13 @@ private ServiceResponse getCertificateDelegate(Respo } /** - * Associates a Key Vault secret to a certificate store that will be used for storing the certificate once it's ready. - * Associates a Key Vault secret to a certificate store that will be used for storing the certificate once it's ready. + * Creates or updates a certificate and associates with key vault secret. + * Creates or updates a certificate and associates with key vault secret. * - * @param resourceGroupName Azure resource group name - * @param certificateOrderName Certificate name - * @param name Certificate name - * @param keyVaultCertificate Key Vault secret csm Id + * @param resourceGroupName Name of the resource group to which the resource belongs. + * @param certificateOrderName Name of the certificate order. + * @param name Name of the certificate. + * @param keyVaultCertificate Key vault certificate resource Id. * @return the AppServiceCertificateInner object if successful. */ public AppServiceCertificateInner createOrUpdateCertificate(String resourceGroupName, String certificateOrderName, String name, AppServiceCertificateInner keyVaultCertificate) { @@ -662,13 +659,13 @@ public AppServiceCertificateInner createOrUpdateCertificate(String resourceGroup } /** - * Associates a Key Vault secret to a certificate store that will be used for storing the certificate once it's ready. - * Associates a Key Vault secret to a certificate store that will be used for storing the certificate once it's ready. + * Creates or updates a certificate and associates with key vault secret. + * Creates or updates a certificate and associates with key vault secret. * - * @param resourceGroupName Azure resource group name - * @param certificateOrderName Certificate name - * @param name Certificate name - * @param keyVaultCertificate Key Vault secret csm Id + * @param resourceGroupName Name of the resource group to which the resource belongs. + * @param certificateOrderName Name of the certificate order. + * @param name Name of the certificate. + * @param keyVaultCertificate Key vault certificate resource Id. * @param serviceCallback the async ServiceCallback to handle successful and failed responses. * @return the {@link ServiceCall} object */ @@ -677,13 +674,13 @@ public ServiceCall createOrUpdateCertificateAsync(St } /** - * Associates a Key Vault secret to a certificate store that will be used for storing the certificate once it's ready. - * Associates a Key Vault secret to a certificate store that will be used for storing the certificate once it's ready. + * Creates or updates a certificate and associates with key vault secret. + * Creates or updates a certificate and associates with key vault secret. * - * @param resourceGroupName Azure resource group name - * @param certificateOrderName Certificate name - * @param name Certificate name - * @param keyVaultCertificate Key Vault secret csm Id + * @param resourceGroupName Name of the resource group to which the resource belongs. + * @param certificateOrderName Name of the certificate order. + * @param name Name of the certificate. + * @param keyVaultCertificate Key vault certificate resource Id. * @return the observable for the request */ public Observable createOrUpdateCertificateAsync(String resourceGroupName, String certificateOrderName, String name, AppServiceCertificateInner keyVaultCertificate) { @@ -696,13 +693,13 @@ public AppServiceCertificateInner call(ServiceResponse> createOrUpdateCertificateWithServiceResponseAsync(String resourceGroupName, String certificateOrderName, String name, AppServiceCertificateInner keyVaultCertificate) { @@ -728,13 +725,13 @@ public Observable> createOrUpdateCer } /** - * Associates a Key Vault secret to a certificate store that will be used for storing the certificate once it's ready. - * Associates a Key Vault secret to a certificate store that will be used for storing the certificate once it's ready. + * Creates or updates a certificate and associates with key vault secret. + * Creates or updates a certificate and associates with key vault secret. * - * @param resourceGroupName Azure resource group name - * @param certificateOrderName Certificate name - * @param name Certificate name - * @param keyVaultCertificate Key Vault secret csm Id + * @param resourceGroupName Name of the resource group to which the resource belongs. + * @param certificateOrderName Name of the certificate order. + * @param name Name of the certificate. + * @param keyVaultCertificate Key vault certificate resource Id. * @return the AppServiceCertificateInner object if successful. */ public AppServiceCertificateInner beginCreateOrUpdateCertificate(String resourceGroupName, String certificateOrderName, String name, AppServiceCertificateInner keyVaultCertificate) { @@ -742,13 +739,13 @@ public AppServiceCertificateInner beginCreateOrUpdateCertificate(String resource } /** - * Associates a Key Vault secret to a certificate store that will be used for storing the certificate once it's ready. - * Associates a Key Vault secret to a certificate store that will be used for storing the certificate once it's ready. + * Creates or updates a certificate and associates with key vault secret. + * Creates or updates a certificate and associates with key vault secret. * - * @param resourceGroupName Azure resource group name - * @param certificateOrderName Certificate name - * @param name Certificate name - * @param keyVaultCertificate Key Vault secret csm Id + * @param resourceGroupName Name of the resource group to which the resource belongs. + * @param certificateOrderName Name of the certificate order. + * @param name Name of the certificate. + * @param keyVaultCertificate Key vault certificate resource Id. * @param serviceCallback the async ServiceCallback to handle successful and failed responses. * @return the {@link ServiceCall} object */ @@ -757,13 +754,13 @@ public ServiceCall beginCreateOrUpdateCertificateAsy } /** - * Associates a Key Vault secret to a certificate store that will be used for storing the certificate once it's ready. - * Associates a Key Vault secret to a certificate store that will be used for storing the certificate once it's ready. + * Creates or updates a certificate and associates with key vault secret. + * Creates or updates a certificate and associates with key vault secret. * - * @param resourceGroupName Azure resource group name - * @param certificateOrderName Certificate name - * @param name Certificate name - * @param keyVaultCertificate Key Vault secret csm Id + * @param resourceGroupName Name of the resource group to which the resource belongs. + * @param certificateOrderName Name of the certificate order. + * @param name Name of the certificate. + * @param keyVaultCertificate Key vault certificate resource Id. * @return the observable to the AppServiceCertificateInner object */ public Observable beginCreateOrUpdateCertificateAsync(String resourceGroupName, String certificateOrderName, String name, AppServiceCertificateInner keyVaultCertificate) { @@ -776,13 +773,13 @@ public AppServiceCertificateInner call(ServiceResponse> beginCreateOrUpdateCertificateWithServiceResponseAsync(String resourceGroupName, String certificateOrderName, String name, AppServiceCertificateInner keyVaultCertificate) { @@ -826,60 +823,59 @@ private ServiceResponse beginCreateOrUpdateCertifica } /** - * Deletes the certificate associated with the certificate order. - * Deletes the certificate associated with the certificate order. + * Delete the certificate associated with a certificate order. + * Delete the certificate associated with a certificate order. * - * @param resourceGroupName Azure resource group name - * @param certificateOrderName Certificate name - * @param name Certificate name - * @return the Object object if successful. + * @param resourceGroupName Name of the resource group to which the resource belongs. + * @param certificateOrderName Name of the certificate order. + * @param name Name of the certificate. */ - public Object deleteCertificate(String resourceGroupName, String certificateOrderName, String name) { - return deleteCertificateWithServiceResponseAsync(resourceGroupName, certificateOrderName, name).toBlocking().single().getBody(); + public void deleteCertificate(String resourceGroupName, String certificateOrderName, String name) { + deleteCertificateWithServiceResponseAsync(resourceGroupName, certificateOrderName, name).toBlocking().single().getBody(); } /** - * Deletes the certificate associated with the certificate order. - * Deletes the certificate associated with the certificate order. + * Delete the certificate associated with a certificate order. + * Delete the certificate associated with a certificate order. * - * @param resourceGroupName Azure resource group name - * @param certificateOrderName Certificate name - * @param name Certificate name + * @param resourceGroupName Name of the resource group to which the resource belongs. + * @param certificateOrderName Name of the certificate order. + * @param name Name of the certificate. * @param serviceCallback the async ServiceCallback to handle successful and failed responses. * @return the {@link ServiceCall} object */ - public ServiceCall deleteCertificateAsync(String resourceGroupName, String certificateOrderName, String name, final ServiceCallback serviceCallback) { + public ServiceCall deleteCertificateAsync(String resourceGroupName, String certificateOrderName, String name, final ServiceCallback serviceCallback) { return ServiceCall.create(deleteCertificateWithServiceResponseAsync(resourceGroupName, certificateOrderName, name), serviceCallback); } /** - * Deletes the certificate associated with the certificate order. - * Deletes the certificate associated with the certificate order. + * Delete the certificate associated with a certificate order. + * Delete the certificate associated with a certificate order. * - * @param resourceGroupName Azure resource group name - * @param certificateOrderName Certificate name - * @param name Certificate name - * @return the observable to the Object object + * @param resourceGroupName Name of the resource group to which the resource belongs. + * @param certificateOrderName Name of the certificate order. + * @param name Name of the certificate. + * @return the {@link ServiceResponse} object if successful. */ - public Observable deleteCertificateAsync(String resourceGroupName, String certificateOrderName, String name) { - return deleteCertificateWithServiceResponseAsync(resourceGroupName, certificateOrderName, name).map(new Func1, Object>() { + public Observable deleteCertificateAsync(String resourceGroupName, String certificateOrderName, String name) { + return deleteCertificateWithServiceResponseAsync(resourceGroupName, certificateOrderName, name).map(new Func1, Void>() { @Override - public Object call(ServiceResponse response) { + public Void call(ServiceResponse response) { return response.getBody(); } }); } /** - * Deletes the certificate associated with the certificate order. - * Deletes the certificate associated with the certificate order. + * Delete the certificate associated with a certificate order. + * Delete the certificate associated with a certificate order. * - * @param resourceGroupName Azure resource group name - * @param certificateOrderName Certificate name - * @param name Certificate name - * @return the observable to the Object object + * @param resourceGroupName Name of the resource group to which the resource belongs. + * @param certificateOrderName Name of the certificate order. + * @param name Name of the certificate. + * @return the {@link ServiceResponse} object if successful. */ - public Observable> deleteCertificateWithServiceResponseAsync(String resourceGroupName, String certificateOrderName, String name) { + public Observable> deleteCertificateWithServiceResponseAsync(String resourceGroupName, String certificateOrderName, String name) { if (resourceGroupName == null) { throw new IllegalArgumentException("Parameter resourceGroupName is required and cannot be null."); } @@ -894,11 +890,11 @@ public Observable> deleteCertificateWithServiceResponseA } final String apiVersion = "2015-08-01"; return service.deleteCertificate(resourceGroupName, certificateOrderName, name, this.client.subscriptionId(), apiVersion, this.client.acceptLanguage(), this.client.userAgent()) - .flatMap(new Func1, Observable>>() { + .flatMap(new Func1, Observable>>() { @Override - public Observable> call(Response response) { + public Observable> call(Response response) { try { - ServiceResponse clientResponse = deleteCertificateDelegate(response); + ServiceResponse clientResponse = deleteCertificateDelegate(response); return Observable.just(clientResponse); } catch (Throwable t) { return Observable.error(t); @@ -907,10 +903,10 @@ public Observable> call(Response response) }); } - private ServiceResponse deleteCertificateDelegate(Response response) throws CloudException, IOException, IllegalArgumentException { - return new AzureServiceResponseBuilder(this.client.mapperAdapter()) - .register(200, new TypeToken() { }.getType()) - .registerError(CloudException.class) + private ServiceResponse deleteCertificateDelegate(Response response) throws CloudException, IOException, IllegalArgumentException { + return new AzureServiceResponseBuilder(this.client.mapperAdapter()) + .register(200, new TypeToken() { }.getType()) + .register(204, new TypeToken() { }.getType()) .build(response); } @@ -918,8 +914,8 @@ private ServiceResponse deleteCertificateDelegate(Response * Get a certificate order. * Get a certificate order. * - * @param resourceGroupName Azure resource group name - * @param name Certificate name + * @param resourceGroupName Name of the resource group to which the resource belongs. + * @param name Name of the certificate. * @return the AppServiceCertificateOrderInner object if successful. */ public AppServiceCertificateOrderInner get(String resourceGroupName, String name) { @@ -930,8 +926,8 @@ public AppServiceCertificateOrderInner get(String resourceGroupName, String name * Get a certificate order. * Get a certificate order. * - * @param resourceGroupName Azure resource group name - * @param name Certificate name + * @param resourceGroupName Name of the resource group to which the resource belongs. + * @param name Name of the certificate. * @param serviceCallback the async ServiceCallback to handle successful and failed responses. * @return the {@link ServiceCall} object */ @@ -943,8 +939,8 @@ public ServiceCall getAsync(String resourceGrou * Get a certificate order. * Get a certificate order. * - * @param resourceGroupName Azure resource group name - * @param name Certificate name + * @param resourceGroupName Name of the resource group to which the resource belongs. + * @param name Name of the certificate. * @return the observable to the AppServiceCertificateOrderInner object */ public Observable getAsync(String resourceGroupName, String name) { @@ -960,8 +956,8 @@ public AppServiceCertificateOrderInner call(ServiceResponse> getWithServiceResponseAsync(String resourceGroupName, String name) { @@ -1000,9 +996,9 @@ private ServiceResponse getDelegate(Response createOrUpdateAsync(String r * Create or update a certificate purchase order. * Create or update a certificate purchase order. * - * @param resourceGroupName Azure resource group name - * @param name Certificate name - * @param certificateDistinguishedName Distinguished name to be used for purchasing certificate + * @param resourceGroupName Name of the resource group to which the resource belongs. + * @param name Name of the certificate. + * @param certificateDistinguishedName Distinguished name to to use for the certificate order. * @return the observable for the request */ public Observable createOrUpdateAsync(String resourceGroupName, String name, AppServiceCertificateOrderInner certificateDistinguishedName) { @@ -1045,9 +1041,9 @@ public AppServiceCertificateOrderInner call(ServiceResponse> createOrUpdateWithServiceResponseAsync(String resourceGroupName, String name, AppServiceCertificateOrderInner certificateDistinguishedName) { @@ -1073,9 +1069,9 @@ public Observable> createOrUpda * Create or update a certificate purchase order. * Create or update a certificate purchase order. * - * @param resourceGroupName Azure resource group name - * @param name Certificate name - * @param certificateDistinguishedName Distinguished name to be used for purchasing certificate + * @param resourceGroupName Name of the resource group to which the resource belongs. + * @param name Name of the certificate. + * @param certificateDistinguishedName Distinguished name to to use for the certificate order. * @return the AppServiceCertificateOrderInner object if successful. */ public AppServiceCertificateOrderInner beginCreateOrUpdate(String resourceGroupName, String name, AppServiceCertificateOrderInner certificateDistinguishedName) { @@ -1086,9 +1082,9 @@ public AppServiceCertificateOrderInner beginCreateOrUpdate(String resourceGroupN * Create or update a certificate purchase order. * Create or update a certificate purchase order. * - * @param resourceGroupName Azure resource group name - * @param name Certificate name - * @param certificateDistinguishedName Distinguished name to be used for purchasing certificate + * @param resourceGroupName Name of the resource group to which the resource belongs. + * @param name Name of the certificate. + * @param certificateDistinguishedName Distinguished name to to use for the certificate order. * @param serviceCallback the async ServiceCallback to handle successful and failed responses. * @return the {@link ServiceCall} object */ @@ -1100,9 +1096,9 @@ public ServiceCall beginCreateOrUpdateAsync(Str * Create or update a certificate purchase order. * Create or update a certificate purchase order. * - * @param resourceGroupName Azure resource group name - * @param name Certificate name - * @param certificateDistinguishedName Distinguished name to be used for purchasing certificate + * @param resourceGroupName Name of the resource group to which the resource belongs. + * @param name Name of the certificate. + * @param certificateDistinguishedName Distinguished name to to use for the certificate order. * @return the observable to the AppServiceCertificateOrderInner object */ public Observable beginCreateOrUpdateAsync(String resourceGroupName, String name, AppServiceCertificateOrderInner certificateDistinguishedName) { @@ -1118,9 +1114,9 @@ public AppServiceCertificateOrderInner call(ServiceResponse> beginCreateOrUpdateWithServiceResponseAsync(String resourceGroupName, String name, AppServiceCertificateOrderInner certificateDistinguishedName) { @@ -1155,6 +1151,7 @@ public Observable> call(Respons private ServiceResponse beginCreateOrUpdateDelegate(Response response) throws CloudException, IOException, IllegalArgumentException { return new AzureServiceResponseBuilder(this.client.mapperAdapter()) .register(200, new TypeToken() { }.getType()) + .register(201, new TypeToken() { }.getType()) .registerError(CloudException.class) .build(response); } @@ -1163,24 +1160,23 @@ private ServiceResponse beginCreateOrUpdateDele * Delete an existing certificate order. * Delete an existing certificate order. * - * @param resourceGroupName Azure resource group name - * @param name Certificate name - * @return the Object object if successful. + * @param resourceGroupName Name of the resource group to which the resource belongs. + * @param name Name of the certificate. */ - public Object deleteCertificateOrder(String resourceGroupName, String name) { - return deleteCertificateOrderWithServiceResponseAsync(resourceGroupName, name).toBlocking().single().getBody(); + public void deleteCertificateOrder(String resourceGroupName, String name) { + deleteCertificateOrderWithServiceResponseAsync(resourceGroupName, name).toBlocking().single().getBody(); } /** * Delete an existing certificate order. * Delete an existing certificate order. * - * @param resourceGroupName Azure resource group name - * @param name Certificate name + * @param resourceGroupName Name of the resource group to which the resource belongs. + * @param name Name of the certificate. * @param serviceCallback the async ServiceCallback to handle successful and failed responses. * @return the {@link ServiceCall} object */ - public ServiceCall deleteCertificateOrderAsync(String resourceGroupName, String name, final ServiceCallback serviceCallback) { + public ServiceCall deleteCertificateOrderAsync(String resourceGroupName, String name, final ServiceCallback serviceCallback) { return ServiceCall.create(deleteCertificateOrderWithServiceResponseAsync(resourceGroupName, name), serviceCallback); } @@ -1188,14 +1184,14 @@ public ServiceCall deleteCertificateOrderAsync(String resourceGroupName, * Delete an existing certificate order. * Delete an existing certificate order. * - * @param resourceGroupName Azure resource group name - * @param name Certificate name - * @return the observable to the Object object + * @param resourceGroupName Name of the resource group to which the resource belongs. + * @param name Name of the certificate. + * @return the {@link ServiceResponse} object if successful. */ - public Observable deleteCertificateOrderAsync(String resourceGroupName, String name) { - return deleteCertificateOrderWithServiceResponseAsync(resourceGroupName, name).map(new Func1, Object>() { + public Observable deleteCertificateOrderAsync(String resourceGroupName, String name) { + return deleteCertificateOrderWithServiceResponseAsync(resourceGroupName, name).map(new Func1, Void>() { @Override - public Object call(ServiceResponse response) { + public Void call(ServiceResponse response) { return response.getBody(); } }); @@ -1205,11 +1201,11 @@ public Object call(ServiceResponse response) { * Delete an existing certificate order. * Delete an existing certificate order. * - * @param resourceGroupName Azure resource group name - * @param name Certificate name - * @return the observable to the Object object + * @param resourceGroupName Name of the resource group to which the resource belongs. + * @param name Name of the certificate. + * @return the {@link ServiceResponse} object if successful. */ - public Observable> deleteCertificateOrderWithServiceResponseAsync(String resourceGroupName, String name) { + public Observable> deleteCertificateOrderWithServiceResponseAsync(String resourceGroupName, String name) { if (resourceGroupName == null) { throw new IllegalArgumentException("Parameter resourceGroupName is required and cannot be null."); } @@ -1221,11 +1217,11 @@ public Observable> deleteCertificateOrderWithServiceResp } final String apiVersion = "2015-08-01"; return service.deleteCertificateOrder(resourceGroupName, name, this.client.subscriptionId(), apiVersion, this.client.acceptLanguage(), this.client.userAgent()) - .flatMap(new Func1, Observable>>() { + .flatMap(new Func1, Observable>>() { @Override - public Observable> call(Response response) { + public Observable> call(Response response) { try { - ServiceResponse clientResponse = deleteCertificateOrderDelegate(response); + ServiceResponse clientResponse = deleteCertificateOrderDelegate(response); return Observable.just(clientResponse); } catch (Throwable t) { return Observable.error(t); @@ -1234,10 +1230,10 @@ public Observable> call(Response response) }); } - private ServiceResponse deleteCertificateOrderDelegate(Response response) throws CloudException, IOException, IllegalArgumentException { - return new AzureServiceResponseBuilder(this.client.mapperAdapter()) - .register(200, new TypeToken() { }.getType()) - .registerError(CloudException.class) + private ServiceResponse deleteCertificateOrderDelegate(Response response) throws CloudException, IOException, IllegalArgumentException { + return new AzureServiceResponseBuilder(this.client.mapperAdapter()) + .register(200, new TypeToken() { }.getType()) + .register(204, new TypeToken() { }.getType()) .build(response); } @@ -1245,26 +1241,25 @@ private ServiceResponse deleteCertificateOrderDelegate(Response reissueAsync(String resourceGroupName, String name, ReissueCertificateOrderRequestInner reissueCertificateOrderRequest, final ServiceCallback serviceCallback) { + public ServiceCall reissueAsync(String resourceGroupName, String name, ReissueCertificateOrderRequestInner reissueCertificateOrderRequest, final ServiceCallback serviceCallback) { return ServiceCall.create(reissueWithServiceResponseAsync(resourceGroupName, name, reissueCertificateOrderRequest), serviceCallback); } @@ -1272,15 +1267,15 @@ public ServiceCall reissueAsync(String resourceGroupName, String name, R * Reissue an existing certificate order. * Reissue an existing certificate order. * - * @param resourceGroupName Azure resource group name - * @param name Certificate name - * @param reissueCertificateOrderRequest Reissue parameters - * @return the observable to the Object object + * @param resourceGroupName Name of the resource group to which the resource belongs. + * @param name Name of the certificate. + * @param reissueCertificateOrderRequest Parameters for the reissue. + * @return the {@link ServiceResponse} object if successful. */ - public Observable reissueAsync(String resourceGroupName, String name, ReissueCertificateOrderRequestInner reissueCertificateOrderRequest) { - return reissueWithServiceResponseAsync(resourceGroupName, name, reissueCertificateOrderRequest).map(new Func1, Object>() { + public Observable reissueAsync(String resourceGroupName, String name, ReissueCertificateOrderRequestInner reissueCertificateOrderRequest) { + return reissueWithServiceResponseAsync(resourceGroupName, name, reissueCertificateOrderRequest).map(new Func1, Void>() { @Override - public Object call(ServiceResponse response) { + public Void call(ServiceResponse response) { return response.getBody(); } }); @@ -1290,12 +1285,12 @@ public Object call(ServiceResponse response) { * Reissue an existing certificate order. * Reissue an existing certificate order. * - * @param resourceGroupName Azure resource group name - * @param name Certificate name - * @param reissueCertificateOrderRequest Reissue parameters - * @return the observable to the Object object + * @param resourceGroupName Name of the resource group to which the resource belongs. + * @param name Name of the certificate. + * @param reissueCertificateOrderRequest Parameters for the reissue. + * @return the {@link ServiceResponse} object if successful. */ - public Observable> reissueWithServiceResponseAsync(String resourceGroupName, String name, ReissueCertificateOrderRequestInner reissueCertificateOrderRequest) { + public Observable> reissueWithServiceResponseAsync(String resourceGroupName, String name, ReissueCertificateOrderRequestInner reissueCertificateOrderRequest) { if (resourceGroupName == null) { throw new IllegalArgumentException("Parameter resourceGroupName is required and cannot be null."); } @@ -1311,11 +1306,11 @@ public Observable> reissueWithServiceResponseAsync(Strin Validator.validate(reissueCertificateOrderRequest); final String apiVersion = "2015-08-01"; return service.reissue(resourceGroupName, name, this.client.subscriptionId(), reissueCertificateOrderRequest, apiVersion, this.client.acceptLanguage(), this.client.userAgent()) - .flatMap(new Func1, Observable>>() { + .flatMap(new Func1, Observable>>() { @Override - public Observable> call(Response response) { + public Observable> call(Response response) { try { - ServiceResponse clientResponse = reissueDelegate(response); + ServiceResponse clientResponse = reissueDelegate(response); return Observable.just(clientResponse); } catch (Throwable t) { return Observable.error(t); @@ -1324,10 +1319,9 @@ public Observable> call(Response response) }); } - private ServiceResponse reissueDelegate(Response response) throws CloudException, IOException, IllegalArgumentException { - return new AzureServiceResponseBuilder(this.client.mapperAdapter()) - .register(200, new TypeToken() { }.getType()) - .registerError(CloudException.class) + private ServiceResponse reissueDelegate(Response response) throws CloudException, IOException, IllegalArgumentException { + return new AzureServiceResponseBuilder(this.client.mapperAdapter()) + .register(204, new TypeToken() { }.getType()) .build(response); } @@ -1335,26 +1329,25 @@ private ServiceResponse reissueDelegate(Response response) * Renew an existing certificate order. * Renew an existing certificate order. * - * @param resourceGroupName Azure resource group name + * @param resourceGroupName Name of the resource group to which the resource belongs. * @param name Certificate name * @param renewCertificateOrderRequest Renew parameters - * @return the Object object if successful. */ - public Object renew(String resourceGroupName, String name, RenewCertificateOrderRequestInner renewCertificateOrderRequest) { - return renewWithServiceResponseAsync(resourceGroupName, name, renewCertificateOrderRequest).toBlocking().single().getBody(); + public void renew(String resourceGroupName, String name, RenewCertificateOrderRequestInner renewCertificateOrderRequest) { + renewWithServiceResponseAsync(resourceGroupName, name, renewCertificateOrderRequest).toBlocking().single().getBody(); } /** * Renew an existing certificate order. * Renew an existing certificate order. * - * @param resourceGroupName Azure resource group name + * @param resourceGroupName Name of the resource group to which the resource belongs. * @param name Certificate name * @param renewCertificateOrderRequest Renew parameters * @param serviceCallback the async ServiceCallback to handle successful and failed responses. * @return the {@link ServiceCall} object */ - public ServiceCall renewAsync(String resourceGroupName, String name, RenewCertificateOrderRequestInner renewCertificateOrderRequest, final ServiceCallback serviceCallback) { + public ServiceCall renewAsync(String resourceGroupName, String name, RenewCertificateOrderRequestInner renewCertificateOrderRequest, final ServiceCallback serviceCallback) { return ServiceCall.create(renewWithServiceResponseAsync(resourceGroupName, name, renewCertificateOrderRequest), serviceCallback); } @@ -1362,15 +1355,15 @@ public ServiceCall renewAsync(String resourceGroupName, String name, Ren * Renew an existing certificate order. * Renew an existing certificate order. * - * @param resourceGroupName Azure resource group name + * @param resourceGroupName Name of the resource group to which the resource belongs. * @param name Certificate name * @param renewCertificateOrderRequest Renew parameters - * @return the observable to the Object object + * @return the {@link ServiceResponse} object if successful. */ - public Observable renewAsync(String resourceGroupName, String name, RenewCertificateOrderRequestInner renewCertificateOrderRequest) { - return renewWithServiceResponseAsync(resourceGroupName, name, renewCertificateOrderRequest).map(new Func1, Object>() { + public Observable renewAsync(String resourceGroupName, String name, RenewCertificateOrderRequestInner renewCertificateOrderRequest) { + return renewWithServiceResponseAsync(resourceGroupName, name, renewCertificateOrderRequest).map(new Func1, Void>() { @Override - public Object call(ServiceResponse response) { + public Void call(ServiceResponse response) { return response.getBody(); } }); @@ -1380,12 +1373,12 @@ public Object call(ServiceResponse response) { * Renew an existing certificate order. * Renew an existing certificate order. * - * @param resourceGroupName Azure resource group name + * @param resourceGroupName Name of the resource group to which the resource belongs. * @param name Certificate name * @param renewCertificateOrderRequest Renew parameters - * @return the observable to the Object object + * @return the {@link ServiceResponse} object if successful. */ - public Observable> renewWithServiceResponseAsync(String resourceGroupName, String name, RenewCertificateOrderRequestInner renewCertificateOrderRequest) { + public Observable> renewWithServiceResponseAsync(String resourceGroupName, String name, RenewCertificateOrderRequestInner renewCertificateOrderRequest) { if (resourceGroupName == null) { throw new IllegalArgumentException("Parameter resourceGroupName is required and cannot be null."); } @@ -1401,11 +1394,11 @@ public Observable> renewWithServiceResponseAsync(String Validator.validate(renewCertificateOrderRequest); final String apiVersion = "2015-08-01"; return service.renew(resourceGroupName, name, this.client.subscriptionId(), renewCertificateOrderRequest, apiVersion, this.client.acceptLanguage(), this.client.userAgent()) - .flatMap(new Func1, Observable>>() { + .flatMap(new Func1, Observable>>() { @Override - public Observable> call(Response response) { + public Observable> call(Response response) { try { - ServiceResponse clientResponse = renewDelegate(response); + ServiceResponse clientResponse = renewDelegate(response); return Observable.just(clientResponse); } catch (Throwable t) { return Observable.error(t); @@ -1414,10 +1407,9 @@ public Observable> call(Response response) }); } - private ServiceResponse renewDelegate(Response response) throws CloudException, IOException, IllegalArgumentException { - return new AzureServiceResponseBuilder(this.client.mapperAdapter()) - .register(200, new TypeToken() { }.getType()) - .registerError(CloudException.class) + private ServiceResponse renewDelegate(Response response) throws CloudException, IOException, IllegalArgumentException { + return new AzureServiceResponseBuilder(this.client.mapperAdapter()) + .register(204, new TypeToken() { }.getType()) .build(response); } @@ -1425,39 +1417,38 @@ private ServiceResponse renewDelegate(Response response) t * Resend certificate email. * Resend certificate email. * - * @param resourceGroupName Azure resource group name + * @param resourceGroupName Name of the resource group to which the resource belongs. * @param name Certificate order name - * @return the Object object if successful. */ - public Object resendCertificateEmail(String resourceGroupName, String name) { - return resendCertificateEmailWithServiceResponseAsync(resourceGroupName, name).toBlocking().single().getBody(); + public void resendEmail(String resourceGroupName, String name) { + resendEmailWithServiceResponseAsync(resourceGroupName, name).toBlocking().single().getBody(); } /** * Resend certificate email. * Resend certificate email. * - * @param resourceGroupName Azure resource group name + * @param resourceGroupName Name of the resource group to which the resource belongs. * @param name Certificate order name * @param serviceCallback the async ServiceCallback to handle successful and failed responses. * @return the {@link ServiceCall} object */ - public ServiceCall resendCertificateEmailAsync(String resourceGroupName, String name, final ServiceCallback serviceCallback) { - return ServiceCall.create(resendCertificateEmailWithServiceResponseAsync(resourceGroupName, name), serviceCallback); + public ServiceCall resendEmailAsync(String resourceGroupName, String name, final ServiceCallback serviceCallback) { + return ServiceCall.create(resendEmailWithServiceResponseAsync(resourceGroupName, name), serviceCallback); } /** * Resend certificate email. * Resend certificate email. * - * @param resourceGroupName Azure resource group name + * @param resourceGroupName Name of the resource group to which the resource belongs. * @param name Certificate order name - * @return the observable to the Object object + * @return the {@link ServiceResponse} object if successful. */ - public Observable resendCertificateEmailAsync(String resourceGroupName, String name) { - return resendCertificateEmailWithServiceResponseAsync(resourceGroupName, name).map(new Func1, Object>() { + public Observable resendEmailAsync(String resourceGroupName, String name) { + return resendEmailWithServiceResponseAsync(resourceGroupName, name).map(new Func1, Void>() { @Override - public Object call(ServiceResponse response) { + public Void call(ServiceResponse response) { return response.getBody(); } }); @@ -1467,11 +1458,11 @@ public Object call(ServiceResponse response) { * Resend certificate email. * Resend certificate email. * - * @param resourceGroupName Azure resource group name + * @param resourceGroupName Name of the resource group to which the resource belongs. * @param name Certificate order name - * @return the observable to the Object object + * @return the {@link ServiceResponse} object if successful. */ - public Observable> resendCertificateEmailWithServiceResponseAsync(String resourceGroupName, String name) { + public Observable> resendEmailWithServiceResponseAsync(String resourceGroupName, String name) { if (resourceGroupName == null) { throw new IllegalArgumentException("Parameter resourceGroupName is required and cannot be null."); } @@ -1482,12 +1473,12 @@ public Observable> resendCertificateEmailWithServiceResp throw new IllegalArgumentException("Parameter this.client.subscriptionId() is required and cannot be null."); } final String apiVersion = "2015-08-01"; - return service.resendCertificateEmail(resourceGroupName, name, this.client.subscriptionId(), apiVersion, this.client.acceptLanguage(), this.client.userAgent()) - .flatMap(new Func1, Observable>>() { + return service.resendEmail(resourceGroupName, name, this.client.subscriptionId(), apiVersion, this.client.acceptLanguage(), this.client.userAgent()) + .flatMap(new Func1, Observable>>() { @Override - public Observable> call(Response response) { + public Observable> call(Response response) { try { - ServiceResponse clientResponse = resendCertificateEmailDelegate(response); + ServiceResponse clientResponse = resendEmailDelegate(response); return Observable.just(clientResponse); } catch (Throwable t) { return Observable.error(t); @@ -1496,10 +1487,9 @@ public Observable> call(Response response) }); } - private ServiceResponse resendCertificateEmailDelegate(Response response) throws CloudException, IOException, IllegalArgumentException { - return new AzureServiceResponseBuilder(this.client.mapperAdapter()) - .register(200, new TypeToken() { }.getType()) - .registerError(CloudException.class) + private ServiceResponse resendEmailDelegate(Response response) throws CloudException, IOException, IllegalArgumentException { + return new AzureServiceResponseBuilder(this.client.mapperAdapter()) + .register(204, new TypeToken() { }.getType()) .build(response); } @@ -1507,7 +1497,7 @@ private ServiceResponse resendCertificateEmailDelegate(Response retrieveCertificateActions(String resou * Retrieve the list of certificate actions. * Retrieve the list of certificate actions. * - * @param resourceGroupName Azure resource group name + * @param resourceGroupName Name of the resource group to which the resource belongs. * @param name Certificate order name * @param serviceCallback the async ServiceCallback to handle successful and failed responses. * @return the {@link ServiceCall} object @@ -1532,7 +1522,7 @@ public ServiceCall> retrieveCertificateActions * Retrieve the list of certificate actions. * Retrieve the list of certificate actions. * - * @param resourceGroupName Azure resource group name + * @param resourceGroupName Name of the resource group to which the resource belongs. * @param name Certificate order name * @return the observable to the List<CertificateOrderActionInner> object */ @@ -1549,7 +1539,7 @@ public List call(ServiceResponse> retrieveCertificateAc } /** - * Retrive email history. - * Retrive email history. + * Retrieve email history. + * Retrieve email history. * - * @param resourceGroupName Azure resource group name + * @param resourceGroupName Name of the resource group to which the resource belongs. * @param name Certificate order name * @return the List<CertificateEmailInner> object if successful. */ @@ -1598,10 +1588,10 @@ public List retrieveCertificateEmailHistory(String resour } /** - * Retrive email history. - * Retrive email history. + * Retrieve email history. + * Retrieve email history. * - * @param resourceGroupName Azure resource group name + * @param resourceGroupName Name of the resource group to which the resource belongs. * @param name Certificate order name * @param serviceCallback the async ServiceCallback to handle successful and failed responses. * @return the {@link ServiceCall} object @@ -1611,10 +1601,10 @@ public ServiceCall> retrieveCertificateEmailHistoryA } /** - * Retrive email history. - * Retrive email history. + * Retrieve email history. + * Retrieve email history. * - * @param resourceGroupName Azure resource group name + * @param resourceGroupName Name of the resource group to which the resource belongs. * @param name Certificate order name * @return the observable to the List<CertificateEmailInner> object */ @@ -1628,10 +1618,10 @@ public List call(ServiceResponse> retrieveCertificateEmailHis * Verify domain ownership for this certificate order. * Verify domain ownership for this certificate order. * - * @param resourceGroupName Azure resource group name + * @param resourceGroupName Name of the resource group to which the resource belongs. * @param name Certificate order name - * @return the Object object if successful. */ - public Object verifyDomainOwnership(String resourceGroupName, String name) { - return verifyDomainOwnershipWithServiceResponseAsync(resourceGroupName, name).toBlocking().single().getBody(); + public void verifyDomainOwnership(String resourceGroupName, String name) { + verifyDomainOwnershipWithServiceResponseAsync(resourceGroupName, name).toBlocking().single().getBody(); } /** * Verify domain ownership for this certificate order. * Verify domain ownership for this certificate order. * - * @param resourceGroupName Azure resource group name + * @param resourceGroupName Name of the resource group to which the resource belongs. * @param name Certificate order name * @param serviceCallback the async ServiceCallback to handle successful and failed responses. * @return the {@link ServiceCall} object */ - public ServiceCall verifyDomainOwnershipAsync(String resourceGroupName, String name, final ServiceCallback serviceCallback) { + public ServiceCall verifyDomainOwnershipAsync(String resourceGroupName, String name, final ServiceCallback serviceCallback) { return ServiceCall.create(verifyDomainOwnershipWithServiceResponseAsync(resourceGroupName, name), serviceCallback); } @@ -1696,14 +1685,14 @@ public ServiceCall verifyDomainOwnershipAsync(String resourceGroupName, * Verify domain ownership for this certificate order. * Verify domain ownership for this certificate order. * - * @param resourceGroupName Azure resource group name + * @param resourceGroupName Name of the resource group to which the resource belongs. * @param name Certificate order name - * @return the observable to the Object object + * @return the {@link ServiceResponse} object if successful. */ - public Observable verifyDomainOwnershipAsync(String resourceGroupName, String name) { - return verifyDomainOwnershipWithServiceResponseAsync(resourceGroupName, name).map(new Func1, Object>() { + public Observable verifyDomainOwnershipAsync(String resourceGroupName, String name) { + return verifyDomainOwnershipWithServiceResponseAsync(resourceGroupName, name).map(new Func1, Void>() { @Override - public Object call(ServiceResponse response) { + public Void call(ServiceResponse response) { return response.getBody(); } }); @@ -1713,11 +1702,11 @@ public Object call(ServiceResponse response) { * Verify domain ownership for this certificate order. * Verify domain ownership for this certificate order. * - * @param resourceGroupName Azure resource group name + * @param resourceGroupName Name of the resource group to which the resource belongs. * @param name Certificate order name - * @return the observable to the Object object + * @return the {@link ServiceResponse} object if successful. */ - public Observable> verifyDomainOwnershipWithServiceResponseAsync(String resourceGroupName, String name) { + public Observable> verifyDomainOwnershipWithServiceResponseAsync(String resourceGroupName, String name) { if (resourceGroupName == null) { throw new IllegalArgumentException("Parameter resourceGroupName is required and cannot be null."); } @@ -1729,11 +1718,11 @@ public Observable> verifyDomainOwnershipWithServiceRespo } final String apiVersion = "2015-08-01"; return service.verifyDomainOwnership(resourceGroupName, name, this.client.subscriptionId(), apiVersion, this.client.acceptLanguage(), this.client.userAgent()) - .flatMap(new Func1, Observable>>() { + .flatMap(new Func1, Observable>>() { @Override - public Observable> call(Response response) { + public Observable> call(Response response) { try { - ServiceResponse clientResponse = verifyDomainOwnershipDelegate(response); + ServiceResponse clientResponse = verifyDomainOwnershipDelegate(response); return Observable.just(clientResponse); } catch (Throwable t) { return Observable.error(t); @@ -1742,16 +1731,15 @@ public Observable> call(Response response) }); } - private ServiceResponse verifyDomainOwnershipDelegate(Response response) throws CloudException, IOException, IllegalArgumentException { - return new AzureServiceResponseBuilder(this.client.mapperAdapter()) - .register(200, new TypeToken() { }.getType()) - .registerError(CloudException.class) + private ServiceResponse verifyDomainOwnershipDelegate(Response response) throws CloudException, IOException, IllegalArgumentException { + return new AzureServiceResponseBuilder(this.client.mapperAdapter()) + .register(204, new TypeToken() { }.getType()) .build(response); } /** - * 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 nextPageLink The NextLink from the previous successful call to List operation. * @return the PagedList<AppServiceCertificateOrderInner> object if successful. @@ -1767,8 +1755,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 nextPageLink The NextLink from the previous successful call to List operation. * @param serviceCall the ServiceCall object tracking the Retrofit calls @@ -1788,8 +1776,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. * * @param nextPageLink The NextLink from the previous successful call to List operation. * @return the observable to the PagedList<AppServiceCertificateOrderInner> object @@ -1805,8 +1793,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. * ServiceResponse> * @param nextPageLink The NextLink from the previous successful call to List operation. * @return the PagedList<AppServiceCertificateOrderInner> object wrapped in {@link ServiceResponse} if successful. @@ -1966,8 +1954,8 @@ private ServiceResponse> listByResourc } /** - * List all certificates associated with a certificate order (only one certificate can be associated with an order at a time). - * List all certificates associated with a certificate order (only one certificate can be associated with an order at a time). + * List all certificates associated with a certificate order. + * List all certificates associated with a certificate order. * * @param nextPageLink The NextLink from the previous successful call to List operation. * @return the PagedList<AppServiceCertificateInner> object if successful. @@ -1983,8 +1971,8 @@ public Page nextPage(String nextPageLink) { } /** - * List all certificates associated with a certificate order (only one certificate can be associated with an order at a time). - * List all certificates associated with a certificate order (only one certificate can be associated with an order at a time). + * List all certificates associated with a certificate order. + * List all certificates associated with a certificate order. * * @param nextPageLink The NextLink from the previous successful call to List operation. * @param serviceCall the ServiceCall object tracking the Retrofit calls @@ -2004,8 +1992,8 @@ public Observable>> call(String } /** - * List all certificates associated with a certificate order (only one certificate can be associated with an order at a time). - * List all certificates associated with a certificate order (only one certificate can be associated with an order at a time). + * List all certificates associated with a certificate order. + * List all certificates associated with a certificate order. * * @param nextPageLink The NextLink from the previous successful call to List operation. * @return the observable to the PagedList<AppServiceCertificateInner> object @@ -2021,8 +2009,8 @@ public Page call(ServiceResponse>> call(Servic } /** - * List all certificates associated with a certificate order (only one certificate can be associated with an order at a time). - * List all certificates associated with a certificate order (only one certificate can be associated with an order at a time). + * List all certificates associated with a certificate order. + * List all certificates associated with a certificate order. * ServiceResponse> * @param nextPageLink The NextLink from the previous successful call to List operation. * @return the PagedList<AppServiceCertificateInner> object wrapped in {@link ServiceResponse} if successful. diff --git a/azure-mgmt-website/src/main/java/com/microsoft/azure/management/website/implementation/AppServiceEnvironmentInner.java b/azure-mgmt-website/src/main/java/com/microsoft/azure/management/website/implementation/AppServiceEnvironmentInner.java index adfbf73851c30..334054e91d963 100644 --- a/azure-mgmt-website/src/main/java/com/microsoft/azure/management/website/implementation/AppServiceEnvironmentInner.java +++ b/azure-mgmt-website/src/main/java/com/microsoft/azure/management/website/implementation/AppServiceEnvironmentInner.java @@ -21,70 +21,64 @@ import com.microsoft.azure.Resource; /** - * Description of an hostingEnvironment (App Service Environment). + * Description of an App Service Environment. */ @JsonFlatten public class AppServiceEnvironmentInner extends Resource { /** - * Name of the hostingEnvironment (App Service Environment). + * Name of the App Service Environment. */ @JsonProperty(value = "properties.name") private String appServiceEnvironmentName; /** - * Location of the hostingEnvironment (App Service Environment), e.g. - * "West US". + * Location of the App Service Environment, e.g. "West US". */ @JsonProperty(value = "properties.location") private String appServiceEnvironmentLocation; /** - * Provisioning state of the hostingEnvironment (App Service Environment). - * Possible values include: 'Succeeded', 'Failed', 'Canceled', - * 'InProgress', 'Deleting'. + * Provisioning state of the App Service Environment. Possible values + * include: 'Succeeded', 'Failed', 'Canceled', 'InProgress', 'Deleting'. */ - @JsonProperty(value = "properties.provisioningState") + @JsonProperty(value = "properties.provisioningState", access = JsonProperty.Access.WRITE_ONLY) private ProvisioningState provisioningState; /** - * Current status of the hostingEnvironment (App Service Environment). - * Possible values include: 'Preparing', 'Ready', 'Scaling', 'Deleting'. + * Current status of the App Service Environment. Possible values include: + * 'Preparing', 'Ready', 'Scaling', 'Deleting'. */ - @JsonProperty(value = "properties.status") + @JsonProperty(value = "properties.status", access = JsonProperty.Access.WRITE_ONLY) private HostingEnvironmentStatus status; /** - * Name of the hostingEnvironment's (App Service Environment) virtual - * network. + * Name of the Virtual Network for the App Service Environment. */ @JsonProperty(value = "properties.vnetName") private String vnetName; /** - * Resource group of the hostingEnvironment's (App Service Environment) - * virtual network. + * Resource group of the Virtual Network. */ @JsonProperty(value = "properties.vnetResourceGroupName") private String vnetResourceGroupName; /** - * Subnet of the hostingEnvironment's (App Service Environment) virtual - * network. + * Subnet of the Virtual Network. */ @JsonProperty(value = "properties.vnetSubnetName") private String vnetSubnetName; /** - * Description of the hostingEnvironment's (App Service Environment) - * virtual network. + * Description of the Virtual Network. */ @JsonProperty(value = "properties.virtualNetwork") private VirtualNetworkProfile virtualNetwork; /** - * Specifies which endpoints to serve internally in the - * hostingEnvironment's (App Service Environment) VNET. Possible values - * include: 'None', 'Web', 'Publishing'. + * Specifies which endpoints to serve internally in the Virtual Network + * for the App Service Environment. Possible values include: 'None', + * 'Web', 'Publishing'. */ @JsonProperty(value = "properties.internalLoadBalancingMode") private InternalLoadBalancingMode internalLoadBalancingMode; @@ -102,159 +96,160 @@ public class AppServiceEnvironmentInner extends Resource { private Integer multiRoleCount; /** - * Description of worker pools with worker size ids, VM sizes, and number + * Description of worker pools with worker size IDs, VM sizes, and number * of workers in each pool. */ @JsonProperty(value = "properties.workerPools") private List workerPools; /** - * Number of IP SSL addresses reserved for this hostingEnvironment (App - * Service Environment). + * Number of IP SSL addresses reserved for the App Service Environment. */ @JsonProperty(value = "properties.ipsslAddressCount") private Integer ipsslAddressCount; /** - * Edition of the metadata database for the hostingEnvironment (App - * Service Environment) e.g. "Standard". + * Edition of the metadata database for the App Service Environment, e.g. + * "Standard". */ - @JsonProperty(value = "properties.databaseEdition") + @JsonProperty(value = "properties.databaseEdition", access = JsonProperty.Access.WRITE_ONLY) private String databaseEdition; /** - * Service objective of the metadata database for the hostingEnvironment - * (App Service Environment) e.g. "S0". + * Service objective of the metadata database for the App Service + * Environment, e.g. "S0". */ - @JsonProperty(value = "properties.databaseServiceObjective") + @JsonProperty(value = "properties.databaseServiceObjective", access = JsonProperty.Access.WRITE_ONLY) private String databaseServiceObjective; /** - * Number of upgrade domains of this hostingEnvironment (App Service - * Environment). + * Number of upgrade domains of the App Service Environment. */ - @JsonProperty(value = "properties.upgradeDomains") + @JsonProperty(value = "properties.upgradeDomains", access = JsonProperty.Access.WRITE_ONLY) private Integer upgradeDomains; /** - * Subscription of the hostingEnvironment (App Service Environment). + * Subscription of the App Service Environment. */ - @JsonProperty(value = "properties.subscriptionId") + @JsonProperty(value = "properties.subscriptionId", access = JsonProperty.Access.WRITE_ONLY) private String subscriptionId; /** - * DNS suffix of the hostingEnvironment (App Service Environment). + * DNS suffix of the App Service Environment. */ @JsonProperty(value = "properties.dnsSuffix") private String dnsSuffix; /** - * Last deployment action on this hostingEnvironment (App Service - * Environment). + * Last deployment action on the App Service Environment. */ - @JsonProperty(value = "properties.lastAction") + @JsonProperty(value = "properties.lastAction", access = JsonProperty.Access.WRITE_ONLY) private String lastAction; /** - * Result of the last deployment action on this hostingEnvironment (App - * Service Environment). + * Result of the last deployment action on the App Service Environment. */ - @JsonProperty(value = "properties.lastActionResult") + @JsonProperty(value = "properties.lastActionResult", access = JsonProperty.Access.WRITE_ONLY) private String lastActionResult; /** * List of comma separated strings describing which VM sizes are allowed * for front-ends. */ - @JsonProperty(value = "properties.allowedMultiSizes") + @JsonProperty(value = "properties.allowedMultiSizes", access = JsonProperty.Access.WRITE_ONLY) private String allowedMultiSizes; /** * List of comma separated strings describing which VM sizes are allowed * for workers. */ - @JsonProperty(value = "properties.allowedWorkerSizes") + @JsonProperty(value = "properties.allowedWorkerSizes", access = JsonProperty.Access.WRITE_ONLY) private String allowedWorkerSizes; /** - * Maximum number of VMs in this hostingEnvironment (App Service - * Environment). + * Maximum number of VMs in the App Service Environment. */ - @JsonProperty(value = "properties.maximumNumberOfMachines") + @JsonProperty(value = "properties.maximumNumberOfMachines", access = JsonProperty.Access.WRITE_ONLY) private Integer maximumNumberOfMachines; /** - * Description of IP SSL mapping for this hostingEnvironment (App Service - * Environment). + * Description of IP SSL mapping for the App Service Environment. */ - @JsonProperty(value = "properties.vipMappings") + @JsonProperty(value = "properties.vipMappings", access = JsonProperty.Access.WRITE_ONLY) private List vipMappings; /** * Current total, used, and available worker capacities. */ - @JsonProperty(value = "properties.environmentCapacities") + @JsonProperty(value = "properties.environmentCapacities", access = JsonProperty.Access.WRITE_ONLY) private List environmentCapacities; /** - * Access control list for controlling traffic to the hostingEnvironment - * (App Service Environment). + * Access control list for controlling traffic to the App Service + * Environment. */ @JsonProperty(value = "properties.networkAccessControlList") private List networkAccessControlList; /** - * True/false indicating whether the hostingEnvironment (App Service - * Environment) is healthy. + * True/false indicating whether the App Service Environment is healthy. */ - @JsonProperty(value = "properties.environmentIsHealthy") + @JsonProperty(value = "properties.environmentIsHealthy", access = JsonProperty.Access.WRITE_ONLY) private Boolean environmentIsHealthy; /** - * Detailed message about with results of the last check of the - * hostingEnvironment (App Service Environment). + * Detailed message about with results of the last check of the App + * Service Environment. */ - @JsonProperty(value = "properties.environmentStatus") + @JsonProperty(value = "properties.environmentStatus", access = JsonProperty.Access.WRITE_ONLY) private String environmentStatus; /** - * Resource group of the hostingEnvironment (App Service Environment). + * Resource group of the App Service Environment. */ - @JsonProperty(value = "properties.resourceGroup") + @JsonProperty(value = "properties.resourceGroup", access = JsonProperty.Access.WRITE_ONLY) private String resourceGroup; /** - * Scale Factor for FrontEnds. + * Scale factor for front-ends. */ @JsonProperty(value = "properties.frontEndScaleFactor") private Integer frontEndScaleFactor; /** - * The apiManagementAccountId property. + * Default Scale Factor for FrontEnds. + */ + @JsonProperty(value = "properties.defaultFrontEndScaleFactor") + private Integer defaultFrontEndScaleFactor; + + /** + * API Management Account associated with the App Service Environment. */ @JsonProperty(value = "properties.apiManagementAccountId") private String apiManagementAccountId; /** - * True/false indicating whether the hostingEnvironment is suspended. The - * environment can be suspended e.g. when the management endpoint is no - * longer available + * <code>true</code> if the App Service Environment is + * suspended; otherwise, <code>false</code>. The environment + * can be suspended, e.g. when the management endpoint is no longer + * available * (most likely because NSG blocked the incoming traffic). */ @JsonProperty(value = "properties.suspended") private Boolean suspended; /** - * True/false indicating whether the hostingEnvironment is suspended. The - * environment can be suspended e.g. when the management endpoint is no - * longer available + * True/false indicating whether the App Service Environment is suspended. + * The environment can be suspended e.g. when the management endpoint is + * no longer available * (most likely because NSG blocked the incoming traffic). */ @JsonProperty(value = "properties.dynamicCacheEnabled") private Boolean dynamicCacheEnabled; /** - * Custom settings for changing the behavior of the hosting environment. + * Custom settings for changing the behavior of the App Service + * Environment. */ @JsonProperty(value = "properties.clusterSettings") private List clusterSettings; @@ -308,17 +303,6 @@ public ProvisioningState provisioningState() { return this.provisioningState; } - /** - * Set the provisioningState value. - * - * @param provisioningState the provisioningState value to set - * @return the AppServiceEnvironmentInner object itself. - */ - public AppServiceEnvironmentInner withProvisioningState(ProvisioningState provisioningState) { - this.provisioningState = provisioningState; - return this; - } - /** * Get the status value. * @@ -328,17 +312,6 @@ public HostingEnvironmentStatus status() { return this.status; } - /** - * Set the status value. - * - * @param status the status value to set - * @return the AppServiceEnvironmentInner object itself. - */ - public AppServiceEnvironmentInner withStatus(HostingEnvironmentStatus status) { - this.status = status; - return this; - } - /** * Get the vnetName value. * @@ -528,17 +501,6 @@ public String databaseEdition() { return this.databaseEdition; } - /** - * Set the databaseEdition value. - * - * @param databaseEdition the databaseEdition value to set - * @return the AppServiceEnvironmentInner object itself. - */ - public AppServiceEnvironmentInner withDatabaseEdition(String databaseEdition) { - this.databaseEdition = databaseEdition; - return this; - } - /** * Get the databaseServiceObjective value. * @@ -548,17 +510,6 @@ public String databaseServiceObjective() { return this.databaseServiceObjective; } - /** - * Set the databaseServiceObjective value. - * - * @param databaseServiceObjective the databaseServiceObjective value to set - * @return the AppServiceEnvironmentInner object itself. - */ - public AppServiceEnvironmentInner withDatabaseServiceObjective(String databaseServiceObjective) { - this.databaseServiceObjective = databaseServiceObjective; - return this; - } - /** * Get the upgradeDomains value. * @@ -568,17 +519,6 @@ public Integer upgradeDomains() { return this.upgradeDomains; } - /** - * Set the upgradeDomains value. - * - * @param upgradeDomains the upgradeDomains value to set - * @return the AppServiceEnvironmentInner object itself. - */ - public AppServiceEnvironmentInner withUpgradeDomains(Integer upgradeDomains) { - this.upgradeDomains = upgradeDomains; - return this; - } - /** * Get the subscriptionId value. * @@ -588,17 +528,6 @@ public String subscriptionId() { return this.subscriptionId; } - /** - * Set the subscriptionId value. - * - * @param subscriptionId the subscriptionId value to set - * @return the AppServiceEnvironmentInner object itself. - */ - public AppServiceEnvironmentInner withSubscriptionId(String subscriptionId) { - this.subscriptionId = subscriptionId; - return this; - } - /** * Get the dnsSuffix value. * @@ -628,17 +557,6 @@ public String lastAction() { return this.lastAction; } - /** - * Set the lastAction value. - * - * @param lastAction the lastAction value to set - * @return the AppServiceEnvironmentInner object itself. - */ - public AppServiceEnvironmentInner withLastAction(String lastAction) { - this.lastAction = lastAction; - return this; - } - /** * Get the lastActionResult value. * @@ -648,17 +566,6 @@ public String lastActionResult() { return this.lastActionResult; } - /** - * Set the lastActionResult value. - * - * @param lastActionResult the lastActionResult value to set - * @return the AppServiceEnvironmentInner object itself. - */ - public AppServiceEnvironmentInner withLastActionResult(String lastActionResult) { - this.lastActionResult = lastActionResult; - return this; - } - /** * Get the allowedMultiSizes value. * @@ -668,17 +575,6 @@ public String allowedMultiSizes() { return this.allowedMultiSizes; } - /** - * Set the allowedMultiSizes value. - * - * @param allowedMultiSizes the allowedMultiSizes value to set - * @return the AppServiceEnvironmentInner object itself. - */ - public AppServiceEnvironmentInner withAllowedMultiSizes(String allowedMultiSizes) { - this.allowedMultiSizes = allowedMultiSizes; - return this; - } - /** * Get the allowedWorkerSizes value. * @@ -688,17 +584,6 @@ public String allowedWorkerSizes() { return this.allowedWorkerSizes; } - /** - * Set the allowedWorkerSizes value. - * - * @param allowedWorkerSizes the allowedWorkerSizes value to set - * @return the AppServiceEnvironmentInner object itself. - */ - public AppServiceEnvironmentInner withAllowedWorkerSizes(String allowedWorkerSizes) { - this.allowedWorkerSizes = allowedWorkerSizes; - return this; - } - /** * Get the maximumNumberOfMachines value. * @@ -708,17 +593,6 @@ public Integer maximumNumberOfMachines() { return this.maximumNumberOfMachines; } - /** - * Set the maximumNumberOfMachines value. - * - * @param maximumNumberOfMachines the maximumNumberOfMachines value to set - * @return the AppServiceEnvironmentInner object itself. - */ - public AppServiceEnvironmentInner withMaximumNumberOfMachines(Integer maximumNumberOfMachines) { - this.maximumNumberOfMachines = maximumNumberOfMachines; - return this; - } - /** * Get the vipMappings value. * @@ -728,17 +602,6 @@ public List vipMappings() { return this.vipMappings; } - /** - * Set the vipMappings value. - * - * @param vipMappings the vipMappings value to set - * @return the AppServiceEnvironmentInner object itself. - */ - public AppServiceEnvironmentInner withVipMappings(List vipMappings) { - this.vipMappings = vipMappings; - return this; - } - /** * Get the environmentCapacities value. * @@ -748,17 +611,6 @@ public List environmentCapacities() { return this.environmentCapacities; } - /** - * Set the environmentCapacities value. - * - * @param environmentCapacities the environmentCapacities value to set - * @return the AppServiceEnvironmentInner object itself. - */ - public AppServiceEnvironmentInner withEnvironmentCapacities(List environmentCapacities) { - this.environmentCapacities = environmentCapacities; - return this; - } - /** * Get the networkAccessControlList value. * @@ -788,17 +640,6 @@ public Boolean environmentIsHealthy() { return this.environmentIsHealthy; } - /** - * Set the environmentIsHealthy value. - * - * @param environmentIsHealthy the environmentIsHealthy value to set - * @return the AppServiceEnvironmentInner object itself. - */ - public AppServiceEnvironmentInner withEnvironmentIsHealthy(Boolean environmentIsHealthy) { - this.environmentIsHealthy = environmentIsHealthy; - return this; - } - /** * Get the environmentStatus value. * @@ -808,17 +649,6 @@ public String environmentStatus() { return this.environmentStatus; } - /** - * Set the environmentStatus value. - * - * @param environmentStatus the environmentStatus value to set - * @return the AppServiceEnvironmentInner object itself. - */ - public AppServiceEnvironmentInner withEnvironmentStatus(String environmentStatus) { - this.environmentStatus = environmentStatus; - return this; - } - /** * Get the resourceGroup value. * @@ -828,17 +658,6 @@ public String resourceGroup() { return this.resourceGroup; } - /** - * Set the resourceGroup value. - * - * @param resourceGroup the resourceGroup value to set - * @return the AppServiceEnvironmentInner object itself. - */ - public AppServiceEnvironmentInner withResourceGroup(String resourceGroup) { - this.resourceGroup = resourceGroup; - return this; - } - /** * Get the frontEndScaleFactor value. * @@ -859,6 +678,26 @@ public AppServiceEnvironmentInner withFrontEndScaleFactor(Integer frontEndScaleF return this; } + /** + * Get the defaultFrontEndScaleFactor value. + * + * @return the defaultFrontEndScaleFactor value + */ + public Integer defaultFrontEndScaleFactor() { + return this.defaultFrontEndScaleFactor; + } + + /** + * Set the defaultFrontEndScaleFactor value. + * + * @param defaultFrontEndScaleFactor the defaultFrontEndScaleFactor value to set + * @return the AppServiceEnvironmentInner object itself. + */ + public AppServiceEnvironmentInner withDefaultFrontEndScaleFactor(Integer defaultFrontEndScaleFactor) { + this.defaultFrontEndScaleFactor = defaultFrontEndScaleFactor; + return this; + } + /** * Get the apiManagementAccountId value. * diff --git a/azure-mgmt-website/src/main/java/com/microsoft/azure/management/website/implementation/AppServiceEnvironmentsInner.java b/azure-mgmt-website/src/main/java/com/microsoft/azure/management/website/implementation/AppServiceEnvironmentsInner.java index 79ca49a612412..fa02f53614df9 100644 --- a/azure-mgmt-website/src/main/java/com/microsoft/azure/management/website/implementation/AppServiceEnvironmentsInner.java +++ b/azure-mgmt-website/src/main/java/com/microsoft/azure/management/website/implementation/AppServiceEnvironmentsInner.java @@ -113,7 +113,7 @@ interface AppServiceEnvironmentsService { @Headers("Content-Type: application/json; charset=utf-8") @GET("subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.Web/hostingEnvironments/{name}/metrics") - Observable> listMetrics(@Path("resourceGroupName") String resourceGroupName, @Path("name") String name, @Path("subscriptionId") String subscriptionId, @Query("details") Boolean details, @Query("$filter") String filter, @Query("api-version") String apiVersion, @Header("accept-language") String acceptLanguage, @Header("User-Agent") String userAgent); + Observable> listMetrics(@Path("resourceGroupName") String resourceGroupName, @Path("name") String name, @Path("subscriptionId") String subscriptionId, @Query("details") Boolean details, @Query(value = "$filter", encoded = true) String filter, @Query("api-version") String apiVersion, @Header("accept-language") String acceptLanguage, @Header("User-Agent") String userAgent); @Headers("Content-Type: application/json; charset=utf-8") @GET("subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.Web/hostingEnvironments/{name}/multiRolePools") @@ -136,7 +136,7 @@ interface AppServiceEnvironmentsService { Observable> listMultiRolePoolInstanceMetricDefinitions(@Path("resourceGroupName") String resourceGroupName, @Path("name") String name, @Path("instance") String instance, @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") - @GET("subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.Web/hostingEnvironments/{name}/multiRolePools/default/instances/{instance}/metrics") + @GET("subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.Web/hostingEnvironments/{name}/multiRolePools/default/instances/{instance}metrics") Observable> listMultiRolePoolInstanceMetrics(@Path("resourceGroupName") String resourceGroupName, @Path("name") String name, @Path("instance") String instance, @Path("subscriptionId") String subscriptionId, @Query("details") Boolean details, @Query("api-version") String apiVersion, @Header("accept-language") String acceptLanguage, @Header("User-Agent") String userAgent); @Headers("Content-Type: application/json; charset=utf-8") @@ -145,7 +145,7 @@ interface AppServiceEnvironmentsService { @Headers("Content-Type: application/json; charset=utf-8") @GET("subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.Web/hostingEnvironments/{name}/multiRolePools/default/metrics") - Observable> listMultiRoleMetrics(@Path("resourceGroupName") String resourceGroupName, @Path("name") String name, @Path("subscriptionId") String subscriptionId, @Query("startTime") String startTime, @Query("endTime") String endTime, @Query("timeGrain") String timeGrain, @Query("details") Boolean details, @Query("$filter") String filter, @Query("api-version") String apiVersion, @Header("accept-language") String acceptLanguage, @Header("User-Agent") String userAgent); + Observable> listMultiRoleMetrics(@Path("resourceGroupName") String resourceGroupName, @Path("name") String name, @Path("subscriptionId") String subscriptionId, @Query("startTime") String startTime, @Query("endTime") String endTime, @Query("timeGrain") String timeGrain, @Query("details") Boolean details, @Query(value = "$filter", encoded = true) String filter, @Query("api-version") String apiVersion, @Header("accept-language") String acceptLanguage, @Header("User-Agent") String userAgent); @Headers("Content-Type: application/json; charset=utf-8") @GET("subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.Web/hostingEnvironments/{name}/multiRolePools/default/skus") @@ -159,10 +159,6 @@ interface AppServiceEnvironmentsService { @GET("subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.Web/hostingEnvironments/{name}/operations") Observable> listOperations(@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") - @GET("subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.Web/hostingEnvironments/{name}/operations/{operationId}") - Observable> getOperation(@Path("resourceGroupName") String resourceGroupName, @Path("name") String name, @Path("operationId") String operationId, @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.Web/hostingEnvironments/{name}/reboot") Observable> reboot(@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); @@ -193,7 +189,7 @@ interface AppServiceEnvironmentsService { @Headers("Content-Type: application/json; charset=utf-8") @GET("subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.Web/hostingEnvironments/{name}/usages") - Observable> listUsages(@Path("resourceGroupName") String resourceGroupName, @Path("name") String name, @Path("subscriptionId") String subscriptionId, @Query("$filter") String filter, @Query("api-version") String apiVersion, @Header("accept-language") String acceptLanguage, @Header("User-Agent") String userAgent); + Observable> listUsages(@Path("resourceGroupName") String resourceGroupName, @Path("name") String name, @Path("subscriptionId") String subscriptionId, @Query(value = "$filter", encoded = true) String filter, @Query("api-version") String apiVersion, @Header("accept-language") String acceptLanguage, @Header("User-Agent") String userAgent); @Headers("Content-Type: application/json; charset=utf-8") @GET("subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.Web/hostingEnvironments/{name}/workerPools") @@ -216,8 +212,8 @@ interface AppServiceEnvironmentsService { Observable> listWorkerPoolInstanceMetricDefinitions(@Path("resourceGroupName") String resourceGroupName, @Path("name") String name, @Path("workerPoolName") String workerPoolName, @Path("instance") String instance, @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") - @GET("subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.Web/hostingEnvironments/{name}/workerPools/{workerPoolName}/instances/{instance}/metrics") - Observable> listWorkerPoolInstanceMetrics(@Path("resourceGroupName") String resourceGroupName, @Path("name") String name, @Path("workerPoolName") String workerPoolName, @Path("instance") String instance, @Path("subscriptionId") String subscriptionId, @Query("details") Boolean details, @Query("$filter") String filter, @Query("api-version") String apiVersion, @Header("accept-language") String acceptLanguage, @Header("User-Agent") String userAgent); + @GET("subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.Web/hostingEnvironments/{name}/workerPools/{workerPoolName}/instances/{instance}metrics") + Observable> listWorkerPoolInstanceMetrics(@Path("resourceGroupName") String resourceGroupName, @Path("name") String name, @Path("workerPoolName") String workerPoolName, @Path("instance") String instance, @Path("subscriptionId") String subscriptionId, @Query("details") Boolean details, @Query(value = "$filter", encoded = true) String filter, @Query("api-version") String apiVersion, @Header("accept-language") String acceptLanguage, @Header("User-Agent") String userAgent); @Headers("Content-Type: application/json; charset=utf-8") @GET("subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.Web/hostingEnvironments/{name}/workerPools/{workerPoolName}/metricdefinitions") @@ -225,7 +221,7 @@ interface AppServiceEnvironmentsService { @Headers("Content-Type: application/json; charset=utf-8") @GET("subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.Web/hostingEnvironments/{name}/workerPools/{workerPoolName}/metrics") - Observable> listWebWorkerMetrics(@Path("resourceGroupName") String resourceGroupName, @Path("name") String name, @Path("workerPoolName") String workerPoolName, @Path("subscriptionId") String subscriptionId, @Query("details") Boolean details, @Query("$filter") String filter, @Query("api-version") String apiVersion, @Header("accept-language") String acceptLanguage, @Header("User-Agent") String userAgent); + Observable> listWebWorkerMetrics(@Path("resourceGroupName") String resourceGroupName, @Path("name") String name, @Path("workerPoolName") String workerPoolName, @Path("subscriptionId") String subscriptionId, @Query("details") Boolean details, @Query(value = "$filter", encoded = true) String filter, @Query("api-version") String apiVersion, @Header("accept-language") String acceptLanguage, @Header("User-Agent") String userAgent); @Headers("Content-Type: application/json; charset=utf-8") @GET("subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.Web/hostingEnvironments/{name}/workerPools/{workerPoolName}/skus") @@ -255,6 +251,14 @@ interface AppServiceEnvironmentsService { @GET("{nextLink}") Observable> listMultiRolePoolsNext(@Path(value = "nextLink", encoded = true) String nextPageLink, @Header("accept-language") String acceptLanguage, @Header("User-Agent") String userAgent); + @Headers("Content-Type: application/json; charset=utf-8") + @GET("{nextLink}") + Observable> listMultiRolePoolInstanceMetricDefinitionsNext(@Path(value = "nextLink", encoded = true) String nextPageLink, @Header("accept-language") String acceptLanguage, @Header("User-Agent") String userAgent); + + @Headers("Content-Type: application/json; charset=utf-8") + @GET("{nextLink}") + Observable> listMultiRolePoolInstanceMetricsNext(@Path(value = "nextLink", encoded = true) String nextPageLink, @Header("accept-language") String acceptLanguage, @Header("User-Agent") String userAgent); + @Headers("Content-Type: application/json; charset=utf-8") @GET("{nextLink}") Observable> listMultiRoleMetricDefinitionsNext(@Path(value = "nextLink", encoded = true) String nextPageLink, @Header("accept-language") String acceptLanguage, @Header("User-Agent") String userAgent); @@ -303,6 +307,14 @@ interface AppServiceEnvironmentsService { @GET("{nextLink}") Observable> listWorkerPoolsNext(@Path(value = "nextLink", encoded = true) String nextPageLink, @Header("accept-language") String acceptLanguage, @Header("User-Agent") String userAgent); + @Headers("Content-Type: application/json; charset=utf-8") + @GET("{nextLink}") + Observable> listWorkerPoolInstanceMetricDefinitionsNext(@Path(value = "nextLink", encoded = true) String nextPageLink, @Header("accept-language") String acceptLanguage, @Header("User-Agent") String userAgent); + + @Headers("Content-Type: application/json; charset=utf-8") + @GET("{nextLink}") + Observable> listWorkerPoolInstanceMetricsNext(@Path(value = "nextLink", encoded = true) String nextPageLink, @Header("accept-language") String acceptLanguage, @Header("User-Agent") String userAgent); + @Headers("Content-Type: application/json; charset=utf-8") @GET("{nextLink}") Observable> listWebWorkerMetricDefinitionsNext(@Path(value = "nextLink", encoded = true) String nextPageLink, @Header("accept-language") String acceptLanguage, @Header("User-Agent") String userAgent); @@ -322,8 +334,8 @@ interface AppServiceEnvironmentsService { } /** - * Gets all hostingEnvironments (App Service Environment) for a subscription. - * Gets all hostingEnvironments (App Service Environment) for a subscription. + * Get all App Service Environments for a subscription. + * Get all App Service Environments for a subscription. * * @return the PagedList<AppServiceEnvironmentInner> object if successful. */ @@ -338,8 +350,8 @@ public Page nextPage(String nextPageLink) { } /** - * Gets all hostingEnvironments (App Service Environment) for a subscription. - * Gets all hostingEnvironments (App Service Environment) for a subscription. + * Get all App Service Environments for a subscription. + * Get all App Service Environments for a subscription. * * @param serviceCallback the async ServiceCallback to handle successful and failed responses. * @return the {@link ServiceCall} object @@ -357,8 +369,8 @@ public Observable>> call(String } /** - * Gets all hostingEnvironments (App Service Environment) for a subscription. - * Gets all hostingEnvironments (App Service Environment) for a subscription. + * Get all App Service Environments for a subscription. + * Get all App Service Environments for a subscription. * * @return the observable to the PagedList<AppServiceEnvironmentInner> object */ @@ -373,8 +385,8 @@ public Page call(ServiceResponse>> call(Servic } /** - * Gets all hostingEnvironments (App Service Environment) for a subscription. - * Gets all hostingEnvironments (App Service Environment) for a subscription. + * Get all App Service Environments for a subscription. + * Get all App Service Environments for a subscription. * * @return the PagedList<AppServiceEnvironmentInner> object wrapped in {@link ServiceResponse} if successful. */ @@ -425,10 +437,10 @@ private ServiceResponse> listDelegate(Respo } /** - * Get all hostingEnvironments (App Service Environments) in a resource group. - * Get all hostingEnvironments (App Service Environments) in a resource group. + * Get all App Service Environments in a resource group. + * Get all App Service Environments in a resource group. * - * @param resourceGroupName Name of resource group + * @param resourceGroupName Name of the resource group to which the resource belongs. * @return the PagedList<AppServiceEnvironmentInner> object if successful. */ public PagedList listByResourceGroup(final String resourceGroupName) { @@ -442,10 +454,10 @@ public Page nextPage(String nextPageLink) { } /** - * Get all hostingEnvironments (App Service Environments) in a resource group. - * Get all hostingEnvironments (App Service Environments) in a resource group. + * Get all App Service Environments in a resource group. + * Get all App Service Environments in a resource group. * - * @param resourceGroupName Name of resource group + * @param resourceGroupName Name of the resource group to which the resource belongs. * @param serviceCallback the async ServiceCallback to handle successful and failed responses. * @return the {@link ServiceCall} object */ @@ -462,10 +474,10 @@ public Observable>> call(String } /** - * Get all hostingEnvironments (App Service Environments) in a resource group. - * Get all hostingEnvironments (App Service Environments) in a resource group. + * Get all App Service Environments in a resource group. + * Get all App Service Environments in a resource group. * - * @param resourceGroupName Name of resource group + * @param resourceGroupName Name of the resource group to which the resource belongs. * @return the observable to the PagedList<AppServiceEnvironmentInner> object */ public Observable> listByResourceGroupAsync(final String resourceGroupName) { @@ -479,10 +491,10 @@ public Page call(ServiceResponse>> listByResourceGroupWithServiceResponseAsync(final String resourceGroupName) { @@ -500,10 +512,10 @@ public Observable>> call(Servic } /** - * Get all hostingEnvironments (App Service Environments) in a resource group. - * Get all hostingEnvironments (App Service Environments) in a resource group. + * Get all App Service Environments in a resource group. + * Get all App Service Environments in a resource group. * - ServiceResponse> * @param resourceGroupName Name of resource group + ServiceResponse> * @param resourceGroupName Name of the resource group to which the resource belongs. * @return the PagedList<AppServiceEnvironmentInner> object wrapped in {@link ServiceResponse} if successful. */ public Observable>> listByResourceGroupSinglePageAsync(final String resourceGroupName) { @@ -536,11 +548,11 @@ private ServiceResponse> listByResourceGrou } /** - * Get properties of AppServiceEnvironment (App Service Environment). - * Get properties of AppServiceEnvironment (App Service Environment). + * Get the properties of an App Service Environment. + * Get the properties of an App Service Environment. * - * @param resourceGroupName Name of resource group - * @param name Name of AppServiceEnvironment (App Service Environment) + * @param resourceGroupName Name of the resource group to which the resource belongs. + * @param name Name of the App Service Environment. * @return the AppServiceEnvironmentInner object if successful. */ public AppServiceEnvironmentInner get(String resourceGroupName, String name) { @@ -548,11 +560,11 @@ public AppServiceEnvironmentInner get(String resourceGroupName, String name) { } /** - * Get properties of AppServiceEnvironment (App Service Environment). - * Get properties of AppServiceEnvironment (App Service Environment). + * Get the properties of an App Service Environment. + * Get the properties of an App Service Environment. * - * @param resourceGroupName Name of resource group - * @param name Name of AppServiceEnvironment (App Service Environment) + * @param resourceGroupName Name of the resource group to which the resource belongs. + * @param name Name of the App Service Environment. * @param serviceCallback the async ServiceCallback to handle successful and failed responses. * @return the {@link ServiceCall} object */ @@ -561,11 +573,11 @@ public ServiceCall getAsync(String resourceGroupName } /** - * Get properties of AppServiceEnvironment (App Service Environment). - * Get properties of AppServiceEnvironment (App Service Environment). + * Get the properties of an App Service Environment. + * Get the properties of an App Service Environment. * - * @param resourceGroupName Name of resource group - * @param name Name of AppServiceEnvironment (App Service Environment) + * @param resourceGroupName Name of the resource group to which the resource belongs. + * @param name Name of the App Service Environment. * @return the observable to the AppServiceEnvironmentInner object */ public Observable getAsync(String resourceGroupName, String name) { @@ -578,11 +590,11 @@ public AppServiceEnvironmentInner call(ServiceResponse> getWithServiceResponseAsync(String resourceGroupName, String name) { @@ -618,12 +630,12 @@ private ServiceResponse getDelegate(Response createOrUpdateAsync(String resour } /** - * Create or update a AppServiceEnvironment (App Service Environment). - * Create or update a AppServiceEnvironment (App Service Environment). + * Create or update an App Service Environment. + * Create or update an App Service Environment. * - * @param resourceGroupName Name of resource group - * @param name Name of AppServiceEnvironment (App Service Environment) - * @param hostingEnvironmentEnvelope Properties of AppServiceEnvironment (App Service Environment) + * @param resourceGroupName Name of the resource group to which the resource belongs. + * @param name Name of the App Service Environment. + * @param hostingEnvironmentEnvelope Configuration details of the App Service Environment. * @return the observable for the request */ public Observable createOrUpdateAsync(String resourceGroupName, String name, AppServiceEnvironmentInner hostingEnvironmentEnvelope) { @@ -663,12 +675,12 @@ public AppServiceEnvironmentInner call(ServiceResponse> createOrUpdateWithServiceResponseAsync(String resourceGroupName, String name, AppServiceEnvironmentInner hostingEnvironmentEnvelope) { @@ -691,12 +703,12 @@ public Observable> createOrUpdateWit } /** - * Create or update a AppServiceEnvironment (App Service Environment). - * Create or update a AppServiceEnvironment (App Service Environment). + * Create or update an App Service Environment. + * Create or update an App Service Environment. * - * @param resourceGroupName Name of resource group - * @param name Name of AppServiceEnvironment (App Service Environment) - * @param hostingEnvironmentEnvelope Properties of AppServiceEnvironment (App Service Environment) + * @param resourceGroupName Name of the resource group to which the resource belongs. + * @param name Name of the App Service Environment. + * @param hostingEnvironmentEnvelope Configuration details of the App Service Environment. * @return the AppServiceEnvironmentInner object if successful. */ public AppServiceEnvironmentInner beginCreateOrUpdate(String resourceGroupName, String name, AppServiceEnvironmentInner hostingEnvironmentEnvelope) { @@ -704,12 +716,12 @@ public AppServiceEnvironmentInner beginCreateOrUpdate(String resourceGroupName, } /** - * Create or update a AppServiceEnvironment (App Service Environment). - * Create or update a AppServiceEnvironment (App Service Environment). + * Create or update an App Service Environment. + * Create or update an App Service Environment. * - * @param resourceGroupName Name of resource group - * @param name Name of AppServiceEnvironment (App Service Environment) - * @param hostingEnvironmentEnvelope Properties of AppServiceEnvironment (App Service Environment) + * @param resourceGroupName Name of the resource group to which the resource belongs. + * @param name Name of the App Service Environment. + * @param hostingEnvironmentEnvelope Configuration details of the App Service Environment. * @param serviceCallback the async ServiceCallback to handle successful and failed responses. * @return the {@link ServiceCall} object */ @@ -718,12 +730,12 @@ public ServiceCall beginCreateOrUpdateAsync(String r } /** - * Create or update a AppServiceEnvironment (App Service Environment). - * Create or update a AppServiceEnvironment (App Service Environment). + * Create or update an App Service Environment. + * Create or update an App Service Environment. * - * @param resourceGroupName Name of resource group - * @param name Name of AppServiceEnvironment (App Service Environment) - * @param hostingEnvironmentEnvelope Properties of AppServiceEnvironment (App Service Environment) + * @param resourceGroupName Name of the resource group to which the resource belongs. + * @param name Name of the App Service Environment. + * @param hostingEnvironmentEnvelope Configuration details of the App Service Environment. * @return the observable to the AppServiceEnvironmentInner object */ public Observable beginCreateOrUpdateAsync(String resourceGroupName, String name, AppServiceEnvironmentInner hostingEnvironmentEnvelope) { @@ -736,12 +748,12 @@ public AppServiceEnvironmentInner call(ServiceResponse> beginCreateOrUpdateWithServiceResponseAsync(String resourceGroupName, String name, AppServiceEnvironmentInner hostingEnvironmentEnvelope) { @@ -785,56 +797,55 @@ private ServiceResponse beginCreateOrUpdateDelegate( } /** - * Delete a AppServiceEnvironment (App Service Environment). - * Delete a AppServiceEnvironment (App Service Environment). + * Delete an App Service Environment. + * Delete an App Service Environment. * - * @param resourceGroupName Name of resource group - * @param name Name of AppServiceEnvironment (App Service Environment) - * @return the Object object if successful. + * @param resourceGroupName Name of the resource group to which the resource belongs. + * @param name Name of the App Service Environment. */ - public Object delete(String resourceGroupName, String name) { - return deleteWithServiceResponseAsync(resourceGroupName, name).toBlocking().last().getBody(); + public void delete(String resourceGroupName, String name) { + deleteWithServiceResponseAsync(resourceGroupName, name).toBlocking().last().getBody(); } /** - * Delete a AppServiceEnvironment (App Service Environment). - * Delete a AppServiceEnvironment (App Service Environment). + * Delete an App Service Environment. + * Delete an App Service Environment. * - * @param resourceGroupName Name of resource group - * @param name Name of AppServiceEnvironment (App Service Environment) + * @param resourceGroupName Name of the resource group to which the resource belongs. + * @param name Name of the App Service Environment. * @param serviceCallback the async ServiceCallback to handle successful and failed responses. * @return the {@link ServiceCall} object */ - public ServiceCall deleteAsync(String resourceGroupName, String name, final ServiceCallback serviceCallback) { + public ServiceCall deleteAsync(String resourceGroupName, String name, final ServiceCallback serviceCallback) { return ServiceCall.create(deleteWithServiceResponseAsync(resourceGroupName, name), serviceCallback); } /** - * Delete a AppServiceEnvironment (App Service Environment). - * Delete a AppServiceEnvironment (App Service Environment). + * Delete an App Service Environment. + * Delete an App Service Environment. * - * @param resourceGroupName Name of resource group - * @param name Name of AppServiceEnvironment (App Service Environment) + * @param resourceGroupName Name of the resource group to which the resource belongs. + * @param name Name of the App Service Environment. * @return the observable for the request */ - public Observable deleteAsync(String resourceGroupName, String name) { - return deleteWithServiceResponseAsync(resourceGroupName, name).map(new Func1, Object>() { + public Observable deleteAsync(String resourceGroupName, String name) { + return deleteWithServiceResponseAsync(resourceGroupName, name).map(new Func1, Void>() { @Override - public Object call(ServiceResponse response) { + public Void call(ServiceResponse response) { return response.getBody(); } }); } /** - * Delete a AppServiceEnvironment (App Service Environment). - * Delete a AppServiceEnvironment (App Service Environment). + * Delete an App Service Environment. + * Delete an App Service Environment. * - * @param resourceGroupName Name of resource group - * @param name Name of AppServiceEnvironment (App Service Environment) + * @param resourceGroupName Name of the resource group to which the resource belongs. + * @param name Name of the App Service Environment. * @return the observable for the request */ - public Observable> deleteWithServiceResponseAsync(String resourceGroupName, String name) { + public Observable> deleteWithServiceResponseAsync(String resourceGroupName, String name) { if (resourceGroupName == null) { throw new IllegalArgumentException("Parameter resourceGroupName is required and cannot be null."); } @@ -847,63 +858,62 @@ public Observable> deleteWithServiceResponseAsync(String final String apiVersion = "2016-09-01"; final Boolean forceDelete = null; Observable> observable = service.delete(resourceGroupName, name, this.client.subscriptionId(), forceDelete, apiVersion, this.client.acceptLanguage(), this.client.userAgent()); - return client.getAzureClient().getPostOrDeleteResultAsync(observable, new TypeToken() { }.getType()); + return client.getAzureClient().getPostOrDeleteResultAsync(observable, new TypeToken() { }.getType()); } /** - * Delete a AppServiceEnvironment (App Service Environment). - * Delete a AppServiceEnvironment (App Service Environment). + * Delete an App Service Environment. + * Delete an App Service Environment. * - * @param resourceGroupName Name of resource group - * @param name Name of AppServiceEnvironment (App Service Environment) - * @param forceDelete Delete even if the AppServiceEnvironment (App Service Environment) contains resources - * @return the Object object if successful. + * @param resourceGroupName Name of the resource group to which the resource belongs. + * @param name Name of the App Service Environment. + * @param forceDelete Specify <code>true</code> to force the deletion even if the App Service Environment contains resources. The default is <code>false</code>. */ - public Object delete(String resourceGroupName, String name, Boolean forceDelete) { - return deleteWithServiceResponseAsync(resourceGroupName, name, forceDelete).toBlocking().last().getBody(); + public void delete(String resourceGroupName, String name, Boolean forceDelete) { + deleteWithServiceResponseAsync(resourceGroupName, name, forceDelete).toBlocking().last().getBody(); } /** - * Delete a AppServiceEnvironment (App Service Environment). - * Delete a AppServiceEnvironment (App Service Environment). + * Delete an App Service Environment. + * Delete an App Service Environment. * - * @param resourceGroupName Name of resource group - * @param name Name of AppServiceEnvironment (App Service Environment) - * @param forceDelete Delete even if the AppServiceEnvironment (App Service Environment) contains resources + * @param resourceGroupName Name of the resource group to which the resource belongs. + * @param name Name of the App Service Environment. + * @param forceDelete Specify <code>true</code> to force the deletion even if the App Service Environment contains resources. The default is <code>false</code>. * @param serviceCallback the async ServiceCallback to handle successful and failed responses. * @return the {@link ServiceCall} object */ - public ServiceCall deleteAsync(String resourceGroupName, String name, Boolean forceDelete, final ServiceCallback serviceCallback) { + public ServiceCall deleteAsync(String resourceGroupName, String name, Boolean forceDelete, final ServiceCallback serviceCallback) { return ServiceCall.create(deleteWithServiceResponseAsync(resourceGroupName, name, forceDelete), serviceCallback); } /** - * Delete a AppServiceEnvironment (App Service Environment). - * Delete a AppServiceEnvironment (App Service Environment). + * Delete an App Service Environment. + * Delete an App Service Environment. * - * @param resourceGroupName Name of resource group - * @param name Name of AppServiceEnvironment (App Service Environment) - * @param forceDelete Delete even if the AppServiceEnvironment (App Service Environment) contains resources + * @param resourceGroupName Name of the resource group to which the resource belongs. + * @param name Name of the App Service Environment. + * @param forceDelete Specify <code>true</code> to force the deletion even if the App Service Environment contains resources. The default is <code>false</code>. * @return the observable for the request */ - public Observable deleteAsync(String resourceGroupName, String name, Boolean forceDelete) { - return deleteWithServiceResponseAsync(resourceGroupName, name, forceDelete).map(new Func1, Object>() { + public Observable deleteAsync(String resourceGroupName, String name, Boolean forceDelete) { + return deleteWithServiceResponseAsync(resourceGroupName, name, forceDelete).map(new Func1, Void>() { @Override - public Object call(ServiceResponse response) { + public Void call(ServiceResponse response) { return response.getBody(); } }); } /** - * Delete a AppServiceEnvironment (App Service Environment). - * Delete a AppServiceEnvironment (App Service Environment). + * Delete an App Service Environment. + * Delete an App Service Environment. * - * @param resourceGroupName Name of resource group - * @param name Name of AppServiceEnvironment (App Service Environment) - * @param forceDelete Delete even if the AppServiceEnvironment (App Service Environment) contains resources + * @param resourceGroupName Name of the resource group to which the resource belongs. + * @param name Name of the App Service Environment. + * @param forceDelete Specify <code>true</code> to force the deletion even if the App Service Environment contains resources. The default is <code>false</code>. * @return the observable for the request */ - public Observable> deleteWithServiceResponseAsync(String resourceGroupName, String name, Boolean forceDelete) { + public Observable> deleteWithServiceResponseAsync(String resourceGroupName, String name, Boolean forceDelete) { if (resourceGroupName == null) { throw new IllegalArgumentException("Parameter resourceGroupName is required and cannot be null."); } @@ -915,60 +925,59 @@ public Observable> deleteWithServiceResponseAsync(String } final String apiVersion = "2016-09-01"; Observable> observable = service.delete(resourceGroupName, name, this.client.subscriptionId(), forceDelete, apiVersion, this.client.acceptLanguage(), this.client.userAgent()); - return client.getAzureClient().getPostOrDeleteResultAsync(observable, new TypeToken() { }.getType()); + return client.getAzureClient().getPostOrDeleteResultAsync(observable, new TypeToken() { }.getType()); } /** - * Delete a AppServiceEnvironment (App Service Environment). - * Delete a AppServiceEnvironment (App Service Environment). + * Delete an App Service Environment. + * Delete an App Service Environment. * - * @param resourceGroupName Name of resource group - * @param name Name of AppServiceEnvironment (App Service Environment) - * @return the Object object if successful. + * @param resourceGroupName Name of the resource group to which the resource belongs. + * @param name Name of the App Service Environment. */ - public Object beginDelete(String resourceGroupName, String name) { - return beginDeleteWithServiceResponseAsync(resourceGroupName, name).toBlocking().single().getBody(); + public void beginDelete(String resourceGroupName, String name) { + beginDeleteWithServiceResponseAsync(resourceGroupName, name).toBlocking().single().getBody(); } /** - * Delete a AppServiceEnvironment (App Service Environment). - * Delete a AppServiceEnvironment (App Service Environment). + * Delete an App Service Environment. + * Delete an App Service Environment. * - * @param resourceGroupName Name of resource group - * @param name Name of AppServiceEnvironment (App Service Environment) + * @param resourceGroupName Name of the resource group to which the resource belongs. + * @param name Name of the App Service Environment. * @param serviceCallback the async ServiceCallback to handle successful and failed responses. * @return the {@link ServiceCall} object */ - public ServiceCall beginDeleteAsync(String resourceGroupName, String name, final ServiceCallback serviceCallback) { + public ServiceCall beginDeleteAsync(String resourceGroupName, String name, final ServiceCallback serviceCallback) { return ServiceCall.create(beginDeleteWithServiceResponseAsync(resourceGroupName, name), serviceCallback); } /** - * Delete a AppServiceEnvironment (App Service Environment). - * Delete a AppServiceEnvironment (App Service Environment). + * Delete an App Service Environment. + * Delete an App Service Environment. * - * @param resourceGroupName Name of resource group - * @param name Name of AppServiceEnvironment (App Service Environment) - * @return the observable to the Object object + * @param resourceGroupName Name of the resource group to which the resource belongs. + * @param name Name of the App Service Environment. + * @return the {@link ServiceResponse} object if successful. */ - public Observable beginDeleteAsync(String resourceGroupName, String name) { - return beginDeleteWithServiceResponseAsync(resourceGroupName, name).map(new Func1, Object>() { + public Observable beginDeleteAsync(String resourceGroupName, String name) { + return beginDeleteWithServiceResponseAsync(resourceGroupName, name).map(new Func1, Void>() { @Override - public Object call(ServiceResponse response) { + public Void call(ServiceResponse response) { return response.getBody(); } }); } /** - * Delete a AppServiceEnvironment (App Service Environment). - * Delete a AppServiceEnvironment (App Service Environment). + * Delete an App Service Environment. + * Delete an App Service Environment. * - * @param resourceGroupName Name of resource group - * @param name Name of AppServiceEnvironment (App Service Environment) - * @return the observable to the Object object + * @param resourceGroupName Name of the resource group to which the resource belongs. + * @param name Name of the App Service Environment. + * @return the {@link ServiceResponse} object if successful. */ - public Observable> beginDeleteWithServiceResponseAsync(String resourceGroupName, String name) { + public Observable> beginDeleteWithServiceResponseAsync(String resourceGroupName, String name) { if (resourceGroupName == null) { throw new IllegalArgumentException("Parameter resourceGroupName is required and cannot be null."); } @@ -981,11 +990,11 @@ public Observable> beginDeleteWithServiceResponseAsync(S final String apiVersion = "2016-09-01"; final Boolean forceDelete = null; return service.beginDelete(resourceGroupName, name, this.client.subscriptionId(), forceDelete, apiVersion, this.client.acceptLanguage(), this.client.userAgent()) - .flatMap(new Func1, Observable>>() { + .flatMap(new Func1, Observable>>() { @Override - public Observable> call(Response response) { + public Observable> call(Response response) { try { - ServiceResponse clientResponse = beginDeleteDelegate(response); + ServiceResponse clientResponse = beginDeleteDelegate(response); return Observable.just(clientResponse); } catch (Throwable t) { return Observable.error(t); @@ -995,60 +1004,59 @@ public Observable> call(Response response) } /** - * Delete a AppServiceEnvironment (App Service Environment). - * Delete a AppServiceEnvironment (App Service Environment). + * Delete an App Service Environment. + * Delete an App Service Environment. * - * @param resourceGroupName Name of resource group - * @param name Name of AppServiceEnvironment (App Service Environment) - * @param forceDelete Delete even if the AppServiceEnvironment (App Service Environment) contains resources - * @return the Object object if successful. + * @param resourceGroupName Name of the resource group to which the resource belongs. + * @param name Name of the App Service Environment. + * @param forceDelete Specify <code>true</code> to force the deletion even if the App Service Environment contains resources. The default is <code>false</code>. */ - public Object beginDelete(String resourceGroupName, String name, Boolean forceDelete) { - return beginDeleteWithServiceResponseAsync(resourceGroupName, name, forceDelete).toBlocking().single().getBody(); + public void beginDelete(String resourceGroupName, String name, Boolean forceDelete) { + beginDeleteWithServiceResponseAsync(resourceGroupName, name, forceDelete).toBlocking().single().getBody(); } /** - * Delete a AppServiceEnvironment (App Service Environment). - * Delete a AppServiceEnvironment (App Service Environment). + * Delete an App Service Environment. + * Delete an App Service Environment. * - * @param resourceGroupName Name of resource group - * @param name Name of AppServiceEnvironment (App Service Environment) - * @param forceDelete Delete even if the AppServiceEnvironment (App Service Environment) contains resources + * @param resourceGroupName Name of the resource group to which the resource belongs. + * @param name Name of the App Service Environment. + * @param forceDelete Specify <code>true</code> to force the deletion even if the App Service Environment contains resources. The default is <code>false</code>. * @param serviceCallback the async ServiceCallback to handle successful and failed responses. * @return the {@link ServiceCall} object */ - public ServiceCall beginDeleteAsync(String resourceGroupName, String name, Boolean forceDelete, final ServiceCallback serviceCallback) { + public ServiceCall beginDeleteAsync(String resourceGroupName, String name, Boolean forceDelete, final ServiceCallback serviceCallback) { return ServiceCall.create(beginDeleteWithServiceResponseAsync(resourceGroupName, name, forceDelete), serviceCallback); } /** - * Delete a AppServiceEnvironment (App Service Environment). - * Delete a AppServiceEnvironment (App Service Environment). + * Delete an App Service Environment. + * Delete an App Service Environment. * - * @param resourceGroupName Name of resource group - * @param name Name of AppServiceEnvironment (App Service Environment) - * @param forceDelete Delete even if the AppServiceEnvironment (App Service Environment) contains resources - * @return the observable to the Object object + * @param resourceGroupName Name of the resource group to which the resource belongs. + * @param name Name of the App Service Environment. + * @param forceDelete Specify <code>true</code> to force the deletion even if the App Service Environment contains resources. The default is <code>false</code>. + * @return the {@link ServiceResponse} object if successful. */ - public Observable beginDeleteAsync(String resourceGroupName, String name, Boolean forceDelete) { - return beginDeleteWithServiceResponseAsync(resourceGroupName, name, forceDelete).map(new Func1, Object>() { + public Observable beginDeleteAsync(String resourceGroupName, String name, Boolean forceDelete) { + return beginDeleteWithServiceResponseAsync(resourceGroupName, name, forceDelete).map(new Func1, Void>() { @Override - public Object call(ServiceResponse response) { + public Void call(ServiceResponse response) { return response.getBody(); } }); } /** - * Delete a AppServiceEnvironment (App Service Environment). - * Delete a AppServiceEnvironment (App Service Environment). + * Delete an App Service Environment. + * Delete an App Service Environment. * - * @param resourceGroupName Name of resource group - * @param name Name of AppServiceEnvironment (App Service Environment) - * @param forceDelete Delete even if the AppServiceEnvironment (App Service Environment) contains resources - * @return the observable to the Object object + * @param resourceGroupName Name of the resource group to which the resource belongs. + * @param name Name of the App Service Environment. + * @param forceDelete Specify <code>true</code> to force the deletion even if the App Service Environment contains resources. The default is <code>false</code>. + * @return the {@link ServiceResponse} object if successful. */ - public Observable> beginDeleteWithServiceResponseAsync(String resourceGroupName, String name, Boolean forceDelete) { + public Observable> beginDeleteWithServiceResponseAsync(String resourceGroupName, String name, Boolean forceDelete) { if (resourceGroupName == null) { throw new IllegalArgumentException("Parameter resourceGroupName is required and cannot be null."); } @@ -1060,11 +1068,11 @@ public Observable> beginDeleteWithServiceResponseAsync(S } final String apiVersion = "2016-09-01"; return service.beginDelete(resourceGroupName, name, this.client.subscriptionId(), forceDelete, apiVersion, this.client.acceptLanguage(), this.client.userAgent()) - .flatMap(new Func1, Observable>>() { + .flatMap(new Func1, Observable>>() { @Override - public Observable> call(Response response) { + public Observable> call(Response response) { try { - ServiceResponse clientResponse = beginDeleteDelegate(response); + ServiceResponse clientResponse = beginDeleteDelegate(response); return Observable.just(clientResponse); } catch (Throwable t) { return Observable.error(t); @@ -1073,23 +1081,22 @@ public Observable> call(Response response) }); } - private ServiceResponse beginDeleteDelegate(Response response) throws CloudException, IOException, IllegalArgumentException { - return new AzureServiceResponseBuilder(this.client.mapperAdapter()) - .register(200, new TypeToken() { }.getType()) - .register(202, new TypeToken() { }.getType()) + private ServiceResponse beginDeleteDelegate(Response response) throws CloudException, IOException, IllegalArgumentException { + return new AzureServiceResponseBuilder(this.client.mapperAdapter()) + .register(202, new TypeToken() { }.getType()) + .register(204, new TypeToken() { }.getType()) .register(400, new TypeToken() { }.getType()) .register(404, new TypeToken() { }.getType()) .register(409, new TypeToken() { }.getType()) - .registerError(CloudException.class) .build(response); } /** - * Get used, available, and total worker capacity for AppServiceEnvironment (App Service Environment). - * Get used, available, and total worker capacity for AppServiceEnvironment (App Service Environment). + * Get the used, available, and total worker capacity an App Service Environment. + * Get the used, available, and total worker capacity an App Service Environment. * - * @param resourceGroupName Name of resource group - * @param name Name of AppServiceEnvironment (App Service Environment) + * @param resourceGroupName Name of the resource group to which the resource belongs. + * @param name Name of the App Service Environment. * @return the PagedList<StampCapacityInner> object if successful. */ public PagedList listCapacities(final String resourceGroupName, final String name) { @@ -1103,11 +1110,11 @@ public Page nextPage(String nextPageLink) { } /** - * Get used, available, and total worker capacity for AppServiceEnvironment (App Service Environment). - * Get used, available, and total worker capacity for AppServiceEnvironment (App Service Environment). + * Get the used, available, and total worker capacity an App Service Environment. + * Get the used, available, and total worker capacity an App Service Environment. * - * @param resourceGroupName Name of resource group - * @param name Name of AppServiceEnvironment (App Service Environment) + * @param resourceGroupName Name of the resource group to which the resource belongs. + * @param name Name of the App Service Environment. * @param serviceCallback the async ServiceCallback to handle successful and failed responses. * @return the {@link ServiceCall} object */ @@ -1124,11 +1131,11 @@ public Observable>> call(String nextPag } /** - * Get used, available, and total worker capacity for AppServiceEnvironment (App Service Environment). - * Get used, available, and total worker capacity for AppServiceEnvironment (App Service Environment). + * Get the used, available, and total worker capacity an App Service Environment. + * Get the used, available, and total worker capacity an App Service Environment. * - * @param resourceGroupName Name of resource group - * @param name Name of AppServiceEnvironment (App Service Environment) + * @param resourceGroupName Name of the resource group to which the resource belongs. + * @param name Name of the App Service Environment. * @return the observable to the PagedList<StampCapacityInner> object */ public Observable> listCapacitiesAsync(final String resourceGroupName, final String name) { @@ -1142,11 +1149,11 @@ public Page call(ServiceResponse> r } /** - * Get used, available, and total worker capacity for AppServiceEnvironment (App Service Environment). - * Get used, available, and total worker capacity for AppServiceEnvironment (App Service Environment). + * Get the used, available, and total worker capacity an App Service Environment. + * Get the used, available, and total worker capacity an App Service Environment. * - * @param resourceGroupName Name of resource group - * @param name Name of AppServiceEnvironment (App Service Environment) + * @param resourceGroupName Name of the resource group to which the resource belongs. + * @param name Name of the App Service Environment. * @return the observable to the PagedList<StampCapacityInner> object */ public Observable>> listCapacitiesWithServiceResponseAsync(final String resourceGroupName, final String name) { @@ -1164,11 +1171,11 @@ public Observable>> call(ServiceRespons } /** - * Get used, available, and total worker capacity for AppServiceEnvironment (App Service Environment). - * Get used, available, and total worker capacity for AppServiceEnvironment (App Service Environment). + * Get the used, available, and total worker capacity an App Service Environment. + * Get the used, available, and total worker capacity an App Service Environment. * - ServiceResponse> * @param resourceGroupName Name of resource group - ServiceResponse> * @param name Name of AppServiceEnvironment (App Service Environment) + ServiceResponse> * @param resourceGroupName Name of the resource group to which the resource belongs. + ServiceResponse> * @param name Name of the App Service Environment. * @return the PagedList<StampCapacityInner> object wrapped in {@link ServiceResponse} if successful. */ public Observable>> listCapacitiesSinglePageAsync(final String resourceGroupName, final String name) { @@ -1204,11 +1211,11 @@ private ServiceResponse> listCapacitiesDelegate(Res } /** - * Get IP addresses assigned to the AppServiceEnvironment (App Service Environment). - * Get IP addresses assigned to the AppServiceEnvironment (App Service Environment). + * Get IP addresses assigned to an App Service Environment. + * Get IP addresses assigned to an App Service Environment. * - * @param resourceGroupName Name of resource group - * @param name Name of AppServiceEnvironment (App Service Environment) + * @param resourceGroupName Name of the resource group to which the resource belongs. + * @param name Name of the App Service Environment. * @return the AddressResponseInner object if successful. */ public AddressResponseInner listVips(String resourceGroupName, String name) { @@ -1216,11 +1223,11 @@ public AddressResponseInner listVips(String resourceGroupName, String name) { } /** - * Get IP addresses assigned to the AppServiceEnvironment (App Service Environment). - * Get IP addresses assigned to the AppServiceEnvironment (App Service Environment). + * Get IP addresses assigned to an App Service Environment. + * Get IP addresses assigned to an App Service Environment. * - * @param resourceGroupName Name of resource group - * @param name Name of AppServiceEnvironment (App Service Environment) + * @param resourceGroupName Name of the resource group to which the resource belongs. + * @param name Name of the App Service Environment. * @param serviceCallback the async ServiceCallback to handle successful and failed responses. * @return the {@link ServiceCall} object */ @@ -1229,11 +1236,11 @@ public ServiceCall listVipsAsync(String resourceGroupName, } /** - * Get IP addresses assigned to the AppServiceEnvironment (App Service Environment). - * Get IP addresses assigned to the AppServiceEnvironment (App Service Environment). + * Get IP addresses assigned to an App Service Environment. + * Get IP addresses assigned to an App Service Environment. * - * @param resourceGroupName Name of resource group - * @param name Name of AppServiceEnvironment (App Service Environment) + * @param resourceGroupName Name of the resource group to which the resource belongs. + * @param name Name of the App Service Environment. * @return the observable to the AddressResponseInner object */ public Observable listVipsAsync(String resourceGroupName, String name) { @@ -1246,11 +1253,11 @@ public AddressResponseInner call(ServiceResponse response) } /** - * Get IP addresses assigned to the AppServiceEnvironment (App Service Environment). - * Get IP addresses assigned to the AppServiceEnvironment (App Service Environment). + * Get IP addresses assigned to an App Service Environment. + * Get IP addresses assigned to an App Service Environment. * - * @param resourceGroupName Name of resource group - * @param name Name of AppServiceEnvironment (App Service Environment) + * @param resourceGroupName Name of the resource group to which the resource belongs. + * @param name Name of the App Service Environment. * @return the observable to the AddressResponseInner object */ public Observable> listVipsWithServiceResponseAsync(String resourceGroupName, String name) { @@ -1286,11 +1293,11 @@ private ServiceResponse listVipsDelegate(Response listDiagnostics(String resourceGroupName, String name) { @@ -1298,11 +1305,11 @@ public List listDiagnostics(String resourceG } /** - * Get diagnostic information for AppServiceEnvironment (App Service Environment). - * Get diagnostic information for AppServiceEnvironment (App Service Environment). + * Get diagnostic information for an App Service Environment. + * Get diagnostic information for an App Service Environment. * - * @param resourceGroupName Name of resource group - * @param name Name of AppServiceEnvironment (App Service Environment) + * @param resourceGroupName Name of the resource group to which the resource belongs. + * @param name Name of the App Service Environment. * @param serviceCallback the async ServiceCallback to handle successful and failed responses. * @return the {@link ServiceCall} object */ @@ -1311,11 +1318,11 @@ public ServiceCall> listDiagnosticsAsyn } /** - * Get diagnostic information for AppServiceEnvironment (App Service Environment). - * Get diagnostic information for AppServiceEnvironment (App Service Environment). + * Get diagnostic information for an App Service Environment. + * Get diagnostic information for an App Service Environment. * - * @param resourceGroupName Name of resource group - * @param name Name of AppServiceEnvironment (App Service Environment) + * @param resourceGroupName Name of the resource group to which the resource belongs. + * @param name Name of the App Service Environment. * @return the observable to the List<HostingEnvironmentDiagnosticsInner> object */ public Observable> listDiagnosticsAsync(String resourceGroupName, String name) { @@ -1328,11 +1335,11 @@ public List call(ServiceResponse>> listDiagnosticsWithServiceResponseAsync(String resourceGroupName, String name) { @@ -1368,12 +1375,12 @@ private ServiceResponse> listDiagnostic } /** - * Get diagnostic information for AppServiceEnvironment (App Service Environment). - * Get diagnostic information for AppServiceEnvironment (App Service Environment). + * Get a diagnostics item for an App Service Environment. + * Get a diagnostics item for an App Service Environment. * - * @param resourceGroupName Name of resource group - * @param name Name of AppServiceEnvironment (App Service Environment) - * @param diagnosticsName Name of the diagnostics + * @param resourceGroupName Name of the resource group to which the resource belongs. + * @param name Name of the App Service Environment. + * @param diagnosticsName Name of the diagnostics item. * @return the HostingEnvironmentDiagnosticsInner object if successful. */ public HostingEnvironmentDiagnosticsInner getDiagnosticsItem(String resourceGroupName, String name, String diagnosticsName) { @@ -1381,12 +1388,12 @@ public HostingEnvironmentDiagnosticsInner getDiagnosticsItem(String resourceGrou } /** - * Get diagnostic information for AppServiceEnvironment (App Service Environment). - * Get diagnostic information for AppServiceEnvironment (App Service Environment). + * Get a diagnostics item for an App Service Environment. + * Get a diagnostics item for an App Service Environment. * - * @param resourceGroupName Name of resource group - * @param name Name of AppServiceEnvironment (App Service Environment) - * @param diagnosticsName Name of the diagnostics + * @param resourceGroupName Name of the resource group to which the resource belongs. + * @param name Name of the App Service Environment. + * @param diagnosticsName Name of the diagnostics item. * @param serviceCallback the async ServiceCallback to handle successful and failed responses. * @return the {@link ServiceCall} object */ @@ -1395,12 +1402,12 @@ public ServiceCall getDiagnosticsItemAsync(S } /** - * Get diagnostic information for AppServiceEnvironment (App Service Environment). - * Get diagnostic information for AppServiceEnvironment (App Service Environment). + * Get a diagnostics item for an App Service Environment. + * Get a diagnostics item for an App Service Environment. * - * @param resourceGroupName Name of resource group - * @param name Name of AppServiceEnvironment (App Service Environment) - * @param diagnosticsName Name of the diagnostics + * @param resourceGroupName Name of the resource group to which the resource belongs. + * @param name Name of the App Service Environment. + * @param diagnosticsName Name of the diagnostics item. * @return the observable to the HostingEnvironmentDiagnosticsInner object */ public Observable getDiagnosticsItemAsync(String resourceGroupName, String name, String diagnosticsName) { @@ -1413,12 +1420,12 @@ public HostingEnvironmentDiagnosticsInner call(ServiceResponse> getDiagnosticsItemWithServiceResponseAsync(String resourceGroupName, String name, String diagnosticsName) { @@ -1457,11 +1464,11 @@ private ServiceResponse getDiagnosticsItemDe } /** - * Get global metric definitions of AppServiceEnvironment (App Service Environment). - * Get global metric definitions of AppServiceEnvironment (App Service Environment). + * Get global metric definitions of an App Service Environment. + * Get global metric definitions of an App Service Environment. * - * @param resourceGroupName Name of resource group - * @param name Name of AppServiceEnvironment (App Service Environment) + * @param resourceGroupName Name of the resource group to which the resource belongs. + * @param name Name of the App Service Environment. * @return the MetricDefinitionInner object if successful. */ public MetricDefinitionInner listMetricDefinitions(String resourceGroupName, String name) { @@ -1469,11 +1476,11 @@ public MetricDefinitionInner listMetricDefinitions(String resourceGroupName, Str } /** - * Get global metric definitions of AppServiceEnvironment (App Service Environment). - * Get global metric definitions of AppServiceEnvironment (App Service Environment). + * Get global metric definitions of an App Service Environment. + * Get global metric definitions of an App Service Environment. * - * @param resourceGroupName Name of resource group - * @param name Name of AppServiceEnvironment (App Service Environment) + * @param resourceGroupName Name of the resource group to which the resource belongs. + * @param name Name of the App Service Environment. * @param serviceCallback the async ServiceCallback to handle successful and failed responses. * @return the {@link ServiceCall} object */ @@ -1482,11 +1489,11 @@ public ServiceCall listMetricDefinitionsAsync(String reso } /** - * Get global metric definitions of AppServiceEnvironment (App Service Environment). - * Get global metric definitions of AppServiceEnvironment (App Service Environment). + * Get global metric definitions of an App Service Environment. + * Get global metric definitions of an App Service Environment. * - * @param resourceGroupName Name of resource group - * @param name Name of AppServiceEnvironment (App Service Environment) + * @param resourceGroupName Name of the resource group to which the resource belongs. + * @param name Name of the App Service Environment. * @return the observable to the MetricDefinitionInner object */ public Observable listMetricDefinitionsAsync(String resourceGroupName, String name) { @@ -1499,11 +1506,11 @@ public MetricDefinitionInner call(ServiceResponse respons } /** - * Get global metric definitions of AppServiceEnvironment (App Service Environment). - * Get global metric definitions of AppServiceEnvironment (App Service Environment). + * Get global metric definitions of an App Service Environment. + * Get global metric definitions of an App Service Environment. * - * @param resourceGroupName Name of resource group - * @param name Name of AppServiceEnvironment (App Service Environment) + * @param resourceGroupName Name of the resource group to which the resource belongs. + * @param name Name of the App Service Environment. * @return the observable to the MetricDefinitionInner object */ public Observable> listMetricDefinitionsWithServiceResponseAsync(String resourceGroupName, String name) { @@ -1539,11 +1546,11 @@ private ServiceResponse listMetricDefinitionsDelegate(Res } /** - * Get global metrics of AppServiceEnvironment (App Service Environment). - * Get global metrics of AppServiceEnvironment (App Service Environment). + * Get global metrics of an App Service Environment. + * Get global metrics of an App Service Environment. * - * @param resourceGroupName Name of resource group - * @param name Name of AppServiceEnvironment (App Service Environment) + * @param resourceGroupName Name of the resource group to which the resource belongs. + * @param name Name of the App Service Environment. * @return the PagedList<ResourceMetricInner> object if successful. */ public PagedList listMetrics(final String resourceGroupName, final String name) { @@ -1557,11 +1564,11 @@ public Page nextPage(String nextPageLink) { } /** - * Get global metrics of AppServiceEnvironment (App Service Environment). - * Get global metrics of AppServiceEnvironment (App Service Environment). + * Get global metrics of an App Service Environment. + * Get global metrics of an App Service Environment. * - * @param resourceGroupName Name of resource group - * @param name Name of AppServiceEnvironment (App Service Environment) + * @param resourceGroupName Name of the resource group to which the resource belongs. + * @param name Name of the App Service Environment. * @param serviceCallback the async ServiceCallback to handle successful and failed responses. * @return the {@link ServiceCall} object */ @@ -1578,11 +1585,11 @@ public Observable>> call(String nextPa } /** - * Get global metrics of AppServiceEnvironment (App Service Environment). - * Get global metrics of AppServiceEnvironment (App Service Environment). + * Get global metrics of an App Service Environment. + * Get global metrics of an App Service Environment. * - * @param resourceGroupName Name of resource group - * @param name Name of AppServiceEnvironment (App Service Environment) + * @param resourceGroupName Name of the resource group to which the resource belongs. + * @param name Name of the App Service Environment. * @return the observable to the PagedList<ResourceMetricInner> object */ public Observable> listMetricsAsync(final String resourceGroupName, final String name) { @@ -1596,11 +1603,11 @@ public Page call(ServiceResponse> } /** - * Get global metrics of AppServiceEnvironment (App Service Environment). - * Get global metrics of AppServiceEnvironment (App Service Environment). + * Get global metrics of an App Service Environment. + * Get global metrics of an App Service Environment. * - * @param resourceGroupName Name of resource group - * @param name Name of AppServiceEnvironment (App Service Environment) + * @param resourceGroupName Name of the resource group to which the resource belongs. + * @param name Name of the App Service Environment. * @return the observable to the PagedList<ResourceMetricInner> object */ public Observable>> listMetricsWithServiceResponseAsync(final String resourceGroupName, final String name) { @@ -1618,11 +1625,11 @@ public Observable>> call(ServiceRespon } /** - * Get global metrics of AppServiceEnvironment (App Service Environment). - * Get global metrics of AppServiceEnvironment (App Service Environment). + * Get global metrics of an App Service Environment. + * Get global metrics of an App Service Environment. * - * @param resourceGroupName Name of resource group - * @param name Name of AppServiceEnvironment (App Service Environment) + * @param resourceGroupName Name of the resource group to which the resource belongs. + * @param name Name of the App Service Environment. * @return the PagedList<ResourceMetricInner> object wrapped in {@link ServiceResponse} if successful. */ public Observable>> listMetricsSinglePageAsync(final String resourceGroupName, final String name) { @@ -1653,12 +1660,12 @@ public Observable>> call(Response nextPage(String nextPageLink) { } /** - * Get global metrics of AppServiceEnvironment (App Service Environment). - * Get global metrics of AppServiceEnvironment (App Service Environment). + * Get global metrics of an App Service Environment. + * Get global metrics of an App Service Environment. * - * @param resourceGroupName Name of resource group - * @param name Name of AppServiceEnvironment (App Service Environment) - * @param details Include instance details + * @param resourceGroupName Name of the resource group to which the resource belongs. + * @param name Name of the App Service Environment. + * @param details Specify <code>true</code> to include instance details. The default is <code>false</code>. * @param filter Return only usages/metrics specified in the filter. Filter conforms to odata syntax. Example: $filter=(name.value eq 'Metric1' or name.value eq 'Metric2') and startTime eq '2014-01-01T00:00:00Z' and endTime eq '2014-12-31T23:59:59Z' and timeGrain eq duration'[Hour|Minute|Day]'. * @param serviceCallback the async ServiceCallback to handle successful and failed responses. * @return the {@link ServiceCall} object @@ -1696,12 +1703,12 @@ public Observable>> call(String nextPa } /** - * Get global metrics of AppServiceEnvironment (App Service Environment). - * Get global metrics of AppServiceEnvironment (App Service Environment). + * Get global metrics of an App Service Environment. + * Get global metrics of an App Service Environment. * - * @param resourceGroupName Name of resource group - * @param name Name of AppServiceEnvironment (App Service Environment) - * @param details Include instance details + * @param resourceGroupName Name of the resource group to which the resource belongs. + * @param name Name of the App Service Environment. + * @param details Specify <code>true</code> to include instance details. The default is <code>false</code>. * @param filter Return only usages/metrics specified in the filter. Filter conforms to odata syntax. Example: $filter=(name.value eq 'Metric1' or name.value eq 'Metric2') and startTime eq '2014-01-01T00:00:00Z' and endTime eq '2014-12-31T23:59:59Z' and timeGrain eq duration'[Hour|Minute|Day]'. * @return the observable to the PagedList<ResourceMetricInner> object */ @@ -1716,12 +1723,12 @@ public Page call(ServiceResponse> } /** - * Get global metrics of AppServiceEnvironment (App Service Environment). - * Get global metrics of AppServiceEnvironment (App Service Environment). + * Get global metrics of an App Service Environment. + * Get global metrics of an App Service Environment. * - * @param resourceGroupName Name of resource group - * @param name Name of AppServiceEnvironment (App Service Environment) - * @param details Include instance details + * @param resourceGroupName Name of the resource group to which the resource belongs. + * @param name Name of the App Service Environment. + * @param details Specify <code>true</code> to include instance details. The default is <code>false</code>. * @param filter Return only usages/metrics specified in the filter. Filter conforms to odata syntax. Example: $filter=(name.value eq 'Metric1' or name.value eq 'Metric2') and startTime eq '2014-01-01T00:00:00Z' and endTime eq '2014-12-31T23:59:59Z' and timeGrain eq duration'[Hour|Minute|Day]'. * @return the observable to the PagedList<ResourceMetricInner> object */ @@ -1740,12 +1747,12 @@ public Observable>> call(ServiceRespon } /** - * Get global metrics of AppServiceEnvironment (App Service Environment). - * Get global metrics of AppServiceEnvironment (App Service Environment). + * Get global metrics of an App Service Environment. + * Get global metrics of an App Service Environment. * - ServiceResponse> * @param resourceGroupName Name of resource group - ServiceResponse> * @param name Name of AppServiceEnvironment (App Service Environment) - ServiceResponse> * @param details Include instance details + ServiceResponse> * @param resourceGroupName Name of the resource group to which the resource belongs. + ServiceResponse> * @param name Name of the App Service Environment. + ServiceResponse> * @param details Specify <code>true</code> to include instance details. The default is <code>false</code>. ServiceResponse> * @param filter Return only usages/metrics specified in the filter. Filter conforms to odata syntax. Example: $filter=(name.value eq 'Metric1' or name.value eq 'Metric2') and startTime eq '2014-01-01T00:00:00Z' and endTime eq '2014-12-31T23:59:59Z' and timeGrain eq duration'[Hour|Minute|Day]'. * @return the PagedList<ResourceMetricInner> object wrapped in {@link ServiceResponse} if successful. */ @@ -1782,11 +1789,11 @@ private ServiceResponse> listMetricsDelegate(Respo } /** - * Get all multi role pools. - * Get all multi role pools. + * Get all multi-role pools. + * Get all multi-role pools. * - * @param resourceGroupName Name of resource group - * @param name Name of AppServiceEnvironment (App Service Environment) + * @param resourceGroupName Name of the resource group to which the resource belongs. + * @param name Name of the App Service Environment. * @return the PagedList<WorkerPoolInner> object if successful. */ public PagedList listMultiRolePools(final String resourceGroupName, final String name) { @@ -1800,11 +1807,11 @@ public Page nextPage(String nextPageLink) { } /** - * Get all multi role pools. - * Get all multi role pools. + * Get all multi-role pools. + * Get all multi-role pools. * - * @param resourceGroupName Name of resource group - * @param name Name of AppServiceEnvironment (App Service Environment) + * @param resourceGroupName Name of the resource group to which the resource belongs. + * @param name Name of the App Service Environment. * @param serviceCallback the async ServiceCallback to handle successful and failed responses. * @return the {@link ServiceCall} object */ @@ -1821,11 +1828,11 @@ public Observable>> call(String nextPageLi } /** - * Get all multi role pools. - * Get all multi role pools. + * Get all multi-role pools. + * Get all multi-role pools. * - * @param resourceGroupName Name of resource group - * @param name Name of AppServiceEnvironment (App Service Environment) + * @param resourceGroupName Name of the resource group to which the resource belongs. + * @param name Name of the App Service Environment. * @return the observable to the PagedList<WorkerPoolInner> object */ public Observable> listMultiRolePoolsAsync(final String resourceGroupName, final String name) { @@ -1839,11 +1846,11 @@ public Page call(ServiceResponse> respons } /** - * Get all multi role pools. - * Get all multi role pools. + * Get all multi-role pools. + * Get all multi-role pools. * - * @param resourceGroupName Name of resource group - * @param name Name of AppServiceEnvironment (App Service Environment) + * @param resourceGroupName Name of the resource group to which the resource belongs. + * @param name Name of the App Service Environment. * @return the observable to the PagedList<WorkerPoolInner> object */ public Observable>> listMultiRolePoolsWithServiceResponseAsync(final String resourceGroupName, final String name) { @@ -1861,11 +1868,11 @@ public Observable>> call(ServiceResponse

> * @param resourceGroupName Name of resource group - ServiceResponse> * @param name Name of AppServiceEnvironment (App Service Environment) + ServiceResponse> * @param resourceGroupName Name of the resource group to which the resource belongs. + ServiceResponse> * @param name Name of the App Service Environment. * @return the PagedList<WorkerPoolInner> object wrapped in {@link ServiceResponse} if successful. */ public Observable>> listMultiRolePoolsSinglePageAsync(final String resourceGroupName, final String name) { @@ -1901,11 +1908,11 @@ private ServiceResponse> listMultiRolePoolsDelegate(Re } /** - * Get properties of a multiRool pool. - * Get properties of a multiRool pool. + * Get properties of a multi-role pool. + * Get properties of a multi-role pool. * - * @param resourceGroupName Name of resource group - * @param name Name of AppServiceEnvironment (App Service Environment) + * @param resourceGroupName Name of the resource group to which the resource belongs. + * @param name Name of the App Service Environment. * @return the WorkerPoolInner object if successful. */ public WorkerPoolInner getMultiRolePool(String resourceGroupName, String name) { @@ -1913,11 +1920,11 @@ public WorkerPoolInner getMultiRolePool(String resourceGroupName, String name) { } /** - * Get properties of a multiRool pool. - * Get properties of a multiRool pool. + * Get properties of a multi-role pool. + * Get properties of a multi-role pool. * - * @param resourceGroupName Name of resource group - * @param name Name of AppServiceEnvironment (App Service Environment) + * @param resourceGroupName Name of the resource group to which the resource belongs. + * @param name Name of the App Service Environment. * @param serviceCallback the async ServiceCallback to handle successful and failed responses. * @return the {@link ServiceCall} object */ @@ -1926,11 +1933,11 @@ public ServiceCall getMultiRolePoolAsync(String resourceGroupNa } /** - * Get properties of a multiRool pool. - * Get properties of a multiRool pool. + * Get properties of a multi-role pool. + * Get properties of a multi-role pool. * - * @param resourceGroupName Name of resource group - * @param name Name of AppServiceEnvironment (App Service Environment) + * @param resourceGroupName Name of the resource group to which the resource belongs. + * @param name Name of the App Service Environment. * @return the observable to the WorkerPoolInner object */ public Observable getMultiRolePoolAsync(String resourceGroupName, String name) { @@ -1943,11 +1950,11 @@ public WorkerPoolInner call(ServiceResponse response) { } /** - * Get properties of a multiRool pool. - * Get properties of a multiRool pool. + * Get properties of a multi-role pool. + * Get properties of a multi-role pool. * - * @param resourceGroupName Name of resource group - * @param name Name of AppServiceEnvironment (App Service Environment) + * @param resourceGroupName Name of the resource group to which the resource belongs. + * @param name Name of the App Service Environment. * @return the observable to the WorkerPoolInner object */ public Observable> getMultiRolePoolWithServiceResponseAsync(String resourceGroupName, String name) { @@ -1983,12 +1990,12 @@ private ServiceResponse getMultiRolePoolDelegate(Response createOrUpdateMultiRolePoolAsync(String reso } /** - * Create or update a multiRole pool. - * Create or update a multiRole pool. + * Create or update a multi-role pool. + * Create or update a multi-role pool. * - * @param resourceGroupName Name of resource group - * @param name Name of AppServiceEnvironment (App Service Environment) - * @param multiRolePoolEnvelope Properties of multiRole pool + * @param resourceGroupName Name of the resource group to which the resource belongs. + * @param name Name of the App Service Environment. + * @param multiRolePoolEnvelope Properties of the multi-role pool. * @return the observable for the request */ public Observable createOrUpdateMultiRolePoolAsync(String resourceGroupName, String name, WorkerPoolInner multiRolePoolEnvelope) { @@ -2028,12 +2035,12 @@ public WorkerPoolInner call(ServiceResponse response) { } /** - * Create or update a multiRole pool. - * Create or update a multiRole pool. + * Create or update a multi-role pool. + * Create or update a multi-role pool. * - * @param resourceGroupName Name of resource group - * @param name Name of AppServiceEnvironment (App Service Environment) - * @param multiRolePoolEnvelope Properties of multiRole pool + * @param resourceGroupName Name of the resource group to which the resource belongs. + * @param name Name of the App Service Environment. + * @param multiRolePoolEnvelope Properties of the multi-role pool. * @return the observable for the request */ public Observable> createOrUpdateMultiRolePoolWithServiceResponseAsync(String resourceGroupName, String name, WorkerPoolInner multiRolePoolEnvelope) { @@ -2056,12 +2063,12 @@ public Observable> createOrUpdateMultiRolePoolW } /** - * Create or update a multiRole pool. - * Create or update a multiRole pool. + * Create or update a multi-role pool. + * Create or update a multi-role pool. * - * @param resourceGroupName Name of resource group - * @param name Name of AppServiceEnvironment (App Service Environment) - * @param multiRolePoolEnvelope Properties of multiRole pool + * @param resourceGroupName Name of the resource group to which the resource belongs. + * @param name Name of the App Service Environment. + * @param multiRolePoolEnvelope Properties of the multi-role pool. * @return the WorkerPoolInner object if successful. */ public WorkerPoolInner beginCreateOrUpdateMultiRolePool(String resourceGroupName, String name, WorkerPoolInner multiRolePoolEnvelope) { @@ -2069,12 +2076,12 @@ public WorkerPoolInner beginCreateOrUpdateMultiRolePool(String resourceGroupName } /** - * Create or update a multiRole pool. - * Create or update a multiRole pool. + * Create or update a multi-role pool. + * Create or update a multi-role pool. * - * @param resourceGroupName Name of resource group - * @param name Name of AppServiceEnvironment (App Service Environment) - * @param multiRolePoolEnvelope Properties of multiRole pool + * @param resourceGroupName Name of the resource group to which the resource belongs. + * @param name Name of the App Service Environment. + * @param multiRolePoolEnvelope Properties of the multi-role pool. * @param serviceCallback the async ServiceCallback to handle successful and failed responses. * @return the {@link ServiceCall} object */ @@ -2083,12 +2090,12 @@ public ServiceCall beginCreateOrUpdateMultiRolePoolAsync(String } /** - * Create or update a multiRole pool. - * Create or update a multiRole pool. + * Create or update a multi-role pool. + * Create or update a multi-role pool. * - * @param resourceGroupName Name of resource group - * @param name Name of AppServiceEnvironment (App Service Environment) - * @param multiRolePoolEnvelope Properties of multiRole pool + * @param resourceGroupName Name of the resource group to which the resource belongs. + * @param name Name of the App Service Environment. + * @param multiRolePoolEnvelope Properties of the multi-role pool. * @return the observable to the WorkerPoolInner object */ public Observable beginCreateOrUpdateMultiRolePoolAsync(String resourceGroupName, String name, WorkerPoolInner multiRolePoolEnvelope) { @@ -2101,12 +2108,12 @@ public WorkerPoolInner call(ServiceResponse response) { } /** - * Create or update a multiRole pool. - * Create or update a multiRole pool. + * Create or update a multi-role pool. + * Create or update a multi-role pool. * - * @param resourceGroupName Name of resource group - * @param name Name of AppServiceEnvironment (App Service Environment) - * @param multiRolePoolEnvelope Properties of multiRole pool + * @param resourceGroupName Name of the resource group to which the resource belongs. + * @param name Name of the App Service Environment. + * @param multiRolePoolEnvelope Properties of the multi-role pool. * @return the observable to the WorkerPoolInner object */ public Observable> beginCreateOrUpdateMultiRolePoolWithServiceResponseAsync(String resourceGroupName, String name, WorkerPoolInner multiRolePoolEnvelope) { @@ -2150,60 +2157,98 @@ private ServiceResponse beginCreateOrUpdateMultiRolePoolDelegat } /** - * Get metric definitions for a specific instance of a multiRole pool of a AppServiceEnvironment (App Service Environment). - * Get metric definitions for a specific instance of a multiRole pool of a AppServiceEnvironment (App Service Environment). + * Get metric definitions for a specific instance of a multi-role pool of an App Service Environment. + * Get metric definitions for a specific instance of a multi-role pool of an App Service Environment. * - * @param resourceGroupName Name of resource group - * @param name Name of AppServiceEnvironment (App Service Environment) - * @param instance Name of instance in the multiRole pool&gt; - * @return the Object object if successful. + * @param resourceGroupName Name of the resource group to which the resource belongs. + * @param name Name of the App Service Environment. + * @param instance Name of the instance in the multi-role pool. + * @return the PagedList<ResourceMetricDefinitionInner> object if successful. */ - public Object listMultiRolePoolInstanceMetricDefinitions(String resourceGroupName, String name, String instance) { - return listMultiRolePoolInstanceMetricDefinitionsWithServiceResponseAsync(resourceGroupName, name, instance).toBlocking().single().getBody(); + public PagedList listMultiRolePoolInstanceMetricDefinitions(final String resourceGroupName, final String name, final String instance) { + ServiceResponse> response = listMultiRolePoolInstanceMetricDefinitionsSinglePageAsync(resourceGroupName, name, instance).toBlocking().single(); + return new PagedList(response.getBody()) { + @Override + public Page nextPage(String nextPageLink) { + return listMultiRolePoolInstanceMetricDefinitionsNextSinglePageAsync(nextPageLink).toBlocking().single().getBody(); + } + }; } /** - * Get metric definitions for a specific instance of a multiRole pool of a AppServiceEnvironment (App Service Environment). - * Get metric definitions for a specific instance of a multiRole pool of a AppServiceEnvironment (App Service Environment). + * Get metric definitions for a specific instance of a multi-role pool of an App Service Environment. + * Get metric definitions for a specific instance of a multi-role pool of an App Service Environment. * - * @param resourceGroupName Name of resource group - * @param name Name of AppServiceEnvironment (App Service Environment) - * @param instance Name of instance in the multiRole pool&gt; + * @param resourceGroupName Name of the resource group to which the resource belongs. + * @param name Name of the App Service Environment. + * @param instance Name of the instance in the multi-role pool. * @param serviceCallback the async ServiceCallback to handle successful and failed responses. * @return the {@link ServiceCall} object */ - public ServiceCall listMultiRolePoolInstanceMetricDefinitionsAsync(String resourceGroupName, String name, String instance, final ServiceCallback serviceCallback) { - return ServiceCall.create(listMultiRolePoolInstanceMetricDefinitionsWithServiceResponseAsync(resourceGroupName, name, instance), serviceCallback); + public ServiceCall> listMultiRolePoolInstanceMetricDefinitionsAsync(final String resourceGroupName, final String name, final String instance, final ListOperationCallback serviceCallback) { + return AzureServiceCall.create( + listMultiRolePoolInstanceMetricDefinitionsSinglePageAsync(resourceGroupName, name, instance), + new Func1>>>() { + @Override + public Observable>> call(String nextPageLink) { + return listMultiRolePoolInstanceMetricDefinitionsNextSinglePageAsync(nextPageLink); + } + }, + serviceCallback); } /** - * Get metric definitions for a specific instance of a multiRole pool of a AppServiceEnvironment (App Service Environment). - * Get metric definitions for a specific instance of a multiRole pool of a AppServiceEnvironment (App Service Environment). + * Get metric definitions for a specific instance of a multi-role pool of an App Service Environment. + * Get metric definitions for a specific instance of a multi-role pool of an App Service Environment. * - * @param resourceGroupName Name of resource group - * @param name Name of AppServiceEnvironment (App Service Environment) - * @param instance Name of instance in the multiRole pool&gt; - * @return the observable to the Object object + * @param resourceGroupName Name of the resource group to which the resource belongs. + * @param name Name of the App Service Environment. + * @param instance Name of the instance in the multi-role pool. + * @return the observable to the PagedList<ResourceMetricDefinitionInner> object */ - public Observable listMultiRolePoolInstanceMetricDefinitionsAsync(String resourceGroupName, String name, String instance) { - return listMultiRolePoolInstanceMetricDefinitionsWithServiceResponseAsync(resourceGroupName, name, instance).map(new Func1, Object>() { - @Override - public Object call(ServiceResponse response) { - return response.getBody(); - } - }); + public Observable> listMultiRolePoolInstanceMetricDefinitionsAsync(final String resourceGroupName, final String name, final String instance) { + return listMultiRolePoolInstanceMetricDefinitionsWithServiceResponseAsync(resourceGroupName, name, instance) + .map(new Func1>, Page>() { + @Override + public Page call(ServiceResponse> response) { + return response.getBody(); + } + }); + } + + /** + * Get metric definitions for a specific instance of a multi-role pool of an App Service Environment. + * Get metric definitions for a specific instance of a multi-role pool of an App Service Environment. + * + * @param resourceGroupName Name of the resource group to which the resource belongs. + * @param name Name of the App Service Environment. + * @param instance Name of the instance in the multi-role pool. + * @return the observable to the PagedList<ResourceMetricDefinitionInner> object + */ + public Observable>> listMultiRolePoolInstanceMetricDefinitionsWithServiceResponseAsync(final String resourceGroupName, final String name, final String instance) { + return listMultiRolePoolInstanceMetricDefinitionsSinglePageAsync(resourceGroupName, name, instance) + .concatMap(new Func1>, Observable>>>() { + @Override + public Observable>> call(ServiceResponse> page) { + String nextPageLink = page.getBody().getNextPageLink(); + if (nextPageLink == null) { + return Observable.just(page); + } + return Observable.just(page).concatWith(listMultiRolePoolInstanceMetricDefinitionsNextWithServiceResponseAsync(nextPageLink)); + } + }); } /** - * Get metric definitions for a specific instance of a multiRole pool of a AppServiceEnvironment (App Service Environment). - * Get metric definitions for a specific instance of a multiRole pool of a AppServiceEnvironment (App Service Environment). + * Get metric definitions for a specific instance of a multi-role pool of an App Service Environment. + * Get metric definitions for a specific instance of a multi-role pool of an App Service Environment. * - * @param resourceGroupName Name of resource group - * @param name Name of AppServiceEnvironment (App Service Environment) - * @param instance Name of instance in the multiRole pool&gt; - * @return the observable to the Object object + ServiceResponse> * @param resourceGroupName Name of the resource group to which the resource belongs. + ServiceResponse> * @param name Name of the App Service Environment. + ServiceResponse> * @param instance Name of the instance in the multi-role pool. + * @return the PagedList<ResourceMetricDefinitionInner> object wrapped in {@link ServiceResponse} if successful. */ - public Observable> listMultiRolePoolInstanceMetricDefinitionsWithServiceResponseAsync(String resourceGroupName, String name, String instance) { + public Observable>> listMultiRolePoolInstanceMetricDefinitionsSinglePageAsync(final String resourceGroupName, final String name, final String instance) { if (resourceGroupName == null) { throw new IllegalArgumentException("Parameter resourceGroupName is required and cannot be null."); } @@ -2218,12 +2263,12 @@ public Observable> listMultiRolePoolInstanceMetricDefini } final String apiVersion = "2016-09-01"; return service.listMultiRolePoolInstanceMetricDefinitions(resourceGroupName, name, instance, this.client.subscriptionId(), apiVersion, this.client.acceptLanguage(), this.client.userAgent()) - .flatMap(new Func1, Observable>>() { + .flatMap(new Func1, Observable>>>() { @Override - public Observable> call(Response response) { + public Observable>> call(Response response) { try { - ServiceResponse clientResponse = listMultiRolePoolInstanceMetricDefinitionsDelegate(response); - return Observable.just(clientResponse); + ServiceResponse> result = listMultiRolePoolInstanceMetricDefinitionsDelegate(response); + return Observable.just(new ServiceResponse>(result.getBody(), result.getResponse())); } catch (Throwable t) { return Observable.error(t); } @@ -2231,68 +2276,106 @@ public Observable> call(Response response) }); } - private ServiceResponse listMultiRolePoolInstanceMetricDefinitionsDelegate(Response response) throws CloudException, IOException, IllegalArgumentException { - return new AzureServiceResponseBuilder(this.client.mapperAdapter()) - .register(200, new TypeToken() { }.getType()) + private ServiceResponse> listMultiRolePoolInstanceMetricDefinitionsDelegate(Response response) throws CloudException, IOException, IllegalArgumentException { + return new AzureServiceResponseBuilder, CloudException>(this.client.mapperAdapter()) + .register(200, new TypeToken>() { }.getType()) .registerError(CloudException.class) .build(response); } /** - * Get metrics for a specific instance of a multiRole pool of a AppServiceEnvironment (App Service Environment). - * Get metrics for a specific instance of a multiRole pool of a AppServiceEnvironment (App Service Environment). + * Get metrics for a specific instance of a multi-role pool of an App Service Environment. + * Get metrics for a specific instance of a multi-role pool of an App Service Environment. * - * @param resourceGroupName Name of resource group - * @param name Name of AppServiceEnvironment (App Service Environment) - * @param instance Name of instance in the multiRole pool - * @return the Object object if successful. + * @param resourceGroupName Name of the resource group to which the resource belongs. + * @param name Name of the App Service Environment. + * @param instance Name of the instance in the multi-role pool. + * @return the PagedList<ResourceMetricInner> object if successful. */ - public Object listMultiRolePoolInstanceMetrics(String resourceGroupName, String name, String instance) { - return listMultiRolePoolInstanceMetricsWithServiceResponseAsync(resourceGroupName, name, instance).toBlocking().single().getBody(); + public PagedList listMultiRolePoolInstanceMetrics(final String resourceGroupName, final String name, final String instance) { + ServiceResponse> response = listMultiRolePoolInstanceMetricsSinglePageAsync(resourceGroupName, name, instance).toBlocking().single(); + return new PagedList(response.getBody()) { + @Override + public Page nextPage(String nextPageLink) { + return listMultiRolePoolInstanceMetricsNextSinglePageAsync(nextPageLink).toBlocking().single().getBody(); + } + }; } /** - * Get metrics for a specific instance of a multiRole pool of a AppServiceEnvironment (App Service Environment). - * Get metrics for a specific instance of a multiRole pool of a AppServiceEnvironment (App Service Environment). + * Get metrics for a specific instance of a multi-role pool of an App Service Environment. + * Get metrics for a specific instance of a multi-role pool of an App Service Environment. * - * @param resourceGroupName Name of resource group - * @param name Name of AppServiceEnvironment (App Service Environment) - * @param instance Name of instance in the multiRole pool + * @param resourceGroupName Name of the resource group to which the resource belongs. + * @param name Name of the App Service Environment. + * @param instance Name of the instance in the multi-role pool. * @param serviceCallback the async ServiceCallback to handle successful and failed responses. * @return the {@link ServiceCall} object */ - public ServiceCall listMultiRolePoolInstanceMetricsAsync(String resourceGroupName, String name, String instance, final ServiceCallback serviceCallback) { - return ServiceCall.create(listMultiRolePoolInstanceMetricsWithServiceResponseAsync(resourceGroupName, name, instance), serviceCallback); + public ServiceCall> listMultiRolePoolInstanceMetricsAsync(final String resourceGroupName, final String name, final String instance, final ListOperationCallback serviceCallback) { + return AzureServiceCall.create( + listMultiRolePoolInstanceMetricsSinglePageAsync(resourceGroupName, name, instance), + new Func1>>>() { + @Override + public Observable>> call(String nextPageLink) { + return listMultiRolePoolInstanceMetricsNextSinglePageAsync(nextPageLink); + } + }, + serviceCallback); } /** - * Get metrics for a specific instance of a multiRole pool of a AppServiceEnvironment (App Service Environment). - * Get metrics for a specific instance of a multiRole pool of a AppServiceEnvironment (App Service Environment). + * Get metrics for a specific instance of a multi-role pool of an App Service Environment. + * Get metrics for a specific instance of a multi-role pool of an App Service Environment. * - * @param resourceGroupName Name of resource group - * @param name Name of AppServiceEnvironment (App Service Environment) - * @param instance Name of instance in the multiRole pool - * @return the observable to the Object object + * @param resourceGroupName Name of the resource group to which the resource belongs. + * @param name Name of the App Service Environment. + * @param instance Name of the instance in the multi-role pool. + * @return the observable to the PagedList<ResourceMetricInner> object */ - public Observable listMultiRolePoolInstanceMetricsAsync(String resourceGroupName, String name, String instance) { - return listMultiRolePoolInstanceMetricsWithServiceResponseAsync(resourceGroupName, name, instance).map(new Func1, Object>() { - @Override - public Object call(ServiceResponse response) { - return response.getBody(); - } - }); + public Observable> listMultiRolePoolInstanceMetricsAsync(final String resourceGroupName, final String name, final String instance) { + return listMultiRolePoolInstanceMetricsWithServiceResponseAsync(resourceGroupName, name, instance) + .map(new Func1>, Page>() { + @Override + public Page call(ServiceResponse> response) { + return response.getBody(); + } + }); + } + + /** + * Get metrics for a specific instance of a multi-role pool of an App Service Environment. + * Get metrics for a specific instance of a multi-role pool of an App Service Environment. + * + * @param resourceGroupName Name of the resource group to which the resource belongs. + * @param name Name of the App Service Environment. + * @param instance Name of the instance in the multi-role pool. + * @return the observable to the PagedList<ResourceMetricInner> object + */ + public Observable>> listMultiRolePoolInstanceMetricsWithServiceResponseAsync(final String resourceGroupName, final String name, final String instance) { + return listMultiRolePoolInstanceMetricsSinglePageAsync(resourceGroupName, name, instance) + .concatMap(new Func1>, Observable>>>() { + @Override + public Observable>> call(ServiceResponse> page) { + String nextPageLink = page.getBody().getNextPageLink(); + if (nextPageLink == null) { + return Observable.just(page); + } + return Observable.just(page).concatWith(listMultiRolePoolInstanceMetricsNextWithServiceResponseAsync(nextPageLink)); + } + }); } /** - * Get metrics for a specific instance of a multiRole pool of a AppServiceEnvironment (App Service Environment). - * Get metrics for a specific instance of a multiRole pool of a AppServiceEnvironment (App Service Environment). + * Get metrics for a specific instance of a multi-role pool of an App Service Environment. + * Get metrics for a specific instance of a multi-role pool of an App Service Environment. * - * @param resourceGroupName Name of resource group - * @param name Name of AppServiceEnvironment (App Service Environment) - * @param instance Name of instance in the multiRole pool - * @return the observable to the Object object + * @param resourceGroupName Name of the resource group to which the resource belongs. + * @param name Name of the App Service Environment. + * @param instance Name of the instance in the multi-role pool. + * @return the PagedList<ResourceMetricInner> object wrapped in {@link ServiceResponse} if successful. */ - public Observable> listMultiRolePoolInstanceMetricsWithServiceResponseAsync(String resourceGroupName, String name, String instance) { + public Observable>> listMultiRolePoolInstanceMetricsSinglePageAsync(final String resourceGroupName, final String name, final String instance) { if (resourceGroupName == null) { throw new IllegalArgumentException("Parameter resourceGroupName is required and cannot be null."); } @@ -2308,12 +2391,12 @@ public Observable> listMultiRolePoolInstanceMetricsWithS final String apiVersion = "2016-09-01"; final Boolean details = null; return service.listMultiRolePoolInstanceMetrics(resourceGroupName, name, instance, this.client.subscriptionId(), details, apiVersion, this.client.acceptLanguage(), this.client.userAgent()) - .flatMap(new Func1, Observable>>() { + .flatMap(new Func1, Observable>>>() { @Override - public Observable> call(Response response) { + public Observable>> call(Response response) { try { - ServiceResponse clientResponse = listMultiRolePoolInstanceMetricsDelegate(response); - return Observable.just(clientResponse); + ServiceResponse> result = listMultiRolePoolInstanceMetricsDelegate(response); + return Observable.just(new ServiceResponse>(result.getBody(), result.getResponse())); } catch (Throwable t) { return Observable.error(t); } @@ -2322,64 +2405,103 @@ public Observable> call(Response response) } /** - * Get metrics for a specific instance of a multiRole pool of a AppServiceEnvironment (App Service Environment). - * Get metrics for a specific instance of a multiRole pool of a AppServiceEnvironment (App Service Environment). + * Get metrics for a specific instance of a multi-role pool of an App Service Environment. + * Get metrics for a specific instance of a multi-role pool of an App Service Environment. * - * @param resourceGroupName Name of resource group - * @param name Name of AppServiceEnvironment (App Service Environment) - * @param instance Name of instance in the multiRole pool - * @param details Include instance details - * @return the Object object if successful. + * @param resourceGroupName Name of the resource group to which the resource belongs. + * @param name Name of the App Service Environment. + * @param instance Name of the instance in the multi-role pool. + * @param details Specify <code>true</code> to include instance details. The default is <code>false</code>. + * @return the PagedList<ResourceMetricInner> object if successful. */ - public Object listMultiRolePoolInstanceMetrics(String resourceGroupName, String name, String instance, Boolean details) { - return listMultiRolePoolInstanceMetricsWithServiceResponseAsync(resourceGroupName, name, instance, details).toBlocking().single().getBody(); + public PagedList listMultiRolePoolInstanceMetrics(final String resourceGroupName, final String name, final String instance, final Boolean details) { + ServiceResponse> response = listMultiRolePoolInstanceMetricsSinglePageAsync(resourceGroupName, name, instance, details).toBlocking().single(); + return new PagedList(response.getBody()) { + @Override + public Page nextPage(String nextPageLink) { + return listMultiRolePoolInstanceMetricsNextSinglePageAsync(nextPageLink).toBlocking().single().getBody(); + } + }; } /** - * Get metrics for a specific instance of a multiRole pool of a AppServiceEnvironment (App Service Environment). - * Get metrics for a specific instance of a multiRole pool of a AppServiceEnvironment (App Service Environment). + * Get metrics for a specific instance of a multi-role pool of an App Service Environment. + * Get metrics for a specific instance of a multi-role pool of an App Service Environment. * - * @param resourceGroupName Name of resource group - * @param name Name of AppServiceEnvironment (App Service Environment) - * @param instance Name of instance in the multiRole pool - * @param details Include instance details + * @param resourceGroupName Name of the resource group to which the resource belongs. + * @param name Name of the App Service Environment. + * @param instance Name of the instance in the multi-role pool. + * @param details Specify <code>true</code> to include instance details. The default is <code>false</code>. * @param serviceCallback the async ServiceCallback to handle successful and failed responses. * @return the {@link ServiceCall} object */ - public ServiceCall listMultiRolePoolInstanceMetricsAsync(String resourceGroupName, String name, String instance, Boolean details, final ServiceCallback serviceCallback) { - return ServiceCall.create(listMultiRolePoolInstanceMetricsWithServiceResponseAsync(resourceGroupName, name, instance, details), serviceCallback); + public ServiceCall> listMultiRolePoolInstanceMetricsAsync(final String resourceGroupName, final String name, final String instance, final Boolean details, final ListOperationCallback serviceCallback) { + return AzureServiceCall.create( + listMultiRolePoolInstanceMetricsSinglePageAsync(resourceGroupName, name, instance, details), + new Func1>>>() { + @Override + public Observable>> call(String nextPageLink) { + return listMultiRolePoolInstanceMetricsNextSinglePageAsync(nextPageLink); + } + }, + serviceCallback); + } + + /** + * Get metrics for a specific instance of a multi-role pool of an App Service Environment. + * Get metrics for a specific instance of a multi-role pool of an App Service Environment. + * + * @param resourceGroupName Name of the resource group to which the resource belongs. + * @param name Name of the App Service Environment. + * @param instance Name of the instance in the multi-role pool. + * @param details Specify <code>true</code> to include instance details. The default is <code>false</code>. + * @return the observable to the PagedList<ResourceMetricInner> object + */ + public Observable> listMultiRolePoolInstanceMetricsAsync(final String resourceGroupName, final String name, final String instance, final Boolean details) { + return listMultiRolePoolInstanceMetricsWithServiceResponseAsync(resourceGroupName, name, instance, details) + .map(new Func1>, Page>() { + @Override + public Page call(ServiceResponse> response) { + return response.getBody(); + } + }); } /** - * Get metrics for a specific instance of a multiRole pool of a AppServiceEnvironment (App Service Environment). - * Get metrics for a specific instance of a multiRole pool of a AppServiceEnvironment (App Service Environment). + * Get metrics for a specific instance of a multi-role pool of an App Service Environment. + * Get metrics for a specific instance of a multi-role pool of an App Service Environment. * - * @param resourceGroupName Name of resource group - * @param name Name of AppServiceEnvironment (App Service Environment) - * @param instance Name of instance in the multiRole pool - * @param details Include instance details - * @return the observable to the Object object + * @param resourceGroupName Name of the resource group to which the resource belongs. + * @param name Name of the App Service Environment. + * @param instance Name of the instance in the multi-role pool. + * @param details Specify <code>true</code> to include instance details. The default is <code>false</code>. + * @return the observable to the PagedList<ResourceMetricInner> object */ - public Observable listMultiRolePoolInstanceMetricsAsync(String resourceGroupName, String name, String instance, Boolean details) { - return listMultiRolePoolInstanceMetricsWithServiceResponseAsync(resourceGroupName, name, instance, details).map(new Func1, Object>() { - @Override - public Object call(ServiceResponse response) { - return response.getBody(); - } - }); + public Observable>> listMultiRolePoolInstanceMetricsWithServiceResponseAsync(final String resourceGroupName, final String name, final String instance, final Boolean details) { + return listMultiRolePoolInstanceMetricsSinglePageAsync(resourceGroupName, name, instance, details) + .concatMap(new Func1>, Observable>>>() { + @Override + public Observable>> call(ServiceResponse> page) { + String nextPageLink = page.getBody().getNextPageLink(); + if (nextPageLink == null) { + return Observable.just(page); + } + return Observable.just(page).concatWith(listMultiRolePoolInstanceMetricsNextWithServiceResponseAsync(nextPageLink)); + } + }); } /** - * Get metrics for a specific instance of a multiRole pool of a AppServiceEnvironment (App Service Environment). - * Get metrics for a specific instance of a multiRole pool of a AppServiceEnvironment (App Service Environment). + * Get metrics for a specific instance of a multi-role pool of an App Service Environment. + * Get metrics for a specific instance of a multi-role pool of an App Service Environment. * - * @param resourceGroupName Name of resource group - * @param name Name of AppServiceEnvironment (App Service Environment) - * @param instance Name of instance in the multiRole pool - * @param details Include instance details - * @return the observable to the Object object + ServiceResponse> * @param resourceGroupName Name of the resource group to which the resource belongs. + ServiceResponse> * @param name Name of the App Service Environment. + ServiceResponse> * @param instance Name of the instance in the multi-role pool. + ServiceResponse> * @param details Specify <code>true</code> to include instance details. The default is <code>false</code>. + * @return the PagedList<ResourceMetricInner> object wrapped in {@link ServiceResponse} if successful. */ - public Observable> listMultiRolePoolInstanceMetricsWithServiceResponseAsync(String resourceGroupName, String name, String instance, Boolean details) { + public Observable>> listMultiRolePoolInstanceMetricsSinglePageAsync(final String resourceGroupName, final String name, final String instance, final Boolean details) { if (resourceGroupName == null) { throw new IllegalArgumentException("Parameter resourceGroupName is required and cannot be null."); } @@ -2394,12 +2516,12 @@ public Observable> listMultiRolePoolInstanceMetricsWithS } final String apiVersion = "2016-09-01"; return service.listMultiRolePoolInstanceMetrics(resourceGroupName, name, instance, this.client.subscriptionId(), details, apiVersion, this.client.acceptLanguage(), this.client.userAgent()) - .flatMap(new Func1, Observable>>() { + .flatMap(new Func1, Observable>>>() { @Override - public Observable> call(Response response) { + public Observable>> call(Response response) { try { - ServiceResponse clientResponse = listMultiRolePoolInstanceMetricsDelegate(response); - return Observable.just(clientResponse); + ServiceResponse> result = listMultiRolePoolInstanceMetricsDelegate(response); + return Observable.just(new ServiceResponse>(result.getBody(), result.getResponse())); } catch (Throwable t) { return Observable.error(t); } @@ -2407,46 +2529,46 @@ public Observable> call(Response response) }); } - private ServiceResponse listMultiRolePoolInstanceMetricsDelegate(Response response) throws CloudException, IOException, IllegalArgumentException { - return new AzureServiceResponseBuilder(this.client.mapperAdapter()) - .register(200, new TypeToken() { }.getType()) + private ServiceResponse> listMultiRolePoolInstanceMetricsDelegate(Response response) throws CloudException, IOException, IllegalArgumentException { + return new AzureServiceResponseBuilder, CloudException>(this.client.mapperAdapter()) + .register(200, new TypeToken>() { }.getType()) .registerError(CloudException.class) .build(response); } /** - * Get metric definitions for a multiRole pool of a AppServiceEnvironment (App Service Environment). - * Get metric definitions for a multiRole pool of a AppServiceEnvironment (App Service Environment). + * Get metric definitions for a multi-role pool of an App Service Environment. + * Get metric definitions for a multi-role pool of an App Service Environment. * - * @param resourceGroupName Name of resource group - * @param name Name of AppServiceEnvironment (App Service Environment) - * @return the PagedList<MetricDefinitionInner> object if successful. + * @param resourceGroupName Name of the resource group to which the resource belongs. + * @param name Name of the App Service Environment. + * @return the PagedList<ResourceMetricDefinitionInner> object if successful. */ - public PagedList listMultiRoleMetricDefinitions(final String resourceGroupName, final String name) { - ServiceResponse> response = listMultiRoleMetricDefinitionsSinglePageAsync(resourceGroupName, name).toBlocking().single(); - return new PagedList(response.getBody()) { + public PagedList listMultiRoleMetricDefinitions(final String resourceGroupName, final String name) { + ServiceResponse> response = listMultiRoleMetricDefinitionsSinglePageAsync(resourceGroupName, name).toBlocking().single(); + return new PagedList(response.getBody()) { @Override - public Page nextPage(String nextPageLink) { + public Page nextPage(String nextPageLink) { return listMultiRoleMetricDefinitionsNextSinglePageAsync(nextPageLink).toBlocking().single().getBody(); } }; } /** - * Get metric definitions for a multiRole pool of a AppServiceEnvironment (App Service Environment). - * Get metric definitions for a multiRole pool of a AppServiceEnvironment (App Service Environment). + * Get metric definitions for a multi-role pool of an App Service Environment. + * Get metric definitions for a multi-role pool of an App Service Environment. * - * @param resourceGroupName Name of resource group - * @param name Name of AppServiceEnvironment (App Service Environment) + * @param resourceGroupName Name of the resource group to which the resource belongs. + * @param name Name of the App Service Environment. * @param serviceCallback the async ServiceCallback to handle successful and failed responses. * @return the {@link ServiceCall} object */ - public ServiceCall> listMultiRoleMetricDefinitionsAsync(final String resourceGroupName, final String name, final ListOperationCallback serviceCallback) { + public ServiceCall> listMultiRoleMetricDefinitionsAsync(final String resourceGroupName, final String name, final ListOperationCallback serviceCallback) { return AzureServiceCall.create( listMultiRoleMetricDefinitionsSinglePageAsync(resourceGroupName, name), - new Func1>>>() { + new Func1>>>() { @Override - public Observable>> call(String nextPageLink) { + public Observable>> call(String nextPageLink) { return listMultiRoleMetricDefinitionsNextSinglePageAsync(nextPageLink); } }, @@ -2454,36 +2576,36 @@ public Observable>> call(String next } /** - * Get metric definitions for a multiRole pool of a AppServiceEnvironment (App Service Environment). - * Get metric definitions for a multiRole pool of a AppServiceEnvironment (App Service Environment). + * Get metric definitions for a multi-role pool of an App Service Environment. + * Get metric definitions for a multi-role pool of an App Service Environment. * - * @param resourceGroupName Name of resource group - * @param name Name of AppServiceEnvironment (App Service Environment) - * @return the observable to the PagedList<MetricDefinitionInner> object + * @param resourceGroupName Name of the resource group to which the resource belongs. + * @param name Name of the App Service Environment. + * @return the observable to the PagedList<ResourceMetricDefinitionInner> object */ - public Observable> listMultiRoleMetricDefinitionsAsync(final String resourceGroupName, final String name) { + public Observable> listMultiRoleMetricDefinitionsAsync(final String resourceGroupName, final String name) { return listMultiRoleMetricDefinitionsWithServiceResponseAsync(resourceGroupName, name) - .map(new Func1>, Page>() { + .map(new Func1>, Page>() { @Override - public Page call(ServiceResponse> response) { + public Page call(ServiceResponse> response) { return response.getBody(); } }); } /** - * Get metric definitions for a multiRole pool of a AppServiceEnvironment (App Service Environment). - * Get metric definitions for a multiRole pool of a AppServiceEnvironment (App Service Environment). + * Get metric definitions for a multi-role pool of an App Service Environment. + * Get metric definitions for a multi-role pool of an App Service Environment. * - * @param resourceGroupName Name of resource group - * @param name Name of AppServiceEnvironment (App Service Environment) - * @return the observable to the PagedList<MetricDefinitionInner> object + * @param resourceGroupName Name of the resource group to which the resource belongs. + * @param name Name of the App Service Environment. + * @return the observable to the PagedList<ResourceMetricDefinitionInner> object */ - public Observable>> listMultiRoleMetricDefinitionsWithServiceResponseAsync(final String resourceGroupName, final String name) { + public Observable>> listMultiRoleMetricDefinitionsWithServiceResponseAsync(final String resourceGroupName, final String name) { return listMultiRoleMetricDefinitionsSinglePageAsync(resourceGroupName, name) - .concatMap(new Func1>, Observable>>>() { + .concatMap(new Func1>, Observable>>>() { @Override - public Observable>> call(ServiceResponse> page) { + public Observable>> call(ServiceResponse> page) { String nextPageLink = page.getBody().getNextPageLink(); if (nextPageLink == null) { return Observable.just(page); @@ -2494,14 +2616,14 @@ public Observable>> call(ServiceResp } /** - * Get metric definitions for a multiRole pool of a AppServiceEnvironment (App Service Environment). - * Get metric definitions for a multiRole pool of a AppServiceEnvironment (App Service Environment). + * Get metric definitions for a multi-role pool of an App Service Environment. + * Get metric definitions for a multi-role pool of an App Service Environment. * - ServiceResponse> * @param resourceGroupName Name of resource group - ServiceResponse> * @param name Name of AppServiceEnvironment (App Service Environment) - * @return the PagedList<MetricDefinitionInner> object wrapped in {@link ServiceResponse} if successful. + ServiceResponse> * @param resourceGroupName Name of the resource group to which the resource belongs. + ServiceResponse> * @param name Name of the App Service Environment. + * @return the PagedList<ResourceMetricDefinitionInner> object wrapped in {@link ServiceResponse} if successful. */ - public Observable>> listMultiRoleMetricDefinitionsSinglePageAsync(final String resourceGroupName, final String name) { + public Observable>> listMultiRoleMetricDefinitionsSinglePageAsync(final String resourceGroupName, final String name) { if (resourceGroupName == null) { throw new IllegalArgumentException("Parameter resourceGroupName is required and cannot be null."); } @@ -2513,12 +2635,12 @@ public Observable>> listMultiRoleMet } final String apiVersion = "2016-09-01"; return service.listMultiRoleMetricDefinitions(resourceGroupName, name, this.client.subscriptionId(), apiVersion, this.client.acceptLanguage(), this.client.userAgent()) - .flatMap(new Func1, Observable>>>() { + .flatMap(new Func1, Observable>>>() { @Override - public Observable>> call(Response response) { + public Observable>> call(Response response) { try { - ServiceResponse> result = listMultiRoleMetricDefinitionsDelegate(response); - return Observable.just(new ServiceResponse>(result.getBody(), result.getResponse())); + ServiceResponse> result = listMultiRoleMetricDefinitionsDelegate(response); + return Observable.just(new ServiceResponse>(result.getBody(), result.getResponse())); } catch (Throwable t) { return Observable.error(t); } @@ -2526,19 +2648,19 @@ public Observable>> call(Response> listMultiRoleMetricDefinitionsDelegate(Response response) throws CloudException, IOException, IllegalArgumentException { - return new AzureServiceResponseBuilder, CloudException>(this.client.mapperAdapter()) - .register(200, new TypeToken>() { }.getType()) + private ServiceResponse> listMultiRoleMetricDefinitionsDelegate(Response response) throws CloudException, IOException, IllegalArgumentException { + return new AzureServiceResponseBuilder, CloudException>(this.client.mapperAdapter()) + .register(200, new TypeToken>() { }.getType()) .registerError(CloudException.class) .build(response); } /** - * Get metrics for a multiRole pool of a AppServiceEnvironment (App Service Environment). - * Get metrics for a multiRole pool of a AppServiceEnvironment (App Service Environment). + * Get metrics for a multi-role pool of an App Service Environment. + * Get metrics for a multi-role pool of an App Service Environment. * - * @param resourceGroupName Name of resource group - * @param name Name of AppServiceEnvironment (App Service Environment) + * @param resourceGroupName Name of the resource group to which the resource belongs. + * @param name Name of the App Service Environment. * @return the PagedList<ResourceMetricInner> object if successful. */ public PagedList listMultiRoleMetrics(final String resourceGroupName, final String name) { @@ -2552,11 +2674,11 @@ public Page nextPage(String nextPageLink) { } /** - * Get metrics for a multiRole pool of a AppServiceEnvironment (App Service Environment). - * Get metrics for a multiRole pool of a AppServiceEnvironment (App Service Environment). + * Get metrics for a multi-role pool of an App Service Environment. + * Get metrics for a multi-role pool of an App Service Environment. * - * @param resourceGroupName Name of resource group - * @param name Name of AppServiceEnvironment (App Service Environment) + * @param resourceGroupName Name of the resource group to which the resource belongs. + * @param name Name of the App Service Environment. * @param serviceCallback the async ServiceCallback to handle successful and failed responses. * @return the {@link ServiceCall} object */ @@ -2573,11 +2695,11 @@ public Observable>> call(String nextPa } /** - * Get metrics for a multiRole pool of a AppServiceEnvironment (App Service Environment). - * Get metrics for a multiRole pool of a AppServiceEnvironment (App Service Environment). + * Get metrics for a multi-role pool of an App Service Environment. + * Get metrics for a multi-role pool of an App Service Environment. * - * @param resourceGroupName Name of resource group - * @param name Name of AppServiceEnvironment (App Service Environment) + * @param resourceGroupName Name of the resource group to which the resource belongs. + * @param name Name of the App Service Environment. * @return the observable to the PagedList<ResourceMetricInner> object */ public Observable> listMultiRoleMetricsAsync(final String resourceGroupName, final String name) { @@ -2591,11 +2713,11 @@ public Page call(ServiceResponse> } /** - * Get metrics for a multiRole pool of a AppServiceEnvironment (App Service Environment). - * Get metrics for a multiRole pool of a AppServiceEnvironment (App Service Environment). + * Get metrics for a multi-role pool of an App Service Environment. + * Get metrics for a multi-role pool of an App Service Environment. * - * @param resourceGroupName Name of resource group - * @param name Name of AppServiceEnvironment (App Service Environment) + * @param resourceGroupName Name of the resource group to which the resource belongs. + * @param name Name of the App Service Environment. * @return the observable to the PagedList<ResourceMetricInner> object */ public Observable>> listMultiRoleMetricsWithServiceResponseAsync(final String resourceGroupName, final String name) { @@ -2613,11 +2735,11 @@ public Observable>> call(ServiceRespon } /** - * Get metrics for a multiRole pool of a AppServiceEnvironment (App Service Environment). - * Get metrics for a multiRole pool of a AppServiceEnvironment (App Service Environment). + * Get metrics for a multi-role pool of an App Service Environment. + * Get metrics for a multi-role pool of an App Service Environment. * - * @param resourceGroupName Name of resource group - * @param name Name of AppServiceEnvironment (App Service Environment) + * @param resourceGroupName Name of the resource group to which the resource belongs. + * @param name Name of the App Service Environment. * @return the PagedList<ResourceMetricInner> object wrapped in {@link ServiceResponse} if successful. */ public Observable>> listMultiRoleMetricsSinglePageAsync(final String resourceGroupName, final String name) { @@ -2651,15 +2773,15 @@ public Observable>> call(Response nextPage(String nextPageLink) { } /** - * Get metrics for a multiRole pool of a AppServiceEnvironment (App Service Environment). - * Get metrics for a multiRole pool of a AppServiceEnvironment (App Service Environment). + * Get metrics for a multi-role pool of an App Service Environment. + * Get metrics for a multi-role pool of an App Service Environment. * - * @param resourceGroupName Name of resource group - * @param name Name of AppServiceEnvironment (App Service Environment) - * @param startTime Beginning time of metrics query - * @param endTime End time of metrics query - * @param timeGrain Time granularity of metrics query - * @param details Include instance details + * @param resourceGroupName Name of the resource group to which the resource belongs. + * @param name Name of the App Service Environment. + * @param startTime Beginning time of the metrics query. + * @param endTime End time of the metrics query. + * @param timeGrain Time granularity of the metrics query. + * @param details Specify <code>true</code> to include instance details. The default is <code>false</code>. * @param filter Return only usages/metrics specified in the filter. Filter conforms to odata syntax. Example: $filter=(name.value eq 'Metric1' or name.value eq 'Metric2') and startTime eq '2014-01-01T00:00:00Z' and endTime eq '2014-12-31T23:59:59Z' and timeGrain eq duration'[Hour|Minute|Day]'. * @param serviceCallback the async ServiceCallback to handle successful and failed responses. * @return the {@link ServiceCall} object @@ -2700,15 +2822,15 @@ public Observable>> call(String nextPa } /** - * Get metrics for a multiRole pool of a AppServiceEnvironment (App Service Environment). - * Get metrics for a multiRole pool of a AppServiceEnvironment (App Service Environment). + * Get metrics for a multi-role pool of an App Service Environment. + * Get metrics for a multi-role pool of an App Service Environment. * - * @param resourceGroupName Name of resource group - * @param name Name of AppServiceEnvironment (App Service Environment) - * @param startTime Beginning time of metrics query - * @param endTime End time of metrics query - * @param timeGrain Time granularity of metrics query - * @param details Include instance details + * @param resourceGroupName Name of the resource group to which the resource belongs. + * @param name Name of the App Service Environment. + * @param startTime Beginning time of the metrics query. + * @param endTime End time of the metrics query. + * @param timeGrain Time granularity of the metrics query. + * @param details Specify <code>true</code> to include instance details. The default is <code>false</code>. * @param filter Return only usages/metrics specified in the filter. Filter conforms to odata syntax. Example: $filter=(name.value eq 'Metric1' or name.value eq 'Metric2') and startTime eq '2014-01-01T00:00:00Z' and endTime eq '2014-12-31T23:59:59Z' and timeGrain eq duration'[Hour|Minute|Day]'. * @return the observable to the PagedList<ResourceMetricInner> object */ @@ -2723,15 +2845,15 @@ public Page call(ServiceResponse> } /** - * Get metrics for a multiRole pool of a AppServiceEnvironment (App Service Environment). - * Get metrics for a multiRole pool of a AppServiceEnvironment (App Service Environment). + * Get metrics for a multi-role pool of an App Service Environment. + * Get metrics for a multi-role pool of an App Service Environment. * - * @param resourceGroupName Name of resource group - * @param name Name of AppServiceEnvironment (App Service Environment) - * @param startTime Beginning time of metrics query - * @param endTime End time of metrics query - * @param timeGrain Time granularity of metrics query - * @param details Include instance details + * @param resourceGroupName Name of the resource group to which the resource belongs. + * @param name Name of the App Service Environment. + * @param startTime Beginning time of the metrics query. + * @param endTime End time of the metrics query. + * @param timeGrain Time granularity of the metrics query. + * @param details Specify <code>true</code> to include instance details. The default is <code>false</code>. * @param filter Return only usages/metrics specified in the filter. Filter conforms to odata syntax. Example: $filter=(name.value eq 'Metric1' or name.value eq 'Metric2') and startTime eq '2014-01-01T00:00:00Z' and endTime eq '2014-12-31T23:59:59Z' and timeGrain eq duration'[Hour|Minute|Day]'. * @return the observable to the PagedList<ResourceMetricInner> object */ @@ -2750,15 +2872,15 @@ public Observable>> call(ServiceRespon } /** - * Get metrics for a multiRole pool of a AppServiceEnvironment (App Service Environment). - * Get metrics for a multiRole pool of a AppServiceEnvironment (App Service Environment). + * Get metrics for a multi-role pool of an App Service Environment. + * Get metrics for a multi-role pool of an App Service Environment. * - ServiceResponse> * @param resourceGroupName Name of resource group - ServiceResponse> * @param name Name of AppServiceEnvironment (App Service Environment) - ServiceResponse> * @param startTime Beginning time of metrics query - ServiceResponse> * @param endTime End time of metrics query - ServiceResponse> * @param timeGrain Time granularity of metrics query - ServiceResponse> * @param details Include instance details + ServiceResponse> * @param resourceGroupName Name of the resource group to which the resource belongs. + ServiceResponse> * @param name Name of the App Service Environment. + ServiceResponse> * @param startTime Beginning time of the metrics query. + ServiceResponse> * @param endTime End time of the metrics query. + ServiceResponse> * @param timeGrain Time granularity of the metrics query. + ServiceResponse> * @param details Specify <code>true</code> to include instance details. The default is <code>false</code>. ServiceResponse> * @param filter Return only usages/metrics specified in the filter. Filter conforms to odata syntax. Example: $filter=(name.value eq 'Metric1' or name.value eq 'Metric2') and startTime eq '2014-01-01T00:00:00Z' and endTime eq '2014-12-31T23:59:59Z' and timeGrain eq duration'[Hour|Minute|Day]'. * @return the PagedList<ResourceMetricInner> object wrapped in {@link ServiceResponse} if successful. */ @@ -2795,11 +2917,11 @@ private ServiceResponse> listMultiRoleMetricsDeleg } /** - * Get available skus for scaling a multiRole pool. - * Get available skus for scaling a multiRole pool. + * Get available SKUs for scaling a multi-role pool. + * Get available SKUs for scaling a multi-role pool. * - * @param resourceGroupName Name of resource group - * @param name Name of AppServiceEnvironment (App Service Environment) + * @param resourceGroupName Name of the resource group to which the resource belongs. + * @param name Name of the App Service Environment. * @return the PagedList<SkuInfoInner> object if successful. */ public PagedList listMultiRolePoolSkus(final String resourceGroupName, final String name) { @@ -2813,11 +2935,11 @@ public Page nextPage(String nextPageLink) { } /** - * Get available skus for scaling a multiRole pool. - * Get available skus for scaling a multiRole pool. + * Get available SKUs for scaling a multi-role pool. + * Get available SKUs for scaling a multi-role pool. * - * @param resourceGroupName Name of resource group - * @param name Name of AppServiceEnvironment (App Service Environment) + * @param resourceGroupName Name of the resource group to which the resource belongs. + * @param name Name of the App Service Environment. * @param serviceCallback the async ServiceCallback to handle successful and failed responses. * @return the {@link ServiceCall} object */ @@ -2834,11 +2956,11 @@ public Observable>> call(String nextPageLink) } /** - * Get available skus for scaling a multiRole pool. - * Get available skus for scaling a multiRole pool. + * Get available SKUs for scaling a multi-role pool. + * Get available SKUs for scaling a multi-role pool. * - * @param resourceGroupName Name of resource group - * @param name Name of AppServiceEnvironment (App Service Environment) + * @param resourceGroupName Name of the resource group to which the resource belongs. + * @param name Name of the App Service Environment. * @return the observable to the PagedList<SkuInfoInner> object */ public Observable> listMultiRolePoolSkusAsync(final String resourceGroupName, final String name) { @@ -2852,11 +2974,11 @@ public Page call(ServiceResponse> response) { } /** - * Get available skus for scaling a multiRole pool. - * Get available skus for scaling a multiRole pool. + * Get available SKUs for scaling a multi-role pool. + * Get available SKUs for scaling a multi-role pool. * - * @param resourceGroupName Name of resource group - * @param name Name of AppServiceEnvironment (App Service Environment) + * @param resourceGroupName Name of the resource group to which the resource belongs. + * @param name Name of the App Service Environment. * @return the observable to the PagedList<SkuInfoInner> object */ public Observable>> listMultiRolePoolSkusWithServiceResponseAsync(final String resourceGroupName, final String name) { @@ -2874,11 +2996,11 @@ public Observable>> call(ServiceResponse> * @param resourceGroupName Name of resource group - ServiceResponse> * @param name Name of AppServiceEnvironment (App Service Environment) + ServiceResponse> * @param resourceGroupName Name of the resource group to which the resource belongs. + ServiceResponse> * @param name Name of the App Service Environment. * @return the PagedList<SkuInfoInner> object wrapped in {@link ServiceResponse} if successful. */ public Observable>> listMultiRolePoolSkusSinglePageAsync(final String resourceGroupName, final String name) { @@ -2914,11 +3036,11 @@ private ServiceResponse> listMultiRolePoolSkusDelegate(Re } /** - * Get usages for a multiRole pool of a AppServiceEnvironment (App Service Environment). - * Get usages for a multiRole pool of a AppServiceEnvironment (App Service Environment). + * Get usage metrics for a multi-role pool of an App Service Environment. + * Get usage metrics for a multi-role pool of an App Service Environment. * - * @param resourceGroupName Name of resource group - * @param name Name of AppServiceEnvironment (App Service Environment) + * @param resourceGroupName Name of the resource group to which the resource belongs. + * @param name Name of the App Service Environment. * @return the PagedList<UsageInner> object if successful. */ public PagedList listMultiRoleUsages(final String resourceGroupName, final String name) { @@ -2932,11 +3054,11 @@ public Page nextPage(String nextPageLink) { } /** - * Get usages for a multiRole pool of a AppServiceEnvironment (App Service Environment). - * Get usages for a multiRole pool of a AppServiceEnvironment (App Service Environment). + * Get usage metrics for a multi-role pool of an App Service Environment. + * Get usage metrics for a multi-role pool of an App Service Environment. * - * @param resourceGroupName Name of resource group - * @param name Name of AppServiceEnvironment (App Service Environment) + * @param resourceGroupName Name of the resource group to which the resource belongs. + * @param name Name of the App Service Environment. * @param serviceCallback the async ServiceCallback to handle successful and failed responses. * @return the {@link ServiceCall} object */ @@ -2953,11 +3075,11 @@ public Observable>> call(String nextPageLink) { } /** - * Get usages for a multiRole pool of a AppServiceEnvironment (App Service Environment). - * Get usages for a multiRole pool of a AppServiceEnvironment (App Service Environment). + * Get usage metrics for a multi-role pool of an App Service Environment. + * Get usage metrics for a multi-role pool of an App Service Environment. * - * @param resourceGroupName Name of resource group - * @param name Name of AppServiceEnvironment (App Service Environment) + * @param resourceGroupName Name of the resource group to which the resource belongs. + * @param name Name of the App Service Environment. * @return the observable to the PagedList<UsageInner> object */ public Observable> listMultiRoleUsagesAsync(final String resourceGroupName, final String name) { @@ -2971,11 +3093,11 @@ public Page call(ServiceResponse> response) { } /** - * Get usages for a multiRole pool of a AppServiceEnvironment (App Service Environment). - * Get usages for a multiRole pool of a AppServiceEnvironment (App Service Environment). + * Get usage metrics for a multi-role pool of an App Service Environment. + * Get usage metrics for a multi-role pool of an App Service Environment. * - * @param resourceGroupName Name of resource group - * @param name Name of AppServiceEnvironment (App Service Environment) + * @param resourceGroupName Name of the resource group to which the resource belongs. + * @param name Name of the App Service Environment. * @return the observable to the PagedList<UsageInner> object */ public Observable>> listMultiRoleUsagesWithServiceResponseAsync(final String resourceGroupName, final String name) { @@ -2993,11 +3115,11 @@ public Observable>> call(ServiceResponse> * @param resourceGroupName Name of resource group - ServiceResponse> * @param name Name of AppServiceEnvironment (App Service Environment) + ServiceResponse> * @param resourceGroupName Name of the resource group to which the resource belongs. + ServiceResponse> * @param name Name of the App Service Environment. * @return the PagedList<UsageInner> object wrapped in {@link ServiceResponse} if successful. */ public Observable>> listMultiRoleUsagesSinglePageAsync(final String resourceGroupName, final String name) { @@ -3033,56 +3155,56 @@ private ServiceResponse> listMultiRoleUsagesDelegate(Respon } /** - * List all currently running operations on the AppServiceEnvironment (App Service Environment). - * List all currently running operations on the AppServiceEnvironment (App Service Environment). + * List all currently running operations on the App Service Environment. + * List all currently running operations on the App Service Environment. * - * @param resourceGroupName Name of resource group - * @param name Name of AppServiceEnvironment (App Service Environment) - * @return the Object object if successful. + * @param resourceGroupName Name of the resource group to which the resource belongs. + * @param name Name of the App Service Environment. + * @return the List<OperationInner> object if successful. */ - public Object listOperations(String resourceGroupName, String name) { + public List listOperations(String resourceGroupName, String name) { return listOperationsWithServiceResponseAsync(resourceGroupName, name).toBlocking().single().getBody(); } /** - * List all currently running operations on the AppServiceEnvironment (App Service Environment). - * List all currently running operations on the AppServiceEnvironment (App Service Environment). + * List all currently running operations on the App Service Environment. + * List all currently running operations on the App Service Environment. * - * @param resourceGroupName Name of resource group - * @param name Name of AppServiceEnvironment (App Service Environment) + * @param resourceGroupName Name of the resource group to which the resource belongs. + * @param name Name of the App Service Environment. * @param serviceCallback the async ServiceCallback to handle successful and failed responses. * @return the {@link ServiceCall} object */ - public ServiceCall listOperationsAsync(String resourceGroupName, String name, final ServiceCallback serviceCallback) { + public ServiceCall> listOperationsAsync(String resourceGroupName, String name, final ServiceCallback> serviceCallback) { return ServiceCall.create(listOperationsWithServiceResponseAsync(resourceGroupName, name), serviceCallback); } /** - * List all currently running operations on the AppServiceEnvironment (App Service Environment). - * List all currently running operations on the AppServiceEnvironment (App Service Environment). + * List all currently running operations on the App Service Environment. + * List all currently running operations on the App Service Environment. * - * @param resourceGroupName Name of resource group - * @param name Name of AppServiceEnvironment (App Service Environment) - * @return the observable to the Object object + * @param resourceGroupName Name of the resource group to which the resource belongs. + * @param name Name of the App Service Environment. + * @return the observable to the List<OperationInner> object */ - public Observable listOperationsAsync(String resourceGroupName, String name) { - return listOperationsWithServiceResponseAsync(resourceGroupName, name).map(new Func1, Object>() { + public Observable> listOperationsAsync(String resourceGroupName, String name) { + return listOperationsWithServiceResponseAsync(resourceGroupName, name).map(new Func1>, List>() { @Override - public Object call(ServiceResponse response) { + public List call(ServiceResponse> response) { return response.getBody(); } }); } /** - * List all currently running operations on the AppServiceEnvironment (App Service Environment). - * List all currently running operations on the AppServiceEnvironment (App Service Environment). + * List all currently running operations on the App Service Environment. + * List all currently running operations on the App Service Environment. * - * @param resourceGroupName Name of resource group - * @param name Name of AppServiceEnvironment (App Service Environment) - * @return the observable to the Object object + * @param resourceGroupName Name of the resource group to which the resource belongs. + * @param name Name of the App Service Environment. + * @return the observable to the List<OperationInner> object */ - public Observable> listOperationsWithServiceResponseAsync(String resourceGroupName, String name) { + public Observable>> listOperationsWithServiceResponseAsync(String resourceGroupName, String name) { if (resourceGroupName == null) { throw new IllegalArgumentException("Parameter resourceGroupName is required and cannot be null."); } @@ -3094,100 +3216,11 @@ public Observable> listOperationsWithServiceResponseAsyn } final String apiVersion = "2016-09-01"; return service.listOperations(resourceGroupName, name, this.client.subscriptionId(), apiVersion, this.client.acceptLanguage(), this.client.userAgent()) - .flatMap(new Func1, Observable>>() { - @Override - public Observable> call(Response response) { - try { - ServiceResponse clientResponse = listOperationsDelegate(response); - return Observable.just(clientResponse); - } catch (Throwable t) { - return Observable.error(t); - } - } - }); - } - - private ServiceResponse listOperationsDelegate(Response response) throws CloudException, IOException, IllegalArgumentException { - return new AzureServiceResponseBuilder(this.client.mapperAdapter()) - .register(200, new TypeToken() { }.getType()) - .registerError(CloudException.class) - .build(response); - } - - /** - * Get status of an operation on a AppServiceEnvironment (App Service Environment). - * Get status of an operation on a AppServiceEnvironment (App Service Environment). - * - * @param resourceGroupName Name of resource group - * @param name Name of AppServiceEnvironment (App Service Environment) - * @param operationId operation identifier GUID - * @return the Object object if successful. - */ - public Object getOperation(String resourceGroupName, String name, String operationId) { - return getOperationWithServiceResponseAsync(resourceGroupName, name, operationId).toBlocking().single().getBody(); - } - - /** - * Get status of an operation on a AppServiceEnvironment (App Service Environment). - * Get status of an operation on a AppServiceEnvironment (App Service Environment). - * - * @param resourceGroupName Name of resource group - * @param name Name of AppServiceEnvironment (App Service Environment) - * @param operationId operation identifier GUID - * @param serviceCallback the async ServiceCallback to handle successful and failed responses. - * @return the {@link ServiceCall} object - */ - public ServiceCall getOperationAsync(String resourceGroupName, String name, String operationId, final ServiceCallback serviceCallback) { - return ServiceCall.create(getOperationWithServiceResponseAsync(resourceGroupName, name, operationId), serviceCallback); - } - - /** - * Get status of an operation on a AppServiceEnvironment (App Service Environment). - * Get status of an operation on a AppServiceEnvironment (App Service Environment). - * - * @param resourceGroupName Name of resource group - * @param name Name of AppServiceEnvironment (App Service Environment) - * @param operationId operation identifier GUID - * @return the observable to the Object object - */ - public Observable getOperationAsync(String resourceGroupName, String name, String operationId) { - return getOperationWithServiceResponseAsync(resourceGroupName, name, operationId).map(new Func1, Object>() { - @Override - public Object call(ServiceResponse response) { - return response.getBody(); - } - }); - } - - /** - * Get status of an operation on a AppServiceEnvironment (App Service Environment). - * Get status of an operation on a AppServiceEnvironment (App Service Environment). - * - * @param resourceGroupName Name of resource group - * @param name Name of AppServiceEnvironment (App Service Environment) - * @param operationId operation identifier GUID - * @return the observable to the Object object - */ - public Observable> getOperationWithServiceResponseAsync(String resourceGroupName, String name, String operationId) { - if (resourceGroupName == null) { - throw new IllegalArgumentException("Parameter resourceGroupName is required and cannot be null."); - } - if (name == null) { - throw new IllegalArgumentException("Parameter name is required and cannot be null."); - } - if (operationId == null) { - throw new IllegalArgumentException("Parameter operationId is required and cannot be null."); - } - if (this.client.subscriptionId() == null) { - throw new IllegalArgumentException("Parameter this.client.subscriptionId() is required and cannot be null."); - } - final String apiVersion = "2016-09-01"; - return service.getOperation(resourceGroupName, name, operationId, this.client.subscriptionId(), apiVersion, this.client.acceptLanguage(), this.client.userAgent()) - .flatMap(new Func1, Observable>>() { + .flatMap(new Func1, Observable>>>() { @Override - public Observable> call(Response response) { + public Observable>> call(Response response) { try { - ServiceResponse clientResponse = getOperationDelegate(response); + ServiceResponse> clientResponse = listOperationsDelegate(response); return Observable.just(clientResponse); } catch (Throwable t) { return Observable.error(t); @@ -3196,67 +3229,63 @@ public Observable> call(Response response) }); } - private ServiceResponse getOperationDelegate(Response response) throws CloudException, IOException, IllegalArgumentException { - return new AzureServiceResponseBuilder(this.client.mapperAdapter()) - .register(200, new TypeToken() { }.getType()) - .register(202, new TypeToken() { }.getType()) - .register(404, new TypeToken() { }.getType()) - .register(500, new TypeToken() { }.getType()) + private ServiceResponse> listOperationsDelegate(Response response) throws CloudException, IOException, IllegalArgumentException { + return new AzureServiceResponseBuilder, CloudException>(this.client.mapperAdapter()) + .register(200, new TypeToken>() { }.getType()) .registerError(CloudException.class) .build(response); } /** - * Reboots all machines in a AppServiceEnvironment (App Service Environment). - * Reboots all machines in a AppServiceEnvironment (App Service Environment). + * Reboot all machines in an App Service Environment. + * Reboot all machines in an App Service Environment. * - * @param resourceGroupName Name of resource group - * @param name Name of AppServiceEnvironment (App Service Environment) - * @return the Object object if successful. + * @param resourceGroupName Name of the resource group to which the resource belongs. + * @param name Name of the App Service Environment. */ - public Object reboot(String resourceGroupName, String name) { - return rebootWithServiceResponseAsync(resourceGroupName, name).toBlocking().single().getBody(); + public void reboot(String resourceGroupName, String name) { + rebootWithServiceResponseAsync(resourceGroupName, name).toBlocking().single().getBody(); } /** - * Reboots all machines in a AppServiceEnvironment (App Service Environment). - * Reboots all machines in a AppServiceEnvironment (App Service Environment). + * Reboot all machines in an App Service Environment. + * Reboot all machines in an App Service Environment. * - * @param resourceGroupName Name of resource group - * @param name Name of AppServiceEnvironment (App Service Environment) + * @param resourceGroupName Name of the resource group to which the resource belongs. + * @param name Name of the App Service Environment. * @param serviceCallback the async ServiceCallback to handle successful and failed responses. * @return the {@link ServiceCall} object */ - public ServiceCall rebootAsync(String resourceGroupName, String name, final ServiceCallback serviceCallback) { + public ServiceCall rebootAsync(String resourceGroupName, String name, final ServiceCallback serviceCallback) { return ServiceCall.create(rebootWithServiceResponseAsync(resourceGroupName, name), serviceCallback); } /** - * Reboots all machines in a AppServiceEnvironment (App Service Environment). - * Reboots all machines in a AppServiceEnvironment (App Service Environment). + * Reboot all machines in an App Service Environment. + * Reboot all machines in an App Service Environment. * - * @param resourceGroupName Name of resource group - * @param name Name of AppServiceEnvironment (App Service Environment) - * @return the observable to the Object object + * @param resourceGroupName Name of the resource group to which the resource belongs. + * @param name Name of the App Service Environment. + * @return the {@link ServiceResponse} object if successful. */ - public Observable rebootAsync(String resourceGroupName, String name) { - return rebootWithServiceResponseAsync(resourceGroupName, name).map(new Func1, Object>() { + public Observable rebootAsync(String resourceGroupName, String name) { + return rebootWithServiceResponseAsync(resourceGroupName, name).map(new Func1, Void>() { @Override - public Object call(ServiceResponse response) { + public Void call(ServiceResponse response) { return response.getBody(); } }); } /** - * Reboots all machines in a AppServiceEnvironment (App Service Environment). - * Reboots all machines in a AppServiceEnvironment (App Service Environment). + * Reboot all machines in an App Service Environment. + * Reboot all machines in an App Service Environment. * - * @param resourceGroupName Name of resource group - * @param name Name of AppServiceEnvironment (App Service Environment) - * @return the observable to the Object object + * @param resourceGroupName Name of the resource group to which the resource belongs. + * @param name Name of the App Service Environment. + * @return the {@link ServiceResponse} object if successful. */ - public Observable> rebootWithServiceResponseAsync(String resourceGroupName, String name) { + public Observable> rebootWithServiceResponseAsync(String resourceGroupName, String name) { if (resourceGroupName == null) { throw new IllegalArgumentException("Parameter resourceGroupName is required and cannot be null."); } @@ -3268,11 +3297,11 @@ public Observable> rebootWithServiceResponseAsync(String } final String apiVersion = "2016-09-01"; return service.reboot(resourceGroupName, name, this.client.subscriptionId(), apiVersion, this.client.acceptLanguage(), this.client.userAgent()) - .flatMap(new Func1, Observable>>() { + .flatMap(new Func1, Observable>>() { @Override - public Observable> call(Response response) { + public Observable> call(Response response) { try { - ServiceResponse clientResponse = rebootDelegate(response); + ServiceResponse clientResponse = rebootDelegate(response); return Observable.just(clientResponse); } catch (Throwable t) { return Observable.error(t); @@ -3281,22 +3310,21 @@ public Observable> call(Response response) }); } - private ServiceResponse rebootDelegate(Response response) throws CloudException, IOException, IllegalArgumentException { - return new AzureServiceResponseBuilder(this.client.mapperAdapter()) - .register(202, new TypeToken() { }.getType()) + private ServiceResponse rebootDelegate(Response response) throws CloudException, IOException, IllegalArgumentException { + return new AzureServiceResponseBuilder(this.client.mapperAdapter()) + .register(202, new TypeToken() { }.getType()) .register(400, new TypeToken() { }.getType()) .register(404, new TypeToken() { }.getType()) .register(409, new TypeToken() { }.getType()) - .registerError(CloudException.class) .build(response); } /** - * Resumes the AppServiceEnvironment. - * Resumes the AppServiceEnvironment. + * Resume an App Service Environment. + * Resume an App Service Environment. * - * @param resourceGroupName Name of resource group - * @param name Name of AppServiceEnvironment (App Service Environment) + * @param resourceGroupName Name of the resource group to which the resource belongs. + * @param name Name of the App Service Environment. * @return the PagedList<SiteInner> object if successful. */ public PagedList resume(final String resourceGroupName, final String name) { @@ -3310,11 +3338,11 @@ public Page nextPage(String nextPageLink) { } /** - * Resumes the AppServiceEnvironment. - * Resumes the AppServiceEnvironment. + * Resume an App Service Environment. + * Resume an App Service Environment. * - * @param resourceGroupName Name of resource group - * @param name Name of AppServiceEnvironment (App Service Environment) + * @param resourceGroupName Name of the resource group to which the resource belongs. + * @param name Name of the App Service Environment. * @param serviceCallback the async ServiceCallback to handle successful and failed responses. * @return the {@link ServiceCall} object */ @@ -3331,11 +3359,11 @@ public Observable>> call(String nextPageLink) { } /** - * Resumes the AppServiceEnvironment. - * Resumes the AppServiceEnvironment. + * Resume an App Service Environment. + * Resume an App Service Environment. * - * @param resourceGroupName Name of resource group - * @param name Name of AppServiceEnvironment (App Service Environment) + * @param resourceGroupName Name of the resource group to which the resource belongs. + * @param name Name of the App Service Environment. * @return the observable to the PagedList<SiteInner> object */ public Observable> resumeAsync(final String resourceGroupName, final String name) { @@ -3349,11 +3377,11 @@ public Page call(ServiceResponse> response) { } /** - * Resumes the AppServiceEnvironment. - * Resumes the AppServiceEnvironment. + * Resume an App Service Environment. + * Resume an App Service Environment. * - * @param resourceGroupName Name of resource group - * @param name Name of AppServiceEnvironment (App Service Environment) + * @param resourceGroupName Name of the resource group to which the resource belongs. + * @param name Name of the App Service Environment. * @return the observable to the PagedList<SiteInner> object */ public Observable>> resumeWithServiceResponseAsync(final String resourceGroupName, final String name) { @@ -3371,11 +3399,11 @@ public Observable>> call(ServiceResponse> * @param resourceGroupName Name of resource group - ServiceResponse> * @param name Name of AppServiceEnvironment (App Service Environment) + ServiceResponse> * @param resourceGroupName Name of the resource group to which the resource belongs. + ServiceResponse> * @param name Name of the App Service Environment. * @return the PagedList<SiteInner> object wrapped in {@link ServiceResponse} if successful. */ public Observable>> resumeSinglePageAsync(final String resourceGroupName, final String name) { @@ -3412,11 +3440,11 @@ private ServiceResponse> resumeDelegate(Response beginResume(final String resourceGroupName, final String name) { @@ -3430,11 +3458,11 @@ public Page nextPage(String nextPageLink) { } /** - * Resumes the AppServiceEnvironment. - * Resumes the AppServiceEnvironment. + * Resume an App Service Environment. + * Resume an App Service Environment. * - * @param resourceGroupName Name of resource group - * @param name Name of AppServiceEnvironment (App Service Environment) + * @param resourceGroupName Name of the resource group to which the resource belongs. + * @param name Name of the App Service Environment. * @param serviceCallback the async ServiceCallback to handle successful and failed responses. * @return the {@link ServiceCall} object */ @@ -3451,11 +3479,11 @@ public Observable>> call(String nextPageLink) { } /** - * Resumes the AppServiceEnvironment. - * Resumes the AppServiceEnvironment. + * Resume an App Service Environment. + * Resume an App Service Environment. * - * @param resourceGroupName Name of resource group - * @param name Name of AppServiceEnvironment (App Service Environment) + * @param resourceGroupName Name of the resource group to which the resource belongs. + * @param name Name of the App Service Environment. * @return the observable to the PagedList<SiteInner> object */ public Observable> beginResumeAsync(final String resourceGroupName, final String name) { @@ -3469,11 +3497,11 @@ public Page call(ServiceResponse> response) { } /** - * Resumes the AppServiceEnvironment. - * Resumes the AppServiceEnvironment. + * Resume an App Service Environment. + * Resume an App Service Environment. * - * @param resourceGroupName Name of resource group - * @param name Name of AppServiceEnvironment (App Service Environment) + * @param resourceGroupName Name of the resource group to which the resource belongs. + * @param name Name of the App Service Environment. * @return the observable to the PagedList<SiteInner> object */ public Observable>> beginResumeWithServiceResponseAsync(final String resourceGroupName, final String name) { @@ -3491,11 +3519,11 @@ public Observable>> call(ServiceResponse> * @param resourceGroupName Name of resource group - ServiceResponse> * @param name Name of AppServiceEnvironment (App Service Environment) + ServiceResponse> * @param resourceGroupName Name of the resource group to which the resource belongs. + ServiceResponse> * @param name Name of the App Service Environment. * @return the PagedList<SiteInner> object wrapped in {@link ServiceResponse} if successful. */ public Observable>> beginResumeSinglePageAsync(final String resourceGroupName, final String name) { @@ -3532,11 +3560,11 @@ private ServiceResponse> beginResumeDelegate(Response listAppServicePlans(final String resourceGroupName, final String name) { @@ -3550,11 +3578,11 @@ public Page nextPage(String nextPageLink) { } /** - * Get all serverfarms (App Service Plans) on the AppServiceEnvironment (App Service Environment). - * Get all serverfarms (App Service Plans) on the AppServiceEnvironment (App Service Environment). + * Get all App Service plans in an App Service Environment. + * Get all App Service plans in an App Service Environment. * - * @param resourceGroupName Name of resource group - * @param name Name of AppServiceEnvironment (App Service Environment) + * @param resourceGroupName Name of the resource group to which the resource belongs. + * @param name Name of the App Service Environment. * @param serviceCallback the async ServiceCallback to handle successful and failed responses. * @return the {@link ServiceCall} object */ @@ -3571,11 +3599,11 @@ public Observable>> call(String nextPa } /** - * Get all serverfarms (App Service Plans) on the AppServiceEnvironment (App Service Environment). - * Get all serverfarms (App Service Plans) on the AppServiceEnvironment (App Service Environment). + * Get all App Service plans in an App Service Environment. + * Get all App Service plans in an App Service Environment. * - * @param resourceGroupName Name of resource group - * @param name Name of AppServiceEnvironment (App Service Environment) + * @param resourceGroupName Name of the resource group to which the resource belongs. + * @param name Name of the App Service Environment. * @return the observable to the PagedList<AppServicePlanInner> object */ public Observable> listAppServicePlansAsync(final String resourceGroupName, final String name) { @@ -3589,11 +3617,11 @@ public Page call(ServiceResponse> } /** - * Get all serverfarms (App Service Plans) on the AppServiceEnvironment (App Service Environment). - * Get all serverfarms (App Service Plans) on the AppServiceEnvironment (App Service Environment). + * Get all App Service plans in an App Service Environment. + * Get all App Service plans in an App Service Environment. * - * @param resourceGroupName Name of resource group - * @param name Name of AppServiceEnvironment (App Service Environment) + * @param resourceGroupName Name of the resource group to which the resource belongs. + * @param name Name of the App Service Environment. * @return the observable to the PagedList<AppServicePlanInner> object */ public Observable>> listAppServicePlansWithServiceResponseAsync(final String resourceGroupName, final String name) { @@ -3611,11 +3639,11 @@ public Observable>> call(ServiceRespon } /** - * Get all serverfarms (App Service Plans) on the AppServiceEnvironment (App Service Environment). - * Get all serverfarms (App Service Plans) on the AppServiceEnvironment (App Service Environment). + * Get all App Service plans in an App Service Environment. + * Get all App Service plans in an App Service Environment. * - ServiceResponse> * @param resourceGroupName Name of resource group - ServiceResponse> * @param name Name of AppServiceEnvironment (App Service Environment) + ServiceResponse> * @param resourceGroupName Name of the resource group to which the resource belongs. + ServiceResponse> * @param name Name of the App Service Environment. * @return the PagedList<AppServicePlanInner> object wrapped in {@link ServiceResponse} if successful. */ public Observable>> listAppServicePlansSinglePageAsync(final String resourceGroupName, final String name) { @@ -3651,11 +3679,11 @@ private ServiceResponse> listAppServicePlansDelega } /** - * Get all sites on the AppServiceEnvironment (App Service Environment). - * Get all sites on the AppServiceEnvironment (App Service Environment). + * Get all apps in an App Service Environment. + * Get all apps in an App Service Environment. * - * @param resourceGroupName Name of resource group - * @param name Name of AppServiceEnvironment (App Service Environment) + * @param resourceGroupName Name of the resource group to which the resource belongs. + * @param name Name of the App Service Environment. * @return the PagedList<SiteInner> object if successful. */ public PagedList listWebApps(final String resourceGroupName, final String name) { @@ -3669,11 +3697,11 @@ public Page nextPage(String nextPageLink) { } /** - * Get all sites on the AppServiceEnvironment (App Service Environment). - * Get all sites on the AppServiceEnvironment (App Service Environment). + * Get all apps in an App Service Environment. + * Get all apps in an App Service Environment. * - * @param resourceGroupName Name of resource group - * @param name Name of AppServiceEnvironment (App Service Environment) + * @param resourceGroupName Name of the resource group to which the resource belongs. + * @param name Name of the App Service Environment. * @param serviceCallback the async ServiceCallback to handle successful and failed responses. * @return the {@link ServiceCall} object */ @@ -3690,11 +3718,11 @@ public Observable>> call(String nextPageLink) { } /** - * Get all sites on the AppServiceEnvironment (App Service Environment). - * Get all sites on the AppServiceEnvironment (App Service Environment). + * Get all apps in an App Service Environment. + * Get all apps in an App Service Environment. * - * @param resourceGroupName Name of resource group - * @param name Name of AppServiceEnvironment (App Service Environment) + * @param resourceGroupName Name of the resource group to which the resource belongs. + * @param name Name of the App Service Environment. * @return the observable to the PagedList<SiteInner> object */ public Observable> listWebAppsAsync(final String resourceGroupName, final String name) { @@ -3708,11 +3736,11 @@ public Page call(ServiceResponse> response) { } /** - * Get all sites on the AppServiceEnvironment (App Service Environment). - * Get all sites on the AppServiceEnvironment (App Service Environment). + * Get all apps in an App Service Environment. + * Get all apps in an App Service Environment. * - * @param resourceGroupName Name of resource group - * @param name Name of AppServiceEnvironment (App Service Environment) + * @param resourceGroupName Name of the resource group to which the resource belongs. + * @param name Name of the App Service Environment. * @return the observable to the PagedList<SiteInner> object */ public Observable>> listWebAppsWithServiceResponseAsync(final String resourceGroupName, final String name) { @@ -3730,11 +3758,11 @@ public Observable>> call(ServiceResponse>> listWebAppsSinglePageAsync(final String resourceGroupName, final String name) { @@ -3764,12 +3792,12 @@ public Observable>> call(Response } /** - * Get all sites on the AppServiceEnvironment (App Service Environment). - * Get all sites on the AppServiceEnvironment (App Service Environment). + * Get all apps in an App Service Environment. + * Get all apps in an App Service Environment. * - * @param resourceGroupName Name of resource group - * @param name Name of AppServiceEnvironment (App Service Environment) - * @param propertiesToInclude Comma separated list of site properties to include + * @param resourceGroupName Name of the resource group to which the resource belongs. + * @param name Name of the App Service Environment. + * @param propertiesToInclude Comma separated list of app properties to include. * @return the PagedList<SiteInner> object if successful. */ public PagedList listWebApps(final String resourceGroupName, final String name, final String propertiesToInclude) { @@ -3783,12 +3811,12 @@ public Page nextPage(String nextPageLink) { } /** - * Get all sites on the AppServiceEnvironment (App Service Environment). - * Get all sites on the AppServiceEnvironment (App Service Environment). + * Get all apps in an App Service Environment. + * Get all apps in an App Service Environment. * - * @param resourceGroupName Name of resource group - * @param name Name of AppServiceEnvironment (App Service Environment) - * @param propertiesToInclude Comma separated list of site properties to include + * @param resourceGroupName Name of the resource group to which the resource belongs. + * @param name Name of the App Service Environment. + * @param propertiesToInclude Comma separated list of app properties to include. * @param serviceCallback the async ServiceCallback to handle successful and failed responses. * @return the {@link ServiceCall} object */ @@ -3805,12 +3833,12 @@ public Observable>> call(String nextPageLink) { } /** - * Get all sites on the AppServiceEnvironment (App Service Environment). - * Get all sites on the AppServiceEnvironment (App Service Environment). + * Get all apps in an App Service Environment. + * Get all apps in an App Service Environment. * - * @param resourceGroupName Name of resource group - * @param name Name of AppServiceEnvironment (App Service Environment) - * @param propertiesToInclude Comma separated list of site properties to include + * @param resourceGroupName Name of the resource group to which the resource belongs. + * @param name Name of the App Service Environment. + * @param propertiesToInclude Comma separated list of app properties to include. * @return the observable to the PagedList<SiteInner> object */ public Observable> listWebAppsAsync(final String resourceGroupName, final String name, final String propertiesToInclude) { @@ -3824,12 +3852,12 @@ public Page call(ServiceResponse> response) { } /** - * Get all sites on the AppServiceEnvironment (App Service Environment). - * Get all sites on the AppServiceEnvironment (App Service Environment). + * Get all apps in an App Service Environment. + * Get all apps in an App Service Environment. * - * @param resourceGroupName Name of resource group - * @param name Name of AppServiceEnvironment (App Service Environment) - * @param propertiesToInclude Comma separated list of site properties to include + * @param resourceGroupName Name of the resource group to which the resource belongs. + * @param name Name of the App Service Environment. + * @param propertiesToInclude Comma separated list of app properties to include. * @return the observable to the PagedList<SiteInner> object */ public Observable>> listWebAppsWithServiceResponseAsync(final String resourceGroupName, final String name, final String propertiesToInclude) { @@ -3847,12 +3875,12 @@ public Observable>> call(ServiceResponse> * @param resourceGroupName Name of resource group - ServiceResponse> * @param name Name of AppServiceEnvironment (App Service Environment) - ServiceResponse> * @param propertiesToInclude Comma separated list of site properties to include + ServiceResponse> * @param resourceGroupName Name of the resource group to which the resource belongs. + ServiceResponse> * @param name Name of the App Service Environment. + ServiceResponse> * @param propertiesToInclude Comma separated list of app properties to include. * @return the PagedList<SiteInner> object wrapped in {@link ServiceResponse} if successful. */ public Observable>> listWebAppsSinglePageAsync(final String resourceGroupName, final String name, final String propertiesToInclude) { @@ -3888,11 +3916,11 @@ private ServiceResponse> listWebAppsDelegate(Response suspend(final String resourceGroupName, final String name) { @@ -3906,11 +3934,11 @@ public Page nextPage(String nextPageLink) { } /** - * Suspends the AppServiceEnvironment. - * Suspends the AppServiceEnvironment. + * Suspend an App Service Environment. + * Suspend an App Service Environment. * - * @param resourceGroupName Name of resource group - * @param name Name of AppServiceEnvironment (App Service Environment) + * @param resourceGroupName Name of the resource group to which the resource belongs. + * @param name Name of the App Service Environment. * @param serviceCallback the async ServiceCallback to handle successful and failed responses. * @return the {@link ServiceCall} object */ @@ -3927,11 +3955,11 @@ public Observable>> call(String nextPageLink) { } /** - * Suspends the AppServiceEnvironment. - * Suspends the AppServiceEnvironment. + * Suspend an App Service Environment. + * Suspend an App Service Environment. * - * @param resourceGroupName Name of resource group - * @param name Name of AppServiceEnvironment (App Service Environment) + * @param resourceGroupName Name of the resource group to which the resource belongs. + * @param name Name of the App Service Environment. * @return the observable to the PagedList<SiteInner> object */ public Observable> suspendAsync(final String resourceGroupName, final String name) { @@ -3945,11 +3973,11 @@ public Page call(ServiceResponse> response) { } /** - * Suspends the AppServiceEnvironment. - * Suspends the AppServiceEnvironment. + * Suspend an App Service Environment. + * Suspend an App Service Environment. * - * @param resourceGroupName Name of resource group - * @param name Name of AppServiceEnvironment (App Service Environment) + * @param resourceGroupName Name of the resource group to which the resource belongs. + * @param name Name of the App Service Environment. * @return the observable to the PagedList<SiteInner> object */ public Observable>> suspendWithServiceResponseAsync(final String resourceGroupName, final String name) { @@ -3967,11 +3995,11 @@ public Observable>> call(ServiceResponse> * @param resourceGroupName Name of resource group - ServiceResponse> * @param name Name of AppServiceEnvironment (App Service Environment) + ServiceResponse> * @param resourceGroupName Name of the resource group to which the resource belongs. + ServiceResponse> * @param name Name of the App Service Environment. * @return the PagedList<SiteInner> object wrapped in {@link ServiceResponse} if successful. */ public Observable>> suspendSinglePageAsync(final String resourceGroupName, final String name) { @@ -4008,11 +4036,11 @@ private ServiceResponse> suspendDelegate(Response beginSuspend(final String resourceGroupName, final String name) { @@ -4026,11 +4054,11 @@ public Page nextPage(String nextPageLink) { } /** - * Suspends the AppServiceEnvironment. - * Suspends the AppServiceEnvironment. + * Suspend an App Service Environment. + * Suspend an App Service Environment. * - * @param resourceGroupName Name of resource group - * @param name Name of AppServiceEnvironment (App Service Environment) + * @param resourceGroupName Name of the resource group to which the resource belongs. + * @param name Name of the App Service Environment. * @param serviceCallback the async ServiceCallback to handle successful and failed responses. * @return the {@link ServiceCall} object */ @@ -4047,11 +4075,11 @@ public Observable>> call(String nextPageLink) { } /** - * Suspends the AppServiceEnvironment. - * Suspends the AppServiceEnvironment. + * Suspend an App Service Environment. + * Suspend an App Service Environment. * - * @param resourceGroupName Name of resource group - * @param name Name of AppServiceEnvironment (App Service Environment) + * @param resourceGroupName Name of the resource group to which the resource belongs. + * @param name Name of the App Service Environment. * @return the observable to the PagedList<SiteInner> object */ public Observable> beginSuspendAsync(final String resourceGroupName, final String name) { @@ -4065,11 +4093,11 @@ public Page call(ServiceResponse> response) { } /** - * Suspends the AppServiceEnvironment. - * Suspends the AppServiceEnvironment. + * Suspend an App Service Environment. + * Suspend an App Service Environment. * - * @param resourceGroupName Name of resource group - * @param name Name of AppServiceEnvironment (App Service Environment) + * @param resourceGroupName Name of the resource group to which the resource belongs. + * @param name Name of the App Service Environment. * @return the observable to the PagedList<SiteInner> object */ public Observable>> beginSuspendWithServiceResponseAsync(final String resourceGroupName, final String name) { @@ -4087,11 +4115,11 @@ public Observable>> call(ServiceResponse> * @param resourceGroupName Name of resource group - ServiceResponse> * @param name Name of AppServiceEnvironment (App Service Environment) + ServiceResponse> * @param resourceGroupName Name of the resource group to which the resource belongs. + ServiceResponse> * @param name Name of the App Service Environment. * @return the PagedList<SiteInner> object wrapped in {@link ServiceResponse} if successful. */ public Observable>> beginSuspendSinglePageAsync(final String resourceGroupName, final String name) { @@ -4128,11 +4156,11 @@ private ServiceResponse> beginSuspendDelegate(Response listUsages(final String resourceGroupName, final String name) { @@ -4146,11 +4174,11 @@ public Page nextPage(String nextPageLink) { } /** - * Get global usages of AppServiceEnvironment (App Service Environment). - * Get global usages of AppServiceEnvironment (App Service Environment). + * Get global usage metrics of an App Service Environment. + * Get global usage metrics of an App Service Environment. * - * @param resourceGroupName Name of resource group - * @param name Name of AppServiceEnvironment (App Service Environment) + * @param resourceGroupName Name of the resource group to which the resource belongs. + * @param name Name of the App Service Environment. * @param serviceCallback the async ServiceCallback to handle successful and failed responses. * @return the {@link ServiceCall} object */ @@ -4167,11 +4195,11 @@ public Observable>> call(String nextPag } /** - * Get global usages of AppServiceEnvironment (App Service Environment). - * Get global usages of AppServiceEnvironment (App Service Environment). + * Get global usage metrics of an App Service Environment. + * Get global usage metrics of an App Service Environment. * - * @param resourceGroupName Name of resource group - * @param name Name of AppServiceEnvironment (App Service Environment) + * @param resourceGroupName Name of the resource group to which the resource belongs. + * @param name Name of the App Service Environment. * @return the observable to the PagedList<CsmUsageQuotaInner> object */ public Observable> listUsagesAsync(final String resourceGroupName, final String name) { @@ -4185,11 +4213,11 @@ public Page call(ServiceResponse> r } /** - * Get global usages of AppServiceEnvironment (App Service Environment). - * Get global usages of AppServiceEnvironment (App Service Environment). + * Get global usage metrics of an App Service Environment. + * Get global usage metrics of an App Service Environment. * - * @param resourceGroupName Name of resource group - * @param name Name of AppServiceEnvironment (App Service Environment) + * @param resourceGroupName Name of the resource group to which the resource belongs. + * @param name Name of the App Service Environment. * @return the observable to the PagedList<CsmUsageQuotaInner> object */ public Observable>> listUsagesWithServiceResponseAsync(final String resourceGroupName, final String name) { @@ -4207,11 +4235,11 @@ public Observable>> call(ServiceRespons } /** - * Get global usages of AppServiceEnvironment (App Service Environment). - * Get global usages of AppServiceEnvironment (App Service Environment). + * Get global usage metrics of an App Service Environment. + * Get global usage metrics of an App Service Environment. * - * @param resourceGroupName Name of resource group - * @param name Name of AppServiceEnvironment (App Service Environment) + * @param resourceGroupName Name of the resource group to which the resource belongs. + * @param name Name of the App Service Environment. * @return the PagedList<CsmUsageQuotaInner> object wrapped in {@link ServiceResponse} if successful. */ public Observable>> listUsagesSinglePageAsync(final String resourceGroupName, final String name) { @@ -4241,11 +4269,11 @@ public Observable>> call(Response nextPage(String nextPageLink) { } /** - * Get global usages of AppServiceEnvironment (App Service Environment). - * Get global usages of AppServiceEnvironment (App Service Environment). + * Get global usage metrics of an App Service Environment. + * Get global usage metrics of an App Service Environment. * - * @param resourceGroupName Name of resource group - * @param name Name of AppServiceEnvironment (App Service Environment) + * @param resourceGroupName Name of the resource group to which the resource belongs. + * @param name Name of the App Service Environment. * @param filter Return only usages/metrics specified in the filter. Filter conforms to odata syntax. Example: $filter=(name.value eq 'Metric1' or name.value eq 'Metric2') and startTime eq '2014-01-01T00:00:00Z' and endTime eq '2014-12-31T23:59:59Z' and timeGrain eq duration'[Hour|Minute|Day]'. * @param serviceCallback the async ServiceCallback to handle successful and failed responses. * @return the {@link ServiceCall} object @@ -4282,11 +4310,11 @@ public Observable>> call(String nextPag } /** - * Get global usages of AppServiceEnvironment (App Service Environment). - * Get global usages of AppServiceEnvironment (App Service Environment). + * Get global usage metrics of an App Service Environment. + * Get global usage metrics of an App Service Environment. * - * @param resourceGroupName Name of resource group - * @param name Name of AppServiceEnvironment (App Service Environment) + * @param resourceGroupName Name of the resource group to which the resource belongs. + * @param name Name of the App Service Environment. * @param filter Return only usages/metrics specified in the filter. Filter conforms to odata syntax. Example: $filter=(name.value eq 'Metric1' or name.value eq 'Metric2') and startTime eq '2014-01-01T00:00:00Z' and endTime eq '2014-12-31T23:59:59Z' and timeGrain eq duration'[Hour|Minute|Day]'. * @return the observable to the PagedList<CsmUsageQuotaInner> object */ @@ -4301,11 +4329,11 @@ public Page call(ServiceResponse> r } /** - * Get global usages of AppServiceEnvironment (App Service Environment). - * Get global usages of AppServiceEnvironment (App Service Environment). + * Get global usage metrics of an App Service Environment. + * Get global usage metrics of an App Service Environment. * - * @param resourceGroupName Name of resource group - * @param name Name of AppServiceEnvironment (App Service Environment) + * @param resourceGroupName Name of the resource group to which the resource belongs. + * @param name Name of the App Service Environment. * @param filter Return only usages/metrics specified in the filter. Filter conforms to odata syntax. Example: $filter=(name.value eq 'Metric1' or name.value eq 'Metric2') and startTime eq '2014-01-01T00:00:00Z' and endTime eq '2014-12-31T23:59:59Z' and timeGrain eq duration'[Hour|Minute|Day]'. * @return the observable to the PagedList<CsmUsageQuotaInner> object */ @@ -4324,11 +4352,11 @@ public Observable>> call(ServiceRespons } /** - * Get global usages of AppServiceEnvironment (App Service Environment). - * Get global usages of AppServiceEnvironment (App Service Environment). + * Get global usage metrics of an App Service Environment. + * Get global usage metrics of an App Service Environment. * - ServiceResponse> * @param resourceGroupName Name of resource group - ServiceResponse> * @param name Name of AppServiceEnvironment (App Service Environment) + ServiceResponse> * @param resourceGroupName Name of the resource group to which the resource belongs. + ServiceResponse> * @param name Name of the App Service Environment. ServiceResponse> * @param filter Return only usages/metrics specified in the filter. Filter conforms to odata syntax. Example: $filter=(name.value eq 'Metric1' or name.value eq 'Metric2') and startTime eq '2014-01-01T00:00:00Z' and endTime eq '2014-12-31T23:59:59Z' and timeGrain eq duration'[Hour|Minute|Day]'. * @return the PagedList<CsmUsageQuotaInner> object wrapped in {@link ServiceResponse} if successful. */ @@ -4365,11 +4393,11 @@ private ServiceResponse> listUsagesDelegate(Respons } /** - * Get all worker pools. - * Get all worker pools. + * Get all worker pools of an App Service Environment. + * Get all worker pools of an App Service Environment. * - * @param resourceGroupName Name of resource group - * @param name Name of AppServiceEnvironment (App Service Environment) + * @param resourceGroupName Name of the resource group to which the resource belongs. + * @param name Name of the App Service Environment. * @return the PagedList<WorkerPoolInner> object if successful. */ public PagedList listWorkerPools(final String resourceGroupName, final String name) { @@ -4383,11 +4411,11 @@ public Page nextPage(String nextPageLink) { } /** - * Get all worker pools. - * Get all worker pools. + * Get all worker pools of an App Service Environment. + * Get all worker pools of an App Service Environment. * - * @param resourceGroupName Name of resource group - * @param name Name of AppServiceEnvironment (App Service Environment) + * @param resourceGroupName Name of the resource group to which the resource belongs. + * @param name Name of the App Service Environment. * @param serviceCallback the async ServiceCallback to handle successful and failed responses. * @return the {@link ServiceCall} object */ @@ -4404,11 +4432,11 @@ public Observable>> call(String nextPageLi } /** - * Get all worker pools. - * Get all worker pools. + * Get all worker pools of an App Service Environment. + * Get all worker pools of an App Service Environment. * - * @param resourceGroupName Name of resource group - * @param name Name of AppServiceEnvironment (App Service Environment) + * @param resourceGroupName Name of the resource group to which the resource belongs. + * @param name Name of the App Service Environment. * @return the observable to the PagedList<WorkerPoolInner> object */ public Observable> listWorkerPoolsAsync(final String resourceGroupName, final String name) { @@ -4422,11 +4450,11 @@ public Page call(ServiceResponse> respons } /** - * Get all worker pools. - * Get all worker pools. + * Get all worker pools of an App Service Environment. + * Get all worker pools of an App Service Environment. * - * @param resourceGroupName Name of resource group - * @param name Name of AppServiceEnvironment (App Service Environment) + * @param resourceGroupName Name of the resource group to which the resource belongs. + * @param name Name of the App Service Environment. * @return the observable to the PagedList<WorkerPoolInner> object */ public Observable>> listWorkerPoolsWithServiceResponseAsync(final String resourceGroupName, final String name) { @@ -4444,11 +4472,11 @@ public Observable>> call(ServiceResponse

> * @param resourceGroupName Name of resource group - ServiceResponse> * @param name Name of AppServiceEnvironment (App Service Environment) + ServiceResponse> * @param resourceGroupName Name of the resource group to which the resource belongs. + ServiceResponse> * @param name Name of the App Service Environment. * @return the PagedList<WorkerPoolInner> object wrapped in {@link ServiceResponse} if successful. */ public Observable>> listWorkerPoolsSinglePageAsync(final String resourceGroupName, final String name) { @@ -4487,9 +4515,9 @@ private ServiceResponse> listWorkerPoolsDelegate(Respo * Get properties of a worker pool. * Get properties of a worker pool. * - * @param resourceGroupName Name of resource group - * @param name Name of AppServiceEnvironment (App Service Environment) - * @param workerPoolName Name of worker pool + * @param resourceGroupName Name of the resource group to which the resource belongs. + * @param name Name of the App Service Environment. + * @param workerPoolName Name of the worker pool. * @return the WorkerPoolInner object if successful. */ public WorkerPoolInner getWorkerPool(String resourceGroupName, String name, String workerPoolName) { @@ -4500,9 +4528,9 @@ public WorkerPoolInner getWorkerPool(String resourceGroupName, String name, Stri * Get properties of a worker pool. * Get properties of a worker pool. * - * @param resourceGroupName Name of resource group - * @param name Name of AppServiceEnvironment (App Service Environment) - * @param workerPoolName Name of worker pool + * @param resourceGroupName Name of the resource group to which the resource belongs. + * @param name Name of the App Service Environment. + * @param workerPoolName Name of the worker pool. * @param serviceCallback the async ServiceCallback to handle successful and failed responses. * @return the {@link ServiceCall} object */ @@ -4514,9 +4542,9 @@ public ServiceCall getWorkerPoolAsync(String resourceGroupName, * Get properties of a worker pool. * Get properties of a worker pool. * - * @param resourceGroupName Name of resource group - * @param name Name of AppServiceEnvironment (App Service Environment) - * @param workerPoolName Name of worker pool + * @param resourceGroupName Name of the resource group to which the resource belongs. + * @param name Name of the App Service Environment. + * @param workerPoolName Name of the worker pool. * @return the observable to the WorkerPoolInner object */ public Observable getWorkerPoolAsync(String resourceGroupName, String name, String workerPoolName) { @@ -4532,9 +4560,9 @@ public WorkerPoolInner call(ServiceResponse response) { * Get properties of a worker pool. * Get properties of a worker pool. * - * @param resourceGroupName Name of resource group - * @param name Name of AppServiceEnvironment (App Service Environment) - * @param workerPoolName Name of worker pool + * @param resourceGroupName Name of the resource group to which the resource belongs. + * @param name Name of the App Service Environment. + * @param workerPoolName Name of the worker pool. * @return the observable to the WorkerPoolInner object */ public Observable> getWorkerPoolWithServiceResponseAsync(String resourceGroupName, String name, String workerPoolName) { @@ -4576,10 +4604,10 @@ private ServiceResponse getWorkerPoolDelegate(Response createOrUpdateWorkerPoolAsync(String resourc * Create or update a worker pool. * Create or update a worker pool. * - * @param resourceGroupName Name of resource group - * @param name Name of AppServiceEnvironment (App Service Environment) - * @param workerPoolName Name of worker pool - * @param workerPoolEnvelope Properties of worker pool + * @param resourceGroupName Name of the resource group to which the resource belongs. + * @param name Name of the App Service Environment. + * @param workerPoolName Name of the worker pool. + * @param workerPoolEnvelope Properties of the worker pool. * @return the observable for the request */ public Observable createOrUpdateWorkerPoolAsync(String resourceGroupName, String name, String workerPoolName, WorkerPoolInner workerPoolEnvelope) { @@ -4624,10 +4652,10 @@ public WorkerPoolInner call(ServiceResponse response) { * Create or update a worker pool. * Create or update a worker pool. * - * @param resourceGroupName Name of resource group - * @param name Name of AppServiceEnvironment (App Service Environment) - * @param workerPoolName Name of worker pool - * @param workerPoolEnvelope Properties of worker pool + * @param resourceGroupName Name of the resource group to which the resource belongs. + * @param name Name of the App Service Environment. + * @param workerPoolName Name of the worker pool. + * @param workerPoolEnvelope Properties of the worker pool. * @return the observable for the request */ public Observable> createOrUpdateWorkerPoolWithServiceResponseAsync(String resourceGroupName, String name, String workerPoolName, WorkerPoolInner workerPoolEnvelope) { @@ -4656,10 +4684,10 @@ public Observable> createOrUpdateWorkerPoolWith * Create or update a worker pool. * Create or update a worker pool. * - * @param resourceGroupName Name of resource group - * @param name Name of AppServiceEnvironment (App Service Environment) - * @param workerPoolName Name of worker pool - * @param workerPoolEnvelope Properties of worker pool + * @param resourceGroupName Name of the resource group to which the resource belongs. + * @param name Name of the App Service Environment. + * @param workerPoolName Name of the worker pool. + * @param workerPoolEnvelope Properties of the worker pool. * @return the WorkerPoolInner object if successful. */ public WorkerPoolInner beginCreateOrUpdateWorkerPool(String resourceGroupName, String name, String workerPoolName, WorkerPoolInner workerPoolEnvelope) { @@ -4670,10 +4698,10 @@ public WorkerPoolInner beginCreateOrUpdateWorkerPool(String resourceGroupName, S * Create or update a worker pool. * Create or update a worker pool. * - * @param resourceGroupName Name of resource group - * @param name Name of AppServiceEnvironment (App Service Environment) - * @param workerPoolName Name of worker pool - * @param workerPoolEnvelope Properties of worker pool + * @param resourceGroupName Name of the resource group to which the resource belongs. + * @param name Name of the App Service Environment. + * @param workerPoolName Name of the worker pool. + * @param workerPoolEnvelope Properties of the worker pool. * @param serviceCallback the async ServiceCallback to handle successful and failed responses. * @return the {@link ServiceCall} object */ @@ -4685,10 +4713,10 @@ public ServiceCall beginCreateOrUpdateWorkerPoolAsync(String re * Create or update a worker pool. * Create or update a worker pool. * - * @param resourceGroupName Name of resource group - * @param name Name of AppServiceEnvironment (App Service Environment) - * @param workerPoolName Name of worker pool - * @param workerPoolEnvelope Properties of worker pool + * @param resourceGroupName Name of the resource group to which the resource belongs. + * @param name Name of the App Service Environment. + * @param workerPoolName Name of the worker pool. + * @param workerPoolEnvelope Properties of the worker pool. * @return the observable to the WorkerPoolInner object */ public Observable beginCreateOrUpdateWorkerPoolAsync(String resourceGroupName, String name, String workerPoolName, WorkerPoolInner workerPoolEnvelope) { @@ -4704,10 +4732,10 @@ public WorkerPoolInner call(ServiceResponse response) { * Create or update a worker pool. * Create or update a worker pool. * - * @param resourceGroupName Name of resource group - * @param name Name of AppServiceEnvironment (App Service Environment) - * @param workerPoolName Name of worker pool - * @param workerPoolEnvelope Properties of worker pool + * @param resourceGroupName Name of the resource group to which the resource belongs. + * @param name Name of the App Service Environment. + * @param workerPoolName Name of the worker pool. + * @param workerPoolEnvelope Properties of the worker pool. * @return the observable to the WorkerPoolInner object */ public Observable> beginCreateOrUpdateWorkerPoolWithServiceResponseAsync(String resourceGroupName, String name, String workerPoolName, WorkerPoolInner workerPoolEnvelope) { @@ -4754,64 +4782,103 @@ private ServiceResponse beginCreateOrUpdateWorkerPoolDelegate(R } /** - * Get metric definitions for a specific instance of a worker pool of a AppServiceEnvironment (App Service Environment). - * Get metric definitions for a specific instance of a worker pool of a AppServiceEnvironment (App Service Environment). + * Get metric definitions for a specific instance of a worker pool of an App Service Environment. + * Get metric definitions for a specific instance of a worker pool of an App Service Environment. * - * @param resourceGroupName Name of resource group - * @param name Name of AppServiceEnvironment (App Service Environment) - * @param workerPoolName Name of worker pool - * @param instance Name of instance in the worker pool - * @return the Object object if successful. + * @param resourceGroupName Name of the resource group to which the resource belongs. + * @param name Name of the App Service Environment. + * @param workerPoolName Name of the worker pool. + * @param instance Name of the instance in the worker pool. + * @return the PagedList<ResourceMetricDefinitionInner> object if successful. */ - public Object listWorkerPoolInstanceMetricDefinitions(String resourceGroupName, String name, String workerPoolName, String instance) { - return listWorkerPoolInstanceMetricDefinitionsWithServiceResponseAsync(resourceGroupName, name, workerPoolName, instance).toBlocking().single().getBody(); + public PagedList listWorkerPoolInstanceMetricDefinitions(final String resourceGroupName, final String name, final String workerPoolName, final String instance) { + ServiceResponse> response = listWorkerPoolInstanceMetricDefinitionsSinglePageAsync(resourceGroupName, name, workerPoolName, instance).toBlocking().single(); + return new PagedList(response.getBody()) { + @Override + public Page nextPage(String nextPageLink) { + return listWorkerPoolInstanceMetricDefinitionsNextSinglePageAsync(nextPageLink).toBlocking().single().getBody(); + } + }; } /** - * Get metric definitions for a specific instance of a worker pool of a AppServiceEnvironment (App Service Environment). - * Get metric definitions for a specific instance of a worker pool of a AppServiceEnvironment (App Service Environment). + * Get metric definitions for a specific instance of a worker pool of an App Service Environment. + * Get metric definitions for a specific instance of a worker pool of an App Service Environment. * - * @param resourceGroupName Name of resource group - * @param name Name of AppServiceEnvironment (App Service Environment) - * @param workerPoolName Name of worker pool - * @param instance Name of instance in the worker pool + * @param resourceGroupName Name of the resource group to which the resource belongs. + * @param name Name of the App Service Environment. + * @param workerPoolName Name of the worker pool. + * @param instance Name of the instance in the worker pool. * @param serviceCallback the async ServiceCallback to handle successful and failed responses. * @return the {@link ServiceCall} object */ - public ServiceCall listWorkerPoolInstanceMetricDefinitionsAsync(String resourceGroupName, String name, String workerPoolName, String instance, final ServiceCallback serviceCallback) { - return ServiceCall.create(listWorkerPoolInstanceMetricDefinitionsWithServiceResponseAsync(resourceGroupName, name, workerPoolName, instance), serviceCallback); + public ServiceCall> listWorkerPoolInstanceMetricDefinitionsAsync(final String resourceGroupName, final String name, final String workerPoolName, final String instance, final ListOperationCallback serviceCallback) { + return AzureServiceCall.create( + listWorkerPoolInstanceMetricDefinitionsSinglePageAsync(resourceGroupName, name, workerPoolName, instance), + new Func1>>>() { + @Override + public Observable>> call(String nextPageLink) { + return listWorkerPoolInstanceMetricDefinitionsNextSinglePageAsync(nextPageLink); + } + }, + serviceCallback); } /** - * Get metric definitions for a specific instance of a worker pool of a AppServiceEnvironment (App Service Environment). - * Get metric definitions for a specific instance of a worker pool of a AppServiceEnvironment (App Service Environment). + * Get metric definitions for a specific instance of a worker pool of an App Service Environment. + * Get metric definitions for a specific instance of a worker pool of an App Service Environment. * - * @param resourceGroupName Name of resource group - * @param name Name of AppServiceEnvironment (App Service Environment) - * @param workerPoolName Name of worker pool - * @param instance Name of instance in the worker pool - * @return the observable to the Object object + * @param resourceGroupName Name of the resource group to which the resource belongs. + * @param name Name of the App Service Environment. + * @param workerPoolName Name of the worker pool. + * @param instance Name of the instance in the worker pool. + * @return the observable to the PagedList<ResourceMetricDefinitionInner> object */ - public Observable listWorkerPoolInstanceMetricDefinitionsAsync(String resourceGroupName, String name, String workerPoolName, String instance) { - return listWorkerPoolInstanceMetricDefinitionsWithServiceResponseAsync(resourceGroupName, name, workerPoolName, instance).map(new Func1, Object>() { - @Override - public Object call(ServiceResponse response) { - return response.getBody(); - } - }); + public Observable> listWorkerPoolInstanceMetricDefinitionsAsync(final String resourceGroupName, final String name, final String workerPoolName, final String instance) { + return listWorkerPoolInstanceMetricDefinitionsWithServiceResponseAsync(resourceGroupName, name, workerPoolName, instance) + .map(new Func1>, Page>() { + @Override + public Page call(ServiceResponse> response) { + return response.getBody(); + } + }); } /** - * Get metric definitions for a specific instance of a worker pool of a AppServiceEnvironment (App Service Environment). - * Get metric definitions for a specific instance of a worker pool of a AppServiceEnvironment (App Service Environment). + * Get metric definitions for a specific instance of a worker pool of an App Service Environment. + * Get metric definitions for a specific instance of a worker pool of an App Service Environment. * - * @param resourceGroupName Name of resource group - * @param name Name of AppServiceEnvironment (App Service Environment) - * @param workerPoolName Name of worker pool - * @param instance Name of instance in the worker pool - * @return the observable to the Object object + * @param resourceGroupName Name of the resource group to which the resource belongs. + * @param name Name of the App Service Environment. + * @param workerPoolName Name of the worker pool. + * @param instance Name of the instance in the worker pool. + * @return the observable to the PagedList<ResourceMetricDefinitionInner> object + */ + public Observable>> listWorkerPoolInstanceMetricDefinitionsWithServiceResponseAsync(final String resourceGroupName, final String name, final String workerPoolName, final String instance) { + return listWorkerPoolInstanceMetricDefinitionsSinglePageAsync(resourceGroupName, name, workerPoolName, instance) + .concatMap(new Func1>, Observable>>>() { + @Override + public Observable>> call(ServiceResponse> page) { + String nextPageLink = page.getBody().getNextPageLink(); + if (nextPageLink == null) { + return Observable.just(page); + } + return Observable.just(page).concatWith(listWorkerPoolInstanceMetricDefinitionsNextWithServiceResponseAsync(nextPageLink)); + } + }); + } + + /** + * Get metric definitions for a specific instance of a worker pool of an App Service Environment. + * Get metric definitions for a specific instance of a worker pool of an App Service Environment. + * + ServiceResponse> * @param resourceGroupName Name of the resource group to which the resource belongs. + ServiceResponse> * @param name Name of the App Service Environment. + ServiceResponse> * @param workerPoolName Name of the worker pool. + ServiceResponse> * @param instance Name of the instance in the worker pool. + * @return the PagedList<ResourceMetricDefinitionInner> object wrapped in {@link ServiceResponse} if successful. */ - public Observable> listWorkerPoolInstanceMetricDefinitionsWithServiceResponseAsync(String resourceGroupName, String name, String workerPoolName, String instance) { + public Observable>> listWorkerPoolInstanceMetricDefinitionsSinglePageAsync(final String resourceGroupName, final String name, final String workerPoolName, final String instance) { if (resourceGroupName == null) { throw new IllegalArgumentException("Parameter resourceGroupName is required and cannot be null."); } @@ -4829,12 +4896,12 @@ public Observable> listWorkerPoolInstanceMetricDefinitio } final String apiVersion = "2016-09-01"; return service.listWorkerPoolInstanceMetricDefinitions(resourceGroupName, name, workerPoolName, instance, this.client.subscriptionId(), apiVersion, this.client.acceptLanguage(), this.client.userAgent()) - .flatMap(new Func1, Observable>>() { + .flatMap(new Func1, Observable>>>() { @Override - public Observable> call(Response response) { + public Observable>> call(Response response) { try { - ServiceResponse clientResponse = listWorkerPoolInstanceMetricDefinitionsDelegate(response); - return Observable.just(clientResponse); + ServiceResponse> result = listWorkerPoolInstanceMetricDefinitionsDelegate(response); + return Observable.just(new ServiceResponse>(result.getBody(), result.getResponse())); } catch (Throwable t) { return Observable.error(t); } @@ -4842,72 +4909,111 @@ public Observable> call(Response response) }); } - private ServiceResponse listWorkerPoolInstanceMetricDefinitionsDelegate(Response response) throws CloudException, IOException, IllegalArgumentException { - return new AzureServiceResponseBuilder(this.client.mapperAdapter()) - .register(200, new TypeToken() { }.getType()) + private ServiceResponse> listWorkerPoolInstanceMetricDefinitionsDelegate(Response response) throws CloudException, IOException, IllegalArgumentException { + return new AzureServiceResponseBuilder, CloudException>(this.client.mapperAdapter()) + .register(200, new TypeToken>() { }.getType()) .registerError(CloudException.class) .build(response); } /** - * Get metrics for a specific instance of a worker pool of a AppServiceEnvironment (App Service Environment). - * Get metrics for a specific instance of a worker pool of a AppServiceEnvironment (App Service Environment). + * Get metrics for a specific instance of a worker pool of an App Service Environment. + * Get metrics for a specific instance of a worker pool of an App Service Environment. * - * @param resourceGroupName Name of resource group - * @param name Name of AppServiceEnvironment (App Service Environment) - * @param workerPoolName Name of worker pool - * @param instance Name of instance in the worker pool - * @return the Object object if successful. + * @param resourceGroupName Name of the resource group to which the resource belongs. + * @param name Name of the App Service Environment. + * @param workerPoolName Name of the worker pool. + * @param instance Name of the instance in the worker pool. + * @return the PagedList<ResourceMetricInner> object if successful. */ - public Object listWorkerPoolInstanceMetrics(String resourceGroupName, String name, String workerPoolName, String instance) { - return listWorkerPoolInstanceMetricsWithServiceResponseAsync(resourceGroupName, name, workerPoolName, instance).toBlocking().single().getBody(); + public PagedList listWorkerPoolInstanceMetrics(final String resourceGroupName, final String name, final String workerPoolName, final String instance) { + ServiceResponse> response = listWorkerPoolInstanceMetricsSinglePageAsync(resourceGroupName, name, workerPoolName, instance).toBlocking().single(); + return new PagedList(response.getBody()) { + @Override + public Page nextPage(String nextPageLink) { + return listWorkerPoolInstanceMetricsNextSinglePageAsync(nextPageLink).toBlocking().single().getBody(); + } + }; } /** - * Get metrics for a specific instance of a worker pool of a AppServiceEnvironment (App Service Environment). - * Get metrics for a specific instance of a worker pool of a AppServiceEnvironment (App Service Environment). + * Get metrics for a specific instance of a worker pool of an App Service Environment. + * Get metrics for a specific instance of a worker pool of an App Service Environment. * - * @param resourceGroupName Name of resource group - * @param name Name of AppServiceEnvironment (App Service Environment) - * @param workerPoolName Name of worker pool - * @param instance Name of instance in the worker pool + * @param resourceGroupName Name of the resource group to which the resource belongs. + * @param name Name of the App Service Environment. + * @param workerPoolName Name of the worker pool. + * @param instance Name of the instance in the worker pool. * @param serviceCallback the async ServiceCallback to handle successful and failed responses. * @return the {@link ServiceCall} object */ - public ServiceCall listWorkerPoolInstanceMetricsAsync(String resourceGroupName, String name, String workerPoolName, String instance, final ServiceCallback serviceCallback) { - return ServiceCall.create(listWorkerPoolInstanceMetricsWithServiceResponseAsync(resourceGroupName, name, workerPoolName, instance), serviceCallback); + public ServiceCall> listWorkerPoolInstanceMetricsAsync(final String resourceGroupName, final String name, final String workerPoolName, final String instance, final ListOperationCallback serviceCallback) { + return AzureServiceCall.create( + listWorkerPoolInstanceMetricsSinglePageAsync(resourceGroupName, name, workerPoolName, instance), + new Func1>>>() { + @Override + public Observable>> call(String nextPageLink) { + return listWorkerPoolInstanceMetricsNextSinglePageAsync(nextPageLink); + } + }, + serviceCallback); } /** - * Get metrics for a specific instance of a worker pool of a AppServiceEnvironment (App Service Environment). - * Get metrics for a specific instance of a worker pool of a AppServiceEnvironment (App Service Environment). + * Get metrics for a specific instance of a worker pool of an App Service Environment. + * Get metrics for a specific instance of a worker pool of an App Service Environment. * - * @param resourceGroupName Name of resource group - * @param name Name of AppServiceEnvironment (App Service Environment) - * @param workerPoolName Name of worker pool - * @param instance Name of instance in the worker pool - * @return the observable to the Object object + * @param resourceGroupName Name of the resource group to which the resource belongs. + * @param name Name of the App Service Environment. + * @param workerPoolName Name of the worker pool. + * @param instance Name of the instance in the worker pool. + * @return the observable to the PagedList<ResourceMetricInner> object */ - public Observable listWorkerPoolInstanceMetricsAsync(String resourceGroupName, String name, String workerPoolName, String instance) { - return listWorkerPoolInstanceMetricsWithServiceResponseAsync(resourceGroupName, name, workerPoolName, instance).map(new Func1, Object>() { - @Override - public Object call(ServiceResponse response) { - return response.getBody(); - } - }); - } - - /** - * Get metrics for a specific instance of a worker pool of a AppServiceEnvironment (App Service Environment). - * Get metrics for a specific instance of a worker pool of a AppServiceEnvironment (App Service Environment). - * - * @param resourceGroupName Name of resource group - * @param name Name of AppServiceEnvironment (App Service Environment) - * @param workerPoolName Name of worker pool - * @param instance Name of instance in the worker pool - * @return the observable to the Object object + public Observable> listWorkerPoolInstanceMetricsAsync(final String resourceGroupName, final String name, final String workerPoolName, final String instance) { + return listWorkerPoolInstanceMetricsWithServiceResponseAsync(resourceGroupName, name, workerPoolName, instance) + .map(new Func1>, Page>() { + @Override + public Page call(ServiceResponse> response) { + return response.getBody(); + } + }); + } + + /** + * Get metrics for a specific instance of a worker pool of an App Service Environment. + * Get metrics for a specific instance of a worker pool of an App Service Environment. + * + * @param resourceGroupName Name of the resource group to which the resource belongs. + * @param name Name of the App Service Environment. + * @param workerPoolName Name of the worker pool. + * @param instance Name of the instance in the worker pool. + * @return the observable to the PagedList<ResourceMetricInner> object */ - public Observable> listWorkerPoolInstanceMetricsWithServiceResponseAsync(String resourceGroupName, String name, String workerPoolName, String instance) { + public Observable>> listWorkerPoolInstanceMetricsWithServiceResponseAsync(final String resourceGroupName, final String name, final String workerPoolName, final String instance) { + return listWorkerPoolInstanceMetricsSinglePageAsync(resourceGroupName, name, workerPoolName, instance) + .concatMap(new Func1>, Observable>>>() { + @Override + public Observable>> call(ServiceResponse> page) { + String nextPageLink = page.getBody().getNextPageLink(); + if (nextPageLink == null) { + return Observable.just(page); + } + return Observable.just(page).concatWith(listWorkerPoolInstanceMetricsNextWithServiceResponseAsync(nextPageLink)); + } + }); + } + + /** + * Get metrics for a specific instance of a worker pool of an App Service Environment. + * Get metrics for a specific instance of a worker pool of an App Service Environment. + * + * @param resourceGroupName Name of the resource group to which the resource belongs. + * @param name Name of the App Service Environment. + * @param workerPoolName Name of the worker pool. + * @param instance Name of the instance in the worker pool. + * @return the PagedList<ResourceMetricInner> object wrapped in {@link ServiceResponse} if successful. + */ + public Observable>> listWorkerPoolInstanceMetricsSinglePageAsync(final String resourceGroupName, final String name, final String workerPoolName, final String instance) { if (resourceGroupName == null) { throw new IllegalArgumentException("Parameter resourceGroupName is required and cannot be null."); } @@ -4927,12 +5033,12 @@ public Observable> listWorkerPoolInstanceMetricsWithServ final Boolean details = null; final String filter = null; return service.listWorkerPoolInstanceMetrics(resourceGroupName, name, workerPoolName, instance, this.client.subscriptionId(), details, filter, apiVersion, this.client.acceptLanguage(), this.client.userAgent()) - .flatMap(new Func1, Observable>>() { + .flatMap(new Func1, Observable>>>() { @Override - public Observable> call(Response response) { + public Observable>> call(Response response) { try { - ServiceResponse clientResponse = listWorkerPoolInstanceMetricsDelegate(response); - return Observable.just(clientResponse); + ServiceResponse> result = listWorkerPoolInstanceMetricsDelegate(response); + return Observable.just(new ServiceResponse>(result.getBody(), result.getResponse())); } catch (Throwable t) { return Observable.error(t); } @@ -4941,72 +5047,113 @@ public Observable> call(Response response) } /** - * Get metrics for a specific instance of a worker pool of a AppServiceEnvironment (App Service Environment). - * Get metrics for a specific instance of a worker pool of a AppServiceEnvironment (App Service Environment). + * Get metrics for a specific instance of a worker pool of an App Service Environment. + * Get metrics for a specific instance of a worker pool of an App Service Environment. * - * @param resourceGroupName Name of resource group - * @param name Name of AppServiceEnvironment (App Service Environment) - * @param workerPoolName Name of worker pool - * @param instance Name of instance in the worker pool - * @param details Include instance details + * @param resourceGroupName Name of the resource group to which the resource belongs. + * @param name Name of the App Service Environment. + * @param workerPoolName Name of the worker pool. + * @param instance Name of the instance in the worker pool. + * @param details Specify <code>true</code> to include instance details. The default is <code>false</code>. * @param filter Return only usages/metrics specified in the filter. Filter conforms to odata syntax. Example: $filter=(name.value eq 'Metric1' or name.value eq 'Metric2') and startTime eq '2014-01-01T00:00:00Z' and endTime eq '2014-12-31T23:59:59Z' and timeGrain eq duration'[Hour|Minute|Day]'. - * @return the Object object if successful. + * @return the PagedList<ResourceMetricInner> object if successful. */ - public Object listWorkerPoolInstanceMetrics(String resourceGroupName, String name, String workerPoolName, String instance, Boolean details, String filter) { - return listWorkerPoolInstanceMetricsWithServiceResponseAsync(resourceGroupName, name, workerPoolName, instance, details, filter).toBlocking().single().getBody(); + public PagedList listWorkerPoolInstanceMetrics(final String resourceGroupName, final String name, final String workerPoolName, final String instance, final Boolean details, final String filter) { + ServiceResponse> response = listWorkerPoolInstanceMetricsSinglePageAsync(resourceGroupName, name, workerPoolName, instance, details, filter).toBlocking().single(); + return new PagedList(response.getBody()) { + @Override + public Page nextPage(String nextPageLink) { + return listWorkerPoolInstanceMetricsNextSinglePageAsync(nextPageLink).toBlocking().single().getBody(); + } + }; } /** - * Get metrics for a specific instance of a worker pool of a AppServiceEnvironment (App Service Environment). - * Get metrics for a specific instance of a worker pool of a AppServiceEnvironment (App Service Environment). + * Get metrics for a specific instance of a worker pool of an App Service Environment. + * Get metrics for a specific instance of a worker pool of an App Service Environment. * - * @param resourceGroupName Name of resource group - * @param name Name of AppServiceEnvironment (App Service Environment) - * @param workerPoolName Name of worker pool - * @param instance Name of instance in the worker pool - * @param details Include instance details + * @param resourceGroupName Name of the resource group to which the resource belongs. + * @param name Name of the App Service Environment. + * @param workerPoolName Name of the worker pool. + * @param instance Name of the instance in the worker pool. + * @param details Specify <code>true</code> to include instance details. The default is <code>false</code>. * @param filter Return only usages/metrics specified in the filter. Filter conforms to odata syntax. Example: $filter=(name.value eq 'Metric1' or name.value eq 'Metric2') and startTime eq '2014-01-01T00:00:00Z' and endTime eq '2014-12-31T23:59:59Z' and timeGrain eq duration'[Hour|Minute|Day]'. * @param serviceCallback the async ServiceCallback to handle successful and failed responses. * @return the {@link ServiceCall} object */ - public ServiceCall listWorkerPoolInstanceMetricsAsync(String resourceGroupName, String name, String workerPoolName, String instance, Boolean details, String filter, final ServiceCallback serviceCallback) { - return ServiceCall.create(listWorkerPoolInstanceMetricsWithServiceResponseAsync(resourceGroupName, name, workerPoolName, instance, details, filter), serviceCallback); + public ServiceCall> listWorkerPoolInstanceMetricsAsync(final String resourceGroupName, final String name, final String workerPoolName, final String instance, final Boolean details, final String filter, final ListOperationCallback serviceCallback) { + return AzureServiceCall.create( + listWorkerPoolInstanceMetricsSinglePageAsync(resourceGroupName, name, workerPoolName, instance, details, filter), + new Func1>>>() { + @Override + public Observable>> call(String nextPageLink) { + return listWorkerPoolInstanceMetricsNextSinglePageAsync(nextPageLink); + } + }, + serviceCallback); } /** - * Get metrics for a specific instance of a worker pool of a AppServiceEnvironment (App Service Environment). - * Get metrics for a specific instance of a worker pool of a AppServiceEnvironment (App Service Environment). + * Get metrics for a specific instance of a worker pool of an App Service Environment. + * Get metrics for a specific instance of a worker pool of an App Service Environment. * - * @param resourceGroupName Name of resource group - * @param name Name of AppServiceEnvironment (App Service Environment) - * @param workerPoolName Name of worker pool - * @param instance Name of instance in the worker pool - * @param details Include instance details + * @param resourceGroupName Name of the resource group to which the resource belongs. + * @param name Name of the App Service Environment. + * @param workerPoolName Name of the worker pool. + * @param instance Name of the instance in the worker pool. + * @param details Specify <code>true</code> to include instance details. The default is <code>false</code>. * @param filter Return only usages/metrics specified in the filter. Filter conforms to odata syntax. Example: $filter=(name.value eq 'Metric1' or name.value eq 'Metric2') and startTime eq '2014-01-01T00:00:00Z' and endTime eq '2014-12-31T23:59:59Z' and timeGrain eq duration'[Hour|Minute|Day]'. - * @return the observable to the Object object + * @return the observable to the PagedList<ResourceMetricInner> object */ - public Observable listWorkerPoolInstanceMetricsAsync(String resourceGroupName, String name, String workerPoolName, String instance, Boolean details, String filter) { - return listWorkerPoolInstanceMetricsWithServiceResponseAsync(resourceGroupName, name, workerPoolName, instance, details, filter).map(new Func1, Object>() { - @Override - public Object call(ServiceResponse response) { - return response.getBody(); - } - }); + public Observable> listWorkerPoolInstanceMetricsAsync(final String resourceGroupName, final String name, final String workerPoolName, final String instance, final Boolean details, final String filter) { + return listWorkerPoolInstanceMetricsWithServiceResponseAsync(resourceGroupName, name, workerPoolName, instance, details, filter) + .map(new Func1>, Page>() { + @Override + public Page call(ServiceResponse> response) { + return response.getBody(); + } + }); } /** - * Get metrics for a specific instance of a worker pool of a AppServiceEnvironment (App Service Environment). - * Get metrics for a specific instance of a worker pool of a AppServiceEnvironment (App Service Environment). + * Get metrics for a specific instance of a worker pool of an App Service Environment. + * Get metrics for a specific instance of a worker pool of an App Service Environment. * - * @param resourceGroupName Name of resource group - * @param name Name of AppServiceEnvironment (App Service Environment) - * @param workerPoolName Name of worker pool - * @param instance Name of instance in the worker pool - * @param details Include instance details + * @param resourceGroupName Name of the resource group to which the resource belongs. + * @param name Name of the App Service Environment. + * @param workerPoolName Name of the worker pool. + * @param instance Name of the instance in the worker pool. + * @param details Specify <code>true</code> to include instance details. The default is <code>false</code>. * @param filter Return only usages/metrics specified in the filter. Filter conforms to odata syntax. Example: $filter=(name.value eq 'Metric1' or name.value eq 'Metric2') and startTime eq '2014-01-01T00:00:00Z' and endTime eq '2014-12-31T23:59:59Z' and timeGrain eq duration'[Hour|Minute|Day]'. - * @return the observable to the Object object + * @return the observable to the PagedList<ResourceMetricInner> object */ - public Observable> listWorkerPoolInstanceMetricsWithServiceResponseAsync(String resourceGroupName, String name, String workerPoolName, String instance, Boolean details, String filter) { + public Observable>> listWorkerPoolInstanceMetricsWithServiceResponseAsync(final String resourceGroupName, final String name, final String workerPoolName, final String instance, final Boolean details, final String filter) { + return listWorkerPoolInstanceMetricsSinglePageAsync(resourceGroupName, name, workerPoolName, instance, details, filter) + .concatMap(new Func1>, Observable>>>() { + @Override + public Observable>> call(ServiceResponse> page) { + String nextPageLink = page.getBody().getNextPageLink(); + if (nextPageLink == null) { + return Observable.just(page); + } + return Observable.just(page).concatWith(listWorkerPoolInstanceMetricsNextWithServiceResponseAsync(nextPageLink)); + } + }); + } + + /** + * Get metrics for a specific instance of a worker pool of an App Service Environment. + * Get metrics for a specific instance of a worker pool of an App Service Environment. + * + ServiceResponse> * @param resourceGroupName Name of the resource group to which the resource belongs. + ServiceResponse> * @param name Name of the App Service Environment. + ServiceResponse> * @param workerPoolName Name of the worker pool. + ServiceResponse> * @param instance Name of the instance in the worker pool. + ServiceResponse> * @param details Specify <code>true</code> to include instance details. The default is <code>false</code>. + ServiceResponse> * @param filter Return only usages/metrics specified in the filter. Filter conforms to odata syntax. Example: $filter=(name.value eq 'Metric1' or name.value eq 'Metric2') and startTime eq '2014-01-01T00:00:00Z' and endTime eq '2014-12-31T23:59:59Z' and timeGrain eq duration'[Hour|Minute|Day]'. + * @return the PagedList<ResourceMetricInner> object wrapped in {@link ServiceResponse} if successful. + */ + public Observable>> listWorkerPoolInstanceMetricsSinglePageAsync(final String resourceGroupName, final String name, final String workerPoolName, final String instance, final Boolean details, final String filter) { if (resourceGroupName == null) { throw new IllegalArgumentException("Parameter resourceGroupName is required and cannot be null."); } @@ -5024,12 +5171,12 @@ public Observable> listWorkerPoolInstanceMetricsWithServ } final String apiVersion = "2016-09-01"; return service.listWorkerPoolInstanceMetrics(resourceGroupName, name, workerPoolName, instance, this.client.subscriptionId(), details, filter, apiVersion, this.client.acceptLanguage(), this.client.userAgent()) - .flatMap(new Func1, Observable>>() { + .flatMap(new Func1, Observable>>>() { @Override - public Observable> call(Response response) { + public Observable>> call(Response response) { try { - ServiceResponse clientResponse = listWorkerPoolInstanceMetricsDelegate(response); - return Observable.just(clientResponse); + ServiceResponse> result = listWorkerPoolInstanceMetricsDelegate(response); + return Observable.just(new ServiceResponse>(result.getBody(), result.getResponse())); } catch (Throwable t) { return Observable.error(t); } @@ -5037,48 +5184,48 @@ public Observable> call(Response response) }); } - private ServiceResponse listWorkerPoolInstanceMetricsDelegate(Response response) throws CloudException, IOException, IllegalArgumentException { - return new AzureServiceResponseBuilder(this.client.mapperAdapter()) - .register(200, new TypeToken() { }.getType()) + private ServiceResponse> listWorkerPoolInstanceMetricsDelegate(Response response) throws CloudException, IOException, IllegalArgumentException { + return new AzureServiceResponseBuilder, CloudException>(this.client.mapperAdapter()) + .register(200, new TypeToken>() { }.getType()) .registerError(CloudException.class) .build(response); } /** - * Get metric definitions for a worker pool of a AppServiceEnvironment (App Service Environment). - * Get metric definitions for a worker pool of a AppServiceEnvironment (App Service Environment). + * Get metric definitions for a worker pool of an App Service Environment. + * Get metric definitions for a worker pool of an App Service Environment. * - * @param resourceGroupName Name of resource group - * @param name Name of AppServiceEnvironment (App Service Environment) - * @param workerPoolName Name of worker pool - * @return the PagedList<MetricDefinitionInner> object if successful. + * @param resourceGroupName Name of the resource group to which the resource belongs. + * @param name Name of the App Service Environment. + * @param workerPoolName Name of the worker pool. + * @return the PagedList<ResourceMetricDefinitionInner> object if successful. */ - public PagedList listWebWorkerMetricDefinitions(final String resourceGroupName, final String name, final String workerPoolName) { - ServiceResponse> response = listWebWorkerMetricDefinitionsSinglePageAsync(resourceGroupName, name, workerPoolName).toBlocking().single(); - return new PagedList(response.getBody()) { + public PagedList listWebWorkerMetricDefinitions(final String resourceGroupName, final String name, final String workerPoolName) { + ServiceResponse> response = listWebWorkerMetricDefinitionsSinglePageAsync(resourceGroupName, name, workerPoolName).toBlocking().single(); + return new PagedList(response.getBody()) { @Override - public Page nextPage(String nextPageLink) { + public Page nextPage(String nextPageLink) { return listWebWorkerMetricDefinitionsNextSinglePageAsync(nextPageLink).toBlocking().single().getBody(); } }; } /** - * Get metric definitions for a worker pool of a AppServiceEnvironment (App Service Environment). - * Get metric definitions for a worker pool of a AppServiceEnvironment (App Service Environment). + * Get metric definitions for a worker pool of an App Service Environment. + * Get metric definitions for a worker pool of an App Service Environment. * - * @param resourceGroupName Name of resource group - * @param name Name of AppServiceEnvironment (App Service Environment) - * @param workerPoolName Name of worker pool + * @param resourceGroupName Name of the resource group to which the resource belongs. + * @param name Name of the App Service Environment. + * @param workerPoolName Name of the worker pool. * @param serviceCallback the async ServiceCallback to handle successful and failed responses. * @return the {@link ServiceCall} object */ - public ServiceCall> listWebWorkerMetricDefinitionsAsync(final String resourceGroupName, final String name, final String workerPoolName, final ListOperationCallback serviceCallback) { + public ServiceCall> listWebWorkerMetricDefinitionsAsync(final String resourceGroupName, final String name, final String workerPoolName, final ListOperationCallback serviceCallback) { return AzureServiceCall.create( listWebWorkerMetricDefinitionsSinglePageAsync(resourceGroupName, name, workerPoolName), - new Func1>>>() { + new Func1>>>() { @Override - public Observable>> call(String nextPageLink) { + public Observable>> call(String nextPageLink) { return listWebWorkerMetricDefinitionsNextSinglePageAsync(nextPageLink); } }, @@ -5086,38 +5233,38 @@ public Observable>> call(String next } /** - * Get metric definitions for a worker pool of a AppServiceEnvironment (App Service Environment). - * Get metric definitions for a worker pool of a AppServiceEnvironment (App Service Environment). + * Get metric definitions for a worker pool of an App Service Environment. + * Get metric definitions for a worker pool of an App Service Environment. * - * @param resourceGroupName Name of resource group - * @param name Name of AppServiceEnvironment (App Service Environment) - * @param workerPoolName Name of worker pool - * @return the observable to the PagedList<MetricDefinitionInner> object + * @param resourceGroupName Name of the resource group to which the resource belongs. + * @param name Name of the App Service Environment. + * @param workerPoolName Name of the worker pool. + * @return the observable to the PagedList<ResourceMetricDefinitionInner> object */ - public Observable> listWebWorkerMetricDefinitionsAsync(final String resourceGroupName, final String name, final String workerPoolName) { + public Observable> listWebWorkerMetricDefinitionsAsync(final String resourceGroupName, final String name, final String workerPoolName) { return listWebWorkerMetricDefinitionsWithServiceResponseAsync(resourceGroupName, name, workerPoolName) - .map(new Func1>, Page>() { + .map(new Func1>, Page>() { @Override - public Page call(ServiceResponse> response) { + public Page call(ServiceResponse> response) { return response.getBody(); } }); } /** - * Get metric definitions for a worker pool of a AppServiceEnvironment (App Service Environment). - * Get metric definitions for a worker pool of a AppServiceEnvironment (App Service Environment). + * Get metric definitions for a worker pool of an App Service Environment. + * Get metric definitions for a worker pool of an App Service Environment. * - * @param resourceGroupName Name of resource group - * @param name Name of AppServiceEnvironment (App Service Environment) - * @param workerPoolName Name of worker pool - * @return the observable to the PagedList<MetricDefinitionInner> object + * @param resourceGroupName Name of the resource group to which the resource belongs. + * @param name Name of the App Service Environment. + * @param workerPoolName Name of the worker pool. + * @return the observable to the PagedList<ResourceMetricDefinitionInner> object */ - public Observable>> listWebWorkerMetricDefinitionsWithServiceResponseAsync(final String resourceGroupName, final String name, final String workerPoolName) { + public Observable>> listWebWorkerMetricDefinitionsWithServiceResponseAsync(final String resourceGroupName, final String name, final String workerPoolName) { return listWebWorkerMetricDefinitionsSinglePageAsync(resourceGroupName, name, workerPoolName) - .concatMap(new Func1>, Observable>>>() { + .concatMap(new Func1>, Observable>>>() { @Override - public Observable>> call(ServiceResponse> page) { + public Observable>> call(ServiceResponse> page) { String nextPageLink = page.getBody().getNextPageLink(); if (nextPageLink == null) { return Observable.just(page); @@ -5128,15 +5275,15 @@ public Observable>> call(ServiceResp } /** - * Get metric definitions for a worker pool of a AppServiceEnvironment (App Service Environment). - * Get metric definitions for a worker pool of a AppServiceEnvironment (App Service Environment). + * Get metric definitions for a worker pool of an App Service Environment. + * Get metric definitions for a worker pool of an App Service Environment. * - ServiceResponse> * @param resourceGroupName Name of resource group - ServiceResponse> * @param name Name of AppServiceEnvironment (App Service Environment) - ServiceResponse> * @param workerPoolName Name of worker pool - * @return the PagedList<MetricDefinitionInner> object wrapped in {@link ServiceResponse} if successful. + ServiceResponse> * @param resourceGroupName Name of the resource group to which the resource belongs. + ServiceResponse> * @param name Name of the App Service Environment. + ServiceResponse> * @param workerPoolName Name of the worker pool. + * @return the PagedList<ResourceMetricDefinitionInner> object wrapped in {@link ServiceResponse} if successful. */ - public Observable>> listWebWorkerMetricDefinitionsSinglePageAsync(final String resourceGroupName, final String name, final String workerPoolName) { + public Observable>> listWebWorkerMetricDefinitionsSinglePageAsync(final String resourceGroupName, final String name, final String workerPoolName) { if (resourceGroupName == null) { throw new IllegalArgumentException("Parameter resourceGroupName is required and cannot be null."); } @@ -5151,12 +5298,12 @@ public Observable>> listWebWorkerMet } final String apiVersion = "2016-09-01"; return service.listWebWorkerMetricDefinitions(resourceGroupName, name, workerPoolName, this.client.subscriptionId(), apiVersion, this.client.acceptLanguage(), this.client.userAgent()) - .flatMap(new Func1, Observable>>>() { + .flatMap(new Func1, Observable>>>() { @Override - public Observable>> call(Response response) { + public Observable>> call(Response response) { try { - ServiceResponse> result = listWebWorkerMetricDefinitionsDelegate(response); - return Observable.just(new ServiceResponse>(result.getBody(), result.getResponse())); + ServiceResponse> result = listWebWorkerMetricDefinitionsDelegate(response); + return Observable.just(new ServiceResponse>(result.getBody(), result.getResponse())); } catch (Throwable t) { return Observable.error(t); } @@ -5164,9 +5311,9 @@ public Observable>> call(Response> listWebWorkerMetricDefinitionsDelegate(Response response) throws CloudException, IOException, IllegalArgumentException { - return new AzureServiceResponseBuilder, CloudException>(this.client.mapperAdapter()) - .register(200, new TypeToken>() { }.getType()) + private ServiceResponse> listWebWorkerMetricDefinitionsDelegate(Response response) throws CloudException, IOException, IllegalArgumentException { + return new AzureServiceResponseBuilder, CloudException>(this.client.mapperAdapter()) + .register(200, new TypeToken>() { }.getType()) .registerError(CloudException.class) .build(response); } @@ -5175,8 +5322,8 @@ private ServiceResponse> listWebWorkerMetricDefi * Get metrics for a worker pool of a AppServiceEnvironment (App Service Environment). * Get metrics for a worker pool of a AppServiceEnvironment (App Service Environment). * - * @param resourceGroupName Name of resource group - * @param name Name of AppServiceEnvironment (App Service Environment) + * @param resourceGroupName Name of the resource group to which the resource belongs. + * @param name Name of the App Service Environment. * @param workerPoolName Name of worker pool * @return the PagedList<ResourceMetricInner> object if successful. */ @@ -5194,8 +5341,8 @@ public Page nextPage(String nextPageLink) { * Get metrics for a worker pool of a AppServiceEnvironment (App Service Environment). * Get metrics for a worker pool of a AppServiceEnvironment (App Service Environment). * - * @param resourceGroupName Name of resource group - * @param name Name of AppServiceEnvironment (App Service Environment) + * @param resourceGroupName Name of the resource group to which the resource belongs. + * @param name Name of the App Service Environment. * @param workerPoolName Name of worker pool * @param serviceCallback the async ServiceCallback to handle successful and failed responses. * @return the {@link ServiceCall} object @@ -5216,8 +5363,8 @@ public Observable>> call(String nextPa * Get metrics for a worker pool of a AppServiceEnvironment (App Service Environment). * Get metrics for a worker pool of a AppServiceEnvironment (App Service Environment). * - * @param resourceGroupName Name of resource group - * @param name Name of AppServiceEnvironment (App Service Environment) + * @param resourceGroupName Name of the resource group to which the resource belongs. + * @param name Name of the App Service Environment. * @param workerPoolName Name of worker pool * @return the observable to the PagedList<ResourceMetricInner> object */ @@ -5235,8 +5382,8 @@ public Page call(ServiceResponse> * Get metrics for a worker pool of a AppServiceEnvironment (App Service Environment). * Get metrics for a worker pool of a AppServiceEnvironment (App Service Environment). * - * @param resourceGroupName Name of resource group - * @param name Name of AppServiceEnvironment (App Service Environment) + * @param resourceGroupName Name of the resource group to which the resource belongs. + * @param name Name of the App Service Environment. * @param workerPoolName Name of worker pool * @return the observable to the PagedList<ResourceMetricInner> object */ @@ -5258,8 +5405,8 @@ public Observable>> call(ServiceRespon * Get metrics for a worker pool of a AppServiceEnvironment (App Service Environment). * Get metrics for a worker pool of a AppServiceEnvironment (App Service Environment). * - * @param resourceGroupName Name of resource group - * @param name Name of AppServiceEnvironment (App Service Environment) + * @param resourceGroupName Name of the resource group to which the resource belongs. + * @param name Name of the App Service Environment. * @param workerPoolName Name of worker pool * @return the PagedList<ResourceMetricInner> object wrapped in {@link ServiceResponse} if successful. */ @@ -5297,10 +5444,10 @@ public Observable>> call(Response nextPage(String nextPageLink) { * Get metrics for a worker pool of a AppServiceEnvironment (App Service Environment). * Get metrics for a worker pool of a AppServiceEnvironment (App Service Environment). * - * @param resourceGroupName Name of resource group - * @param name Name of AppServiceEnvironment (App Service Environment) + * @param resourceGroupName Name of the resource group to which the resource belongs. + * @param name Name of the App Service Environment. * @param workerPoolName Name of worker pool - * @param details Include instance details + * @param details Specify <code>true</code> to include instance details. The default is <code>false</code>. * @param filter Return only usages/metrics specified in the filter. Filter conforms to odata syntax. Example: $filter=(name.value eq 'Metric1' or name.value eq 'Metric2') and startTime eq '2014-01-01T00:00:00Z' and endTime eq '2014-12-31T23:59:59Z' and timeGrain eq duration'[Hour|Minute|Day]'. * @param serviceCallback the async ServiceCallback to handle successful and failed responses. * @return the {@link ServiceCall} object @@ -5342,10 +5489,10 @@ public Observable>> call(String nextPa * Get metrics for a worker pool of a AppServiceEnvironment (App Service Environment). * Get metrics for a worker pool of a AppServiceEnvironment (App Service Environment). * - * @param resourceGroupName Name of resource group - * @param name Name of AppServiceEnvironment (App Service Environment) + * @param resourceGroupName Name of the resource group to which the resource belongs. + * @param name Name of the App Service Environment. * @param workerPoolName Name of worker pool - * @param details Include instance details + * @param details Specify <code>true</code> to include instance details. The default is <code>false</code>. * @param filter Return only usages/metrics specified in the filter. Filter conforms to odata syntax. Example: $filter=(name.value eq 'Metric1' or name.value eq 'Metric2') and startTime eq '2014-01-01T00:00:00Z' and endTime eq '2014-12-31T23:59:59Z' and timeGrain eq duration'[Hour|Minute|Day]'. * @return the observable to the PagedList<ResourceMetricInner> object */ @@ -5363,10 +5510,10 @@ public Page call(ServiceResponse> * Get metrics for a worker pool of a AppServiceEnvironment (App Service Environment). * Get metrics for a worker pool of a AppServiceEnvironment (App Service Environment). * - * @param resourceGroupName Name of resource group - * @param name Name of AppServiceEnvironment (App Service Environment) + * @param resourceGroupName Name of the resource group to which the resource belongs. + * @param name Name of the App Service Environment. * @param workerPoolName Name of worker pool - * @param details Include instance details + * @param details Specify <code>true</code> to include instance details. The default is <code>false</code>. * @param filter Return only usages/metrics specified in the filter. Filter conforms to odata syntax. Example: $filter=(name.value eq 'Metric1' or name.value eq 'Metric2') and startTime eq '2014-01-01T00:00:00Z' and endTime eq '2014-12-31T23:59:59Z' and timeGrain eq duration'[Hour|Minute|Day]'. * @return the observable to the PagedList<ResourceMetricInner> object */ @@ -5388,10 +5535,10 @@ public Observable>> call(ServiceRespon * Get metrics for a worker pool of a AppServiceEnvironment (App Service Environment). * Get metrics for a worker pool of a AppServiceEnvironment (App Service Environment). * - ServiceResponse> * @param resourceGroupName Name of resource group - ServiceResponse> * @param name Name of AppServiceEnvironment (App Service Environment) + ServiceResponse> * @param resourceGroupName Name of the resource group to which the resource belongs. + ServiceResponse> * @param name Name of the App Service Environment. ServiceResponse> * @param workerPoolName Name of worker pool - ServiceResponse> * @param details Include instance details + ServiceResponse> * @param details Specify <code>true</code> to include instance details. The default is <code>false</code>. ServiceResponse> * @param filter Return only usages/metrics specified in the filter. Filter conforms to odata syntax. Example: $filter=(name.value eq 'Metric1' or name.value eq 'Metric2') and startTime eq '2014-01-01T00:00:00Z' and endTime eq '2014-12-31T23:59:59Z' and timeGrain eq duration'[Hour|Minute|Day]'. * @return the PagedList<ResourceMetricInner> object wrapped in {@link ServiceResponse} if successful. */ @@ -5431,12 +5578,12 @@ private ServiceResponse> listWebWorkerMetricsDeleg } /** - * Get available skus for scaling a worker pool. - * Get available skus for scaling a worker pool. + * Get available SKUs for scaling a worker pool. + * Get available SKUs for scaling a worker pool. * - * @param resourceGroupName Name of resource group - * @param name Name of AppServiceEnvironment (App Service Environment) - * @param workerPoolName Name of worker pool + * @param resourceGroupName Name of the resource group to which the resource belongs. + * @param name Name of the App Service Environment. + * @param workerPoolName Name of the worker pool. * @return the PagedList<SkuInfoInner> object if successful. */ public PagedList listWorkerPoolSkus(final String resourceGroupName, final String name, final String workerPoolName) { @@ -5450,12 +5597,12 @@ public Page nextPage(String nextPageLink) { } /** - * Get available skus for scaling a worker pool. - * Get available skus for scaling a worker pool. + * Get available SKUs for scaling a worker pool. + * Get available SKUs for scaling a worker pool. * - * @param resourceGroupName Name of resource group - * @param name Name of AppServiceEnvironment (App Service Environment) - * @param workerPoolName Name of worker pool + * @param resourceGroupName Name of the resource group to which the resource belongs. + * @param name Name of the App Service Environment. + * @param workerPoolName Name of the worker pool. * @param serviceCallback the async ServiceCallback to handle successful and failed responses. * @return the {@link ServiceCall} object */ @@ -5472,12 +5619,12 @@ public Observable>> call(String nextPageLink) } /** - * Get available skus for scaling a worker pool. - * Get available skus for scaling a worker pool. + * Get available SKUs for scaling a worker pool. + * Get available SKUs for scaling a worker pool. * - * @param resourceGroupName Name of resource group - * @param name Name of AppServiceEnvironment (App Service Environment) - * @param workerPoolName Name of worker pool + * @param resourceGroupName Name of the resource group to which the resource belongs. + * @param name Name of the App Service Environment. + * @param workerPoolName Name of the worker pool. * @return the observable to the PagedList<SkuInfoInner> object */ public Observable> listWorkerPoolSkusAsync(final String resourceGroupName, final String name, final String workerPoolName) { @@ -5491,12 +5638,12 @@ public Page call(ServiceResponse> response) { } /** - * Get available skus for scaling a worker pool. - * Get available skus for scaling a worker pool. + * Get available SKUs for scaling a worker pool. + * Get available SKUs for scaling a worker pool. * - * @param resourceGroupName Name of resource group - * @param name Name of AppServiceEnvironment (App Service Environment) - * @param workerPoolName Name of worker pool + * @param resourceGroupName Name of the resource group to which the resource belongs. + * @param name Name of the App Service Environment. + * @param workerPoolName Name of the worker pool. * @return the observable to the PagedList<SkuInfoInner> object */ public Observable>> listWorkerPoolSkusWithServiceResponseAsync(final String resourceGroupName, final String name, final String workerPoolName) { @@ -5514,12 +5661,12 @@ public Observable>> call(ServiceResponse> * @param resourceGroupName Name of resource group - ServiceResponse> * @param name Name of AppServiceEnvironment (App Service Environment) - ServiceResponse> * @param workerPoolName Name of worker pool + ServiceResponse> * @param resourceGroupName Name of the resource group to which the resource belongs. + ServiceResponse> * @param name Name of the App Service Environment. + ServiceResponse> * @param workerPoolName Name of the worker pool. * @return the PagedList<SkuInfoInner> object wrapped in {@link ServiceResponse} if successful. */ public Observable>> listWorkerPoolSkusSinglePageAsync(final String resourceGroupName, final String name, final String workerPoolName) { @@ -5558,12 +5705,12 @@ private ServiceResponse> listWorkerPoolSkusDelegate(Respo } /** - * Get usages for a worker pool of a AppServiceEnvironment (App Service Environment). - * Get usages for a worker pool of a AppServiceEnvironment (App Service Environment). + * Get usage metrics for a worker pool of an App Service Environment. + * Get usage metrics for a worker pool of an App Service Environment. * - * @param resourceGroupName Name of resource group - * @param name Name of AppServiceEnvironment (App Service Environment) - * @param workerPoolName Name of worker pool + * @param resourceGroupName Name of the resource group to which the resource belongs. + * @param name Name of the App Service Environment. + * @param workerPoolName Name of the worker pool. * @return the PagedList<UsageInner> object if successful. */ public PagedList listWebWorkerUsages(final String resourceGroupName, final String name, final String workerPoolName) { @@ -5577,12 +5724,12 @@ public Page nextPage(String nextPageLink) { } /** - * Get usages for a worker pool of a AppServiceEnvironment (App Service Environment). - * Get usages for a worker pool of a AppServiceEnvironment (App Service Environment). + * Get usage metrics for a worker pool of an App Service Environment. + * Get usage metrics for a worker pool of an App Service Environment. * - * @param resourceGroupName Name of resource group - * @param name Name of AppServiceEnvironment (App Service Environment) - * @param workerPoolName Name of worker pool + * @param resourceGroupName Name of the resource group to which the resource belongs. + * @param name Name of the App Service Environment. + * @param workerPoolName Name of the worker pool. * @param serviceCallback the async ServiceCallback to handle successful and failed responses. * @return the {@link ServiceCall} object */ @@ -5599,12 +5746,12 @@ public Observable>> call(String nextPageLink) { } /** - * Get usages for a worker pool of a AppServiceEnvironment (App Service Environment). - * Get usages for a worker pool of a AppServiceEnvironment (App Service Environment). + * Get usage metrics for a worker pool of an App Service Environment. + * Get usage metrics for a worker pool of an App Service Environment. * - * @param resourceGroupName Name of resource group - * @param name Name of AppServiceEnvironment (App Service Environment) - * @param workerPoolName Name of worker pool + * @param resourceGroupName Name of the resource group to which the resource belongs. + * @param name Name of the App Service Environment. + * @param workerPoolName Name of the worker pool. * @return the observable to the PagedList<UsageInner> object */ public Observable> listWebWorkerUsagesAsync(final String resourceGroupName, final String name, final String workerPoolName) { @@ -5618,12 +5765,12 @@ public Page call(ServiceResponse> response) { } /** - * Get usages for a worker pool of a AppServiceEnvironment (App Service Environment). - * Get usages for a worker pool of a AppServiceEnvironment (App Service Environment). + * Get usage metrics for a worker pool of an App Service Environment. + * Get usage metrics for a worker pool of an App Service Environment. * - * @param resourceGroupName Name of resource group - * @param name Name of AppServiceEnvironment (App Service Environment) - * @param workerPoolName Name of worker pool + * @param resourceGroupName Name of the resource group to which the resource belongs. + * @param name Name of the App Service Environment. + * @param workerPoolName Name of the worker pool. * @return the observable to the PagedList<UsageInner> object */ public Observable>> listWebWorkerUsagesWithServiceResponseAsync(final String resourceGroupName, final String name, final String workerPoolName) { @@ -5641,12 +5788,12 @@ public Observable>> call(ServiceResponse> * @param resourceGroupName Name of resource group - ServiceResponse> * @param name Name of AppServiceEnvironment (App Service Environment) - ServiceResponse> * @param workerPoolName Name of worker pool + ServiceResponse> * @param resourceGroupName Name of the resource group to which the resource belongs. + ServiceResponse> * @param name Name of the App Service Environment. + ServiceResponse> * @param workerPoolName Name of the worker pool. * @return the PagedList<UsageInner> object wrapped in {@link ServiceResponse} if successful. */ public Observable>> listWebWorkerUsagesSinglePageAsync(final String resourceGroupName, final String name, final String workerPoolName) { @@ -5685,8 +5832,8 @@ private ServiceResponse> listWebWorkerUsagesDelegate(Respon } /** - * Gets all hostingEnvironments (App Service Environment) for a subscription. - * Gets all hostingEnvironments (App Service Environment) for a subscription. + * Get all App Service Environments for a subscription. + * Get all App Service Environments for a subscription. * * @param nextPageLink The NextLink from the previous successful call to List operation. * @return the PagedList<AppServiceEnvironmentInner> object if successful. @@ -5702,8 +5849,8 @@ public Page nextPage(String nextPageLink) { } /** - * Gets all hostingEnvironments (App Service Environment) for a subscription. - * Gets all hostingEnvironments (App Service Environment) for a subscription. + * Get all App Service Environments for a subscription. + * Get all App Service Environments for a subscription. * * @param nextPageLink The NextLink from the previous successful call to List operation. * @param serviceCall the ServiceCall object tracking the Retrofit calls @@ -5723,8 +5870,8 @@ public Observable>> call(String } /** - * Gets all hostingEnvironments (App Service Environment) for a subscription. - * Gets all hostingEnvironments (App Service Environment) for a subscription. + * Get all App Service Environments for a subscription. + * Get all App Service Environments for a subscription. * * @param nextPageLink The NextLink from the previous successful call to List operation. * @return the observable to the PagedList<AppServiceEnvironmentInner> object @@ -5740,8 +5887,8 @@ public Page call(ServiceResponse>> call(Servic } /** - * Gets all hostingEnvironments (App Service Environment) for a subscription. - * Gets all hostingEnvironments (App Service Environment) for a subscription. + * Get all App Service Environments for a subscription. + * Get all App Service Environments for a subscription. * ServiceResponse> * @param nextPageLink The NextLink from the previous successful call to List operation. * @return the PagedList<AppServiceEnvironmentInner> object wrapped in {@link ServiceResponse} if successful. @@ -5793,8 +5940,8 @@ private ServiceResponse> listNextDelegate(R } /** - * Get all hostingEnvironments (App Service Environments) in a resource group. - * Get all hostingEnvironments (App Service Environments) in a resource group. + * Get all App Service Environments in a resource group. + * Get all App Service Environments in a resource group. * * @param nextPageLink The NextLink from the previous successful call to List operation. * @return the PagedList<AppServiceEnvironmentInner> object if successful. @@ -5810,8 +5957,8 @@ public Page nextPage(String nextPageLink) { } /** - * Get all hostingEnvironments (App Service Environments) in a resource group. - * Get all hostingEnvironments (App Service Environments) in a resource group. + * Get all App Service Environments in a resource group. + * Get all App Service Environments in a resource group. * * @param nextPageLink The NextLink from the previous successful call to List operation. * @param serviceCall the ServiceCall object tracking the Retrofit calls @@ -5831,8 +5978,8 @@ public Observable>> call(String } /** - * Get all hostingEnvironments (App Service Environments) in a resource group. - * Get all hostingEnvironments (App Service Environments) in a resource group. + * Get all App Service Environments in a resource group. + * Get all App Service Environments in a resource group. * * @param nextPageLink The NextLink from the previous successful call to List operation. * @return the observable to the PagedList<AppServiceEnvironmentInner> object @@ -5848,8 +5995,8 @@ public Page call(ServiceResponse>> call(Servic } /** - * Get all hostingEnvironments (App Service Environments) in a resource group. - * Get all hostingEnvironments (App Service Environments) in a resource group. + * Get all App Service Environments in a resource group. + * Get all App Service Environments in a resource group. * ServiceResponse> * @param nextPageLink The NextLink from the previous successful call to List operation. * @return the PagedList<AppServiceEnvironmentInner> object wrapped in {@link ServiceResponse} if successful. @@ -5901,8 +6048,8 @@ private ServiceResponse> listByResourceGrou } /** - * Get used, available, and total worker capacity for AppServiceEnvironment (App Service Environment). - * Get used, available, and total worker capacity for AppServiceEnvironment (App Service Environment). + * Get the used, available, and total worker capacity an App Service Environment. + * Get the used, available, and total worker capacity an App Service Environment. * * @param nextPageLink The NextLink from the previous successful call to List operation. * @return the PagedList<StampCapacityInner> object if successful. @@ -5918,8 +6065,8 @@ public Page nextPage(String nextPageLink) { } /** - * Get used, available, and total worker capacity for AppServiceEnvironment (App Service Environment). - * Get used, available, and total worker capacity for AppServiceEnvironment (App Service Environment). + * Get the used, available, and total worker capacity an App Service Environment. + * Get the used, available, and total worker capacity an App Service Environment. * * @param nextPageLink The NextLink from the previous successful call to List operation. * @param serviceCall the ServiceCall object tracking the Retrofit calls @@ -5939,8 +6086,8 @@ public Observable>> call(String nextPag } /** - * Get used, available, and total worker capacity for AppServiceEnvironment (App Service Environment). - * Get used, available, and total worker capacity for AppServiceEnvironment (App Service Environment). + * Get the used, available, and total worker capacity an App Service Environment. + * Get the used, available, and total worker capacity an App Service Environment. * * @param nextPageLink The NextLink from the previous successful call to List operation. * @return the observable to the PagedList<StampCapacityInner> object @@ -5956,8 +6103,8 @@ public Page call(ServiceResponse> r } /** - * Get used, available, and total worker capacity for AppServiceEnvironment (App Service Environment). - * Get used, available, and total worker capacity for AppServiceEnvironment (App Service Environment). + * Get the used, available, and total worker capacity an App Service Environment. + * Get the used, available, and total worker capacity an App Service Environment. * * @param nextPageLink The NextLink from the previous successful call to List operation. * @return the observable to the PagedList<StampCapacityInner> object @@ -5977,8 +6124,8 @@ public Observable>> call(ServiceRespons } /** - * Get used, available, and total worker capacity for AppServiceEnvironment (App Service Environment). - * Get used, available, and total worker capacity for AppServiceEnvironment (App Service Environment). + * Get the used, available, and total worker capacity an App Service Environment. + * Get the used, available, and total worker capacity an App Service Environment. * ServiceResponse> * @param nextPageLink The NextLink from the previous successful call to List operation. * @return the PagedList<StampCapacityInner> object wrapped in {@link ServiceResponse} if successful. @@ -6009,8 +6156,8 @@ private ServiceResponse> listCapacitiesNextDelegate } /** - * Get global metrics of AppServiceEnvironment (App Service Environment). - * Get global metrics of AppServiceEnvironment (App Service Environment). + * Get global metrics of an App Service Environment. + * Get global metrics of an App Service Environment. * * @param nextPageLink The NextLink from the previous successful call to List operation. * @return the PagedList<ResourceMetricInner> object if successful. @@ -6026,8 +6173,8 @@ public Page nextPage(String nextPageLink) { } /** - * Get global metrics of AppServiceEnvironment (App Service Environment). - * Get global metrics of AppServiceEnvironment (App Service Environment). + * Get global metrics of an App Service Environment. + * Get global metrics of an App Service Environment. * * @param nextPageLink The NextLink from the previous successful call to List operation. * @param serviceCall the ServiceCall object tracking the Retrofit calls @@ -6047,8 +6194,8 @@ public Observable>> call(String nextPa } /** - * Get global metrics of AppServiceEnvironment (App Service Environment). - * Get global metrics of AppServiceEnvironment (App Service Environment). + * Get global metrics of an App Service Environment. + * Get global metrics of an App Service Environment. * * @param nextPageLink The NextLink from the previous successful call to List operation. * @return the observable to the PagedList<ResourceMetricInner> object @@ -6064,8 +6211,8 @@ public Page call(ServiceResponse> } /** - * Get global metrics of AppServiceEnvironment (App Service Environment). - * Get global metrics of AppServiceEnvironment (App Service Environment). + * Get global metrics of an App Service Environment. + * Get global metrics of an App Service Environment. * * @param nextPageLink The NextLink from the previous successful call to List operation. * @return the observable to the PagedList<ResourceMetricInner> object @@ -6085,8 +6232,8 @@ public Observable>> call(ServiceRespon } /** - * Get global metrics of AppServiceEnvironment (App Service Environment). - * Get global metrics of AppServiceEnvironment (App Service Environment). + * Get global metrics of an App Service Environment. + * Get global metrics of an App Service Environment. * ServiceResponse> * @param nextPageLink The NextLink from the previous successful call to List operation. * @return the PagedList<ResourceMetricInner> object wrapped in {@link ServiceResponse} if successful. @@ -6117,8 +6264,8 @@ private ServiceResponse> listMetricsNextDelegate(R } /** - * Get all multi role pools. - * Get all multi role pools. + * Get all multi-role pools. + * Get all multi-role pools. * * @param nextPageLink The NextLink from the previous successful call to List operation. * @return the PagedList<WorkerPoolInner> object if successful. @@ -6134,8 +6281,8 @@ public Page nextPage(String nextPageLink) { } /** - * Get all multi role pools. - * Get all multi role pools. + * Get all multi-role pools. + * Get all multi-role pools. * * @param nextPageLink The NextLink from the previous successful call to List operation. * @param serviceCall the ServiceCall object tracking the Retrofit calls @@ -6155,8 +6302,8 @@ public Observable>> call(String nextPageLi } /** - * Get all multi role pools. - * Get all multi role pools. + * Get all multi-role pools. + * Get all multi-role pools. * * @param nextPageLink The NextLink from the previous successful call to List operation. * @return the observable to the PagedList<WorkerPoolInner> object @@ -6172,8 +6319,8 @@ public Page call(ServiceResponse> respons } /** - * Get all multi role pools. - * Get all multi role pools. + * Get all multi-role pools. + * Get all multi-role pools. * * @param nextPageLink The NextLink from the previous successful call to List operation. * @return the observable to the PagedList<WorkerPoolInner> object @@ -6193,8 +6340,8 @@ public Observable>> call(ServiceResponse

> * @param nextPageLink The NextLink from the previous successful call to List operation. * @return the PagedList<WorkerPoolInner> object wrapped in {@link ServiceResponse} if successful. @@ -6225,37 +6372,253 @@ private ServiceResponse> listMultiRolePoolsNextDelegat } /** - * Get metric definitions for a multiRole pool of a AppServiceEnvironment (App Service Environment). - * Get metric definitions for a multiRole pool of a AppServiceEnvironment (App Service Environment). + * Get metric definitions for a specific instance of a multi-role pool of an App Service Environment. + * Get metric definitions for a specific instance of a multi-role pool of an App Service Environment. * * @param nextPageLink The NextLink from the previous successful call to List operation. - * @return the PagedList<MetricDefinitionInner> object if successful. + * @return the PagedList<ResourceMetricDefinitionInner> object if successful. */ - public PagedList listMultiRoleMetricDefinitionsNext(final String nextPageLink) { - ServiceResponse> response = listMultiRoleMetricDefinitionsNextSinglePageAsync(nextPageLink).toBlocking().single(); - return new PagedList(response.getBody()) { + public PagedList listMultiRolePoolInstanceMetricDefinitionsNext(final String nextPageLink) { + ServiceResponse> response = listMultiRolePoolInstanceMetricDefinitionsNextSinglePageAsync(nextPageLink).toBlocking().single(); + return new PagedList(response.getBody()) { @Override - public Page nextPage(String nextPageLink) { + public Page nextPage(String nextPageLink) { + return listMultiRolePoolInstanceMetricDefinitionsNextSinglePageAsync(nextPageLink).toBlocking().single().getBody(); + } + }; + } + + /** + * Get metric definitions for a specific instance of a multi-role pool of an App Service Environment. + * Get metric definitions for a specific instance of a multi-role pool of an App Service Environment. + * + * @param nextPageLink The NextLink from the previous successful call to List operation. + * @param serviceCall the ServiceCall object tracking the Retrofit calls + * @param serviceCallback the async ServiceCallback to handle successful and failed responses. + * @return the {@link ServiceCall} object + */ + public ServiceCall> listMultiRolePoolInstanceMetricDefinitionsNextAsync(final String nextPageLink, final ServiceCall> serviceCall, final ListOperationCallback serviceCallback) { + return AzureServiceCall.create( + listMultiRolePoolInstanceMetricDefinitionsNextSinglePageAsync(nextPageLink), + new Func1>>>() { + @Override + public Observable>> call(String nextPageLink) { + return listMultiRolePoolInstanceMetricDefinitionsNextSinglePageAsync(nextPageLink); + } + }, + serviceCallback); + } + + /** + * Get metric definitions for a specific instance of a multi-role pool of an App Service Environment. + * Get metric definitions for a specific instance of a multi-role pool of an App Service Environment. + * + * @param nextPageLink The NextLink from the previous successful call to List operation. + * @return the observable to the PagedList<ResourceMetricDefinitionInner> object + */ + public Observable> listMultiRolePoolInstanceMetricDefinitionsNextAsync(final String nextPageLink) { + return listMultiRolePoolInstanceMetricDefinitionsNextWithServiceResponseAsync(nextPageLink) + .map(new Func1>, Page>() { + @Override + public Page call(ServiceResponse> response) { + return response.getBody(); + } + }); + } + + /** + * Get metric definitions for a specific instance of a multi-role pool of an App Service Environment. + * Get metric definitions for a specific instance of a multi-role pool of an App Service Environment. + * + * @param nextPageLink The NextLink from the previous successful call to List operation. + * @return the observable to the PagedList<ResourceMetricDefinitionInner> object + */ + public Observable>> listMultiRolePoolInstanceMetricDefinitionsNextWithServiceResponseAsync(final String nextPageLink) { + return listMultiRolePoolInstanceMetricDefinitionsNextSinglePageAsync(nextPageLink) + .concatMap(new Func1>, Observable>>>() { + @Override + public Observable>> call(ServiceResponse> page) { + String nextPageLink = page.getBody().getNextPageLink(); + if (nextPageLink == null) { + return Observable.just(page); + } + return Observable.just(page).concatWith(listMultiRolePoolInstanceMetricDefinitionsNextWithServiceResponseAsync(nextPageLink)); + } + }); + } + + /** + * Get metric definitions for a specific instance of a multi-role pool of an App Service Environment. + * Get metric definitions for a specific instance of a multi-role pool of an App Service Environment. + * + ServiceResponse> * @param nextPageLink The NextLink from the previous successful call to List operation. + * @return the PagedList<ResourceMetricDefinitionInner> object wrapped in {@link ServiceResponse} if successful. + */ + public Observable>> listMultiRolePoolInstanceMetricDefinitionsNextSinglePageAsync(final String nextPageLink) { + if (nextPageLink == null) { + throw new IllegalArgumentException("Parameter nextPageLink is required and cannot be null."); + } + return service.listMultiRolePoolInstanceMetricDefinitionsNext(nextPageLink, this.client.acceptLanguage(), this.client.userAgent()) + .flatMap(new Func1, Observable>>>() { + @Override + public Observable>> call(Response response) { + try { + ServiceResponse> result = listMultiRolePoolInstanceMetricDefinitionsNextDelegate(response); + return Observable.just(new ServiceResponse>(result.getBody(), result.getResponse())); + } catch (Throwable t) { + return Observable.error(t); + } + } + }); + } + + private ServiceResponse> listMultiRolePoolInstanceMetricDefinitionsNextDelegate(Response response) throws CloudException, IOException, IllegalArgumentException { + return new AzureServiceResponseBuilder, CloudException>(this.client.mapperAdapter()) + .register(200, new TypeToken>() { }.getType()) + .registerError(CloudException.class) + .build(response); + } + + /** + * Get metrics for a specific instance of a multi-role pool of an App Service Environment. + * Get metrics for a specific instance of a multi-role pool of an App Service Environment. + * + * @param nextPageLink The NextLink from the previous successful call to List operation. + * @return the PagedList<ResourceMetricInner> object if successful. + */ + public PagedList listMultiRolePoolInstanceMetricsNext(final String nextPageLink) { + ServiceResponse> response = listMultiRolePoolInstanceMetricsNextSinglePageAsync(nextPageLink).toBlocking().single(); + return new PagedList(response.getBody()) { + @Override + public Page nextPage(String nextPageLink) { + return listMultiRolePoolInstanceMetricsNextSinglePageAsync(nextPageLink).toBlocking().single().getBody(); + } + }; + } + + /** + * Get metrics for a specific instance of a multi-role pool of an App Service Environment. + * Get metrics for a specific instance of a multi-role pool of an App Service Environment. + * + * @param nextPageLink The NextLink from the previous successful call to List operation. + * @param serviceCall the ServiceCall object tracking the Retrofit calls + * @param serviceCallback the async ServiceCallback to handle successful and failed responses. + * @return the {@link ServiceCall} object + */ + public ServiceCall> listMultiRolePoolInstanceMetricsNextAsync(final String nextPageLink, final ServiceCall> serviceCall, final ListOperationCallback serviceCallback) { + return AzureServiceCall.create( + listMultiRolePoolInstanceMetricsNextSinglePageAsync(nextPageLink), + new Func1>>>() { + @Override + public Observable>> call(String nextPageLink) { + return listMultiRolePoolInstanceMetricsNextSinglePageAsync(nextPageLink); + } + }, + serviceCallback); + } + + /** + * Get metrics for a specific instance of a multi-role pool of an App Service Environment. + * Get metrics for a specific instance of a multi-role pool of an App Service Environment. + * + * @param nextPageLink The NextLink from the previous successful call to List operation. + * @return the observable to the PagedList<ResourceMetricInner> object + */ + public Observable> listMultiRolePoolInstanceMetricsNextAsync(final String nextPageLink) { + return listMultiRolePoolInstanceMetricsNextWithServiceResponseAsync(nextPageLink) + .map(new Func1>, Page>() { + @Override + public Page call(ServiceResponse> response) { + return response.getBody(); + } + }); + } + + /** + * Get metrics for a specific instance of a multi-role pool of an App Service Environment. + * Get metrics for a specific instance of a multi-role pool of an App Service Environment. + * + * @param nextPageLink The NextLink from the previous successful call to List operation. + * @return the observable to the PagedList<ResourceMetricInner> object + */ + public Observable>> listMultiRolePoolInstanceMetricsNextWithServiceResponseAsync(final String nextPageLink) { + return listMultiRolePoolInstanceMetricsNextSinglePageAsync(nextPageLink) + .concatMap(new Func1>, Observable>>>() { + @Override + public Observable>> call(ServiceResponse> page) { + String nextPageLink = page.getBody().getNextPageLink(); + if (nextPageLink == null) { + return Observable.just(page); + } + return Observable.just(page).concatWith(listMultiRolePoolInstanceMetricsNextWithServiceResponseAsync(nextPageLink)); + } + }); + } + + /** + * Get metrics for a specific instance of a multi-role pool of an App Service Environment. + * Get metrics for a specific instance of a multi-role pool of an App Service Environment. + * + ServiceResponse> * @param nextPageLink The NextLink from the previous successful call to List operation. + * @return the PagedList<ResourceMetricInner> object wrapped in {@link ServiceResponse} if successful. + */ + public Observable>> listMultiRolePoolInstanceMetricsNextSinglePageAsync(final String nextPageLink) { + if (nextPageLink == null) { + throw new IllegalArgumentException("Parameter nextPageLink is required and cannot be null."); + } + return service.listMultiRolePoolInstanceMetricsNext(nextPageLink, this.client.acceptLanguage(), this.client.userAgent()) + .flatMap(new Func1, Observable>>>() { + @Override + public Observable>> call(Response response) { + try { + ServiceResponse> result = listMultiRolePoolInstanceMetricsNextDelegate(response); + return Observable.just(new ServiceResponse>(result.getBody(), result.getResponse())); + } catch (Throwable t) { + return Observable.error(t); + } + } + }); + } + + private ServiceResponse> listMultiRolePoolInstanceMetricsNextDelegate(Response response) throws CloudException, IOException, IllegalArgumentException { + return new AzureServiceResponseBuilder, CloudException>(this.client.mapperAdapter()) + .register(200, new TypeToken>() { }.getType()) + .registerError(CloudException.class) + .build(response); + } + + /** + * Get metric definitions for a multi-role pool of an App Service Environment. + * Get metric definitions for a multi-role pool of an App Service Environment. + * + * @param nextPageLink The NextLink from the previous successful call to List operation. + * @return the PagedList<ResourceMetricDefinitionInner> object if successful. + */ + public PagedList listMultiRoleMetricDefinitionsNext(final String nextPageLink) { + ServiceResponse> response = listMultiRoleMetricDefinitionsNextSinglePageAsync(nextPageLink).toBlocking().single(); + return new PagedList(response.getBody()) { + @Override + public Page nextPage(String nextPageLink) { return listMultiRoleMetricDefinitionsNextSinglePageAsync(nextPageLink).toBlocking().single().getBody(); } }; } /** - * Get metric definitions for a multiRole pool of a AppServiceEnvironment (App Service Environment). - * Get metric definitions for a multiRole pool of a AppServiceEnvironment (App Service Environment). + * Get metric definitions for a multi-role pool of an App Service Environment. + * Get metric definitions for a multi-role pool of an App Service Environment. * * @param nextPageLink The NextLink from the previous successful call to List operation. * @param serviceCall the ServiceCall object tracking the Retrofit calls * @param serviceCallback the async ServiceCallback to handle successful and failed responses. * @return the {@link ServiceCall} object */ - public ServiceCall> listMultiRoleMetricDefinitionsNextAsync(final String nextPageLink, final ServiceCall> serviceCall, final ListOperationCallback serviceCallback) { + public ServiceCall> listMultiRoleMetricDefinitionsNextAsync(final String nextPageLink, final ServiceCall> serviceCall, final ListOperationCallback serviceCallback) { return AzureServiceCall.create( listMultiRoleMetricDefinitionsNextSinglePageAsync(nextPageLink), - new Func1>>>() { + new Func1>>>() { @Override - public Observable>> call(String nextPageLink) { + public Observable>> call(String nextPageLink) { return listMultiRoleMetricDefinitionsNextSinglePageAsync(nextPageLink); } }, @@ -6263,34 +6626,34 @@ public Observable>> call(String next } /** - * Get metric definitions for a multiRole pool of a AppServiceEnvironment (App Service Environment). - * Get metric definitions for a multiRole pool of a AppServiceEnvironment (App Service Environment). + * Get metric definitions for a multi-role pool of an App Service Environment. + * Get metric definitions for a multi-role pool of an App Service Environment. * * @param nextPageLink The NextLink from the previous successful call to List operation. - * @return the observable to the PagedList<MetricDefinitionInner> object + * @return the observable to the PagedList<ResourceMetricDefinitionInner> object */ - public Observable> listMultiRoleMetricDefinitionsNextAsync(final String nextPageLink) { + public Observable> listMultiRoleMetricDefinitionsNextAsync(final String nextPageLink) { return listMultiRoleMetricDefinitionsNextWithServiceResponseAsync(nextPageLink) - .map(new Func1>, Page>() { + .map(new Func1>, Page>() { @Override - public Page call(ServiceResponse> response) { + public Page call(ServiceResponse> response) { return response.getBody(); } }); } /** - * Get metric definitions for a multiRole pool of a AppServiceEnvironment (App Service Environment). - * Get metric definitions for a multiRole pool of a AppServiceEnvironment (App Service Environment). + * Get metric definitions for a multi-role pool of an App Service Environment. + * Get metric definitions for a multi-role pool of an App Service Environment. * * @param nextPageLink The NextLink from the previous successful call to List operation. - * @return the observable to the PagedList<MetricDefinitionInner> object + * @return the observable to the PagedList<ResourceMetricDefinitionInner> object */ - public Observable>> listMultiRoleMetricDefinitionsNextWithServiceResponseAsync(final String nextPageLink) { + public Observable>> listMultiRoleMetricDefinitionsNextWithServiceResponseAsync(final String nextPageLink) { return listMultiRoleMetricDefinitionsNextSinglePageAsync(nextPageLink) - .concatMap(new Func1>, Observable>>>() { + .concatMap(new Func1>, Observable>>>() { @Override - public Observable>> call(ServiceResponse> page) { + public Observable>> call(ServiceResponse> page) { String nextPageLink = page.getBody().getNextPageLink(); if (nextPageLink == null) { return Observable.just(page); @@ -6301,23 +6664,23 @@ public Observable>> call(ServiceResp } /** - * Get metric definitions for a multiRole pool of a AppServiceEnvironment (App Service Environment). - * Get metric definitions for a multiRole pool of a AppServiceEnvironment (App Service Environment). + * Get metric definitions for a multi-role pool of an App Service Environment. + * Get metric definitions for a multi-role pool of an App Service Environment. * - ServiceResponse> * @param nextPageLink The NextLink from the previous successful call to List operation. - * @return the PagedList<MetricDefinitionInner> object wrapped in {@link ServiceResponse} if successful. + ServiceResponse> * @param nextPageLink The NextLink from the previous successful call to List operation. + * @return the PagedList<ResourceMetricDefinitionInner> object wrapped in {@link ServiceResponse} if successful. */ - public Observable>> listMultiRoleMetricDefinitionsNextSinglePageAsync(final String nextPageLink) { + public Observable>> listMultiRoleMetricDefinitionsNextSinglePageAsync(final String nextPageLink) { if (nextPageLink == null) { throw new IllegalArgumentException("Parameter nextPageLink is required and cannot be null."); } return service.listMultiRoleMetricDefinitionsNext(nextPageLink, this.client.acceptLanguage(), this.client.userAgent()) - .flatMap(new Func1, Observable>>>() { + .flatMap(new Func1, Observable>>>() { @Override - public Observable>> call(Response response) { + public Observable>> call(Response response) { try { - ServiceResponse> result = listMultiRoleMetricDefinitionsNextDelegate(response); - return Observable.just(new ServiceResponse>(result.getBody(), result.getResponse())); + ServiceResponse> result = listMultiRoleMetricDefinitionsNextDelegate(response); + return Observable.just(new ServiceResponse>(result.getBody(), result.getResponse())); } catch (Throwable t) { return Observable.error(t); } @@ -6325,16 +6688,16 @@ public Observable>> call(Response> listMultiRoleMetricDefinitionsNextDelegate(Response response) throws CloudException, IOException, IllegalArgumentException { - return new AzureServiceResponseBuilder, CloudException>(this.client.mapperAdapter()) - .register(200, new TypeToken>() { }.getType()) + private ServiceResponse> listMultiRoleMetricDefinitionsNextDelegate(Response response) throws CloudException, IOException, IllegalArgumentException { + return new AzureServiceResponseBuilder, CloudException>(this.client.mapperAdapter()) + .register(200, new TypeToken>() { }.getType()) .registerError(CloudException.class) .build(response); } /** - * Get metrics for a multiRole pool of a AppServiceEnvironment (App Service Environment). - * Get metrics for a multiRole pool of a AppServiceEnvironment (App Service Environment). + * Get metrics for a multi-role pool of an App Service Environment. + * Get metrics for a multi-role pool of an App Service Environment. * * @param nextPageLink The NextLink from the previous successful call to List operation. * @return the PagedList<ResourceMetricInner> object if successful. @@ -6350,8 +6713,8 @@ public Page nextPage(String nextPageLink) { } /** - * Get metrics for a multiRole pool of a AppServiceEnvironment (App Service Environment). - * Get metrics for a multiRole pool of a AppServiceEnvironment (App Service Environment). + * Get metrics for a multi-role pool of an App Service Environment. + * Get metrics for a multi-role pool of an App Service Environment. * * @param nextPageLink The NextLink from the previous successful call to List operation. * @param serviceCall the ServiceCall object tracking the Retrofit calls @@ -6371,8 +6734,8 @@ public Observable>> call(String nextPa } /** - * Get metrics for a multiRole pool of a AppServiceEnvironment (App Service Environment). - * Get metrics for a multiRole pool of a AppServiceEnvironment (App Service Environment). + * Get metrics for a multi-role pool of an App Service Environment. + * Get metrics for a multi-role pool of an App Service Environment. * * @param nextPageLink The NextLink from the previous successful call to List operation. * @return the observable to the PagedList<ResourceMetricInner> object @@ -6388,8 +6751,8 @@ public Page call(ServiceResponse> } /** - * Get metrics for a multiRole pool of a AppServiceEnvironment (App Service Environment). - * Get metrics for a multiRole pool of a AppServiceEnvironment (App Service Environment). + * Get metrics for a multi-role pool of an App Service Environment. + * Get metrics for a multi-role pool of an App Service Environment. * * @param nextPageLink The NextLink from the previous successful call to List operation. * @return the observable to the PagedList<ResourceMetricInner> object @@ -6409,8 +6772,8 @@ public Observable>> call(ServiceRespon } /** - * Get metrics for a multiRole pool of a AppServiceEnvironment (App Service Environment). - * Get metrics for a multiRole pool of a AppServiceEnvironment (App Service Environment). + * Get metrics for a multi-role pool of an App Service Environment. + * Get metrics for a multi-role pool of an App Service Environment. * ServiceResponse> * @param nextPageLink The NextLink from the previous successful call to List operation. * @return the PagedList<ResourceMetricInner> object wrapped in {@link ServiceResponse} if successful. @@ -6441,8 +6804,8 @@ private ServiceResponse> listMultiRoleMetricsNextD } /** - * Get available skus for scaling a multiRole pool. - * Get available skus for scaling a multiRole pool. + * Get available SKUs for scaling a multi-role pool. + * Get available SKUs for scaling a multi-role pool. * * @param nextPageLink The NextLink from the previous successful call to List operation. * @return the PagedList<SkuInfoInner> object if successful. @@ -6458,8 +6821,8 @@ public Page nextPage(String nextPageLink) { } /** - * Get available skus for scaling a multiRole pool. - * Get available skus for scaling a multiRole pool. + * Get available SKUs for scaling a multi-role pool. + * Get available SKUs for scaling a multi-role pool. * * @param nextPageLink The NextLink from the previous successful call to List operation. * @param serviceCall the ServiceCall object tracking the Retrofit calls @@ -6479,8 +6842,8 @@ public Observable>> call(String nextPageLink) } /** - * Get available skus for scaling a multiRole pool. - * Get available skus for scaling a multiRole pool. + * Get available SKUs for scaling a multi-role pool. + * Get available SKUs for scaling a multi-role pool. * * @param nextPageLink The NextLink from the previous successful call to List operation. * @return the observable to the PagedList<SkuInfoInner> object @@ -6496,8 +6859,8 @@ public Page call(ServiceResponse> response) { } /** - * Get available skus for scaling a multiRole pool. - * Get available skus for scaling a multiRole pool. + * Get available SKUs for scaling a multi-role pool. + * Get available SKUs for scaling a multi-role pool. * * @param nextPageLink The NextLink from the previous successful call to List operation. * @return the observable to the PagedList<SkuInfoInner> object @@ -6517,8 +6880,8 @@ public Observable>> call(ServiceResponse> * @param nextPageLink The NextLink from the previous successful call to List operation. * @return the PagedList<SkuInfoInner> object wrapped in {@link ServiceResponse} if successful. @@ -6549,8 +6912,8 @@ private ServiceResponse> listMultiRolePoolSkusNextDelegat } /** - * Get usages for a multiRole pool of a AppServiceEnvironment (App Service Environment). - * Get usages for a multiRole pool of a AppServiceEnvironment (App Service Environment). + * Get usage metrics for a multi-role pool of an App Service Environment. + * Get usage metrics for a multi-role pool of an App Service Environment. * * @param nextPageLink The NextLink from the previous successful call to List operation. * @return the PagedList<UsageInner> object if successful. @@ -6566,8 +6929,8 @@ public Page nextPage(String nextPageLink) { } /** - * Get usages for a multiRole pool of a AppServiceEnvironment (App Service Environment). - * Get usages for a multiRole pool of a AppServiceEnvironment (App Service Environment). + * Get usage metrics for a multi-role pool of an App Service Environment. + * Get usage metrics for a multi-role pool of an App Service Environment. * * @param nextPageLink The NextLink from the previous successful call to List operation. * @param serviceCall the ServiceCall object tracking the Retrofit calls @@ -6587,8 +6950,8 @@ public Observable>> call(String nextPageLink) { } /** - * Get usages for a multiRole pool of a AppServiceEnvironment (App Service Environment). - * Get usages for a multiRole pool of a AppServiceEnvironment (App Service Environment). + * Get usage metrics for a multi-role pool of an App Service Environment. + * Get usage metrics for a multi-role pool of an App Service Environment. * * @param nextPageLink The NextLink from the previous successful call to List operation. * @return the observable to the PagedList<UsageInner> object @@ -6604,8 +6967,8 @@ public Page call(ServiceResponse> response) { } /** - * Get usages for a multiRole pool of a AppServiceEnvironment (App Service Environment). - * Get usages for a multiRole pool of a AppServiceEnvironment (App Service Environment). + * Get usage metrics for a multi-role pool of an App Service Environment. + * Get usage metrics for a multi-role pool of an App Service Environment. * * @param nextPageLink The NextLink from the previous successful call to List operation. * @return the observable to the PagedList<UsageInner> object @@ -6625,8 +6988,8 @@ public Observable>> call(ServiceResponse> * @param nextPageLink The NextLink from the previous successful call to List operation. * @return the PagedList<UsageInner> object wrapped in {@link ServiceResponse} if successful. @@ -6657,8 +7020,8 @@ private ServiceResponse> listMultiRoleUsagesNextDelegate(Re } /** - * Resumes the AppServiceEnvironment. - * Resumes the AppServiceEnvironment. + * Resume an App Service Environment. + * Resume an App Service Environment. * * @param nextPageLink The NextLink from the previous successful call to List operation. * @return the PagedList<SiteInner> object if successful. @@ -6674,8 +7037,8 @@ public Page nextPage(String nextPageLink) { } /** - * Resumes the AppServiceEnvironment. - * Resumes the AppServiceEnvironment. + * Resume an App Service Environment. + * Resume an App Service Environment. * * @param nextPageLink The NextLink from the previous successful call to List operation. * @param serviceCall the ServiceCall object tracking the Retrofit calls @@ -6695,8 +7058,8 @@ public Observable>> call(String nextPageLink) { } /** - * Resumes the AppServiceEnvironment. - * Resumes the AppServiceEnvironment. + * Resume an App Service Environment. + * Resume an App Service Environment. * * @param nextPageLink The NextLink from the previous successful call to List operation. * @return the observable to the PagedList<SiteInner> object @@ -6712,8 +7075,8 @@ public Page call(ServiceResponse> response) { } /** - * Resumes the AppServiceEnvironment. - * Resumes the AppServiceEnvironment. + * Resume an App Service Environment. + * Resume an App Service Environment. * * @param nextPageLink The NextLink from the previous successful call to List operation. * @return the observable to the PagedList<SiteInner> object @@ -6733,8 +7096,8 @@ public Observable>> call(ServiceResponse> * @param nextPageLink The NextLink from the previous successful call to List operation. * @return the PagedList<SiteInner> object wrapped in {@link ServiceResponse} if successful. @@ -6766,8 +7129,8 @@ private ServiceResponse> resumeNextDelegate(Response nextPage(String nextPageLink) { } /** - * Resumes the AppServiceEnvironment. - * Resumes the AppServiceEnvironment. + * Resume an App Service Environment. + * Resume an App Service Environment. * * @param nextPageLink The NextLink from the previous successful call to List operation. * @param serviceCall the ServiceCall object tracking the Retrofit calls @@ -6804,8 +7167,8 @@ public Observable>> call(String nextPageLink) { } /** - * Resumes the AppServiceEnvironment. - * Resumes the AppServiceEnvironment. + * Resume an App Service Environment. + * Resume an App Service Environment. * * @param nextPageLink The NextLink from the previous successful call to List operation. * @return the observable to the PagedList<SiteInner> object @@ -6821,8 +7184,8 @@ public Page call(ServiceResponse> response) { } /** - * Resumes the AppServiceEnvironment. - * Resumes the AppServiceEnvironment. + * Resume an App Service Environment. + * Resume an App Service Environment. * * @param nextPageLink The NextLink from the previous successful call to List operation. * @return the observable to the PagedList<SiteInner> object @@ -6842,8 +7205,8 @@ public Observable>> call(ServiceResponse> * @param nextPageLink The NextLink from the previous successful call to List operation. * @return the PagedList<SiteInner> object wrapped in {@link ServiceResponse} if successful. @@ -6875,8 +7238,8 @@ private ServiceResponse> beginResumeNextDelegate(Response nextPage(String nextPageLink) { } /** - * Get all serverfarms (App Service Plans) on the AppServiceEnvironment (App Service Environment). - * Get all serverfarms (App Service Plans) on the AppServiceEnvironment (App Service Environment). + * Get all App Service plans in an App Service Environment. + * Get all App Service plans in an App Service Environment. * * @param nextPageLink The NextLink from the previous successful call to List operation. * @param serviceCall the ServiceCall object tracking the Retrofit calls @@ -6913,8 +7276,8 @@ public Observable>> call(String nextPa } /** - * Get all serverfarms (App Service Plans) on the AppServiceEnvironment (App Service Environment). - * Get all serverfarms (App Service Plans) on the AppServiceEnvironment (App Service Environment). + * Get all App Service plans in an App Service Environment. + * Get all App Service plans in an App Service Environment. * * @param nextPageLink The NextLink from the previous successful call to List operation. * @return the observable to the PagedList<AppServicePlanInner> object @@ -6930,8 +7293,8 @@ public Page call(ServiceResponse> } /** - * Get all serverfarms (App Service Plans) on the AppServiceEnvironment (App Service Environment). - * Get all serverfarms (App Service Plans) on the AppServiceEnvironment (App Service Environment). + * Get all App Service plans in an App Service Environment. + * Get all App Service plans in an App Service Environment. * * @param nextPageLink The NextLink from the previous successful call to List operation. * @return the observable to the PagedList<AppServicePlanInner> object @@ -6951,8 +7314,8 @@ public Observable>> call(ServiceRespon } /** - * Get all serverfarms (App Service Plans) on the AppServiceEnvironment (App Service Environment). - * Get all serverfarms (App Service Plans) on the AppServiceEnvironment (App Service Environment). + * Get all App Service plans in an App Service Environment. + * Get all App Service plans in an App Service Environment. * ServiceResponse> * @param nextPageLink The NextLink from the previous successful call to List operation. * @return the PagedList<AppServicePlanInner> object wrapped in {@link ServiceResponse} if successful. @@ -6983,8 +7346,8 @@ private ServiceResponse> listAppServicePlansNextDe } /** - * Get all sites on the AppServiceEnvironment (App Service Environment). - * Get all sites on the AppServiceEnvironment (App Service Environment). + * Get all apps in an App Service Environment. + * Get all apps in an App Service Environment. * * @param nextPageLink The NextLink from the previous successful call to List operation. * @return the PagedList<SiteInner> object if successful. @@ -7000,8 +7363,8 @@ public Page nextPage(String nextPageLink) { } /** - * Get all sites on the AppServiceEnvironment (App Service Environment). - * Get all sites on the AppServiceEnvironment (App Service Environment). + * Get all apps in an App Service Environment. + * Get all apps in an App Service Environment. * * @param nextPageLink The NextLink from the previous successful call to List operation. * @param serviceCall the ServiceCall object tracking the Retrofit calls @@ -7021,8 +7384,8 @@ public Observable>> call(String nextPageLink) { } /** - * Get all sites on the AppServiceEnvironment (App Service Environment). - * Get all sites on the AppServiceEnvironment (App Service Environment). + * Get all apps in an App Service Environment. + * Get all apps in an App Service Environment. * * @param nextPageLink The NextLink from the previous successful call to List operation. * @return the observable to the PagedList<SiteInner> object @@ -7038,8 +7401,8 @@ public Page call(ServiceResponse> response) { } /** - * Get all sites on the AppServiceEnvironment (App Service Environment). - * Get all sites on the AppServiceEnvironment (App Service Environment). + * Get all apps in an App Service Environment. + * Get all apps in an App Service Environment. * * @param nextPageLink The NextLink from the previous successful call to List operation. * @return the observable to the PagedList<SiteInner> object @@ -7059,8 +7422,8 @@ public Observable>> call(ServiceResponse> * @param nextPageLink The NextLink from the previous successful call to List operation. * @return the PagedList<SiteInner> object wrapped in {@link ServiceResponse} if successful. @@ -7091,8 +7454,8 @@ private ServiceResponse> listWebAppsNextDelegate(Response nextPage(String nextPageLink) { } /** - * Suspends the AppServiceEnvironment. - * Suspends the AppServiceEnvironment. + * Suspend an App Service Environment. + * Suspend an App Service Environment. * * @param nextPageLink The NextLink from the previous successful call to List operation. * @param serviceCall the ServiceCall object tracking the Retrofit calls @@ -7129,8 +7492,8 @@ public Observable>> call(String nextPageLink) { } /** - * Suspends the AppServiceEnvironment. - * Suspends the AppServiceEnvironment. + * Suspend an App Service Environment. + * Suspend an App Service Environment. * * @param nextPageLink The NextLink from the previous successful call to List operation. * @return the observable to the PagedList<SiteInner> object @@ -7146,8 +7509,8 @@ public Page call(ServiceResponse> response) { } /** - * Suspends the AppServiceEnvironment. - * Suspends the AppServiceEnvironment. + * Suspend an App Service Environment. + * Suspend an App Service Environment. * * @param nextPageLink The NextLink from the previous successful call to List operation. * @return the observable to the PagedList<SiteInner> object @@ -7167,8 +7530,8 @@ public Observable>> call(ServiceResponse> * @param nextPageLink The NextLink from the previous successful call to List operation. * @return the PagedList<SiteInner> object wrapped in {@link ServiceResponse} if successful. @@ -7200,8 +7563,8 @@ private ServiceResponse> suspendNextDelegate(Response nextPage(String nextPageLink) { } /** - * Suspends the AppServiceEnvironment. - * Suspends the AppServiceEnvironment. + * Suspend an App Service Environment. + * Suspend an App Service Environment. * * @param nextPageLink The NextLink from the previous successful call to List operation. * @param serviceCall the ServiceCall object tracking the Retrofit calls @@ -7238,8 +7601,8 @@ public Observable>> call(String nextPageLink) { } /** - * Suspends the AppServiceEnvironment. - * Suspends the AppServiceEnvironment. + * Suspend an App Service Environment. + * Suspend an App Service Environment. * * @param nextPageLink The NextLink from the previous successful call to List operation. * @return the observable to the PagedList<SiteInner> object @@ -7255,8 +7618,8 @@ public Page call(ServiceResponse> response) { } /** - * Suspends the AppServiceEnvironment. - * Suspends the AppServiceEnvironment. + * Suspend an App Service Environment. + * Suspend an App Service Environment. * * @param nextPageLink The NextLink from the previous successful call to List operation. * @return the observable to the PagedList<SiteInner> object @@ -7276,8 +7639,8 @@ public Observable>> call(ServiceResponse> * @param nextPageLink The NextLink from the previous successful call to List operation. * @return the PagedList<SiteInner> object wrapped in {@link ServiceResponse} if successful. @@ -7309,8 +7672,8 @@ private ServiceResponse> beginSuspendNextDelegate(Response nextPage(String nextPageLink) { } /** - * Get global usages of AppServiceEnvironment (App Service Environment). - * Get global usages of AppServiceEnvironment (App Service Environment). + * Get global usage metrics of an App Service Environment. + * Get global usage metrics of an App Service Environment. * * @param nextPageLink The NextLink from the previous successful call to List operation. * @param serviceCall the ServiceCall object tracking the Retrofit calls @@ -7347,8 +7710,8 @@ public Observable>> call(String nextPag } /** - * Get global usages of AppServiceEnvironment (App Service Environment). - * Get global usages of AppServiceEnvironment (App Service Environment). + * Get global usage metrics of an App Service Environment. + * Get global usage metrics of an App Service Environment. * * @param nextPageLink The NextLink from the previous successful call to List operation. * @return the observable to the PagedList<CsmUsageQuotaInner> object @@ -7364,8 +7727,8 @@ public Page call(ServiceResponse> r } /** - * Get global usages of AppServiceEnvironment (App Service Environment). - * Get global usages of AppServiceEnvironment (App Service Environment). + * Get global usage metrics of an App Service Environment. + * Get global usage metrics of an App Service Environment. * * @param nextPageLink The NextLink from the previous successful call to List operation. * @return the observable to the PagedList<CsmUsageQuotaInner> object @@ -7385,8 +7748,8 @@ public Observable>> call(ServiceRespons } /** - * Get global usages of AppServiceEnvironment (App Service Environment). - * Get global usages of AppServiceEnvironment (App Service Environment). + * Get global usage metrics of an App Service Environment. + * Get global usage metrics of an App Service Environment. * ServiceResponse> * @param nextPageLink The NextLink from the previous successful call to List operation. * @return the PagedList<CsmUsageQuotaInner> object wrapped in {@link ServiceResponse} if successful. @@ -7417,8 +7780,8 @@ private ServiceResponse> listUsagesNextDelegate(Res } /** - * Get all worker pools. - * Get all worker pools. + * Get all worker pools of an App Service Environment. + * Get all worker pools of an App Service Environment. * * @param nextPageLink The NextLink from the previous successful call to List operation. * @return the PagedList<WorkerPoolInner> object if successful. @@ -7434,8 +7797,8 @@ public Page nextPage(String nextPageLink) { } /** - * Get all worker pools. - * Get all worker pools. + * Get all worker pools of an App Service Environment. + * Get all worker pools of an App Service Environment. * * @param nextPageLink The NextLink from the previous successful call to List operation. * @param serviceCall the ServiceCall object tracking the Retrofit calls @@ -7455,8 +7818,8 @@ public Observable>> call(String nextPageLi } /** - * Get all worker pools. - * Get all worker pools. + * Get all worker pools of an App Service Environment. + * Get all worker pools of an App Service Environment. * * @param nextPageLink The NextLink from the previous successful call to List operation. * @return the observable to the PagedList<WorkerPoolInner> object @@ -7472,8 +7835,8 @@ public Page call(ServiceResponse> respons } /** - * Get all worker pools. - * Get all worker pools. + * Get all worker pools of an App Service Environment. + * Get all worker pools of an App Service Environment. * * @param nextPageLink The NextLink from the previous successful call to List operation. * @return the observable to the PagedList<WorkerPoolInner> object @@ -7493,8 +7856,8 @@ public Observable>> call(ServiceResponse

> * @param nextPageLink The NextLink from the previous successful call to List operation. * @return the PagedList<WorkerPoolInner> object wrapped in {@link ServiceResponse} if successful. @@ -7525,37 +7888,253 @@ private ServiceResponse> listWorkerPoolsNextDelegate(R } /** - * Get metric definitions for a worker pool of a AppServiceEnvironment (App Service Environment). - * Get metric definitions for a worker pool of a AppServiceEnvironment (App Service Environment). + * Get metric definitions for a specific instance of a worker pool of an App Service Environment. + * Get metric definitions for a specific instance of a worker pool of an App Service Environment. + * + * @param nextPageLink The NextLink from the previous successful call to List operation. + * @return the PagedList<ResourceMetricDefinitionInner> object if successful. + */ + public PagedList listWorkerPoolInstanceMetricDefinitionsNext(final String nextPageLink) { + ServiceResponse> response = listWorkerPoolInstanceMetricDefinitionsNextSinglePageAsync(nextPageLink).toBlocking().single(); + return new PagedList(response.getBody()) { + @Override + public Page nextPage(String nextPageLink) { + return listWorkerPoolInstanceMetricDefinitionsNextSinglePageAsync(nextPageLink).toBlocking().single().getBody(); + } + }; + } + + /** + * Get metric definitions for a specific instance of a worker pool of an App Service Environment. + * Get metric definitions for a specific instance of a worker pool of an App Service Environment. + * + * @param nextPageLink The NextLink from the previous successful call to List operation. + * @param serviceCall the ServiceCall object tracking the Retrofit calls + * @param serviceCallback the async ServiceCallback to handle successful and failed responses. + * @return the {@link ServiceCall} object + */ + public ServiceCall> listWorkerPoolInstanceMetricDefinitionsNextAsync(final String nextPageLink, final ServiceCall> serviceCall, final ListOperationCallback serviceCallback) { + return AzureServiceCall.create( + listWorkerPoolInstanceMetricDefinitionsNextSinglePageAsync(nextPageLink), + new Func1>>>() { + @Override + public Observable>> call(String nextPageLink) { + return listWorkerPoolInstanceMetricDefinitionsNextSinglePageAsync(nextPageLink); + } + }, + serviceCallback); + } + + /** + * Get metric definitions for a specific instance of a worker pool of an App Service Environment. + * Get metric definitions for a specific instance of a worker pool of an App Service Environment. + * + * @param nextPageLink The NextLink from the previous successful call to List operation. + * @return the observable to the PagedList<ResourceMetricDefinitionInner> object + */ + public Observable> listWorkerPoolInstanceMetricDefinitionsNextAsync(final String nextPageLink) { + return listWorkerPoolInstanceMetricDefinitionsNextWithServiceResponseAsync(nextPageLink) + .map(new Func1>, Page>() { + @Override + public Page call(ServiceResponse> response) { + return response.getBody(); + } + }); + } + + /** + * Get metric definitions for a specific instance of a worker pool of an App Service Environment. + * Get metric definitions for a specific instance of a worker pool of an App Service Environment. + * + * @param nextPageLink The NextLink from the previous successful call to List operation. + * @return the observable to the PagedList<ResourceMetricDefinitionInner> object + */ + public Observable>> listWorkerPoolInstanceMetricDefinitionsNextWithServiceResponseAsync(final String nextPageLink) { + return listWorkerPoolInstanceMetricDefinitionsNextSinglePageAsync(nextPageLink) + .concatMap(new Func1>, Observable>>>() { + @Override + public Observable>> call(ServiceResponse> page) { + String nextPageLink = page.getBody().getNextPageLink(); + if (nextPageLink == null) { + return Observable.just(page); + } + return Observable.just(page).concatWith(listWorkerPoolInstanceMetricDefinitionsNextWithServiceResponseAsync(nextPageLink)); + } + }); + } + + /** + * Get metric definitions for a specific instance of a worker pool of an App Service Environment. + * Get metric definitions for a specific instance of a worker pool of an App Service Environment. + * + ServiceResponse> * @param nextPageLink The NextLink from the previous successful call to List operation. + * @return the PagedList<ResourceMetricDefinitionInner> object wrapped in {@link ServiceResponse} if successful. + */ + public Observable>> listWorkerPoolInstanceMetricDefinitionsNextSinglePageAsync(final String nextPageLink) { + if (nextPageLink == null) { + throw new IllegalArgumentException("Parameter nextPageLink is required and cannot be null."); + } + return service.listWorkerPoolInstanceMetricDefinitionsNext(nextPageLink, this.client.acceptLanguage(), this.client.userAgent()) + .flatMap(new Func1, Observable>>>() { + @Override + public Observable>> call(Response response) { + try { + ServiceResponse> result = listWorkerPoolInstanceMetricDefinitionsNextDelegate(response); + return Observable.just(new ServiceResponse>(result.getBody(), result.getResponse())); + } catch (Throwable t) { + return Observable.error(t); + } + } + }); + } + + private ServiceResponse> listWorkerPoolInstanceMetricDefinitionsNextDelegate(Response response) throws CloudException, IOException, IllegalArgumentException { + return new AzureServiceResponseBuilder, CloudException>(this.client.mapperAdapter()) + .register(200, new TypeToken>() { }.getType()) + .registerError(CloudException.class) + .build(response); + } + + /** + * Get metrics for a specific instance of a worker pool of an App Service Environment. + * Get metrics for a specific instance of a worker pool of an App Service Environment. + * + * @param nextPageLink The NextLink from the previous successful call to List operation. + * @return the PagedList<ResourceMetricInner> object if successful. + */ + public PagedList listWorkerPoolInstanceMetricsNext(final String nextPageLink) { + ServiceResponse> response = listWorkerPoolInstanceMetricsNextSinglePageAsync(nextPageLink).toBlocking().single(); + return new PagedList(response.getBody()) { + @Override + public Page nextPage(String nextPageLink) { + return listWorkerPoolInstanceMetricsNextSinglePageAsync(nextPageLink).toBlocking().single().getBody(); + } + }; + } + + /** + * Get metrics for a specific instance of a worker pool of an App Service Environment. + * Get metrics for a specific instance of a worker pool of an App Service Environment. + * + * @param nextPageLink The NextLink from the previous successful call to List operation. + * @param serviceCall the ServiceCall object tracking the Retrofit calls + * @param serviceCallback the async ServiceCallback to handle successful and failed responses. + * @return the {@link ServiceCall} object + */ + public ServiceCall> listWorkerPoolInstanceMetricsNextAsync(final String nextPageLink, final ServiceCall> serviceCall, final ListOperationCallback serviceCallback) { + return AzureServiceCall.create( + listWorkerPoolInstanceMetricsNextSinglePageAsync(nextPageLink), + new Func1>>>() { + @Override + public Observable>> call(String nextPageLink) { + return listWorkerPoolInstanceMetricsNextSinglePageAsync(nextPageLink); + } + }, + serviceCallback); + } + + /** + * Get metrics for a specific instance of a worker pool of an App Service Environment. + * Get metrics for a specific instance of a worker pool of an App Service Environment. + * + * @param nextPageLink The NextLink from the previous successful call to List operation. + * @return the observable to the PagedList<ResourceMetricInner> object + */ + public Observable> listWorkerPoolInstanceMetricsNextAsync(final String nextPageLink) { + return listWorkerPoolInstanceMetricsNextWithServiceResponseAsync(nextPageLink) + .map(new Func1>, Page>() { + @Override + public Page call(ServiceResponse> response) { + return response.getBody(); + } + }); + } + + /** + * Get metrics for a specific instance of a worker pool of an App Service Environment. + * Get metrics for a specific instance of a worker pool of an App Service Environment. + * + * @param nextPageLink The NextLink from the previous successful call to List operation. + * @return the observable to the PagedList<ResourceMetricInner> object + */ + public Observable>> listWorkerPoolInstanceMetricsNextWithServiceResponseAsync(final String nextPageLink) { + return listWorkerPoolInstanceMetricsNextSinglePageAsync(nextPageLink) + .concatMap(new Func1>, Observable>>>() { + @Override + public Observable>> call(ServiceResponse> page) { + String nextPageLink = page.getBody().getNextPageLink(); + if (nextPageLink == null) { + return Observable.just(page); + } + return Observable.just(page).concatWith(listWorkerPoolInstanceMetricsNextWithServiceResponseAsync(nextPageLink)); + } + }); + } + + /** + * Get metrics for a specific instance of a worker pool of an App Service Environment. + * Get metrics for a specific instance of a worker pool of an App Service Environment. + * + ServiceResponse> * @param nextPageLink The NextLink from the previous successful call to List operation. + * @return the PagedList<ResourceMetricInner> object wrapped in {@link ServiceResponse} if successful. + */ + public Observable>> listWorkerPoolInstanceMetricsNextSinglePageAsync(final String nextPageLink) { + if (nextPageLink == null) { + throw new IllegalArgumentException("Parameter nextPageLink is required and cannot be null."); + } + return service.listWorkerPoolInstanceMetricsNext(nextPageLink, this.client.acceptLanguage(), this.client.userAgent()) + .flatMap(new Func1, Observable>>>() { + @Override + public Observable>> call(Response response) { + try { + ServiceResponse> result = listWorkerPoolInstanceMetricsNextDelegate(response); + return Observable.just(new ServiceResponse>(result.getBody(), result.getResponse())); + } catch (Throwable t) { + return Observable.error(t); + } + } + }); + } + + private ServiceResponse> listWorkerPoolInstanceMetricsNextDelegate(Response response) throws CloudException, IOException, IllegalArgumentException { + return new AzureServiceResponseBuilder, CloudException>(this.client.mapperAdapter()) + .register(200, new TypeToken>() { }.getType()) + .registerError(CloudException.class) + .build(response); + } + + /** + * Get metric definitions for a worker pool of an App Service Environment. + * Get metric definitions for a worker pool of an App Service Environment. * * @param nextPageLink The NextLink from the previous successful call to List operation. - * @return the PagedList<MetricDefinitionInner> object if successful. + * @return the PagedList<ResourceMetricDefinitionInner> object if successful. */ - public PagedList listWebWorkerMetricDefinitionsNext(final String nextPageLink) { - ServiceResponse> response = listWebWorkerMetricDefinitionsNextSinglePageAsync(nextPageLink).toBlocking().single(); - return new PagedList(response.getBody()) { + public PagedList listWebWorkerMetricDefinitionsNext(final String nextPageLink) { + ServiceResponse> response = listWebWorkerMetricDefinitionsNextSinglePageAsync(nextPageLink).toBlocking().single(); + return new PagedList(response.getBody()) { @Override - public Page nextPage(String nextPageLink) { + public Page nextPage(String nextPageLink) { return listWebWorkerMetricDefinitionsNextSinglePageAsync(nextPageLink).toBlocking().single().getBody(); } }; } /** - * Get metric definitions for a worker pool of a AppServiceEnvironment (App Service Environment). - * Get metric definitions for a worker pool of a AppServiceEnvironment (App Service Environment). + * Get metric definitions for a worker pool of an App Service Environment. + * Get metric definitions for a worker pool of an App Service Environment. * * @param nextPageLink The NextLink from the previous successful call to List operation. * @param serviceCall the ServiceCall object tracking the Retrofit calls * @param serviceCallback the async ServiceCallback to handle successful and failed responses. * @return the {@link ServiceCall} object */ - public ServiceCall> listWebWorkerMetricDefinitionsNextAsync(final String nextPageLink, final ServiceCall> serviceCall, final ListOperationCallback serviceCallback) { + public ServiceCall> listWebWorkerMetricDefinitionsNextAsync(final String nextPageLink, final ServiceCall> serviceCall, final ListOperationCallback serviceCallback) { return AzureServiceCall.create( listWebWorkerMetricDefinitionsNextSinglePageAsync(nextPageLink), - new Func1>>>() { + new Func1>>>() { @Override - public Observable>> call(String nextPageLink) { + public Observable>> call(String nextPageLink) { return listWebWorkerMetricDefinitionsNextSinglePageAsync(nextPageLink); } }, @@ -7563,34 +8142,34 @@ public Observable>> call(String next } /** - * Get metric definitions for a worker pool of a AppServiceEnvironment (App Service Environment). - * Get metric definitions for a worker pool of a AppServiceEnvironment (App Service Environment). + * Get metric definitions for a worker pool of an App Service Environment. + * Get metric definitions for a worker pool of an App Service Environment. * * @param nextPageLink The NextLink from the previous successful call to List operation. - * @return the observable to the PagedList<MetricDefinitionInner> object + * @return the observable to the PagedList<ResourceMetricDefinitionInner> object */ - public Observable> listWebWorkerMetricDefinitionsNextAsync(final String nextPageLink) { + public Observable> listWebWorkerMetricDefinitionsNextAsync(final String nextPageLink) { return listWebWorkerMetricDefinitionsNextWithServiceResponseAsync(nextPageLink) - .map(new Func1>, Page>() { + .map(new Func1>, Page>() { @Override - public Page call(ServiceResponse> response) { + public Page call(ServiceResponse> response) { return response.getBody(); } }); } /** - * Get metric definitions for a worker pool of a AppServiceEnvironment (App Service Environment). - * Get metric definitions for a worker pool of a AppServiceEnvironment (App Service Environment). + * Get metric definitions for a worker pool of an App Service Environment. + * Get metric definitions for a worker pool of an App Service Environment. * * @param nextPageLink The NextLink from the previous successful call to List operation. - * @return the observable to the PagedList<MetricDefinitionInner> object + * @return the observable to the PagedList<ResourceMetricDefinitionInner> object */ - public Observable>> listWebWorkerMetricDefinitionsNextWithServiceResponseAsync(final String nextPageLink) { + public Observable>> listWebWorkerMetricDefinitionsNextWithServiceResponseAsync(final String nextPageLink) { return listWebWorkerMetricDefinitionsNextSinglePageAsync(nextPageLink) - .concatMap(new Func1>, Observable>>>() { + .concatMap(new Func1>, Observable>>>() { @Override - public Observable>> call(ServiceResponse> page) { + public Observable>> call(ServiceResponse> page) { String nextPageLink = page.getBody().getNextPageLink(); if (nextPageLink == null) { return Observable.just(page); @@ -7601,23 +8180,23 @@ public Observable>> call(ServiceResp } /** - * Get metric definitions for a worker pool of a AppServiceEnvironment (App Service Environment). - * Get metric definitions for a worker pool of a AppServiceEnvironment (App Service Environment). + * Get metric definitions for a worker pool of an App Service Environment. + * Get metric definitions for a worker pool of an App Service Environment. * - ServiceResponse> * @param nextPageLink The NextLink from the previous successful call to List operation. - * @return the PagedList<MetricDefinitionInner> object wrapped in {@link ServiceResponse} if successful. + ServiceResponse> * @param nextPageLink The NextLink from the previous successful call to List operation. + * @return the PagedList<ResourceMetricDefinitionInner> object wrapped in {@link ServiceResponse} if successful. */ - public Observable>> listWebWorkerMetricDefinitionsNextSinglePageAsync(final String nextPageLink) { + public Observable>> listWebWorkerMetricDefinitionsNextSinglePageAsync(final String nextPageLink) { if (nextPageLink == null) { throw new IllegalArgumentException("Parameter nextPageLink is required and cannot be null."); } return service.listWebWorkerMetricDefinitionsNext(nextPageLink, this.client.acceptLanguage(), this.client.userAgent()) - .flatMap(new Func1, Observable>>>() { + .flatMap(new Func1, Observable>>>() { @Override - public Observable>> call(Response response) { + public Observable>> call(Response response) { try { - ServiceResponse> result = listWebWorkerMetricDefinitionsNextDelegate(response); - return Observable.just(new ServiceResponse>(result.getBody(), result.getResponse())); + ServiceResponse> result = listWebWorkerMetricDefinitionsNextDelegate(response); + return Observable.just(new ServiceResponse>(result.getBody(), result.getResponse())); } catch (Throwable t) { return Observable.error(t); } @@ -7625,9 +8204,9 @@ public Observable>> call(Response> listWebWorkerMetricDefinitionsNextDelegate(Response response) throws CloudException, IOException, IllegalArgumentException { - return new AzureServiceResponseBuilder, CloudException>(this.client.mapperAdapter()) - .register(200, new TypeToken>() { }.getType()) + private ServiceResponse> listWebWorkerMetricDefinitionsNextDelegate(Response response) throws CloudException, IOException, IllegalArgumentException { + return new AzureServiceResponseBuilder, CloudException>(this.client.mapperAdapter()) + .register(200, new TypeToken>() { }.getType()) .registerError(CloudException.class) .build(response); } @@ -7741,8 +8320,8 @@ private ServiceResponse> listWebWorkerMetricsNextD } /** - * Get available skus for scaling a worker pool. - * Get available skus for scaling a worker pool. + * Get available SKUs for scaling a worker pool. + * Get available SKUs for scaling a worker pool. * * @param nextPageLink The NextLink from the previous successful call to List operation. * @return the PagedList<SkuInfoInner> object if successful. @@ -7758,8 +8337,8 @@ public Page nextPage(String nextPageLink) { } /** - * Get available skus for scaling a worker pool. - * Get available skus for scaling a worker pool. + * Get available SKUs for scaling a worker pool. + * Get available SKUs for scaling a worker pool. * * @param nextPageLink The NextLink from the previous successful call to List operation. * @param serviceCall the ServiceCall object tracking the Retrofit calls @@ -7779,8 +8358,8 @@ public Observable>> call(String nextPageLink) } /** - * Get available skus for scaling a worker pool. - * Get available skus for scaling a worker pool. + * Get available SKUs for scaling a worker pool. + * Get available SKUs for scaling a worker pool. * * @param nextPageLink The NextLink from the previous successful call to List operation. * @return the observable to the PagedList<SkuInfoInner> object @@ -7796,8 +8375,8 @@ public Page call(ServiceResponse> response) { } /** - * Get available skus for scaling a worker pool. - * Get available skus for scaling a worker pool. + * Get available SKUs for scaling a worker pool. + * Get available SKUs for scaling a worker pool. * * @param nextPageLink The NextLink from the previous successful call to List operation. * @return the observable to the PagedList<SkuInfoInner> object @@ -7817,8 +8396,8 @@ public Observable>> call(ServiceResponse> * @param nextPageLink The NextLink from the previous successful call to List operation. * @return the PagedList<SkuInfoInner> object wrapped in {@link ServiceResponse} if successful. @@ -7849,8 +8428,8 @@ private ServiceResponse> listWorkerPoolSkusNextDelegate(R } /** - * Get usages for a worker pool of a AppServiceEnvironment (App Service Environment). - * Get usages for a worker pool of a AppServiceEnvironment (App Service Environment). + * Get usage metrics for a worker pool of an App Service Environment. + * Get usage metrics for a worker pool of an App Service Environment. * * @param nextPageLink The NextLink from the previous successful call to List operation. * @return the PagedList<UsageInner> object if successful. @@ -7866,8 +8445,8 @@ public Page nextPage(String nextPageLink) { } /** - * Get usages for a worker pool of a AppServiceEnvironment (App Service Environment). - * Get usages for a worker pool of a AppServiceEnvironment (App Service Environment). + * Get usage metrics for a worker pool of an App Service Environment. + * Get usage metrics for a worker pool of an App Service Environment. * * @param nextPageLink The NextLink from the previous successful call to List operation. * @param serviceCall the ServiceCall object tracking the Retrofit calls @@ -7887,8 +8466,8 @@ public Observable>> call(String nextPageLink) { } /** - * Get usages for a worker pool of a AppServiceEnvironment (App Service Environment). - * Get usages for a worker pool of a AppServiceEnvironment (App Service Environment). + * Get usage metrics for a worker pool of an App Service Environment. + * Get usage metrics for a worker pool of an App Service Environment. * * @param nextPageLink The NextLink from the previous successful call to List operation. * @return the observable to the PagedList<UsageInner> object @@ -7904,8 +8483,8 @@ public Page call(ServiceResponse> response) { } /** - * Get usages for a worker pool of a AppServiceEnvironment (App Service Environment). - * Get usages for a worker pool of a AppServiceEnvironment (App Service Environment). + * Get usage metrics for a worker pool of an App Service Environment. + * Get usage metrics for a worker pool of an App Service Environment. * * @param nextPageLink The NextLink from the previous successful call to List operation. * @return the observable to the PagedList<UsageInner> object @@ -7925,8 +8504,8 @@ public Observable>> call(ServiceResponse> * @param nextPageLink The NextLink from the previous successful call to List operation. * @return the PagedList<UsageInner> object wrapped in {@link ServiceResponse} if successful. diff --git a/azure-mgmt-website/src/main/java/com/microsoft/azure/management/website/implementation/AppServicePlanInner.java b/azure-mgmt-website/src/main/java/com/microsoft/azure/management/website/implementation/AppServicePlanInner.java index 36f0e064a57ac..5f6fbbd41b8c8 100644 --- a/azure-mgmt-website/src/main/java/com/microsoft/azure/management/website/implementation/AppServicePlanInner.java +++ b/azure-mgmt-website/src/main/java/com/microsoft/azure/management/website/implementation/AppServicePlanInner.java @@ -10,87 +10,107 @@ import com.microsoft.azure.management.website.StatusOptions; import com.microsoft.azure.management.website.HostingEnvironmentProfile; +import com.microsoft.azure.management.website.ProvisioningState; import com.microsoft.azure.management.website.SkuDescription; import com.fasterxml.jackson.annotation.JsonProperty; import com.microsoft.rest.serializer.JsonFlatten; import com.microsoft.azure.Resource; /** - * App Service Plan Model. + * App Service plan. */ @JsonFlatten public class AppServicePlanInner extends Resource { /** - * Name for the App Service Plan. + * Name for the App Service plan. */ @JsonProperty(value = "properties.name") private String appServicePlanName; /** - * Target worker tier assigned to the App Service Plan. + * Target worker tier assigned to the App Service plan. */ @JsonProperty(value = "properties.workerTierName") private String workerTierName; /** - * App Service Plan Status. Possible values include: 'Ready', 'Pending'. + * App Service plan status. Possible values include: 'Ready', 'Pending'. */ - @JsonProperty(value = "properties.status") + @JsonProperty(value = "properties.status", access = JsonProperty.Access.WRITE_ONLY) private StatusOptions status; /** - * App Service Plan Subscription. + * App Service plan subscription. */ - @JsonProperty(value = "properties.subscription") + @JsonProperty(value = "properties.subscription", access = JsonProperty.Access.WRITE_ONLY) private String subscription; /** - * App Service Plan administration site. + * App Service plan administration site. */ @JsonProperty(value = "properties.adminSiteName") private String adminSiteName; /** - * Specification for the hosting environment (App Service Environment) to - * use for the App Service Plan. + * Specification for the App Service Environment to use for the App + * Service plan. */ @JsonProperty(value = "properties.hostingEnvironmentProfile") private HostingEnvironmentProfile hostingEnvironmentProfile; /** * Maximum number of instances that can be assigned to this App Service - * Plan. + * plan. */ - @JsonProperty(value = "properties.maximumNumberOfWorkers") + @JsonProperty(value = "properties.maximumNumberOfWorkers", access = JsonProperty.Access.WRITE_ONLY) private Integer maximumNumberOfWorkers; /** - * Geographical location for the App Service Plan. + * Geographical location for the App Service plan. */ - @JsonProperty(value = "properties.geoRegion") + @JsonProperty(value = "properties.geoRegion", access = JsonProperty.Access.WRITE_ONLY) private String geoRegion; /** - * If True apps assigned to this App Service Plan can be scaled - * independently - * If False apps assigned to this App Service Plan will scale - * to all instances of the plan. + * If <code>true</code>, apps assigned to this App Service + * plan can be scaled independently. + * If <code>false</code>, apps assigned to this App Service + * plan will scale to all instances of the plan. */ @JsonProperty(value = "properties.perSiteScaling") private Boolean perSiteScaling; /** - * Number of web apps assigned to this App Service Plan. + * Number of apps assigned to this App Service plan. */ - @JsonProperty(value = "properties.numberOfSites") + @JsonProperty(value = "properties.numberOfSites", access = JsonProperty.Access.WRITE_ONLY) private Integer numberOfSites; /** - * Resource group of the serverfarm. + * Resource group of the App Service plan. */ - @JsonProperty(value = "properties.resourceGroup") + @JsonProperty(value = "properties.resourceGroup", access = JsonProperty.Access.WRITE_ONLY) private String resourceGroup; + /** + * Scaling worker count. + */ + @JsonProperty(value = "properties.targetWorkerCount") + private Integer targetWorkerCount; + + /** + * Scaling worker size ID. + */ + @JsonProperty(value = "properties.targetWorkerSizeId") + private Integer targetWorkerSizeId; + + /** + * Provisioning state of the App Service Environment. Possible values + * include: 'Succeeded', 'Failed', 'Canceled', 'InProgress', 'Deleting'. + */ + @JsonProperty(value = "properties.provisioningState", access = JsonProperty.Access.WRITE_ONLY) + private ProvisioningState provisioningState; + /** * The sku property. */ @@ -145,17 +165,6 @@ public StatusOptions status() { return this.status; } - /** - * Set the status value. - * - * @param status the status value to set - * @return the AppServicePlanInner object itself. - */ - public AppServicePlanInner withStatus(StatusOptions status) { - this.status = status; - return this; - } - /** * Get the subscription value. * @@ -165,17 +174,6 @@ public String subscription() { return this.subscription; } - /** - * Set the subscription value. - * - * @param subscription the subscription value to set - * @return the AppServicePlanInner object itself. - */ - public AppServicePlanInner withSubscription(String subscription) { - this.subscription = subscription; - return this; - } - /** * Get the adminSiteName value. * @@ -225,17 +223,6 @@ public Integer maximumNumberOfWorkers() { return this.maximumNumberOfWorkers; } - /** - * Set the maximumNumberOfWorkers value. - * - * @param maximumNumberOfWorkers the maximumNumberOfWorkers value to set - * @return the AppServicePlanInner object itself. - */ - public AppServicePlanInner withMaximumNumberOfWorkers(Integer maximumNumberOfWorkers) { - this.maximumNumberOfWorkers = maximumNumberOfWorkers; - return this; - } - /** * Get the geoRegion value. * @@ -245,17 +232,6 @@ public String geoRegion() { return this.geoRegion; } - /** - * Set the geoRegion value. - * - * @param geoRegion the geoRegion value to set - * @return the AppServicePlanInner object itself. - */ - public AppServicePlanInner withGeoRegion(String geoRegion) { - this.geoRegion = geoRegion; - return this; - } - /** * Get the perSiteScaling value. * @@ -286,36 +262,63 @@ public Integer numberOfSites() { } /** - * Set the numberOfSites value. + * Get the resourceGroup value. + * + * @return the resourceGroup value + */ + public String resourceGroup() { + return this.resourceGroup; + } + + /** + * Get the targetWorkerCount value. + * + * @return the targetWorkerCount value + */ + public Integer targetWorkerCount() { + return this.targetWorkerCount; + } + + /** + * Set the targetWorkerCount value. * - * @param numberOfSites the numberOfSites value to set + * @param targetWorkerCount the targetWorkerCount value to set * @return the AppServicePlanInner object itself. */ - public AppServicePlanInner withNumberOfSites(Integer numberOfSites) { - this.numberOfSites = numberOfSites; + public AppServicePlanInner withTargetWorkerCount(Integer targetWorkerCount) { + this.targetWorkerCount = targetWorkerCount; return this; } /** - * Get the resourceGroup value. + * Get the targetWorkerSizeId value. * - * @return the resourceGroup value + * @return the targetWorkerSizeId value */ - public String resourceGroup() { - return this.resourceGroup; + public Integer targetWorkerSizeId() { + return this.targetWorkerSizeId; } /** - * Set the resourceGroup value. + * Set the targetWorkerSizeId value. * - * @param resourceGroup the resourceGroup value to set + * @param targetWorkerSizeId the targetWorkerSizeId value to set * @return the AppServicePlanInner object itself. */ - public AppServicePlanInner withResourceGroup(String resourceGroup) { - this.resourceGroup = resourceGroup; + public AppServicePlanInner withTargetWorkerSizeId(Integer targetWorkerSizeId) { + this.targetWorkerSizeId = targetWorkerSizeId; return this; } + /** + * Get the provisioningState value. + * + * @return the provisioningState value + */ + public ProvisioningState provisioningState() { + return this.provisioningState; + } + /** * Get the sku value. * diff --git a/azure-mgmt-website/src/main/java/com/microsoft/azure/management/website/implementation/AppServicePlansInner.java b/azure-mgmt-website/src/main/java/com/microsoft/azure/management/website/implementation/AppServicePlansInner.java index ae06501b60530..b7e0658e8e695 100644 --- a/azure-mgmt-website/src/main/java/com/microsoft/azure/management/website/implementation/AppServicePlansInner.java +++ b/azure-mgmt-website/src/main/java/com/microsoft/azure/management/website/implementation/AppServicePlansInner.java @@ -77,11 +77,11 @@ interface AppServicePlansService { @Headers("Content-Type: application/json; charset=utf-8") @PUT("subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.Web/serverfarms/{name}") - Observable> createOrUpdate(@Path("resourceGroupName") String resourceGroupName, @Path("name") String name, @Path("subscriptionId") String subscriptionId, @Body AppServicePlanInner appServicePlan, @Query("allowPendingState") Boolean allowPendingState, @Query("api-version") String apiVersion, @Header("accept-language") String acceptLanguage, @Header("User-Agent") String userAgent); + Observable> createOrUpdate(@Path("resourceGroupName") String resourceGroupName, @Path("name") String name, @Path("subscriptionId") String subscriptionId, @Body AppServicePlanInner appServicePlan, @Query("api-version") String apiVersion, @Header("accept-language") String acceptLanguage, @Header("User-Agent") String userAgent); @Headers("Content-Type: application/json; charset=utf-8") @PUT("subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.Web/serverfarms/{name}") - Observable> beginCreateOrUpdate(@Path("resourceGroupName") String resourceGroupName, @Path("name") String name, @Path("subscriptionId") String subscriptionId, @Body AppServicePlanInner appServicePlan, @Query("allowPendingState") Boolean allowPendingState, @Query("api-version") String apiVersion, @Header("accept-language") String acceptLanguage, @Header("User-Agent") String userAgent); + Observable> beginCreateOrUpdate(@Path("resourceGroupName") String resourceGroupName, @Path("name") String name, @Path("subscriptionId") String subscriptionId, @Body AppServicePlanInner appServicePlan, @Query("api-version") String apiVersion, @Header("accept-language") String acceptLanguage, @Header("User-Agent") String userAgent); @Headers("Content-Type: application/json; charset=utf-8") @HTTP(path = "subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.Web/serverfarms/{name}", method = "DELETE", hasBody = true) @@ -109,7 +109,7 @@ interface AppServicePlansService { @Headers("Content-Type: application/json; charset=utf-8") @GET("subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.Web/serverfarms/{name}/hybridConnectionNamespaces/{namespaceName}/relays/{relayName}/sites") - Observable> listHybridConnectionWebApps(@Path("resourceGroupName") String resourceGroupName, @Path("name") String name, @Path("namespaceName") String namespaceName, @Path("relayName") String relayName, @Path("subscriptionId") String subscriptionId, @Query("api-version") String apiVersion, @Header("accept-language") String acceptLanguage, @Header("User-Agent") String userAgent); + Observable> listWebAppsByHybridConnection(@Path("resourceGroupName") String resourceGroupName, @Path("name") String name, @Path("namespaceName") String namespaceName, @Path("relayName") String relayName, @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") @GET("subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.Web/serverfarms/{name}/hybridConnectionPlanLimits/limit") @@ -125,11 +125,7 @@ interface AppServicePlansService { @Headers("Content-Type: application/json; charset=utf-8") @GET("subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.Web/serverfarms/{name}/metrics") - Observable> listMetrics(@Path("resourceGroupName") String resourceGroupName, @Path("name") String name, @Path("subscriptionId") String subscriptionId, @Query("details") Boolean details, @Query("$filter") String filter, @Query("api-version") String apiVersion, @Header("accept-language") String acceptLanguage, @Header("User-Agent") String userAgent); - - @Headers("Content-Type: application/json; charset=utf-8") - @GET("subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.Web/serverfarms/{name}/operationresults/{operationId}") - Observable> getOperation(@Path("resourceGroupName") String resourceGroupName, @Path("name") String name, @Path("operationId") String operationId, @Path("subscriptionId") String subscriptionId, @Query("api-version") String apiVersion, @Header("accept-language") String acceptLanguage, @Header("User-Agent") String userAgent); + Observable> listMetrics(@Path("resourceGroupName") String resourceGroupName, @Path("name") String name, @Path("subscriptionId") String subscriptionId, @Query("details") Boolean details, @Query(value = "$filter", encoded = true) String filter, @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.Web/serverfarms/{name}/restartSites") @@ -137,7 +133,7 @@ interface AppServicePlansService { @Headers("Content-Type: application/json; charset=utf-8") @GET("subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.Web/serverfarms/{name}/sites") - Observable> listWebApps(@Path("resourceGroupName") String resourceGroupName, @Path("name") String name, @Path("subscriptionId") String subscriptionId, @Query("$skipToken") String skipToken, @Query("$filter") String filter, @Query("$top") String top, @Query("api-version") String apiVersion, @Header("accept-language") String acceptLanguage, @Header("User-Agent") String userAgent); + Observable> listWebApps(@Path("resourceGroupName") String resourceGroupName, @Path("name") String name, @Path("subscriptionId") String subscriptionId, @Query("$skipToken") String skipToken, @Query(value = "$filter", encoded = true) String filter, @Query("$top") String top, @Query("api-version") String apiVersion, @Header("accept-language") String acceptLanguage, @Header("User-Agent") String userAgent); @Headers("Content-Type: application/json; charset=utf-8") @GET("subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.Web/serverfarms/{name}/virtualNetworkConnections") @@ -157,7 +153,7 @@ interface AppServicePlansService { @Headers("Content-Type: application/json; charset=utf-8") @GET("subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.Web/serverfarms/{name}/virtualNetworkConnections/{vnetName}/routes") - Observable> listtRoutesForVnet(@Path("resourceGroupName") String resourceGroupName, @Path("name") String name, @Path("vnetName") String vnetName, @Path("subscriptionId") String subscriptionId, @Query("api-version") String apiVersion, @Header("accept-language") String acceptLanguage, @Header("User-Agent") String userAgent); + Observable> listRoutesForVnet(@Path("resourceGroupName") String resourceGroupName, @Path("name") String name, @Path("vnetName") String vnetName, @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") @GET("subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.Web/serverfarms/{name}/virtualNetworkConnections/{vnetName}/routes/{routeName}") @@ -187,6 +183,14 @@ interface AppServicePlansService { @GET("{nextLink}") Observable> listByResourceGroupNext(@Path(value = "nextLink", encoded = true) String nextPageLink, @Header("accept-language") String acceptLanguage, @Header("User-Agent") String userAgent); + @Headers("Content-Type: application/json; charset=utf-8") + @GET("{nextLink}") + Observable> listWebAppsByHybridConnectionNext(@Path(value = "nextLink", encoded = true) String nextPageLink, @Header("accept-language") String acceptLanguage, @Header("User-Agent") String userAgent); + + @Headers("Content-Type: application/json; charset=utf-8") + @GET("{nextLink}") + Observable> listHybridConnectionsNext(@Path(value = "nextLink", encoded = true) String nextPageLink, @Header("accept-language") String acceptLanguage, @Header("User-Agent") String userAgent); + @Headers("Content-Type: application/json; charset=utf-8") @GET("{nextLink}") Observable> listMetricDefintionsNext(@Path(value = "nextLink", encoded = true) String nextPageLink, @Header("accept-language") String acceptLanguage, @Header("User-Agent") String userAgent); @@ -202,8 +206,8 @@ interface AppServicePlansService { } /** - * Gets all App Service Plans for a subcription. - * Gets all App Service Plans for a subcription. + * Get all App Service plans for a subcription. + * Get all App Service plans for a subcription. * * @return the PagedList<AppServicePlanInner> object if successful. */ @@ -218,8 +222,8 @@ public Page nextPage(String nextPageLink) { } /** - * Gets all App Service Plans for a subcription. - * Gets all App Service Plans for a subcription. + * Get all App Service plans for a subcription. + * Get all App Service plans for a subcription. * * @param serviceCallback the async ServiceCallback to handle successful and failed responses. * @return the {@link ServiceCall} object @@ -237,8 +241,8 @@ public Observable>> call(String nextPa } /** - * Gets all App Service Plans for a subcription. - * Gets all App Service Plans for a subcription. + * Get all App Service plans for a subcription. + * Get all App Service plans for a subcription. * * @return the observable to the PagedList<AppServicePlanInner> object */ @@ -253,8 +257,8 @@ public Page call(ServiceResponse> } /** - * Gets all App Service Plans for a subcription. - * Gets all App Service Plans for a subcription. + * Get all App Service plans for a subcription. + * Get all App Service plans for a subcription. * * @return the observable to the PagedList<AppServicePlanInner> object */ @@ -273,8 +277,8 @@ public Observable>> call(ServiceRespon } /** - * Gets all App Service Plans for a subcription. - * Gets all App Service Plans for a subcription. + * Get all App Service plans for a subcription. + * Get all App Service plans for a subcription. * * @return the PagedList<AppServicePlanInner> object wrapped in {@link ServiceResponse} if successful. */ @@ -299,11 +303,11 @@ public Observable>> call(Response list(final Boolean detailed) { @@ -317,11 +321,11 @@ public Page nextPage(String nextPageLink) { } /** - * Gets all App Service Plans for a subcription. - * Gets all App Service Plans for a subcription. + * Get all App Service plans for a subcription. + * Get all App Service plans for a subcription. * - * @param detailed False to return a subset of App Service Plan properties, true to return all of the properties. - Retrieval of all properties may increase the API latency. + * @param detailed Specify <code>true</code> to return all App Service plan properties. The default is <code>false</code>, which returns a subset of the properties. + Retrieval of all properties may increase the API latency. * @param serviceCallback the async ServiceCallback to handle successful and failed responses. * @return the {@link ServiceCall} object */ @@ -338,11 +342,11 @@ public Observable>> call(String nextPa } /** - * Gets all App Service Plans for a subcription. - * Gets all App Service Plans for a subcription. + * Get all App Service plans for a subcription. + * Get all App Service plans for a subcription. * - * @param detailed False to return a subset of App Service Plan properties, true to return all of the properties. - Retrieval of all properties may increase the API latency. + * @param detailed Specify <code>true</code> to return all App Service plan properties. The default is <code>false</code>, which returns a subset of the properties. + Retrieval of all properties may increase the API latency. * @return the observable to the PagedList<AppServicePlanInner> object */ public Observable> listAsync(final Boolean detailed) { @@ -356,11 +360,11 @@ public Page call(ServiceResponse> } /** - * Gets all App Service Plans for a subcription. - * Gets all App Service Plans for a subcription. + * Get all App Service plans for a subcription. + * Get all App Service plans for a subcription. * - * @param detailed False to return a subset of App Service Plan properties, true to return all of the properties. - Retrieval of all properties may increase the API latency. + * @param detailed Specify <code>true</code> to return all App Service plan properties. The default is <code>false</code>, which returns a subset of the properties. + Retrieval of all properties may increase the API latency. * @return the observable to the PagedList<AppServicePlanInner> object */ public Observable>> listWithServiceResponseAsync(final Boolean detailed) { @@ -378,11 +382,11 @@ public Observable>> call(ServiceRespon } /** - * Gets all App Service Plans for a subcription. - * Gets all App Service Plans for a subcription. + * Get all App Service plans for a subcription. + * Get all App Service plans for a subcription. * - ServiceResponse> * @param detailed False to return a subset of App Service Plan properties, true to return all of the properties. - Retrieval of all properties may increase the API latency. + ServiceResponse> * @param detailed Specify <code>true</code> to return all App Service plan properties. The default is <code>false</code>, which returns a subset of the properties. + Retrieval of all properties may increase the API latency. * @return the PagedList<AppServicePlanInner> object wrapped in {@link ServiceResponse} if successful. */ public Observable>> listSinglePageAsync(final Boolean detailed) { @@ -412,10 +416,10 @@ private ServiceResponse> listDelegate(Response listByResourceGroup(final String resourceGroupName) { @@ -429,10 +433,10 @@ public Page nextPage(String nextPageLink) { } /** - * Gets collection of App Service Plans in a resource group for a given subscription. - * Gets collection of App Service Plans in a resource group for a given subscription. + * Get all App Service plans in a resource group. + * Get all App Service plans in a resource group. * - * @param resourceGroupName Name of resource group + * @param resourceGroupName Name of the resource group to which the resource belongs. * @param serviceCallback the async ServiceCallback to handle successful and failed responses. * @return the {@link ServiceCall} object */ @@ -449,10 +453,10 @@ public Observable>> call(String nextPa } /** - * Gets collection of App Service Plans in a resource group for a given subscription. - * Gets collection of App Service Plans in a resource group for a given subscription. + * Get all App Service plans in a resource group. + * Get all App Service plans in a resource group. * - * @param resourceGroupName Name of resource group + * @param resourceGroupName Name of the resource group to which the resource belongs. * @return the observable to the PagedList<AppServicePlanInner> object */ public Observable> listByResourceGroupAsync(final String resourceGroupName) { @@ -466,10 +470,10 @@ public Page call(ServiceResponse> } /** - * Gets collection of App Service Plans in a resource group for a given subscription. - * Gets collection of App Service Plans in a resource group for a given subscription. + * Get all App Service plans in a resource group. + * Get all App Service plans in a resource group. * - * @param resourceGroupName Name of resource group + * @param resourceGroupName Name of the resource group to which the resource belongs. * @return the observable to the PagedList<AppServicePlanInner> object */ public Observable>> listByResourceGroupWithServiceResponseAsync(final String resourceGroupName) { @@ -487,10 +491,10 @@ public Observable>> call(ServiceRespon } /** - * Gets collection of App Service Plans in a resource group for a given subscription. - * Gets collection of App Service Plans in a resource group for a given subscription. + * Get all App Service plans in a resource group. + * Get all App Service plans in a resource group. * - ServiceResponse> * @param resourceGroupName Name of resource group + ServiceResponse> * @param resourceGroupName Name of the resource group to which the resource belongs. * @return the PagedList<AppServicePlanInner> object wrapped in {@link ServiceResponse} if successful. */ public Observable>> listByResourceGroupSinglePageAsync(final String resourceGroupName) { @@ -523,11 +527,11 @@ private ServiceResponse> listByResourceGroupDelega } /** - * Gets specified App Service Plan in a resource group. - * Gets specified App Service Plan in a resource group. + * Get an App Service plan. + * Get an App Service plan. * - * @param resourceGroupName Name of resource group - * @param name Name of App Service Plan + * @param resourceGroupName Name of the resource group to which the resource belongs. + * @param name Name of the App Service plan. * @return the AppServicePlanInner object if successful. */ public AppServicePlanInner get(String resourceGroupName, String name) { @@ -535,11 +539,11 @@ public AppServicePlanInner get(String resourceGroupName, String name) { } /** - * Gets specified App Service Plan in a resource group. - * Gets specified App Service Plan in a resource group. + * Get an App Service plan. + * Get an App Service plan. * - * @param resourceGroupName Name of resource group - * @param name Name of App Service Plan + * @param resourceGroupName Name of the resource group to which the resource belongs. + * @param name Name of the App Service plan. * @param serviceCallback the async ServiceCallback to handle successful and failed responses. * @return the {@link ServiceCall} object */ @@ -548,11 +552,11 @@ public ServiceCall getAsync(String resourceGroupName, Strin } /** - * Gets specified App Service Plan in a resource group. - * Gets specified App Service Plan in a resource group. + * Get an App Service plan. + * Get an App Service plan. * - * @param resourceGroupName Name of resource group - * @param name Name of App Service Plan + * @param resourceGroupName Name of the resource group to which the resource belongs. + * @param name Name of the App Service plan. * @return the observable to the AppServicePlanInner object */ public Observable getAsync(String resourceGroupName, String name) { @@ -565,11 +569,11 @@ public AppServicePlanInner call(ServiceResponse response) { } /** - * Gets specified App Service Plan in a resource group. - * Gets specified App Service Plan in a resource group. + * Get an App Service plan. + * Get an App Service plan. * - * @param resourceGroupName Name of resource group - * @param name Name of App Service Plan + * @param resourceGroupName Name of the resource group to which the resource belongs. + * @param name Name of the App Service plan. * @return the observable to the AppServicePlanInner object */ public Observable> getWithServiceResponseAsync(String resourceGroupName, String name) { @@ -608,10 +612,10 @@ private ServiceResponse getDelegate(Response * Creates or updates an App Service Plan. * Creates or updates an App Service Plan. * - * @param resourceGroupName Name of resource group - * @param name Name of App Service Plan - * @param appServicePlan Details of App Service Plan - * @return the AppServicePlanInner object if successful. + * @param resourceGroupName Name of the resource group to which the resource belongs. + * @param name Name of the App Service plan. + * @param appServicePlan Details of the App Service plan. + * @return the AppServicePlanInner object if successful. */ public AppServicePlanInner createOrUpdate(String resourceGroupName, String name, AppServicePlanInner appServicePlan) { return createOrUpdateWithServiceResponseAsync(resourceGroupName, name, appServicePlan).toBlocking().last().getBody(); @@ -621,9 +625,9 @@ public AppServicePlanInner createOrUpdate(String resourceGroupName, String name, * Creates or updates an App Service Plan. * Creates or updates an App Service Plan. * - * @param resourceGroupName Name of resource group - * @param name Name of App Service Plan - * @param appServicePlan Details of App Service Plan + * @param resourceGroupName Name of the resource group to which the resource belongs. + * @param name Name of the App Service plan. + * @param appServicePlan Details of the App Service plan. * @param serviceCallback the async ServiceCallback to handle successful and failed responses. * @return the {@link ServiceCall} object */ @@ -635,9 +639,9 @@ public ServiceCall createOrUpdateAsync(String resourceGroup * Creates or updates an App Service Plan. * Creates or updates an App Service Plan. * - * @param resourceGroupName Name of resource group - * @param name Name of App Service Plan - * @param appServicePlan Details of App Service Plan + * @param resourceGroupName Name of the resource group to which the resource belongs. + * @param name Name of the App Service plan. + * @param appServicePlan Details of the App Service plan. * @return the observable for the request */ public Observable createOrUpdateAsync(String resourceGroupName, String name, AppServicePlanInner appServicePlan) { @@ -653,9 +657,9 @@ public AppServicePlanInner call(ServiceResponse response) { * Creates or updates an App Service Plan. * Creates or updates an App Service Plan. * - * @param resourceGroupName Name of resource group - * @param name Name of App Service Plan - * @param appServicePlan Details of App Service Plan + * @param resourceGroupName Name of the resource group to which the resource belongs. + * @param name Name of the App Service plan. + * @param appServicePlan Details of the App Service plan. * @return the observable for the request */ public Observable> createOrUpdateWithServiceResponseAsync(String resourceGroupName, String name, AppServicePlanInner appServicePlan) { @@ -673,94 +677,17 @@ public Observable> createOrUpdateWithServic } Validator.validate(appServicePlan); final String apiVersion = "2016-09-01"; - final Boolean allowPendingState = null; - Observable> observable = service.createOrUpdate(resourceGroupName, name, this.client.subscriptionId(), appServicePlan, allowPendingState, apiVersion, this.client.acceptLanguage(), this.client.userAgent()); + Observable> observable = service.createOrUpdate(resourceGroupName, name, this.client.subscriptionId(), appServicePlan, apiVersion, this.client.acceptLanguage(), this.client.userAgent()); return client.getAzureClient().getPutOrPatchResultAsync(observable, new TypeToken() { }.getType()); } - /** - * Creates or updates an App Service Plan. - * Creates or updates an App Service Plan. - * - * @param resourceGroupName Name of resource group - * @param name Name of App Service Plan - * @param appServicePlan Details of App Service Plan - * @param allowPendingState OBSOLETE: If true, allow pending state for App Service Plan - * @return the AppServicePlanInner object if successful. - */ - public AppServicePlanInner createOrUpdate(String resourceGroupName, String name, AppServicePlanInner appServicePlan, Boolean allowPendingState) { - return createOrUpdateWithServiceResponseAsync(resourceGroupName, name, appServicePlan, allowPendingState).toBlocking().last().getBody(); - } - - /** - * Creates or updates an App Service Plan. - * Creates or updates an App Service Plan. - * - * @param resourceGroupName Name of resource group - * @param name Name of App Service Plan - * @param appServicePlan Details of App Service Plan - * @param allowPendingState OBSOLETE: If true, allow pending state for App Service Plan - * @param serviceCallback the async ServiceCallback to handle successful and failed responses. - * @return the {@link ServiceCall} object - */ - public ServiceCall createOrUpdateAsync(String resourceGroupName, String name, AppServicePlanInner appServicePlan, Boolean allowPendingState, final ServiceCallback serviceCallback) { - return ServiceCall.create(createOrUpdateWithServiceResponseAsync(resourceGroupName, name, appServicePlan, allowPendingState), serviceCallback); - } /** * Creates or updates an App Service Plan. * Creates or updates an App Service Plan. * - * @param resourceGroupName Name of resource group - * @param name Name of App Service Plan - * @param appServicePlan Details of App Service Plan - * @param allowPendingState OBSOLETE: If true, allow pending state for App Service Plan - * @return the observable for the request - */ - public Observable createOrUpdateAsync(String resourceGroupName, String name, AppServicePlanInner appServicePlan, Boolean allowPendingState) { - return createOrUpdateWithServiceResponseAsync(resourceGroupName, name, appServicePlan, allowPendingState).map(new Func1, AppServicePlanInner>() { - @Override - public AppServicePlanInner call(ServiceResponse response) { - return response.getBody(); - } - }); - } - - /** - * Creates or updates an App Service Plan. - * Creates or updates an App Service Plan. - * - * @param resourceGroupName Name of resource group - * @param name Name of App Service Plan - * @param appServicePlan Details of App Service Plan - * @param allowPendingState OBSOLETE: If true, allow pending state for App Service Plan - * @return the observable for the request - */ - public Observable> createOrUpdateWithServiceResponseAsync(String resourceGroupName, String name, AppServicePlanInner appServicePlan, Boolean allowPendingState) { - if (resourceGroupName == null) { - throw new IllegalArgumentException("Parameter resourceGroupName is required and cannot be null."); - } - if (name == null) { - throw new IllegalArgumentException("Parameter name is required and cannot be null."); - } - if (this.client.subscriptionId() == null) { - throw new IllegalArgumentException("Parameter this.client.subscriptionId() is required and cannot be null."); - } - if (appServicePlan == null) { - throw new IllegalArgumentException("Parameter appServicePlan is required and cannot be null."); - } - Validator.validate(appServicePlan); - final String apiVersion = "2016-09-01"; - Observable> observable = service.createOrUpdate(resourceGroupName, name, this.client.subscriptionId(), appServicePlan, allowPendingState, apiVersion, this.client.acceptLanguage(), this.client.userAgent()); - return client.getAzureClient().getPutOrPatchResultAsync(observable, new TypeToken() { }.getType()); - } - - /** - * Creates or updates an App Service Plan. - * Creates or updates an App Service Plan. - * - * @param resourceGroupName Name of resource group - * @param name Name of App Service Plan - * @param appServicePlan Details of App Service Plan + * @param resourceGroupName Name of the resource group to which the resource belongs. + * @param name Name of the App Service plan. + * @param appServicePlan Details of the App Service plan. * @return the AppServicePlanInner object if successful. */ public AppServicePlanInner beginCreateOrUpdate(String resourceGroupName, String name, AppServicePlanInner appServicePlan) { @@ -771,9 +698,9 @@ public AppServicePlanInner beginCreateOrUpdate(String resourceGroupName, String * Creates or updates an App Service Plan. * Creates or updates an App Service Plan. * - * @param resourceGroupName Name of resource group - * @param name Name of App Service Plan - * @param appServicePlan Details of App Service Plan + * @param resourceGroupName Name of the resource group to which the resource belongs. + * @param name Name of the App Service plan. + * @param appServicePlan Details of the App Service plan. * @param serviceCallback the async ServiceCallback to handle successful and failed responses. * @return the {@link ServiceCall} object */ @@ -785,9 +712,9 @@ public ServiceCall beginCreateOrUpdateAsync(String resource * Creates or updates an App Service Plan. * Creates or updates an App Service Plan. * - * @param resourceGroupName Name of resource group - * @param name Name of App Service Plan - * @param appServicePlan Details of App Service Plan + * @param resourceGroupName Name of the resource group to which the resource belongs. + * @param name Name of the App Service plan. + * @param appServicePlan Details of the App Service plan. * @return the observable to the AppServicePlanInner object */ public Observable beginCreateOrUpdateAsync(String resourceGroupName, String name, AppServicePlanInner appServicePlan) { @@ -803,9 +730,9 @@ public AppServicePlanInner call(ServiceResponse response) { * Creates or updates an App Service Plan. * Creates or updates an App Service Plan. * - * @param resourceGroupName Name of resource group - * @param name Name of App Service Plan - * @param appServicePlan Details of App Service Plan + * @param resourceGroupName Name of the resource group to which the resource belongs. + * @param name Name of the App Service plan. + * @param appServicePlan Details of the App Service plan. * @return the observable to the AppServicePlanInner object */ public Observable> beginCreateOrUpdateWithServiceResponseAsync(String resourceGroupName, String name, AppServicePlanInner appServicePlan) { @@ -823,95 +750,7 @@ public Observable> beginCreateOrUpdateWithS } Validator.validate(appServicePlan); final String apiVersion = "2016-09-01"; - final Boolean allowPendingState = null; - return service.beginCreateOrUpdate(resourceGroupName, name, this.client.subscriptionId(), appServicePlan, allowPendingState, apiVersion, this.client.acceptLanguage(), this.client.userAgent()) - .flatMap(new Func1, Observable>>() { - @Override - public Observable> call(Response response) { - try { - ServiceResponse clientResponse = beginCreateOrUpdateDelegate(response); - return Observable.just(clientResponse); - } catch (Throwable t) { - return Observable.error(t); - } - } - }); - } - - /** - * Creates or updates an App Service Plan. - * Creates or updates an App Service Plan. - * - * @param resourceGroupName Name of resource group - * @param name Name of App Service Plan - * @param appServicePlan Details of App Service Plan - * @param allowPendingState OBSOLETE: If true, allow pending state for App Service Plan - * @return the AppServicePlanInner object if successful. - */ - public AppServicePlanInner beginCreateOrUpdate(String resourceGroupName, String name, AppServicePlanInner appServicePlan, Boolean allowPendingState) { - return beginCreateOrUpdateWithServiceResponseAsync(resourceGroupName, name, appServicePlan, allowPendingState).toBlocking().single().getBody(); - } - - /** - * Creates or updates an App Service Plan. - * Creates or updates an App Service Plan. - * - * @param resourceGroupName Name of resource group - * @param name Name of App Service Plan - * @param appServicePlan Details of App Service Plan - * @param allowPendingState OBSOLETE: If true, allow pending state for App Service Plan - * @param serviceCallback the async ServiceCallback to handle successful and failed responses. - * @return the {@link ServiceCall} object - */ - public ServiceCall beginCreateOrUpdateAsync(String resourceGroupName, String name, AppServicePlanInner appServicePlan, Boolean allowPendingState, final ServiceCallback serviceCallback) { - return ServiceCall.create(beginCreateOrUpdateWithServiceResponseAsync(resourceGroupName, name, appServicePlan, allowPendingState), serviceCallback); - } - - /** - * Creates or updates an App Service Plan. - * Creates or updates an App Service Plan. - * - * @param resourceGroupName Name of resource group - * @param name Name of App Service Plan - * @param appServicePlan Details of App Service Plan - * @param allowPendingState OBSOLETE: If true, allow pending state for App Service Plan - * @return the observable to the AppServicePlanInner object - */ - public Observable beginCreateOrUpdateAsync(String resourceGroupName, String name, AppServicePlanInner appServicePlan, Boolean allowPendingState) { - return beginCreateOrUpdateWithServiceResponseAsync(resourceGroupName, name, appServicePlan, allowPendingState).map(new Func1, AppServicePlanInner>() { - @Override - public AppServicePlanInner call(ServiceResponse response) { - return response.getBody(); - } - }); - } - - /** - * Creates or updates an App Service Plan. - * Creates or updates an App Service Plan. - * - * @param resourceGroupName Name of resource group - * @param name Name of App Service Plan - * @param appServicePlan Details of App Service Plan - * @param allowPendingState OBSOLETE: If true, allow pending state for App Service Plan - * @return the observable to the AppServicePlanInner object - */ - public Observable> beginCreateOrUpdateWithServiceResponseAsync(String resourceGroupName, String name, AppServicePlanInner appServicePlan, Boolean allowPendingState) { - if (resourceGroupName == null) { - throw new IllegalArgumentException("Parameter resourceGroupName is required and cannot be null."); - } - if (name == null) { - throw new IllegalArgumentException("Parameter name is required and cannot be null."); - } - if (this.client.subscriptionId() == null) { - throw new IllegalArgumentException("Parameter this.client.subscriptionId() is required and cannot be null."); - } - if (appServicePlan == null) { - throw new IllegalArgumentException("Parameter appServicePlan is required and cannot be null."); - } - Validator.validate(appServicePlan); - final String apiVersion = "2016-09-01"; - return service.beginCreateOrUpdate(resourceGroupName, name, this.client.subscriptionId(), appServicePlan, allowPendingState, apiVersion, this.client.acceptLanguage(), this.client.userAgent()) + return service.beginCreateOrUpdate(resourceGroupName, name, this.client.subscriptionId(), appServicePlan, apiVersion, this.client.acceptLanguage(), this.client.userAgent()) .flatMap(new Func1, Observable>>() { @Override public Observable> call(Response response) { @@ -934,56 +773,55 @@ private ServiceResponse beginCreateOrUpdateDelegate(Respons } /** - * Deletes a App Service Plan. - * Deletes a App Service Plan. + * Delete an App Service plan. + * Delete an App Service plan. * - * @param resourceGroupName Name of resource group - * @param name Name of App Service Plan - * @return the Object object if successful. + * @param resourceGroupName Name of the resource group to which the resource belongs. + * @param name Name of the App Service plan. */ - public Object delete(String resourceGroupName, String name) { - return deleteWithServiceResponseAsync(resourceGroupName, name).toBlocking().single().getBody(); + public void delete(String resourceGroupName, String name) { + deleteWithServiceResponseAsync(resourceGroupName, name).toBlocking().single().getBody(); } /** - * Deletes a App Service Plan. - * Deletes a App Service Plan. + * Delete an App Service plan. + * Delete an App Service plan. * - * @param resourceGroupName Name of resource group - * @param name Name of App Service Plan + * @param resourceGroupName Name of the resource group to which the resource belongs. + * @param name Name of the App Service plan. * @param serviceCallback the async ServiceCallback to handle successful and failed responses. * @return the {@link ServiceCall} object */ - public ServiceCall deleteAsync(String resourceGroupName, String name, final ServiceCallback serviceCallback) { + public ServiceCall deleteAsync(String resourceGroupName, String name, final ServiceCallback serviceCallback) { return ServiceCall.create(deleteWithServiceResponseAsync(resourceGroupName, name), serviceCallback); } /** - * Deletes a App Service Plan. - * Deletes a App Service Plan. + * Delete an App Service plan. + * Delete an App Service plan. * - * @param resourceGroupName Name of resource group - * @param name Name of App Service Plan - * @return the observable to the Object object + * @param resourceGroupName Name of the resource group to which the resource belongs. + * @param name Name of the App Service plan. + * @return the {@link ServiceResponse} object if successful. */ - public Observable deleteAsync(String resourceGroupName, String name) { - return deleteWithServiceResponseAsync(resourceGroupName, name).map(new Func1, Object>() { + public Observable deleteAsync(String resourceGroupName, String name) { + return deleteWithServiceResponseAsync(resourceGroupName, name).map(new Func1, Void>() { @Override - public Object call(ServiceResponse response) { + public Void call(ServiceResponse response) { return response.getBody(); } }); } /** - * Deletes a App Service Plan. - * Deletes a App Service Plan. + * Delete an App Service plan. + * Delete an App Service plan. * - * @param resourceGroupName Name of resource group - * @param name Name of App Service Plan - * @return the observable to the Object object + * @param resourceGroupName Name of the resource group to which the resource belongs. + * @param name Name of the App Service plan. + * @return the {@link ServiceResponse} object if successful. */ - public Observable> deleteWithServiceResponseAsync(String resourceGroupName, String name) { + public Observable> deleteWithServiceResponseAsync(String resourceGroupName, String name) { if (resourceGroupName == null) { throw new IllegalArgumentException("Parameter resourceGroupName is required and cannot be null."); } @@ -995,11 +833,11 @@ public Observable> deleteWithServiceResponseAsync(String } final String apiVersion = "2016-09-01"; return service.delete(resourceGroupName, name, this.client.subscriptionId(), apiVersion, this.client.acceptLanguage(), this.client.userAgent()) - .flatMap(new Func1, Observable>>() { + .flatMap(new Func1, Observable>>() { @Override - public Observable> call(Response response) { + public Observable> call(Response response) { try { - ServiceResponse clientResponse = deleteDelegate(response); + ServiceResponse clientResponse = deleteDelegate(response); return Observable.just(clientResponse); } catch (Throwable t) { return Observable.error(t); @@ -1008,19 +846,18 @@ public Observable> call(Response response) }); } - private ServiceResponse deleteDelegate(Response response) throws CloudException, IOException, IllegalArgumentException { - return new AzureServiceResponseBuilder(this.client.mapperAdapter()) - .register(200, new TypeToken() { }.getType()) - .registerError(CloudException.class) + private ServiceResponse deleteDelegate(Response response) throws CloudException, IOException, IllegalArgumentException { + return new AzureServiceResponseBuilder(this.client.mapperAdapter()) + .register(204, new TypeToken() { }.getType()) .build(response); } /** - * List serverfarm capabilities. - * List serverfarm capabilities. + * List all capabilities of an App Service plan. + * List all capabilities of an App Service plan. * - * @param resourceGroupName The resource group name - * @param name The name of the App Service Plan + * @param resourceGroupName Name of the resource group to which the resource belongs. + * @param name Name of the App Service plan. * @return the List<CapabilityInner> object if successful. */ public List listCapabilities(String resourceGroupName, String name) { @@ -1028,11 +865,11 @@ public List listCapabilities(String resourceGroupName, String n } /** - * List serverfarm capabilities. - * List serverfarm capabilities. + * List all capabilities of an App Service plan. + * List all capabilities of an App Service plan. * - * @param resourceGroupName The resource group name - * @param name The name of the App Service Plan + * @param resourceGroupName Name of the resource group to which the resource belongs. + * @param name Name of the App Service plan. * @param serviceCallback the async ServiceCallback to handle successful and failed responses. * @return the {@link ServiceCall} object */ @@ -1041,11 +878,11 @@ public ServiceCall> listCapabilitiesAsync(String resourceG } /** - * List serverfarm capabilities. - * List serverfarm capabilities. + * List all capabilities of an App Service plan. + * List all capabilities of an App Service plan. * - * @param resourceGroupName The resource group name - * @param name The name of the App Service Plan + * @param resourceGroupName Name of the resource group to which the resource belongs. + * @param name Name of the App Service plan. * @return the observable to the List<CapabilityInner> object */ public Observable> listCapabilitiesAsync(String resourceGroupName, String name) { @@ -1058,11 +895,11 @@ public List call(ServiceResponse> respons } /** - * List serverfarm capabilities. - * List serverfarm capabilities. + * List all capabilities of an App Service plan. + * List all capabilities of an App Service plan. * - * @param resourceGroupName The resource group name - * @param name The name of the App Service Plan + * @param resourceGroupName Name of the resource group to which the resource belongs. + * @param name Name of the App Service plan. * @return the observable to the List<CapabilityInner> object */ public Observable>> listCapabilitiesWithServiceResponseAsync(String resourceGroupName, String name) { @@ -1098,13 +935,13 @@ private ServiceResponse> listCapabilitiesDelegate(Response } /** - * Retrieves a specific Service Bus Hybrid Connection in use on this App Service Plan. - * Retrieves a specific Service Bus Hybrid Connection in use on this App Service Plan. + * Retrieve a Hybrid Connection in use in an App Service plan. + * Retrieve a Hybrid Connection in use in an App Service plan. * - * @param resourceGroupName The resource group name - * @param name The name of the App Service Plan - * @param namespaceName The name of the Service Bus Namespace - * @param relayName The name of the Service Bus Relay + * @param resourceGroupName Name of the resource group to which the resource belongs. + * @param name Name of the App Service plan. + * @param namespaceName Name of the Service Bus namespace. + * @param relayName Name of the Service Bus relay. * @return the HybridConnectionInner object if successful. */ public HybridConnectionInner getHybridConnection(String resourceGroupName, String name, String namespaceName, String relayName) { @@ -1112,13 +949,13 @@ public HybridConnectionInner getHybridConnection(String resourceGroupName, Strin } /** - * Retrieves a specific Service Bus Hybrid Connection in use on this App Service Plan. - * Retrieves a specific Service Bus Hybrid Connection in use on this App Service Plan. + * Retrieve a Hybrid Connection in use in an App Service plan. + * Retrieve a Hybrid Connection in use in an App Service plan. * - * @param resourceGroupName The resource group name - * @param name The name of the App Service Plan - * @param namespaceName The name of the Service Bus Namespace - * @param relayName The name of the Service Bus Relay + * @param resourceGroupName Name of the resource group to which the resource belongs. + * @param name Name of the App Service plan. + * @param namespaceName Name of the Service Bus namespace. + * @param relayName Name of the Service Bus relay. * @param serviceCallback the async ServiceCallback to handle successful and failed responses. * @return the {@link ServiceCall} object */ @@ -1127,13 +964,13 @@ public ServiceCall getHybridConnectionAsync(String resour } /** - * Retrieves a specific Service Bus Hybrid Connection in use on this App Service Plan. - * Retrieves a specific Service Bus Hybrid Connection in use on this App Service Plan. + * Retrieve a Hybrid Connection in use in an App Service plan. + * Retrieve a Hybrid Connection in use in an App Service plan. * - * @param resourceGroupName The resource group name - * @param name The name of the App Service Plan - * @param namespaceName The name of the Service Bus Namespace - * @param relayName The name of the Service Bus Relay + * @param resourceGroupName Name of the resource group to which the resource belongs. + * @param name Name of the App Service plan. + * @param namespaceName Name of the Service Bus namespace. + * @param relayName Name of the Service Bus relay. * @return the observable to the HybridConnectionInner object */ public Observable getHybridConnectionAsync(String resourceGroupName, String name, String namespaceName, String relayName) { @@ -1146,13 +983,13 @@ public HybridConnectionInner call(ServiceResponse respons } /** - * Retrieves a specific Service Bus Hybrid Connection in use on this App Service Plan. - * Retrieves a specific Service Bus Hybrid Connection in use on this App Service Plan. + * Retrieve a Hybrid Connection in use in an App Service plan. + * Retrieve a Hybrid Connection in use in an App Service plan. * - * @param resourceGroupName The resource group name - * @param name The name of the App Service Plan - * @param namespaceName The name of the Service Bus Namespace - * @param relayName The name of the Service Bus Relay + * @param resourceGroupName Name of the resource group to which the resource belongs. + * @param name Name of the App Service plan. + * @param namespaceName Name of the Service Bus namespace. + * @param relayName Name of the Service Bus relay. * @return the observable to the HybridConnectionInner object */ public Observable> getHybridConnectionWithServiceResponseAsync(String resourceGroupName, String name, String namespaceName, String relayName) { @@ -1194,14 +1031,14 @@ private ServiceResponse getHybridConnectionDelegate(Respo } /** - * Updates an existing Service Bus Hybrid Connection in use on this App Service Plan. This will fail if the Hybrid Connection does not already exist. - * Updates an existing Service Bus Hybrid Connection in use on this App Service Plan. This will fail if the Hybrid Connection does not already exist. + * Update a Hybrid Connection in use in an App Service plan. This operation will fail if the Hybrid Connection does not already exist. + * Update a Hybrid Connection in use in an App Service plan. This operation will fail if the Hybrid Connection does not already exist. * - * @param resourceGroupName The resource group name - * @param name The name of the App Service Plan - * @param namespaceName The name of the Service Bus Namespace - * @param relayName The name of the Service Bus Relay - * @param connection The hybrid connection entity + * @param resourceGroupName Name of the resource group to which the resource belongs. + * @param name Name of the App Service plan. + * @param namespaceName Name of the Service Bus namespace. + * @param relayName Name of the Service Bus relay. + * @param connection The Hybrid Connection entity. * @return the HybridConnectionInner object if successful. */ public HybridConnectionInner updateHybridConnection(String resourceGroupName, String name, String namespaceName, String relayName, HybridConnectionInner connection) { @@ -1209,14 +1046,14 @@ public HybridConnectionInner updateHybridConnection(String resourceGroupName, St } /** - * Updates an existing Service Bus Hybrid Connection in use on this App Service Plan. This will fail if the Hybrid Connection does not already exist. - * Updates an existing Service Bus Hybrid Connection in use on this App Service Plan. This will fail if the Hybrid Connection does not already exist. + * Update a Hybrid Connection in use in an App Service plan. This operation will fail if the Hybrid Connection does not already exist. + * Update a Hybrid Connection in use in an App Service plan. This operation will fail if the Hybrid Connection does not already exist. * - * @param resourceGroupName The resource group name - * @param name The name of the App Service Plan - * @param namespaceName The name of the Service Bus Namespace - * @param relayName The name of the Service Bus Relay - * @param connection The hybrid connection entity + * @param resourceGroupName Name of the resource group to which the resource belongs. + * @param name Name of the App Service plan. + * @param namespaceName Name of the Service Bus namespace. + * @param relayName Name of the Service Bus relay. + * @param connection The Hybrid Connection entity. * @param serviceCallback the async ServiceCallback to handle successful and failed responses. * @return the {@link ServiceCall} object */ @@ -1225,14 +1062,14 @@ public ServiceCall updateHybridConnectionAsync(String res } /** - * Updates an existing Service Bus Hybrid Connection in use on this App Service Plan. This will fail if the Hybrid Connection does not already exist. - * Updates an existing Service Bus Hybrid Connection in use on this App Service Plan. This will fail if the Hybrid Connection does not already exist. + * Update a Hybrid Connection in use in an App Service plan. This operation will fail if the Hybrid Connection does not already exist. + * Update a Hybrid Connection in use in an App Service plan. This operation will fail if the Hybrid Connection does not already exist. * - * @param resourceGroupName The resource group name - * @param name The name of the App Service Plan - * @param namespaceName The name of the Service Bus Namespace - * @param relayName The name of the Service Bus Relay - * @param connection The hybrid connection entity + * @param resourceGroupName Name of the resource group to which the resource belongs. + * @param name Name of the App Service plan. + * @param namespaceName Name of the Service Bus namespace. + * @param relayName Name of the Service Bus relay. + * @param connection The Hybrid Connection entity. * @return the observable to the HybridConnectionInner object */ public Observable updateHybridConnectionAsync(String resourceGroupName, String name, String namespaceName, String relayName, HybridConnectionInner connection) { @@ -1245,14 +1082,14 @@ public HybridConnectionInner call(ServiceResponse respons } /** - * Updates an existing Service Bus Hybrid Connection in use on this App Service Plan. This will fail if the Hybrid Connection does not already exist. - * Updates an existing Service Bus Hybrid Connection in use on this App Service Plan. This will fail if the Hybrid Connection does not already exist. + * Update a Hybrid Connection in use in an App Service plan. This operation will fail if the Hybrid Connection does not already exist. + * Update a Hybrid Connection in use in an App Service plan. This operation will fail if the Hybrid Connection does not already exist. * - * @param resourceGroupName The resource group name - * @param name The name of the App Service Plan - * @param namespaceName The name of the Service Bus Namespace - * @param relayName The name of the Service Bus Relay - * @param connection The hybrid connection entity + * @param resourceGroupName Name of the resource group to which the resource belongs. + * @param name Name of the App Service plan. + * @param namespaceName Name of the Service Bus namespace. + * @param relayName Name of the Service Bus relay. + * @param connection The Hybrid Connection entity. * @return the observable to the HybridConnectionInner object */ public Observable> updateHybridConnectionWithServiceResponseAsync(String resourceGroupName, String name, String namespaceName, String relayName, HybridConnectionInner connection) { @@ -1298,64 +1135,63 @@ private ServiceResponse updateHybridConnectionDelegate(Re } /** - * Deletes an existing Service Bus Hybrid Connection in use on this App Service Plan. - * Deletes an existing Service Bus Hybrid Connection in use on this App Service Plan. + * Delete a Hybrid Connection in use in an App Service plan. + * Delete a Hybrid Connection in use in an App Service plan. * - * @param resourceGroupName The resource group name - * @param name The name of the App Service Plan - * @param namespaceName The name of the Service Bus Namespace - * @param relayName The name of the Service Bus Relay - * @return the Object object if successful. + * @param resourceGroupName Name of the resource group to which the resource belongs. + * @param name Name of the App Service plan. + * @param namespaceName Name of the Service Bus namespace. + * @param relayName Name of the Service Bus relay. */ - public Object deleteHybridConnection(String resourceGroupName, String name, String namespaceName, String relayName) { - return deleteHybridConnectionWithServiceResponseAsync(resourceGroupName, name, namespaceName, relayName).toBlocking().single().getBody(); + public void deleteHybridConnection(String resourceGroupName, String name, String namespaceName, String relayName) { + deleteHybridConnectionWithServiceResponseAsync(resourceGroupName, name, namespaceName, relayName).toBlocking().single().getBody(); } /** - * Deletes an existing Service Bus Hybrid Connection in use on this App Service Plan. - * Deletes an existing Service Bus Hybrid Connection in use on this App Service Plan. + * Delete a Hybrid Connection in use in an App Service plan. + * Delete a Hybrid Connection in use in an App Service plan. * - * @param resourceGroupName The resource group name - * @param name The name of the App Service Plan - * @param namespaceName The name of the Service Bus Namespace - * @param relayName The name of the Service Bus Relay + * @param resourceGroupName Name of the resource group to which the resource belongs. + * @param name Name of the App Service plan. + * @param namespaceName Name of the Service Bus namespace. + * @param relayName Name of the Service Bus relay. * @param serviceCallback the async ServiceCallback to handle successful and failed responses. * @return the {@link ServiceCall} object */ - public ServiceCall deleteHybridConnectionAsync(String resourceGroupName, String name, String namespaceName, String relayName, final ServiceCallback serviceCallback) { + public ServiceCall deleteHybridConnectionAsync(String resourceGroupName, String name, String namespaceName, String relayName, final ServiceCallback serviceCallback) { return ServiceCall.create(deleteHybridConnectionWithServiceResponseAsync(resourceGroupName, name, namespaceName, relayName), serviceCallback); } /** - * Deletes an existing Service Bus Hybrid Connection in use on this App Service Plan. - * Deletes an existing Service Bus Hybrid Connection in use on this App Service Plan. + * Delete a Hybrid Connection in use in an App Service plan. + * Delete a Hybrid Connection in use in an App Service plan. * - * @param resourceGroupName The resource group name - * @param name The name of the App Service Plan - * @param namespaceName The name of the Service Bus Namespace - * @param relayName The name of the Service Bus Relay - * @return the observable to the Object object + * @param resourceGroupName Name of the resource group to which the resource belongs. + * @param name Name of the App Service plan. + * @param namespaceName Name of the Service Bus namespace. + * @param relayName Name of the Service Bus relay. + * @return the {@link ServiceResponse} object if successful. */ - public Observable deleteHybridConnectionAsync(String resourceGroupName, String name, String namespaceName, String relayName) { - return deleteHybridConnectionWithServiceResponseAsync(resourceGroupName, name, namespaceName, relayName).map(new Func1, Object>() { + public Observable deleteHybridConnectionAsync(String resourceGroupName, String name, String namespaceName, String relayName) { + return deleteHybridConnectionWithServiceResponseAsync(resourceGroupName, name, namespaceName, relayName).map(new Func1, Void>() { @Override - public Object call(ServiceResponse response) { + public Void call(ServiceResponse response) { return response.getBody(); } }); } /** - * Deletes an existing Service Bus Hybrid Connection in use on this App Service Plan. - * Deletes an existing Service Bus Hybrid Connection in use on this App Service Plan. + * Delete a Hybrid Connection in use in an App Service plan. + * Delete a Hybrid Connection in use in an App Service plan. * - * @param resourceGroupName The resource group name - * @param name The name of the App Service Plan - * @param namespaceName The name of the Service Bus Namespace - * @param relayName The name of the Service Bus Relay - * @return the observable to the Object object + * @param resourceGroupName Name of the resource group to which the resource belongs. + * @param name Name of the App Service plan. + * @param namespaceName Name of the Service Bus namespace. + * @param relayName Name of the Service Bus relay. + * @return the {@link ServiceResponse} object if successful. */ - public Observable> deleteHybridConnectionWithServiceResponseAsync(String resourceGroupName, String name, String namespaceName, String relayName) { + public Observable> deleteHybridConnectionWithServiceResponseAsync(String resourceGroupName, String name, String namespaceName, String relayName) { if (resourceGroupName == null) { throw new IllegalArgumentException("Parameter resourceGroupName is required and cannot be null."); } @@ -1373,11 +1209,11 @@ public Observable> deleteHybridConnectionWithServiceResp } final String apiVersion = "2016-09-01"; return service.deleteHybridConnection(resourceGroupName, name, namespaceName, relayName, this.client.subscriptionId(), apiVersion, this.client.acceptLanguage(), this.client.userAgent()) - .flatMap(new Func1, Observable>>() { + .flatMap(new Func1, Observable>>() { @Override - public Observable> call(Response response) { + public Observable> call(Response response) { try { - ServiceResponse clientResponse = deleteHybridConnectionDelegate(response); + ServiceResponse clientResponse = deleteHybridConnectionDelegate(response); return Observable.just(clientResponse); } catch (Throwable t) { return Observable.error(t); @@ -1386,21 +1222,21 @@ public Observable> call(Response response) }); } - private ServiceResponse deleteHybridConnectionDelegate(Response response) throws CloudException, IOException, IllegalArgumentException { - return new AzureServiceResponseBuilder(this.client.mapperAdapter()) - .register(200, new TypeToken() { }.getType()) - .registerError(CloudException.class) + private ServiceResponse deleteHybridConnectionDelegate(Response response) throws CloudException, IOException, IllegalArgumentException { + return new AzureServiceResponseBuilder(this.client.mapperAdapter()) + .register(200, new TypeToken() { }.getType()) + .register(204, new TypeToken() { }.getType()) .build(response); } /** - * Gets the send key name and value for this Hybrid Connection. - * Gets the send key name and value for this Hybrid Connection. + * Get the send key name and value of a Hybrid Connection. + * Get the send key name and value of a Hybrid Connection. * - * @param resourceGroupName The resource group name - * @param name The name of the App Service Plan - * @param namespaceName The name of the Service Bus Namespace - * @param relayName The name of the Service Bus Relay + * @param resourceGroupName Name of the resource group to which the resource belongs. + * @param name Name of the App Service plan. + * @param namespaceName The name of the Service Bus namespace. + * @param relayName The name of the Service Bus relay. * @return the HybridConnectionKeyInner object if successful. */ public HybridConnectionKeyInner listHybridConnectionKeys(String resourceGroupName, String name, String namespaceName, String relayName) { @@ -1408,13 +1244,13 @@ public HybridConnectionKeyInner listHybridConnectionKeys(String resourceGroupNam } /** - * Gets the send key name and value for this Hybrid Connection. - * Gets the send key name and value for this Hybrid Connection. + * Get the send key name and value of a Hybrid Connection. + * Get the send key name and value of a Hybrid Connection. * - * @param resourceGroupName The resource group name - * @param name The name of the App Service Plan - * @param namespaceName The name of the Service Bus Namespace - * @param relayName The name of the Service Bus Relay + * @param resourceGroupName Name of the resource group to which the resource belongs. + * @param name Name of the App Service plan. + * @param namespaceName The name of the Service Bus namespace. + * @param relayName The name of the Service Bus relay. * @param serviceCallback the async ServiceCallback to handle successful and failed responses. * @return the {@link ServiceCall} object */ @@ -1423,13 +1259,13 @@ public ServiceCall listHybridConnectionKeysAsync(Strin } /** - * Gets the send key name and value for this Hybrid Connection. - * Gets the send key name and value for this Hybrid Connection. + * Get the send key name and value of a Hybrid Connection. + * Get the send key name and value of a Hybrid Connection. * - * @param resourceGroupName The resource group name - * @param name The name of the App Service Plan - * @param namespaceName The name of the Service Bus Namespace - * @param relayName The name of the Service Bus Relay + * @param resourceGroupName Name of the resource group to which the resource belongs. + * @param name Name of the App Service plan. + * @param namespaceName The name of the Service Bus namespace. + * @param relayName The name of the Service Bus relay. * @return the observable to the HybridConnectionKeyInner object */ public Observable listHybridConnectionKeysAsync(String resourceGroupName, String name, String namespaceName, String relayName) { @@ -1442,13 +1278,13 @@ public HybridConnectionKeyInner call(ServiceResponse r } /** - * Gets the send key name and value for this Hybrid Connection. - * Gets the send key name and value for this Hybrid Connection. + * Get the send key name and value of a Hybrid Connection. + * Get the send key name and value of a Hybrid Connection. * - * @param resourceGroupName The resource group name - * @param name The name of the App Service Plan - * @param namespaceName The name of the Service Bus Namespace - * @param relayName The name of the Service Bus Relay + * @param resourceGroupName Name of the resource group to which the resource belongs. + * @param name Name of the App Service plan. + * @param namespaceName The name of the Service Bus namespace. + * @param relayName The name of the Service Bus relay. * @return the observable to the HybridConnectionKeyInner object */ public Observable> listHybridConnectionKeysWithServiceResponseAsync(String resourceGroupName, String name, String namespaceName, String relayName) { @@ -1490,64 +1326,103 @@ private ServiceResponse listHybridConnectionKeysDelega } /** - * Gets a list of sites that are using a particular Hybrid Connection on an App Service Plan. - * Gets a list of sites that are using a particular Hybrid Connection on an App Service Plan. + * Get all apps that use a Hybrid Connection in an App Service Plan. + * Get all apps that use a Hybrid Connection in an App Service Plan. * - * @param resourceGroupName The resource group - * @param name The name of the App Service Plan - * @param namespaceName The Hybrid Connection namespace - * @param relayName The Hybrid Connection relay name - * @return the Object object if successful. + * @param resourceGroupName Name of the resource group to which the resource belongs. + * @param name Name of the App Service plan. + * @param namespaceName Name of the Hybrid Connection namespace. + * @param relayName Name of the Hybrid Connection relay. + * @return the PagedList<String> object if successful. */ - public Object listHybridConnectionWebApps(String resourceGroupName, String name, String namespaceName, String relayName) { - return listHybridConnectionWebAppsWithServiceResponseAsync(resourceGroupName, name, namespaceName, relayName).toBlocking().single().getBody(); + public PagedList listWebAppsByHybridConnection(final String resourceGroupName, final String name, final String namespaceName, final String relayName) { + ServiceResponse> response = listWebAppsByHybridConnectionSinglePageAsync(resourceGroupName, name, namespaceName, relayName).toBlocking().single(); + return new PagedList(response.getBody()) { + @Override + public Page nextPage(String nextPageLink) { + return listWebAppsByHybridConnectionNextSinglePageAsync(nextPageLink).toBlocking().single().getBody(); + } + }; } /** - * Gets a list of sites that are using a particular Hybrid Connection on an App Service Plan. - * Gets a list of sites that are using a particular Hybrid Connection on an App Service Plan. + * Get all apps that use a Hybrid Connection in an App Service Plan. + * Get all apps that use a Hybrid Connection in an App Service Plan. * - * @param resourceGroupName The resource group - * @param name The name of the App Service Plan - * @param namespaceName The Hybrid Connection namespace - * @param relayName The Hybrid Connection relay name + * @param resourceGroupName Name of the resource group to which the resource belongs. + * @param name Name of the App Service plan. + * @param namespaceName Name of the Hybrid Connection namespace. + * @param relayName Name of the Hybrid Connection relay. * @param serviceCallback the async ServiceCallback to handle successful and failed responses. * @return the {@link ServiceCall} object */ - public ServiceCall listHybridConnectionWebAppsAsync(String resourceGroupName, String name, String namespaceName, String relayName, final ServiceCallback serviceCallback) { - return ServiceCall.create(listHybridConnectionWebAppsWithServiceResponseAsync(resourceGroupName, name, namespaceName, relayName), serviceCallback); + public ServiceCall> listWebAppsByHybridConnectionAsync(final String resourceGroupName, final String name, final String namespaceName, final String relayName, final ListOperationCallback serviceCallback) { + return AzureServiceCall.create( + listWebAppsByHybridConnectionSinglePageAsync(resourceGroupName, name, namespaceName, relayName), + new Func1>>>() { + @Override + public Observable>> call(String nextPageLink) { + return listWebAppsByHybridConnectionNextSinglePageAsync(nextPageLink); + } + }, + serviceCallback); } /** - * Gets a list of sites that are using a particular Hybrid Connection on an App Service Plan. - * Gets a list of sites that are using a particular Hybrid Connection on an App Service Plan. + * Get all apps that use a Hybrid Connection in an App Service Plan. + * Get all apps that use a Hybrid Connection in an App Service Plan. * - * @param resourceGroupName The resource group - * @param name The name of the App Service Plan - * @param namespaceName The Hybrid Connection namespace - * @param relayName The Hybrid Connection relay name - * @return the observable to the Object object + * @param resourceGroupName Name of the resource group to which the resource belongs. + * @param name Name of the App Service plan. + * @param namespaceName Name of the Hybrid Connection namespace. + * @param relayName Name of the Hybrid Connection relay. + * @return the observable to the PagedList<String> object */ - public Observable listHybridConnectionWebAppsAsync(String resourceGroupName, String name, String namespaceName, String relayName) { - return listHybridConnectionWebAppsWithServiceResponseAsync(resourceGroupName, name, namespaceName, relayName).map(new Func1, Object>() { - @Override - public Object call(ServiceResponse response) { - return response.getBody(); - } - }); + public Observable> listWebAppsByHybridConnectionAsync(final String resourceGroupName, final String name, final String namespaceName, final String relayName) { + return listWebAppsByHybridConnectionWithServiceResponseAsync(resourceGroupName, name, namespaceName, relayName) + .map(new Func1>, Page>() { + @Override + public Page call(ServiceResponse> response) { + return response.getBody(); + } + }); + } + + /** + * Get all apps that use a Hybrid Connection in an App Service Plan. + * Get all apps that use a Hybrid Connection in an App Service Plan. + * + * @param resourceGroupName Name of the resource group to which the resource belongs. + * @param name Name of the App Service plan. + * @param namespaceName Name of the Hybrid Connection namespace. + * @param relayName Name of the Hybrid Connection relay. + * @return the observable to the PagedList<String> object + */ + public Observable>> listWebAppsByHybridConnectionWithServiceResponseAsync(final String resourceGroupName, final String name, final String namespaceName, final String relayName) { + return listWebAppsByHybridConnectionSinglePageAsync(resourceGroupName, name, namespaceName, relayName) + .concatMap(new Func1>, Observable>>>() { + @Override + public Observable>> call(ServiceResponse> page) { + String nextPageLink = page.getBody().getNextPageLink(); + if (nextPageLink == null) { + return Observable.just(page); + } + return Observable.just(page).concatWith(listWebAppsByHybridConnectionNextWithServiceResponseAsync(nextPageLink)); + } + }); } /** - * Gets a list of sites that are using a particular Hybrid Connection on an App Service Plan. - * Gets a list of sites that are using a particular Hybrid Connection on an App Service Plan. + * Get all apps that use a Hybrid Connection in an App Service Plan. + * Get all apps that use a Hybrid Connection in an App Service Plan. * - * @param resourceGroupName The resource group - * @param name The name of the App Service Plan - * @param namespaceName The Hybrid Connection namespace - * @param relayName The Hybrid Connection relay name - * @return the observable to the Object object + ServiceResponse> * @param resourceGroupName Name of the resource group to which the resource belongs. + ServiceResponse> * @param name Name of the App Service plan. + ServiceResponse> * @param namespaceName Name of the Hybrid Connection namespace. + ServiceResponse> * @param relayName Name of the Hybrid Connection relay. + * @return the PagedList<String> object wrapped in {@link ServiceResponse} if successful. */ - public Observable> listHybridConnectionWebAppsWithServiceResponseAsync(String resourceGroupName, String name, String namespaceName, String relayName) { + public Observable>> listWebAppsByHybridConnectionSinglePageAsync(final String resourceGroupName, final String name, final String namespaceName, final String relayName) { if (resourceGroupName == null) { throw new IllegalArgumentException("Parameter resourceGroupName is required and cannot be null."); } @@ -1564,13 +1439,13 @@ public Observable> listHybridConnectionWebAppsWithServic throw new IllegalArgumentException("Parameter this.client.subscriptionId() is required and cannot be null."); } final String apiVersion = "2016-09-01"; - return service.listHybridConnectionWebApps(resourceGroupName, name, namespaceName, relayName, this.client.subscriptionId(), apiVersion, this.client.acceptLanguage(), this.client.userAgent()) - .flatMap(new Func1, Observable>>() { + return service.listWebAppsByHybridConnection(resourceGroupName, name, namespaceName, relayName, this.client.subscriptionId(), apiVersion, this.client.acceptLanguage(), this.client.userAgent()) + .flatMap(new Func1, Observable>>>() { @Override - public Observable> call(Response response) { + public Observable>> call(Response response) { try { - ServiceResponse clientResponse = listHybridConnectionWebAppsDelegate(response); - return Observable.just(clientResponse); + ServiceResponse> result = listWebAppsByHybridConnectionDelegate(response); + return Observable.just(new ServiceResponse>(result.getBody(), result.getResponse())); } catch (Throwable t) { return Observable.error(t); } @@ -1578,64 +1453,64 @@ public Observable> call(Response response) }); } - private ServiceResponse listHybridConnectionWebAppsDelegate(Response response) throws CloudException, IOException, IllegalArgumentException { - return new AzureServiceResponseBuilder(this.client.mapperAdapter()) - .register(200, new TypeToken() { }.getType()) + private ServiceResponse> listWebAppsByHybridConnectionDelegate(Response response) throws CloudException, IOException, IllegalArgumentException { + return new AzureServiceResponseBuilder, CloudException>(this.client.mapperAdapter()) + .register(200, new TypeToken>() { }.getType()) .registerError(CloudException.class) .build(response); } /** - * Gets the maximum number of Hybrid Connections allowed on a specified App Service Plan. - * Gets the maximum number of Hybrid Connections allowed on a specified App Service Plan. + * Get the maximum number of Hybrid Connections allowed in an App Service plan. + * Get the maximum number of Hybrid Connections allowed in an App Service plan. * - * @param resourceGroupName The resource group - * @param name The name of the App Service Plan - * @return the Object object if successful. + * @param resourceGroupName Name of the resource group to which the resource belongs. + * @param name Name of the App Service plan. + * @return the HybridConnectionLimitsInner object if successful. */ - public Object getHybridConnectionPlanLimit(String resourceGroupName, String name) { + public HybridConnectionLimitsInner getHybridConnectionPlanLimit(String resourceGroupName, String name) { return getHybridConnectionPlanLimitWithServiceResponseAsync(resourceGroupName, name).toBlocking().single().getBody(); } /** - * Gets the maximum number of Hybrid Connections allowed on a specified App Service Plan. - * Gets the maximum number of Hybrid Connections allowed on a specified App Service Plan. + * Get the maximum number of Hybrid Connections allowed in an App Service plan. + * Get the maximum number of Hybrid Connections allowed in an App Service plan. * - * @param resourceGroupName The resource group - * @param name The name of the App Service Plan + * @param resourceGroupName Name of the resource group to which the resource belongs. + * @param name Name of the App Service plan. * @param serviceCallback the async ServiceCallback to handle successful and failed responses. * @return the {@link ServiceCall} object */ - public ServiceCall getHybridConnectionPlanLimitAsync(String resourceGroupName, String name, final ServiceCallback serviceCallback) { + public ServiceCall getHybridConnectionPlanLimitAsync(String resourceGroupName, String name, final ServiceCallback serviceCallback) { return ServiceCall.create(getHybridConnectionPlanLimitWithServiceResponseAsync(resourceGroupName, name), serviceCallback); } /** - * Gets the maximum number of Hybrid Connections allowed on a specified App Service Plan. - * Gets the maximum number of Hybrid Connections allowed on a specified App Service Plan. + * Get the maximum number of Hybrid Connections allowed in an App Service plan. + * Get the maximum number of Hybrid Connections allowed in an App Service plan. * - * @param resourceGroupName The resource group - * @param name The name of the App Service Plan - * @return the observable to the Object object + * @param resourceGroupName Name of the resource group to which the resource belongs. + * @param name Name of the App Service plan. + * @return the observable to the HybridConnectionLimitsInner object */ - public Observable getHybridConnectionPlanLimitAsync(String resourceGroupName, String name) { - return getHybridConnectionPlanLimitWithServiceResponseAsync(resourceGroupName, name).map(new Func1, Object>() { + public Observable getHybridConnectionPlanLimitAsync(String resourceGroupName, String name) { + return getHybridConnectionPlanLimitWithServiceResponseAsync(resourceGroupName, name).map(new Func1, HybridConnectionLimitsInner>() { @Override - public Object call(ServiceResponse response) { + public HybridConnectionLimitsInner call(ServiceResponse response) { return response.getBody(); } }); } /** - * Gets the maximum number of Hybrid Connections allowed on a specified App Service Plan. - * Gets the maximum number of Hybrid Connections allowed on a specified App Service Plan. + * Get the maximum number of Hybrid Connections allowed in an App Service plan. + * Get the maximum number of Hybrid Connections allowed in an App Service plan. * - * @param resourceGroupName The resource group - * @param name The name of the App Service Plan - * @return the observable to the Object object + * @param resourceGroupName Name of the resource group to which the resource belongs. + * @param name Name of the App Service plan. + * @return the observable to the HybridConnectionLimitsInner object */ - public Observable> getHybridConnectionPlanLimitWithServiceResponseAsync(String resourceGroupName, String name) { + public Observable> getHybridConnectionPlanLimitWithServiceResponseAsync(String resourceGroupName, String name) { if (resourceGroupName == null) { throw new IllegalArgumentException("Parameter resourceGroupName is required and cannot be null."); } @@ -1647,11 +1522,11 @@ public Observable> getHybridConnectionPlanLimitWithServi } final String apiVersion = "2016-09-01"; return service.getHybridConnectionPlanLimit(resourceGroupName, name, this.client.subscriptionId(), apiVersion, this.client.acceptLanguage(), this.client.userAgent()) - .flatMap(new Func1, Observable>>() { + .flatMap(new Func1, Observable>>() { @Override - public Observable> call(Response response) { + public Observable> call(Response response) { try { - ServiceResponse clientResponse = getHybridConnectionPlanLimitDelegate(response); + ServiceResponse clientResponse = getHybridConnectionPlanLimitDelegate(response); return Observable.just(clientResponse); } catch (Throwable t) { return Observable.error(t); @@ -1660,64 +1535,101 @@ public Observable> call(Response response) }); } - private ServiceResponse getHybridConnectionPlanLimitDelegate(Response response) throws CloudException, IOException, IllegalArgumentException { - return new AzureServiceResponseBuilder(this.client.mapperAdapter()) - .register(200, new TypeToken() { }.getType()) + private ServiceResponse getHybridConnectionPlanLimitDelegate(Response response) throws CloudException, IOException, IllegalArgumentException { + return new AzureServiceResponseBuilder(this.client.mapperAdapter()) + .register(200, new TypeToken() { }.getType()) .registerError(CloudException.class) .build(response); } /** - * Retrieves all Service Bus Hybrid Connections in use on this App Service Plan. - * Retrieves all Service Bus Hybrid Connections in use on this App Service Plan. + * Retrieve all Hybrid Connections in use in an App Service plan. + * Retrieve all Hybrid Connections in use in an App Service plan. * - * @param resourceGroupName The resource group name - * @param name The name of the App Service Plan - * @return the HybridConnectionInner object if successful. + * @param resourceGroupName Name of the resource group to which the resource belongs. + * @param name Name of the App Service plan. + * @return the PagedList<HybridConnectionInner> object if successful. */ - public HybridConnectionInner listHybridConnections(String resourceGroupName, String name) { - return listHybridConnectionsWithServiceResponseAsync(resourceGroupName, name).toBlocking().single().getBody(); + public PagedList listHybridConnections(final String resourceGroupName, final String name) { + ServiceResponse> response = listHybridConnectionsSinglePageAsync(resourceGroupName, name).toBlocking().single(); + return new PagedList(response.getBody()) { + @Override + public Page nextPage(String nextPageLink) { + return listHybridConnectionsNextSinglePageAsync(nextPageLink).toBlocking().single().getBody(); + } + }; } /** - * Retrieves all Service Bus Hybrid Connections in use on this App Service Plan. - * Retrieves all Service Bus Hybrid Connections in use on this App Service Plan. + * Retrieve all Hybrid Connections in use in an App Service plan. + * Retrieve all Hybrid Connections in use in an App Service plan. * - * @param resourceGroupName The resource group name - * @param name The name of the App Service Plan + * @param resourceGroupName Name of the resource group to which the resource belongs. + * @param name Name of the App Service plan. * @param serviceCallback the async ServiceCallback to handle successful and failed responses. * @return the {@link ServiceCall} object */ - public ServiceCall listHybridConnectionsAsync(String resourceGroupName, String name, final ServiceCallback serviceCallback) { - return ServiceCall.create(listHybridConnectionsWithServiceResponseAsync(resourceGroupName, name), serviceCallback); + public ServiceCall> listHybridConnectionsAsync(final String resourceGroupName, final String name, final ListOperationCallback serviceCallback) { + return AzureServiceCall.create( + listHybridConnectionsSinglePageAsync(resourceGroupName, name), + new Func1>>>() { + @Override + public Observable>> call(String nextPageLink) { + return listHybridConnectionsNextSinglePageAsync(nextPageLink); + } + }, + serviceCallback); } /** - * Retrieves all Service Bus Hybrid Connections in use on this App Service Plan. - * Retrieves all Service Bus Hybrid Connections in use on this App Service Plan. + * Retrieve all Hybrid Connections in use in an App Service plan. + * Retrieve all Hybrid Connections in use in an App Service plan. * - * @param resourceGroupName The resource group name - * @param name The name of the App Service Plan - * @return the observable to the HybridConnectionInner object + * @param resourceGroupName Name of the resource group to which the resource belongs. + * @param name Name of the App Service plan. + * @return the observable to the PagedList<HybridConnectionInner> object */ - public Observable listHybridConnectionsAsync(String resourceGroupName, String name) { - return listHybridConnectionsWithServiceResponseAsync(resourceGroupName, name).map(new Func1, HybridConnectionInner>() { - @Override - public HybridConnectionInner call(ServiceResponse response) { - return response.getBody(); - } - }); + public Observable> listHybridConnectionsAsync(final String resourceGroupName, final String name) { + return listHybridConnectionsWithServiceResponseAsync(resourceGroupName, name) + .map(new Func1>, Page>() { + @Override + public Page call(ServiceResponse> response) { + return response.getBody(); + } + }); } /** - * Retrieves all Service Bus Hybrid Connections in use on this App Service Plan. - * Retrieves all Service Bus Hybrid Connections in use on this App Service Plan. + * Retrieve all Hybrid Connections in use in an App Service plan. + * Retrieve all Hybrid Connections in use in an App Service plan. * - * @param resourceGroupName The resource group name - * @param name The name of the App Service Plan - * @return the observable to the HybridConnectionInner object + * @param resourceGroupName Name of the resource group to which the resource belongs. + * @param name Name of the App Service plan. + * @return the observable to the PagedList<HybridConnectionInner> object + */ + public Observable>> listHybridConnectionsWithServiceResponseAsync(final String resourceGroupName, final String name) { + return listHybridConnectionsSinglePageAsync(resourceGroupName, name) + .concatMap(new Func1>, Observable>>>() { + @Override + public Observable>> call(ServiceResponse> page) { + String nextPageLink = page.getBody().getNextPageLink(); + if (nextPageLink == null) { + return Observable.just(page); + } + return Observable.just(page).concatWith(listHybridConnectionsNextWithServiceResponseAsync(nextPageLink)); + } + }); + } + + /** + * Retrieve all Hybrid Connections in use in an App Service plan. + * Retrieve all Hybrid Connections in use in an App Service plan. + * + ServiceResponse> * @param resourceGroupName Name of the resource group to which the resource belongs. + ServiceResponse> * @param name Name of the App Service plan. + * @return the PagedList<HybridConnectionInner> object wrapped in {@link ServiceResponse} if successful. */ - public Observable> listHybridConnectionsWithServiceResponseAsync(String resourceGroupName, String name) { + public Observable>> listHybridConnectionsSinglePageAsync(final String resourceGroupName, final String name) { if (resourceGroupName == null) { throw new IllegalArgumentException("Parameter resourceGroupName is required and cannot be null."); } @@ -1729,12 +1641,12 @@ public Observable> listHybridConnectionsW } final String apiVersion = "2016-09-01"; return service.listHybridConnections(resourceGroupName, name, this.client.subscriptionId(), apiVersion, this.client.acceptLanguage(), this.client.userAgent()) - .flatMap(new Func1, Observable>>() { + .flatMap(new Func1, Observable>>>() { @Override - public Observable> call(Response response) { + public Observable>> call(Response response) { try { - ServiceResponse clientResponse = listHybridConnectionsDelegate(response); - return Observable.just(clientResponse); + ServiceResponse> result = listHybridConnectionsDelegate(response); + return Observable.just(new ServiceResponse>(result.getBody(), result.getResponse())); } catch (Throwable t) { return Observable.error(t); } @@ -1742,46 +1654,46 @@ public Observable> call(Response listHybridConnectionsDelegate(Response response) throws CloudException, IOException, IllegalArgumentException { - return new AzureServiceResponseBuilder(this.client.mapperAdapter()) - .register(200, new TypeToken() { }.getType()) + private ServiceResponse> listHybridConnectionsDelegate(Response response) throws CloudException, IOException, IllegalArgumentException { + return new AzureServiceResponseBuilder, CloudException>(this.client.mapperAdapter()) + .register(200, new TypeToken>() { }.getType()) .registerError(CloudException.class) .build(response); } /** - * List of metrics that can be queried for an App Service Plan. - * List of metrics that can be queried for an App Service Plan. + * Get metrics that can be queried for an App Service plan, and their definitions. + * Get metrics that can be queried for an App Service plan, and their definitions. * - * @param resourceGroupName Name of resource group - * @param name Name of App Service Plan - * @return the PagedList<MetricDefinitionInner> object if successful. + * @param resourceGroupName Name of the resource group to which the resource belongs. + * @param name Name of the App Service plan. + * @return the PagedList<ResourceMetricDefinitionInner> object if successful. */ - public PagedList listMetricDefintions(final String resourceGroupName, final String name) { - ServiceResponse> response = listMetricDefintionsSinglePageAsync(resourceGroupName, name).toBlocking().single(); - return new PagedList(response.getBody()) { + public PagedList listMetricDefintions(final String resourceGroupName, final String name) { + ServiceResponse> response = listMetricDefintionsSinglePageAsync(resourceGroupName, name).toBlocking().single(); + return new PagedList(response.getBody()) { @Override - public Page nextPage(String nextPageLink) { + public Page nextPage(String nextPageLink) { return listMetricDefintionsNextSinglePageAsync(nextPageLink).toBlocking().single().getBody(); } }; } /** - * List of metrics that can be queried for an App Service Plan. - * List of metrics that can be queried for an App Service Plan. + * Get metrics that can be queried for an App Service plan, and their definitions. + * Get metrics that can be queried for an App Service plan, and their definitions. * - * @param resourceGroupName Name of resource group - * @param name Name of App Service Plan + * @param resourceGroupName Name of the resource group to which the resource belongs. + * @param name Name of the App Service plan. * @param serviceCallback the async ServiceCallback to handle successful and failed responses. * @return the {@link ServiceCall} object */ - public ServiceCall> listMetricDefintionsAsync(final String resourceGroupName, final String name, final ListOperationCallback serviceCallback) { + public ServiceCall> listMetricDefintionsAsync(final String resourceGroupName, final String name, final ListOperationCallback serviceCallback) { return AzureServiceCall.create( listMetricDefintionsSinglePageAsync(resourceGroupName, name), - new Func1>>>() { + new Func1>>>() { @Override - public Observable>> call(String nextPageLink) { + public Observable>> call(String nextPageLink) { return listMetricDefintionsNextSinglePageAsync(nextPageLink); } }, @@ -1789,36 +1701,36 @@ public Observable>> call(String next } /** - * List of metrics that can be queried for an App Service Plan. - * List of metrics that can be queried for an App Service Plan. + * Get metrics that can be queried for an App Service plan, and their definitions. + * Get metrics that can be queried for an App Service plan, and their definitions. * - * @param resourceGroupName Name of resource group - * @param name Name of App Service Plan - * @return the observable to the PagedList<MetricDefinitionInner> object + * @param resourceGroupName Name of the resource group to which the resource belongs. + * @param name Name of the App Service plan. + * @return the observable to the PagedList<ResourceMetricDefinitionInner> object */ - public Observable> listMetricDefintionsAsync(final String resourceGroupName, final String name) { + public Observable> listMetricDefintionsAsync(final String resourceGroupName, final String name) { return listMetricDefintionsWithServiceResponseAsync(resourceGroupName, name) - .map(new Func1>, Page>() { + .map(new Func1>, Page>() { @Override - public Page call(ServiceResponse> response) { + public Page call(ServiceResponse> response) { return response.getBody(); } }); } /** - * List of metrics that can be queried for an App Service Plan. - * List of metrics that can be queried for an App Service Plan. + * Get metrics that can be queried for an App Service plan, and their definitions. + * Get metrics that can be queried for an App Service plan, and their definitions. * - * @param resourceGroupName Name of resource group - * @param name Name of App Service Plan - * @return the observable to the PagedList<MetricDefinitionInner> object + * @param resourceGroupName Name of the resource group to which the resource belongs. + * @param name Name of the App Service plan. + * @return the observable to the PagedList<ResourceMetricDefinitionInner> object */ - public Observable>> listMetricDefintionsWithServiceResponseAsync(final String resourceGroupName, final String name) { + public Observable>> listMetricDefintionsWithServiceResponseAsync(final String resourceGroupName, final String name) { return listMetricDefintionsSinglePageAsync(resourceGroupName, name) - .concatMap(new Func1>, Observable>>>() { + .concatMap(new Func1>, Observable>>>() { @Override - public Observable>> call(ServiceResponse> page) { + public Observable>> call(ServiceResponse> page) { String nextPageLink = page.getBody().getNextPageLink(); if (nextPageLink == null) { return Observable.just(page); @@ -1829,14 +1741,14 @@ public Observable>> call(ServiceResp } /** - * List of metrics that can be queried for an App Service Plan. - * List of metrics that can be queried for an App Service Plan. + * Get metrics that can be queried for an App Service plan, and their definitions. + * Get metrics that can be queried for an App Service plan, and their definitions. * - ServiceResponse> * @param resourceGroupName Name of resource group - ServiceResponse> * @param name Name of App Service Plan - * @return the PagedList<MetricDefinitionInner> object wrapped in {@link ServiceResponse} if successful. + ServiceResponse> * @param resourceGroupName Name of the resource group to which the resource belongs. + ServiceResponse> * @param name Name of the App Service plan. + * @return the PagedList<ResourceMetricDefinitionInner> object wrapped in {@link ServiceResponse} if successful. */ - public Observable>> listMetricDefintionsSinglePageAsync(final String resourceGroupName, final String name) { + public Observable>> listMetricDefintionsSinglePageAsync(final String resourceGroupName, final String name) { if (resourceGroupName == null) { throw new IllegalArgumentException("Parameter resourceGroupName is required and cannot be null."); } @@ -1848,12 +1760,12 @@ public Observable>> listMetricDefint } final String apiVersion = "2016-09-01"; return service.listMetricDefintions(resourceGroupName, name, this.client.subscriptionId(), apiVersion, this.client.acceptLanguage(), this.client.userAgent()) - .flatMap(new Func1, Observable>>>() { + .flatMap(new Func1, Observable>>>() { @Override - public Observable>> call(Response response) { + public Observable>> call(Response response) { try { - ServiceResponse> result = listMetricDefintionsDelegate(response); - return Observable.just(new ServiceResponse>(result.getBody(), result.getResponse())); + ServiceResponse> result = listMetricDefintionsDelegate(response); + return Observable.just(new ServiceResponse>(result.getBody(), result.getResponse())); } catch (Throwable t) { return Observable.error(t); } @@ -1861,19 +1773,19 @@ public Observable>> call(Response> listMetricDefintionsDelegate(Response response) throws CloudException, IOException, IllegalArgumentException { - return new AzureServiceResponseBuilder, CloudException>(this.client.mapperAdapter()) - .register(200, new TypeToken>() { }.getType()) + private ServiceResponse> listMetricDefintionsDelegate(Response response) throws CloudException, IOException, IllegalArgumentException { + return new AzureServiceResponseBuilder, CloudException>(this.client.mapperAdapter()) + .register(200, new TypeToken>() { }.getType()) .registerError(CloudException.class) .build(response); } /** - * Queries for App Serice Plan metrics. - * Queries for App Serice Plan metrics. + * Get metrics for an App Serice plan. + * Get metrics for an App Serice plan. * - * @param resourceGroupName Name of resource group - * @param name Name of App Service Plan + * @param resourceGroupName Name of the resource group to which the resource belongs. + * @param name Name of the App Service plan. * @return the PagedList<ResourceMetricInner> object if successful. */ public PagedList listMetrics(final String resourceGroupName, final String name) { @@ -1887,11 +1799,11 @@ public Page nextPage(String nextPageLink) { } /** - * Queries for App Serice Plan metrics. - * Queries for App Serice Plan metrics. + * Get metrics for an App Serice plan. + * Get metrics for an App Serice plan. * - * @param resourceGroupName Name of resource group - * @param name Name of App Service Plan + * @param resourceGroupName Name of the resource group to which the resource belongs. + * @param name Name of the App Service plan. * @param serviceCallback the async ServiceCallback to handle successful and failed responses. * @return the {@link ServiceCall} object */ @@ -1908,11 +1820,11 @@ public Observable>> call(String nextPa } /** - * Queries for App Serice Plan metrics. - * Queries for App Serice Plan metrics. + * Get metrics for an App Serice plan. + * Get metrics for an App Serice plan. * - * @param resourceGroupName Name of resource group - * @param name Name of App Service Plan + * @param resourceGroupName Name of the resource group to which the resource belongs. + * @param name Name of the App Service plan. * @return the observable to the PagedList<ResourceMetricInner> object */ public Observable> listMetricsAsync(final String resourceGroupName, final String name) { @@ -1926,11 +1838,11 @@ public Page call(ServiceResponse> } /** - * Queries for App Serice Plan metrics. - * Queries for App Serice Plan metrics. + * Get metrics for an App Serice plan. + * Get metrics for an App Serice plan. * - * @param resourceGroupName Name of resource group - * @param name Name of App Service Plan + * @param resourceGroupName Name of the resource group to which the resource belongs. + * @param name Name of the App Service plan. * @return the observable to the PagedList<ResourceMetricInner> object */ public Observable>> listMetricsWithServiceResponseAsync(final String resourceGroupName, final String name) { @@ -1948,11 +1860,11 @@ public Observable>> call(ServiceRespon } /** - * Queries for App Serice Plan metrics. - * Queries for App Serice Plan metrics. + * Get metrics for an App Serice plan. + * Get metrics for an App Serice plan. * - * @param resourceGroupName Name of resource group - * @param name Name of App Service Plan + * @param resourceGroupName Name of the resource group to which the resource belongs. + * @param name Name of the App Service plan. * @return the PagedList<ResourceMetricInner> object wrapped in {@link ServiceResponse} if successful. */ public Observable>> listMetricsSinglePageAsync(final String resourceGroupName, final String name) { @@ -1983,12 +1895,12 @@ public Observable>> call(Response nextPage(String nextPageLink) { } /** - * Queries for App Serice Plan metrics. - * Queries for App Serice Plan metrics. + * Get metrics for an App Serice plan. + * Get metrics for an App Serice plan. * - * @param resourceGroupName Name of resource group - * @param name Name of App Service Plan - * @param details If true, metrics are broken down per App Service Plan instance + * @param resourceGroupName Name of the resource group to which the resource belongs. + * @param name Name of the App Service plan. + * @param details Specify <code>true</code> to include instance details. The default is <code>false</code>. * @param filter Return only usages/metrics specified in the filter. Filter conforms to odata syntax. Example: $filter=(name.value eq 'Metric1' or name.value eq 'Metric2') and startTime eq '2014-01-01T00:00:00Z' and endTime eq '2014-12-31T23:59:59Z' and timeGrain eq duration'[Hour|Minute|Day]'. * @param serviceCallback the async ServiceCallback to handle successful and failed responses. * @return the {@link ServiceCall} object @@ -2026,12 +1938,12 @@ public Observable>> call(String nextPa } /** - * Queries for App Serice Plan metrics. - * Queries for App Serice Plan metrics. + * Get metrics for an App Serice plan. + * Get metrics for an App Serice plan. * - * @param resourceGroupName Name of resource group - * @param name Name of App Service Plan - * @param details If true, metrics are broken down per App Service Plan instance + * @param resourceGroupName Name of the resource group to which the resource belongs. + * @param name Name of the App Service plan. + * @param details Specify <code>true</code> to include instance details. The default is <code>false</code>. * @param filter Return only usages/metrics specified in the filter. Filter conforms to odata syntax. Example: $filter=(name.value eq 'Metric1' or name.value eq 'Metric2') and startTime eq '2014-01-01T00:00:00Z' and endTime eq '2014-12-31T23:59:59Z' and timeGrain eq duration'[Hour|Minute|Day]'. * @return the observable to the PagedList<ResourceMetricInner> object */ @@ -2046,12 +1958,12 @@ public Page call(ServiceResponse> } /** - * Queries for App Serice Plan metrics. - * Queries for App Serice Plan metrics. + * Get metrics for an App Serice plan. + * Get metrics for an App Serice plan. * - * @param resourceGroupName Name of resource group - * @param name Name of App Service Plan - * @param details If true, metrics are broken down per App Service Plan instance + * @param resourceGroupName Name of the resource group to which the resource belongs. + * @param name Name of the App Service plan. + * @param details Specify <code>true</code> to include instance details. The default is <code>false</code>. * @param filter Return only usages/metrics specified in the filter. Filter conforms to odata syntax. Example: $filter=(name.value eq 'Metric1' or name.value eq 'Metric2') and startTime eq '2014-01-01T00:00:00Z' and endTime eq '2014-12-31T23:59:59Z' and timeGrain eq duration'[Hour|Minute|Day]'. * @return the observable to the PagedList<ResourceMetricInner> object */ @@ -2070,12 +1982,12 @@ public Observable>> call(ServiceRespon } /** - * Queries for App Serice Plan metrics. - * Queries for App Serice Plan metrics. + * Get metrics for an App Serice plan. + * Get metrics for an App Serice plan. * - ServiceResponse> * @param resourceGroupName Name of resource group - ServiceResponse> * @param name Name of App Service Plan - ServiceResponse> * @param details If true, metrics are broken down per App Service Plan instance + ServiceResponse> * @param resourceGroupName Name of the resource group to which the resource belongs. + ServiceResponse> * @param name Name of the App Service plan. + ServiceResponse> * @param details Specify <code>true</code> to include instance details. The default is <code>false</code>. ServiceResponse> * @param filter Return only usages/metrics specified in the filter. Filter conforms to odata syntax. Example: $filter=(name.value eq 'Metric1' or name.value eq 'Metric2') and startTime eq '2014-01-01T00:00:00Z' and endTime eq '2014-12-31T23:59:59Z' and timeGrain eq duration'[Hour|Minute|Day]'. * @return the PagedList<ResourceMetricInner> object wrapped in {@link ServiceResponse} if successful. */ @@ -2112,145 +2024,55 @@ private ServiceResponse> listMetricsDelegate(Respo } /** - * Gets a server farm operation. - * Gets a server farm operation. - * - * @param resourceGroupName Name of resource group - * @param name Name of server farm - * @param operationId Id of Server farm operation"&gt; - * @return the AppServicePlanInner object if successful. - */ - public AppServicePlanInner getOperation(String resourceGroupName, String name, String operationId) { - return getOperationWithServiceResponseAsync(resourceGroupName, name, operationId).toBlocking().single().getBody(); - } - - /** - * Gets a server farm operation. - * Gets a server farm operation. - * - * @param resourceGroupName Name of resource group - * @param name Name of server farm - * @param operationId Id of Server farm operation"&gt; - * @param serviceCallback the async ServiceCallback to handle successful and failed responses. - * @return the {@link ServiceCall} object - */ - public ServiceCall getOperationAsync(String resourceGroupName, String name, String operationId, final ServiceCallback serviceCallback) { - return ServiceCall.create(getOperationWithServiceResponseAsync(resourceGroupName, name, operationId), serviceCallback); - } - - /** - * Gets a server farm operation. - * Gets a server farm operation. - * - * @param resourceGroupName Name of resource group - * @param name Name of server farm - * @param operationId Id of Server farm operation"&gt; - * @return the observable to the AppServicePlanInner object - */ - public Observable getOperationAsync(String resourceGroupName, String name, String operationId) { - return getOperationWithServiceResponseAsync(resourceGroupName, name, operationId).map(new Func1, AppServicePlanInner>() { - @Override - public AppServicePlanInner call(ServiceResponse response) { - return response.getBody(); - } - }); - } - - /** - * Gets a server farm operation. - * Gets a server farm operation. - * - * @param resourceGroupName Name of resource group - * @param name Name of server farm - * @param operationId Id of Server farm operation"&gt; - * @return the observable to the AppServicePlanInner object - */ - public Observable> getOperationWithServiceResponseAsync(String resourceGroupName, String name, String operationId) { - if (resourceGroupName == null) { - throw new IllegalArgumentException("Parameter resourceGroupName is required and cannot be null."); - } - if (name == null) { - throw new IllegalArgumentException("Parameter name is required and cannot be null."); - } - if (operationId == null) { - throw new IllegalArgumentException("Parameter operationId is required and cannot be null."); - } - if (this.client.subscriptionId() == null) { - throw new IllegalArgumentException("Parameter this.client.subscriptionId() is required and cannot be null."); - } - final String apiVersion = "2016-09-01"; - return service.getOperation(resourceGroupName, name, operationId, this.client.subscriptionId(), apiVersion, this.client.acceptLanguage(), this.client.userAgent()) - .flatMap(new Func1, Observable>>() { - @Override - public Observable> call(Response response) { - try { - ServiceResponse clientResponse = getOperationDelegate(response); - return Observable.just(clientResponse); - } catch (Throwable t) { - return Observable.error(t); - } - } - }); - } - - private ServiceResponse getOperationDelegate(Response response) throws CloudException, IOException, IllegalArgumentException { - return new AzureServiceResponseBuilder(this.client.mapperAdapter()) - .register(200, new TypeToken() { }.getType()) - .registerError(CloudException.class) - .build(response); - } - - /** - * Restarts web apps in a specified App Service Plan. - * Restarts web apps in a specified App Service Plan. + * Restart all apps in an App Service plan. + * Restart all apps in an App Service plan. * - * @param resourceGroupName Name of resource group - * @param name Name of App Service Plan - * @return the Object object if successful. + * @param resourceGroupName Name of the resource group to which the resource belongs. + * @param name Name of the App Service plan. */ - public Object restartWebApps(String resourceGroupName, String name) { - return restartWebAppsWithServiceResponseAsync(resourceGroupName, name).toBlocking().single().getBody(); + public void restartWebApps(String resourceGroupName, String name) { + restartWebAppsWithServiceResponseAsync(resourceGroupName, name).toBlocking().single().getBody(); } /** - * Restarts web apps in a specified App Service Plan. - * Restarts web apps in a specified App Service Plan. + * Restart all apps in an App Service plan. + * Restart all apps in an App Service plan. * - * @param resourceGroupName Name of resource group - * @param name Name of App Service Plan + * @param resourceGroupName Name of the resource group to which the resource belongs. + * @param name Name of the App Service plan. * @param serviceCallback the async ServiceCallback to handle successful and failed responses. * @return the {@link ServiceCall} object */ - public ServiceCall restartWebAppsAsync(String resourceGroupName, String name, final ServiceCallback serviceCallback) { + public ServiceCall restartWebAppsAsync(String resourceGroupName, String name, final ServiceCallback serviceCallback) { return ServiceCall.create(restartWebAppsWithServiceResponseAsync(resourceGroupName, name), serviceCallback); } /** - * Restarts web apps in a specified App Service Plan. - * Restarts web apps in a specified App Service Plan. + * Restart all apps in an App Service plan. + * Restart all apps in an App Service plan. * - * @param resourceGroupName Name of resource group - * @param name Name of App Service Plan - * @return the observable to the Object object + * @param resourceGroupName Name of the resource group to which the resource belongs. + * @param name Name of the App Service plan. + * @return the {@link ServiceResponse} object if successful. */ - public Observable restartWebAppsAsync(String resourceGroupName, String name) { - return restartWebAppsWithServiceResponseAsync(resourceGroupName, name).map(new Func1, Object>() { + public Observable restartWebAppsAsync(String resourceGroupName, String name) { + return restartWebAppsWithServiceResponseAsync(resourceGroupName, name).map(new Func1, Void>() { @Override - public Object call(ServiceResponse response) { + public Void call(ServiceResponse response) { return response.getBody(); } }); } /** - * Restarts web apps in a specified App Service Plan. - * Restarts web apps in a specified App Service Plan. + * Restart all apps in an App Service plan. + * Restart all apps in an App Service plan. * - * @param resourceGroupName Name of resource group - * @param name Name of App Service Plan - * @return the observable to the Object object + * @param resourceGroupName Name of the resource group to which the resource belongs. + * @param name Name of the App Service plan. + * @return the {@link ServiceResponse} object if successful. */ - public Observable> restartWebAppsWithServiceResponseAsync(String resourceGroupName, String name) { + public Observable> restartWebAppsWithServiceResponseAsync(String resourceGroupName, String name) { if (resourceGroupName == null) { throw new IllegalArgumentException("Parameter resourceGroupName is required and cannot be null."); } @@ -2263,11 +2085,11 @@ public Observable> restartWebAppsWithServiceResponseAsyn final String apiVersion = "2016-09-01"; final Boolean softRestart = null; return service.restartWebApps(resourceGroupName, name, this.client.subscriptionId(), softRestart, apiVersion, this.client.acceptLanguage(), this.client.userAgent()) - .flatMap(new Func1, Observable>>() { + .flatMap(new Func1, Observable>>() { @Override - public Observable> call(Response response) { + public Observable> call(Response response) { try { - ServiceResponse clientResponse = restartWebAppsDelegate(response); + ServiceResponse clientResponse = restartWebAppsDelegate(response); return Observable.just(clientResponse); } catch (Throwable t) { return Observable.error(t); @@ -2277,60 +2099,59 @@ public Observable> call(Response response) } /** - * Restarts web apps in a specified App Service Plan. - * Restarts web apps in a specified App Service Plan. + * Restart all apps in an App Service plan. + * Restart all apps in an App Service plan. * - * @param resourceGroupName Name of resource group - * @param name Name of App Service Plan - * @param softRestart Soft restart applies the configuration settings and restarts the apps if necessary. Hard restart always restarts and reprovisions the apps - * @return the Object object if successful. + * @param resourceGroupName Name of the resource group to which the resource belongs. + * @param name Name of the App Service plan. + * @param softRestart Specify <code>true</code> to performa a soft restart, applies the configuration settings and restarts the apps if necessary. The default is <code>false</code>, which always restarts and reprovisions the apps */ - public Object restartWebApps(String resourceGroupName, String name, Boolean softRestart) { - return restartWebAppsWithServiceResponseAsync(resourceGroupName, name, softRestart).toBlocking().single().getBody(); + public void restartWebApps(String resourceGroupName, String name, Boolean softRestart) { + restartWebAppsWithServiceResponseAsync(resourceGroupName, name, softRestart).toBlocking().single().getBody(); } /** - * Restarts web apps in a specified App Service Plan. - * Restarts web apps in a specified App Service Plan. + * Restart all apps in an App Service plan. + * Restart all apps in an App Service plan. * - * @param resourceGroupName Name of resource group - * @param name Name of App Service Plan - * @param softRestart Soft restart applies the configuration settings and restarts the apps if necessary. Hard restart always restarts and reprovisions the apps + * @param resourceGroupName Name of the resource group to which the resource belongs. + * @param name Name of the App Service plan. + * @param softRestart Specify <code>true</code> to performa a soft restart, applies the configuration settings and restarts the apps if necessary. The default is <code>false</code>, which always restarts and reprovisions the apps * @param serviceCallback the async ServiceCallback to handle successful and failed responses. * @return the {@link ServiceCall} object */ - public ServiceCall restartWebAppsAsync(String resourceGroupName, String name, Boolean softRestart, final ServiceCallback serviceCallback) { + public ServiceCall restartWebAppsAsync(String resourceGroupName, String name, Boolean softRestart, final ServiceCallback serviceCallback) { return ServiceCall.create(restartWebAppsWithServiceResponseAsync(resourceGroupName, name, softRestart), serviceCallback); } /** - * Restarts web apps in a specified App Service Plan. - * Restarts web apps in a specified App Service Plan. + * Restart all apps in an App Service plan. + * Restart all apps in an App Service plan. * - * @param resourceGroupName Name of resource group - * @param name Name of App Service Plan - * @param softRestart Soft restart applies the configuration settings and restarts the apps if necessary. Hard restart always restarts and reprovisions the apps - * @return the observable to the Object object + * @param resourceGroupName Name of the resource group to which the resource belongs. + * @param name Name of the App Service plan. + * @param softRestart Specify <code>true</code> to performa a soft restart, applies the configuration settings and restarts the apps if necessary. The default is <code>false</code>, which always restarts and reprovisions the apps + * @return the {@link ServiceResponse} object if successful. */ - public Observable restartWebAppsAsync(String resourceGroupName, String name, Boolean softRestart) { - return restartWebAppsWithServiceResponseAsync(resourceGroupName, name, softRestart).map(new Func1, Object>() { + public Observable restartWebAppsAsync(String resourceGroupName, String name, Boolean softRestart) { + return restartWebAppsWithServiceResponseAsync(resourceGroupName, name, softRestart).map(new Func1, Void>() { @Override - public Object call(ServiceResponse response) { + public Void call(ServiceResponse response) { return response.getBody(); } }); } /** - * Restarts web apps in a specified App Service Plan. - * Restarts web apps in a specified App Service Plan. + * Restart all apps in an App Service plan. + * Restart all apps in an App Service plan. * - * @param resourceGroupName Name of resource group - * @param name Name of App Service Plan - * @param softRestart Soft restart applies the configuration settings and restarts the apps if necessary. Hard restart always restarts and reprovisions the apps - * @return the observable to the Object object + * @param resourceGroupName Name of the resource group to which the resource belongs. + * @param name Name of the App Service plan. + * @param softRestart Specify <code>true</code> to performa a soft restart, applies the configuration settings and restarts the apps if necessary. The default is <code>false</code>, which always restarts and reprovisions the apps + * @return the {@link ServiceResponse} object if successful. */ - public Observable> restartWebAppsWithServiceResponseAsync(String resourceGroupName, String name, Boolean softRestart) { + public Observable> restartWebAppsWithServiceResponseAsync(String resourceGroupName, String name, Boolean softRestart) { if (resourceGroupName == null) { throw new IllegalArgumentException("Parameter resourceGroupName is required and cannot be null."); } @@ -2342,11 +2163,11 @@ public Observable> restartWebAppsWithServiceResponseAsyn } final String apiVersion = "2016-09-01"; return service.restartWebApps(resourceGroupName, name, this.client.subscriptionId(), softRestart, apiVersion, this.client.acceptLanguage(), this.client.userAgent()) - .flatMap(new Func1, Observable>>() { + .flatMap(new Func1, Observable>>() { @Override - public Observable> call(Response response) { + public Observable> call(Response response) { try { - ServiceResponse clientResponse = restartWebAppsDelegate(response); + ServiceResponse clientResponse = restartWebAppsDelegate(response); return Observable.just(clientResponse); } catch (Throwable t) { return Observable.error(t); @@ -2355,19 +2176,18 @@ public Observable> call(Response response) }); } - private ServiceResponse restartWebAppsDelegate(Response response) throws CloudException, IOException, IllegalArgumentException { - return new AzureServiceResponseBuilder(this.client.mapperAdapter()) - .register(200, new TypeToken() { }.getType()) - .registerError(CloudException.class) + private ServiceResponse restartWebAppsDelegate(Response response) throws CloudException, IOException, IllegalArgumentException { + return new AzureServiceResponseBuilder(this.client.mapperAdapter()) + .register(204, new TypeToken() { }.getType()) .build(response); } /** - * Gets list of Apps associated with an App Service Plan. - * Gets list of Apps associated with an App Service Plan. + * Get all apps associated with an App Service plan. + * Get all apps associated with an App Service plan. * - * @param resourceGroupName Name of resource group - * @param name Name of App Service Plan + * @param resourceGroupName Name of the resource group to which the resource belongs. + * @param name Name of the App Service plan. * @return the PagedList<SiteInner> object if successful. */ public PagedList listWebApps(final String resourceGroupName, final String name) { @@ -2381,11 +2201,11 @@ public Page nextPage(String nextPageLink) { } /** - * Gets list of Apps associated with an App Service Plan. - * Gets list of Apps associated with an App Service Plan. + * Get all apps associated with an App Service plan. + * Get all apps associated with an App Service plan. * - * @param resourceGroupName Name of resource group - * @param name Name of App Service Plan + * @param resourceGroupName Name of the resource group to which the resource belongs. + * @param name Name of the App Service plan. * @param serviceCallback the async ServiceCallback to handle successful and failed responses. * @return the {@link ServiceCall} object */ @@ -2402,11 +2222,11 @@ public Observable>> call(String nextPageLink) { } /** - * Gets list of Apps associated with an App Service Plan. - * Gets list of Apps associated with an App Service Plan. + * Get all apps associated with an App Service plan. + * Get all apps associated with an App Service plan. * - * @param resourceGroupName Name of resource group - * @param name Name of App Service Plan + * @param resourceGroupName Name of the resource group to which the resource belongs. + * @param name Name of the App Service plan. * @return the observable to the PagedList<SiteInner> object */ public Observable> listWebAppsAsync(final String resourceGroupName, final String name) { @@ -2420,11 +2240,11 @@ public Page call(ServiceResponse> response) { } /** - * Gets list of Apps associated with an App Service Plan. - * Gets list of Apps associated with an App Service Plan. + * Get all apps associated with an App Service plan. + * Get all apps associated with an App Service plan. * - * @param resourceGroupName Name of resource group - * @param name Name of App Service Plan + * @param resourceGroupName Name of the resource group to which the resource belongs. + * @param name Name of the App Service plan. * @return the observable to the PagedList<SiteInner> object */ public Observable>> listWebAppsWithServiceResponseAsync(final String resourceGroupName, final String name) { @@ -2442,11 +2262,11 @@ public Observable>> call(ServiceResponse>> listWebAppsSinglePageAsync(final String resourceGroupName, final String name) { @@ -2478,12 +2298,12 @@ public Observable>> call(Response } /** - * Gets list of Apps associated with an App Service Plan. - * Gets list of Apps associated with an App Service Plan. + * Get all apps associated with an App Service plan. + * Get all apps associated with an App Service plan. * - * @param resourceGroupName Name of resource group - * @param name Name of App Service Plan - * @param skipToken Skip to of web apps in a list. If specified, the resulting list will contain web apps starting from (including) the skipToken. Else, the resulting list contains web apps from the start of the list + * @param resourceGroupName Name of the resource group to which the resource belongs. + * @param name Name of the App Service plan. + * @param skipToken Skip to a web app in the list of webapps associated with app service plan. If specified, the resulting list will contain web apps starting from (including) the skipToken. Otherwise, the resulting list contains web apps from the start of the list * @param filter Supported filter: $filter=state eq running. Returns only web apps that are currently running * @param top List page size. If specified, results are paged. * @return the PagedList<SiteInner> object if successful. @@ -2499,12 +2319,12 @@ public Page nextPage(String nextPageLink) { } /** - * Gets list of Apps associated with an App Service Plan. - * Gets list of Apps associated with an App Service Plan. + * Get all apps associated with an App Service plan. + * Get all apps associated with an App Service plan. * - * @param resourceGroupName Name of resource group - * @param name Name of App Service Plan - * @param skipToken Skip to of web apps in a list. If specified, the resulting list will contain web apps starting from (including) the skipToken. Else, the resulting list contains web apps from the start of the list + * @param resourceGroupName Name of the resource group to which the resource belongs. + * @param name Name of the App Service plan. + * @param skipToken Skip to a web app in the list of webapps associated with app service plan. If specified, the resulting list will contain web apps starting from (including) the skipToken. Otherwise, the resulting list contains web apps from the start of the list * @param filter Supported filter: $filter=state eq running. Returns only web apps that are currently running * @param top List page size. If specified, results are paged. * @param serviceCallback the async ServiceCallback to handle successful and failed responses. @@ -2523,12 +2343,12 @@ public Observable>> call(String nextPageLink) { } /** - * Gets list of Apps associated with an App Service Plan. - * Gets list of Apps associated with an App Service Plan. + * Get all apps associated with an App Service plan. + * Get all apps associated with an App Service plan. * - * @param resourceGroupName Name of resource group - * @param name Name of App Service Plan - * @param skipToken Skip to of web apps in a list. If specified, the resulting list will contain web apps starting from (including) the skipToken. Else, the resulting list contains web apps from the start of the list + * @param resourceGroupName Name of the resource group to which the resource belongs. + * @param name Name of the App Service plan. + * @param skipToken Skip to a web app in the list of webapps associated with app service plan. If specified, the resulting list will contain web apps starting from (including) the skipToken. Otherwise, the resulting list contains web apps from the start of the list * @param filter Supported filter: $filter=state eq running. Returns only web apps that are currently running * @param top List page size. If specified, results are paged. * @return the observable to the PagedList<SiteInner> object @@ -2544,12 +2364,12 @@ public Page call(ServiceResponse> response) { } /** - * Gets list of Apps associated with an App Service Plan. - * Gets list of Apps associated with an App Service Plan. + * Get all apps associated with an App Service plan. + * Get all apps associated with an App Service plan. * - * @param resourceGroupName Name of resource group - * @param name Name of App Service Plan - * @param skipToken Skip to of web apps in a list. If specified, the resulting list will contain web apps starting from (including) the skipToken. Else, the resulting list contains web apps from the start of the list + * @param resourceGroupName Name of the resource group to which the resource belongs. + * @param name Name of the App Service plan. + * @param skipToken Skip to a web app in the list of webapps associated with app service plan. If specified, the resulting list will contain web apps starting from (including) the skipToken. Otherwise, the resulting list contains web apps from the start of the list * @param filter Supported filter: $filter=state eq running. Returns only web apps that are currently running * @param top List page size. If specified, results are paged. * @return the observable to the PagedList<SiteInner> object @@ -2569,12 +2389,12 @@ public Observable>> call(ServiceResponse> * @param resourceGroupName Name of resource group - ServiceResponse> * @param name Name of App Service Plan - ServiceResponse> * @param skipToken Skip to of web apps in a list. If specified, the resulting list will contain web apps starting from (including) the skipToken. Else, the resulting list contains web apps from the start of the list + ServiceResponse> * @param resourceGroupName Name of the resource group to which the resource belongs. + ServiceResponse> * @param name Name of the App Service plan. + ServiceResponse> * @param skipToken Skip to a web app in the list of webapps associated with app service plan. If specified, the resulting list will contain web apps starting from (including) the skipToken. Otherwise, the resulting list contains web apps from the start of the list ServiceResponse> * @param filter Supported filter: $filter=state eq running. Returns only web apps that are currently running ServiceResponse> * @param top List page size. If specified, results are paged. * @return the PagedList<SiteInner> object wrapped in {@link ServiceResponse} if successful. @@ -2612,11 +2432,11 @@ private ServiceResponse> listWebAppsDelegate(Response listVnets(String resourceGroupName, String name) { @@ -2624,11 +2444,11 @@ public List listVnets(String resourceGroupName, String name) { } /** - * Gets list of vnets associated with App Service Plan. - * Gets list of vnets associated with App Service Plan. + * Get all Virtual Networks associated with an App Service plan. + * Get all Virtual Networks associated with an App Service plan. * - * @param resourceGroupName Name of resource group - * @param name Name of App Service Plan + * @param resourceGroupName Name of the resource group to which the resource belongs. + * @param name Name of the App Service plan. * @param serviceCallback the async ServiceCallback to handle successful and failed responses. * @return the {@link ServiceCall} object */ @@ -2637,11 +2457,11 @@ public ServiceCall> listVnetsAsync(String resourceGroupName, } /** - * Gets list of vnets associated with App Service Plan. - * Gets list of vnets associated with App Service Plan. + * Get all Virtual Networks associated with an App Service plan. + * Get all Virtual Networks associated with an App Service plan. * - * @param resourceGroupName Name of resource group - * @param name Name of App Service Plan + * @param resourceGroupName Name of the resource group to which the resource belongs. + * @param name Name of the App Service plan. * @return the observable to the List<VnetInfoInner> object */ public Observable> listVnetsAsync(String resourceGroupName, String name) { @@ -2654,11 +2474,11 @@ public List call(ServiceResponse> response) { } /** - * Gets list of vnets associated with App Service Plan. - * Gets list of vnets associated with App Service Plan. + * Get all Virtual Networks associated with an App Service plan. + * Get all Virtual Networks associated with an App Service plan. * - * @param resourceGroupName Name of resource group - * @param name Name of App Service Plan + * @param resourceGroupName Name of the resource group to which the resource belongs. + * @param name Name of the App Service plan. * @return the observable to the List<VnetInfoInner> object */ public Observable>> listVnetsWithServiceResponseAsync(String resourceGroupName, String name) { @@ -2694,12 +2514,12 @@ private ServiceResponse> listVnetsDelegate(Response getVnetFromServerFarmAsync(String resourceGrou } /** - * Gets a vnet associated with an App Service Plan. - * Gets a vnet associated with an App Service Plan. + * Get a Virtual Network associated with an App Service plan. + * Get a Virtual Network associated with an App Service plan. * - * @param resourceGroupName Name of resource group - * @param name Name of App Service Plan - * @param vnetName Name of virtual network + * @param resourceGroupName Name of the resource group to which the resource belongs. + * @param name Name of the App Service plan. + * @param vnetName Name of the Virtual Network. * @return the observable to the VnetInfoInner object */ public Observable getVnetFromServerFarmAsync(String resourceGroupName, String name, String vnetName) { @@ -2739,12 +2559,12 @@ public VnetInfoInner call(ServiceResponse response) { } /** - * Gets a vnet associated with an App Service Plan. - * Gets a vnet associated with an App Service Plan. + * Get a Virtual Network associated with an App Service plan. + * Get a Virtual Network associated with an App Service plan. * - * @param resourceGroupName Name of resource group - * @param name Name of App Service Plan - * @param vnetName Name of virtual network + * @param resourceGroupName Name of the resource group to which the resource belongs. + * @param name Name of the App Service plan. + * @param vnetName Name of the Virtual Network. * @return the observable to the VnetInfoInner object */ public Observable> getVnetFromServerFarmWithServiceResponseAsync(String resourceGroupName, String name, String vnetName) { @@ -2784,12 +2604,12 @@ private ServiceResponse getVnetFromServerFarmDelegate(Response getVnetGatewayAsync(String resourceGroupNam } /** - * Gets the vnet gateway. - * Gets the vnet gateway. + * Get a Virtual Network gateway. + * Get a Virtual Network gateway. * - * @param resourceGroupName Name of resource group - * @param name Name of the App Service Plan - * @param vnetName Name of the virtual network + * @param resourceGroupName Name of the resource group to which the resource belongs. + * @param name Name of the App Service plan. + * @param vnetName Name of the Virtual Network. * @param gatewayName Name of the gateway. Only the 'primary' gateway is supported. * @return the observable to the VnetGatewayInner object */ @@ -2832,12 +2652,12 @@ public VnetGatewayInner call(ServiceResponse response) { } /** - * Gets the vnet gateway. - * Gets the vnet gateway. + * Get a Virtual Network gateway. + * Get a Virtual Network gateway. * - * @param resourceGroupName Name of resource group - * @param name Name of the App Service Plan - * @param vnetName Name of the virtual network + * @param resourceGroupName Name of the resource group to which the resource belongs. + * @param name Name of the App Service plan. + * @param vnetName Name of the Virtual Network. * @param gatewayName Name of the gateway. Only the 'primary' gateway is supported. * @return the observable to the VnetGatewayInner object */ @@ -2880,14 +2700,14 @@ private ServiceResponse getVnetGatewayDelegate(Response updateVnetGatewayAsync(String resourceGroup } /** - * Updates the vnet gateway. - * Updates the vnet gateway. + * Update a Virtual Network gateway. + * Update a Virtual Network gateway. * - * @param resourceGroupName The resource group - * @param name The name of the App Service Plan - * @param vnetName The name of the virtual network - * @param gatewayName The name of the gateway. Only 'primary' is supported. - * @param connectionEnvelope The gateway entity. + * @param resourceGroupName Name of the resource group to which the resource belongs. + * @param name Name of the App Service plan. + * @param vnetName Name of the Virtual Network. + * @param gatewayName Name of the gateway. Only the 'primary' gateway is supported. + * @param connectionEnvelope Definition of the gateway. * @return the observable to the VnetGatewayInner object */ public Observable updateVnetGatewayAsync(String resourceGroupName, String name, String vnetName, String gatewayName, VnetGatewayInner connectionEnvelope) { @@ -2931,14 +2751,14 @@ public VnetGatewayInner call(ServiceResponse response) { } /** - * Updates the vnet gateway. - * Updates the vnet gateway. + * Update a Virtual Network gateway. + * Update a Virtual Network gateway. * - * @param resourceGroupName The resource group - * @param name The name of the App Service Plan - * @param vnetName The name of the virtual network - * @param gatewayName The name of the gateway. Only 'primary' is supported. - * @param connectionEnvelope The gateway entity. + * @param resourceGroupName Name of the resource group to which the resource belongs. + * @param name Name of the App Service plan. + * @param vnetName Name of the Virtual Network. + * @param gatewayName Name of the gateway. Only the 'primary' gateway is supported. + * @param connectionEnvelope Definition of the gateway. * @return the observable to the VnetGatewayInner object */ public Observable> updateVnetGatewayWithServiceResponseAsync(String resourceGroupName, String name, String vnetName, String gatewayName, VnetGatewayInner connectionEnvelope) { @@ -2984,43 +2804,43 @@ private ServiceResponse updateVnetGatewayDelegate(Response listtRoutesForVnet(String resourceGroupName, String name, String vnetName) { - return listtRoutesForVnetWithServiceResponseAsync(resourceGroupName, name, vnetName).toBlocking().single().getBody(); + public List listRoutesForVnet(String resourceGroupName, String name, String vnetName) { + return listRoutesForVnetWithServiceResponseAsync(resourceGroupName, name, vnetName).toBlocking().single().getBody(); } /** - * Gets a list of all routes associated with a vnet, in an app service plan. - * Gets a list of all routes associated with a vnet, in an app service plan. + * Get all routes that are associated with a Virtual Network in an App Service plan. + * Get all routes that are associated with a Virtual Network in an App Service plan. * - * @param resourceGroupName Name of resource group - * @param name Name of App Service Plan - * @param vnetName Name of virtual network + * @param resourceGroupName Name of the resource group to which the resource belongs. + * @param name Name of the App Service plan. + * @param vnetName Name of the Virtual Network. * @param serviceCallback the async ServiceCallback to handle successful and failed responses. * @return the {@link ServiceCall} object */ - public ServiceCall> listtRoutesForVnetAsync(String resourceGroupName, String name, String vnetName, final ServiceCallback> serviceCallback) { - return ServiceCall.create(listtRoutesForVnetWithServiceResponseAsync(resourceGroupName, name, vnetName), serviceCallback); + public ServiceCall> listRoutesForVnetAsync(String resourceGroupName, String name, String vnetName, final ServiceCallback> serviceCallback) { + return ServiceCall.create(listRoutesForVnetWithServiceResponseAsync(resourceGroupName, name, vnetName), serviceCallback); } /** - * Gets a list of all routes associated with a vnet, in an app service plan. - * Gets a list of all routes associated with a vnet, in an app service plan. + * Get all routes that are associated with a Virtual Network in an App Service plan. + * Get all routes that are associated with a Virtual Network in an App Service plan. * - * @param resourceGroupName Name of resource group - * @param name Name of App Service Plan - * @param vnetName Name of virtual network + * @param resourceGroupName Name of the resource group to which the resource belongs. + * @param name Name of the App Service plan. + * @param vnetName Name of the Virtual Network. * @return the observable to the List<VnetRouteInner> object */ - public Observable> listtRoutesForVnetAsync(String resourceGroupName, String name, String vnetName) { - return listtRoutesForVnetWithServiceResponseAsync(resourceGroupName, name, vnetName).map(new Func1>, List>() { + public Observable> listRoutesForVnetAsync(String resourceGroupName, String name, String vnetName) { + return listRoutesForVnetWithServiceResponseAsync(resourceGroupName, name, vnetName).map(new Func1>, List>() { @Override public List call(ServiceResponse> response) { return response.getBody(); @@ -3029,15 +2849,15 @@ public List call(ServiceResponse> response) } /** - * Gets a list of all routes associated with a vnet, in an app service plan. - * Gets a list of all routes associated with a vnet, in an app service plan. + * Get all routes that are associated with a Virtual Network in an App Service plan. + * Get all routes that are associated with a Virtual Network in an App Service plan. * - * @param resourceGroupName Name of resource group - * @param name Name of App Service Plan - * @param vnetName Name of virtual network + * @param resourceGroupName Name of the resource group to which the resource belongs. + * @param name Name of the App Service plan. + * @param vnetName Name of the Virtual Network. * @return the observable to the List<VnetRouteInner> object */ - public Observable>> listtRoutesForVnetWithServiceResponseAsync(String resourceGroupName, String name, String vnetName) { + public Observable>> listRoutesForVnetWithServiceResponseAsync(String resourceGroupName, String name, String vnetName) { if (resourceGroupName == null) { throw new IllegalArgumentException("Parameter resourceGroupName is required and cannot be null."); } @@ -3051,12 +2871,12 @@ public Observable>> listtRoutesForVnetWithS throw new IllegalArgumentException("Parameter this.client.subscriptionId() is required and cannot be null."); } final String apiVersion = "2016-09-01"; - return service.listtRoutesForVnet(resourceGroupName, name, vnetName, this.client.subscriptionId(), apiVersion, this.client.acceptLanguage(), this.client.userAgent()) + return service.listRoutesForVnet(resourceGroupName, name, vnetName, this.client.subscriptionId(), apiVersion, this.client.acceptLanguage(), this.client.userAgent()) .flatMap(new Func1, Observable>>>() { @Override public Observable>> call(Response response) { try { - ServiceResponse> clientResponse = listtRoutesForVnetDelegate(response); + ServiceResponse> clientResponse = listRoutesForVnetDelegate(response); return Observable.just(clientResponse); } catch (Throwable t) { return Observable.error(t); @@ -3065,7 +2885,7 @@ public Observable>> call(Response> listtRoutesForVnetDelegate(Response response) throws CloudException, IOException, IllegalArgumentException { + private ServiceResponse> listRoutesForVnetDelegate(Response response) throws CloudException, IOException, IllegalArgumentException { return new AzureServiceResponseBuilder, CloudException>(this.client.mapperAdapter()) .register(200, new TypeToken>() { }.getType()) .registerError(CloudException.class) @@ -3073,13 +2893,13 @@ private ServiceResponse> listtRoutesForVnetDelegate(Respons } /** - * Gets a specific route associated with a vnet, in an app service plan. - * Gets a specific route associated with a vnet, in an app service plan. + * Get a Virtual Network route in an App Service plan. + * Get a Virtual Network route in an App Service plan. * - * @param resourceGroupName Name of resource group - * @param name Name of App Service Plan - * @param vnetName Name of virtual network - * @param routeName Name of the virtual network route + * @param resourceGroupName Name of the resource group to which the resource belongs. + * @param name Name of the App Service plan. + * @param vnetName Name of the Virtual Network. + * @param routeName Name of the Virtual Network route. * @return the List<VnetRouteInner> object if successful. */ public List getRouteForVnet(String resourceGroupName, String name, String vnetName, String routeName) { @@ -3087,13 +2907,13 @@ public List getRouteForVnet(String resourceGroupName, String nam } /** - * Gets a specific route associated with a vnet, in an app service plan. - * Gets a specific route associated with a vnet, in an app service plan. + * Get a Virtual Network route in an App Service plan. + * Get a Virtual Network route in an App Service plan. * - * @param resourceGroupName Name of resource group - * @param name Name of App Service Plan - * @param vnetName Name of virtual network - * @param routeName Name of the virtual network route + * @param resourceGroupName Name of the resource group to which the resource belongs. + * @param name Name of the App Service plan. + * @param vnetName Name of the Virtual Network. + * @param routeName Name of the Virtual Network route. * @param serviceCallback the async ServiceCallback to handle successful and failed responses. * @return the {@link ServiceCall} object */ @@ -3102,13 +2922,13 @@ public ServiceCall> getRouteForVnetAsync(String resourceGro } /** - * Gets a specific route associated with a vnet, in an app service plan. - * Gets a specific route associated with a vnet, in an app service plan. + * Get a Virtual Network route in an App Service plan. + * Get a Virtual Network route in an App Service plan. * - * @param resourceGroupName Name of resource group - * @param name Name of App Service Plan - * @param vnetName Name of virtual network - * @param routeName Name of the virtual network route + * @param resourceGroupName Name of the resource group to which the resource belongs. + * @param name Name of the App Service plan. + * @param vnetName Name of the Virtual Network. + * @param routeName Name of the Virtual Network route. * @return the observable to the List<VnetRouteInner> object */ public Observable> getRouteForVnetAsync(String resourceGroupName, String name, String vnetName, String routeName) { @@ -3121,13 +2941,13 @@ public List call(ServiceResponse> response) } /** - * Gets a specific route associated with a vnet, in an app service plan. - * Gets a specific route associated with a vnet, in an app service plan. + * Get a Virtual Network route in an App Service plan. + * Get a Virtual Network route in an App Service plan. * - * @param resourceGroupName Name of resource group - * @param name Name of App Service Plan - * @param vnetName Name of virtual network - * @param routeName Name of the virtual network route + * @param resourceGroupName Name of the resource group to which the resource belongs. + * @param name Name of the App Service plan. + * @param vnetName Name of the Virtual Network. + * @param routeName Name of the Virtual Network route. * @return the observable to the List<VnetRouteInner> object */ public Observable>> getRouteForVnetWithServiceResponseAsync(String resourceGroupName, String name, String vnetName, String routeName) { @@ -3170,14 +2990,14 @@ private ServiceResponse> getRouteForVnetDelegate(Response createOrUpdateVnetRouteAsync(String resourceG } /** - * Creates a new route or updates an existing route for a vnet in an app service plan. - * Creates a new route or updates an existing route for a vnet in an app service plan. + * Create or update a Virtual Network route in an App Service plan. + * Create or update a Virtual Network route in an App Service plan. * - * @param resourceGroupName Name of resource group - * @param name Name of App Service Plan - * @param vnetName Name of virtual network - * @param routeName Name of the virtual network route - * @param route The route object + * @param resourceGroupName Name of the resource group to which the resource belongs. + * @param name Name of the App Service plan. + * @param vnetName Name of the Virtual Network. + * @param routeName Name of the Virtual Network route. + * @param route Definition of the Virtual Network route. * @return the observable to the VnetRouteInner object */ public Observable createOrUpdateVnetRouteAsync(String resourceGroupName, String name, String vnetName, String routeName, VnetRouteInner route) { @@ -3221,14 +3041,14 @@ public VnetRouteInner call(ServiceResponse response) { } /** - * Creates a new route or updates an existing route for a vnet in an app service plan. - * Creates a new route or updates an existing route for a vnet in an app service plan. + * Create or update a Virtual Network route in an App Service plan. + * Create or update a Virtual Network route in an App Service plan. * - * @param resourceGroupName Name of resource group - * @param name Name of App Service Plan - * @param vnetName Name of virtual network - * @param routeName Name of the virtual network route - * @param route The route object + * @param resourceGroupName Name of the resource group to which the resource belongs. + * @param name Name of the App Service plan. + * @param vnetName Name of the Virtual Network. + * @param routeName Name of the Virtual Network route. + * @param route Definition of the Virtual Network route. * @return the observable to the VnetRouteInner object */ public Observable> createOrUpdateVnetRouteWithServiceResponseAsync(String resourceGroupName, String name, String vnetName, String routeName, VnetRouteInner route) { @@ -3276,64 +3096,63 @@ private ServiceResponse createOrUpdateVnetRouteDelegate(Response } /** - * Deletes an existing route for a vnet in an app service plan. - * Deletes an existing route for a vnet in an app service plan. + * Delete a Virtual Network route in an App Service plan. + * Delete a Virtual Network route in an App Service plan. * - * @param resourceGroupName Name of resource group - * @param name Name of App Service Plan - * @param vnetName Name of virtual network - * @param routeName Name of the virtual network route - * @return the Object object if successful. + * @param resourceGroupName Name of the resource group to which the resource belongs. + * @param name Name of the App Service plan. + * @param vnetName Name of the Virtual Network. + * @param routeName Name of the Virtual Network route. */ - public Object deleteVnetRoute(String resourceGroupName, String name, String vnetName, String routeName) { - return deleteVnetRouteWithServiceResponseAsync(resourceGroupName, name, vnetName, routeName).toBlocking().single().getBody(); + public void deleteVnetRoute(String resourceGroupName, String name, String vnetName, String routeName) { + deleteVnetRouteWithServiceResponseAsync(resourceGroupName, name, vnetName, routeName).toBlocking().single().getBody(); } /** - * Deletes an existing route for a vnet in an app service plan. - * Deletes an existing route for a vnet in an app service plan. + * Delete a Virtual Network route in an App Service plan. + * Delete a Virtual Network route in an App Service plan. * - * @param resourceGroupName Name of resource group - * @param name Name of App Service Plan - * @param vnetName Name of virtual network - * @param routeName Name of the virtual network route + * @param resourceGroupName Name of the resource group to which the resource belongs. + * @param name Name of the App Service plan. + * @param vnetName Name of the Virtual Network. + * @param routeName Name of the Virtual Network route. * @param serviceCallback the async ServiceCallback to handle successful and failed responses. * @return the {@link ServiceCall} object */ - public ServiceCall deleteVnetRouteAsync(String resourceGroupName, String name, String vnetName, String routeName, final ServiceCallback serviceCallback) { + public ServiceCall deleteVnetRouteAsync(String resourceGroupName, String name, String vnetName, String routeName, final ServiceCallback serviceCallback) { return ServiceCall.create(deleteVnetRouteWithServiceResponseAsync(resourceGroupName, name, vnetName, routeName), serviceCallback); } /** - * Deletes an existing route for a vnet in an app service plan. - * Deletes an existing route for a vnet in an app service plan. + * Delete a Virtual Network route in an App Service plan. + * Delete a Virtual Network route in an App Service plan. * - * @param resourceGroupName Name of resource group - * @param name Name of App Service Plan - * @param vnetName Name of virtual network - * @param routeName Name of the virtual network route - * @return the observable to the Object object + * @param resourceGroupName Name of the resource group to which the resource belongs. + * @param name Name of the App Service plan. + * @param vnetName Name of the Virtual Network. + * @param routeName Name of the Virtual Network route. + * @return the {@link ServiceResponse} object if successful. */ - public Observable deleteVnetRouteAsync(String resourceGroupName, String name, String vnetName, String routeName) { - return deleteVnetRouteWithServiceResponseAsync(resourceGroupName, name, vnetName, routeName).map(new Func1, Object>() { + public Observable deleteVnetRouteAsync(String resourceGroupName, String name, String vnetName, String routeName) { + return deleteVnetRouteWithServiceResponseAsync(resourceGroupName, name, vnetName, routeName).map(new Func1, Void>() { @Override - public Object call(ServiceResponse response) { + public Void call(ServiceResponse response) { return response.getBody(); } }); } /** - * Deletes an existing route for a vnet in an app service plan. - * Deletes an existing route for a vnet in an app service plan. + * Delete a Virtual Network route in an App Service plan. + * Delete a Virtual Network route in an App Service plan. * - * @param resourceGroupName Name of resource group - * @param name Name of App Service Plan - * @param vnetName Name of virtual network - * @param routeName Name of the virtual network route - * @return the observable to the Object object + * @param resourceGroupName Name of the resource group to which the resource belongs. + * @param name Name of the App Service plan. + * @param vnetName Name of the Virtual Network. + * @param routeName Name of the Virtual Network route. + * @return the {@link ServiceResponse} object if successful. */ - public Observable> deleteVnetRouteWithServiceResponseAsync(String resourceGroupName, String name, String vnetName, String routeName) { + public Observable> deleteVnetRouteWithServiceResponseAsync(String resourceGroupName, String name, String vnetName, String routeName) { if (resourceGroupName == null) { throw new IllegalArgumentException("Parameter resourceGroupName is required and cannot be null."); } @@ -3351,11 +3170,11 @@ public Observable> deleteVnetRouteWithServiceResponseAsy } final String apiVersion = "2016-09-01"; return service.deleteVnetRoute(resourceGroupName, name, vnetName, routeName, this.client.subscriptionId(), apiVersion, this.client.acceptLanguage(), this.client.userAgent()) - .flatMap(new Func1, Observable>>() { + .flatMap(new Func1, Observable>>() { @Override - public Observable> call(Response response) { + public Observable> call(Response response) { try { - ServiceResponse clientResponse = deleteVnetRouteDelegate(response); + ServiceResponse clientResponse = deleteVnetRouteDelegate(response); return Observable.just(clientResponse); } catch (Throwable t) { return Observable.error(t); @@ -3364,23 +3183,22 @@ public Observable> call(Response response) }); } - private ServiceResponse deleteVnetRouteDelegate(Response response) throws CloudException, IOException, IllegalArgumentException { - return new AzureServiceResponseBuilder(this.client.mapperAdapter()) - .register(200, new TypeToken() { }.getType()) + private ServiceResponse deleteVnetRouteDelegate(Response response) throws CloudException, IOException, IllegalArgumentException { + return new AzureServiceResponseBuilder(this.client.mapperAdapter()) + .register(200, new TypeToken() { }.getType()) .register(404, new TypeToken() { }.getType()) - .registerError(CloudException.class) .build(response); } /** - * Creates a new route or updates an existing route for a vnet in an app service plan. - * Creates a new route or updates an existing route for a vnet in an app service plan. + * Create or update a Virtual Network route in an App Service plan. + * Create or update a Virtual Network route in an App Service plan. * - * @param resourceGroupName Name of resource group - * @param name Name of App Service Plan - * @param vnetName Name of virtual network - * @param routeName Name of the virtual network route - * @param route The route object + * @param resourceGroupName Name of the resource group to which the resource belongs. + * @param name Name of the App Service plan. + * @param vnetName Name of the Virtual Network. + * @param routeName Name of the Virtual Network route. + * @param route Definition of the Virtual Network route. * @return the VnetRouteInner object if successful. */ public VnetRouteInner updateVnetRoute(String resourceGroupName, String name, String vnetName, String routeName, VnetRouteInner route) { @@ -3388,14 +3206,14 @@ public VnetRouteInner updateVnetRoute(String resourceGroupName, String name, Str } /** - * Creates a new route or updates an existing route for a vnet in an app service plan. - * Creates a new route or updates an existing route for a vnet in an app service plan. + * Create or update a Virtual Network route in an App Service plan. + * Create or update a Virtual Network route in an App Service plan. * - * @param resourceGroupName Name of resource group - * @param name Name of App Service Plan - * @param vnetName Name of virtual network - * @param routeName Name of the virtual network route - * @param route The route object + * @param resourceGroupName Name of the resource group to which the resource belongs. + * @param name Name of the App Service plan. + * @param vnetName Name of the Virtual Network. + * @param routeName Name of the Virtual Network route. + * @param route Definition of the Virtual Network route. * @param serviceCallback the async ServiceCallback to handle successful and failed responses. * @return the {@link ServiceCall} object */ @@ -3404,14 +3222,14 @@ public ServiceCall updateVnetRouteAsync(String resourceGroupName } /** - * Creates a new route or updates an existing route for a vnet in an app service plan. - * Creates a new route or updates an existing route for a vnet in an app service plan. + * Create or update a Virtual Network route in an App Service plan. + * Create or update a Virtual Network route in an App Service plan. * - * @param resourceGroupName Name of resource group - * @param name Name of App Service Plan - * @param vnetName Name of virtual network - * @param routeName Name of the virtual network route - * @param route The route object + * @param resourceGroupName Name of the resource group to which the resource belongs. + * @param name Name of the App Service plan. + * @param vnetName Name of the Virtual Network. + * @param routeName Name of the Virtual Network route. + * @param route Definition of the Virtual Network route. * @return the observable to the VnetRouteInner object */ public Observable updateVnetRouteAsync(String resourceGroupName, String name, String vnetName, String routeName, VnetRouteInner route) { @@ -3424,14 +3242,14 @@ public VnetRouteInner call(ServiceResponse response) { } /** - * Creates a new route or updates an existing route for a vnet in an app service plan. - * Creates a new route or updates an existing route for a vnet in an app service plan. + * Create or update a Virtual Network route in an App Service plan. + * Create or update a Virtual Network route in an App Service plan. * - * @param resourceGroupName Name of resource group - * @param name Name of App Service Plan - * @param vnetName Name of virtual network - * @param routeName Name of the virtual network route - * @param route The route object + * @param resourceGroupName Name of the resource group to which the resource belongs. + * @param name Name of the App Service plan. + * @param vnetName Name of the Virtual Network. + * @param routeName Name of the Virtual Network route. + * @param route Definition of the Virtual Network route. * @return the observable to the VnetRouteInner object */ public Observable> updateVnetRouteWithServiceResponseAsync(String resourceGroupName, String name, String vnetName, String routeName, VnetRouteInner route) { @@ -3479,60 +3297,59 @@ private ServiceResponse updateVnetRouteDelegate(Response rebootWorkerAsync(String resourceGroupName, String name, String workerName, final ServiceCallback serviceCallback) { + public ServiceCall rebootWorkerAsync(String resourceGroupName, String name, String workerName, final ServiceCallback serviceCallback) { return ServiceCall.create(rebootWorkerWithServiceResponseAsync(resourceGroupName, name, workerName), serviceCallback); } /** - * Submit a reboot request for a worker machine in the specified server farm. - * Submit a reboot request for a worker machine in the specified server farm. + * Reboot a worker machine in an App Service plan. + * Reboot a worker machine in an App Service plan. * - * @param resourceGroupName Name of resource group - * @param name Name of server farm - * @param workerName Name of worker machine, typically starts with RD - * @return the observable to the Object object + * @param resourceGroupName Name of the resource group to which the resource belongs. + * @param name Name of the App Service plan. + * @param workerName Name of worker machine, which typically starts with RD. + * @return the {@link ServiceResponse} object if successful. */ - public Observable rebootWorkerAsync(String resourceGroupName, String name, String workerName) { - return rebootWorkerWithServiceResponseAsync(resourceGroupName, name, workerName).map(new Func1, Object>() { + public Observable rebootWorkerAsync(String resourceGroupName, String name, String workerName) { + return rebootWorkerWithServiceResponseAsync(resourceGroupName, name, workerName).map(new Func1, Void>() { @Override - public Object call(ServiceResponse response) { + public Void call(ServiceResponse response) { return response.getBody(); } }); } /** - * Submit a reboot request for a worker machine in the specified server farm. - * Submit a reboot request for a worker machine in the specified server farm. + * Reboot a worker machine in an App Service plan. + * Reboot a worker machine in an App Service plan. * - * @param resourceGroupName Name of resource group - * @param name Name of server farm - * @param workerName Name of worker machine, typically starts with RD - * @return the observable to the Object object + * @param resourceGroupName Name of the resource group to which the resource belongs. + * @param name Name of the App Service plan. + * @param workerName Name of worker machine, which typically starts with RD. + * @return the {@link ServiceResponse} object if successful. */ - public Observable> rebootWorkerWithServiceResponseAsync(String resourceGroupName, String name, String workerName) { + public Observable> rebootWorkerWithServiceResponseAsync(String resourceGroupName, String name, String workerName) { if (resourceGroupName == null) { throw new IllegalArgumentException("Parameter resourceGroupName is required and cannot be null."); } @@ -3547,11 +3364,11 @@ public Observable> rebootWorkerWithServiceResponseAsync( } final String apiVersion = "2016-09-01"; return service.rebootWorker(resourceGroupName, name, workerName, this.client.subscriptionId(), apiVersion, this.client.acceptLanguage(), this.client.userAgent()) - .flatMap(new Func1, Observable>>() { + .flatMap(new Func1, Observable>>() { @Override - public Observable> call(Response response) { + public Observable> call(Response response) { try { - ServiceResponse clientResponse = rebootWorkerDelegate(response); + ServiceResponse clientResponse = rebootWorkerDelegate(response); return Observable.just(clientResponse); } catch (Throwable t) { return Observable.error(t); @@ -3560,16 +3377,15 @@ public Observable> call(Response response) }); } - private ServiceResponse rebootWorkerDelegate(Response response) throws CloudException, IOException, IllegalArgumentException { - return new AzureServiceResponseBuilder(this.client.mapperAdapter()) - .register(200, new TypeToken() { }.getType()) - .registerError(CloudException.class) + private ServiceResponse rebootWorkerDelegate(Response response) throws CloudException, IOException, IllegalArgumentException { + return new AzureServiceResponseBuilder(this.client.mapperAdapter()) + .register(204, new TypeToken() { }.getType()) .build(response); } /** - * Gets all App Service Plans for a subcription. - * Gets all App Service Plans for a subcription. + * Get all App Service plans for a subcription. + * Get all App Service plans for a subcription. * * @param nextPageLink The NextLink from the previous successful call to List operation. * @return the PagedList<AppServicePlanInner> object if successful. @@ -3585,8 +3401,8 @@ public Page nextPage(String nextPageLink) { } /** - * Gets all App Service Plans for a subcription. - * Gets all App Service Plans for a subcription. + * Get all App Service plans for a subcription. + * Get all App Service plans for a subcription. * * @param nextPageLink The NextLink from the previous successful call to List operation. * @param serviceCall the ServiceCall object tracking the Retrofit calls @@ -3606,8 +3422,8 @@ public Observable>> call(String nextPa } /** - * Gets all App Service Plans for a subcription. - * Gets all App Service Plans for a subcription. + * Get all App Service plans for a subcription. + * Get all App Service plans for a subcription. * * @param nextPageLink The NextLink from the previous successful call to List operation. * @return the observable to the PagedList<AppServicePlanInner> object @@ -3623,8 +3439,8 @@ public Page call(ServiceResponse> } /** - * Gets all App Service Plans for a subcription. - * Gets all App Service Plans for a subcription. + * Get all App Service plans for a subcription. + * Get all App Service plans for a subcription. * * @param nextPageLink The NextLink from the previous successful call to List operation. * @return the observable to the PagedList<AppServicePlanInner> object @@ -3644,8 +3460,8 @@ public Observable>> call(ServiceRespon } /** - * Gets all App Service Plans for a subcription. - * Gets all App Service Plans for a subcription. + * Get all App Service plans for a subcription. + * Get all App Service plans for a subcription. * ServiceResponse> * @param nextPageLink The NextLink from the previous successful call to List operation. * @return the PagedList<AppServicePlanInner> object wrapped in {@link ServiceResponse} if successful. @@ -3676,8 +3492,8 @@ private ServiceResponse> listNextDelegate(Response } /** - * Gets collection of App Service Plans in a resource group for a given subscription. - * Gets collection of App Service Plans in a resource group for a given subscription. + * Get all App Service plans in a resource group. + * Get all App Service plans in a resource group. * * @param nextPageLink The NextLink from the previous successful call to List operation. * @return the PagedList<AppServicePlanInner> object if successful. @@ -3693,8 +3509,8 @@ public Page nextPage(String nextPageLink) { } /** - * Gets collection of App Service Plans in a resource group for a given subscription. - * Gets collection of App Service Plans in a resource group for a given subscription. + * Get all App Service plans in a resource group. + * Get all App Service plans in a resource group. * * @param nextPageLink The NextLink from the previous successful call to List operation. * @param serviceCall the ServiceCall object tracking the Retrofit calls @@ -3714,8 +3530,8 @@ public Observable>> call(String nextPa } /** - * Gets collection of App Service Plans in a resource group for a given subscription. - * Gets collection of App Service Plans in a resource group for a given subscription. + * Get all App Service plans in a resource group. + * Get all App Service plans in a resource group. * * @param nextPageLink The NextLink from the previous successful call to List operation. * @return the observable to the PagedList<AppServicePlanInner> object @@ -3731,8 +3547,8 @@ public Page call(ServiceResponse> } /** - * Gets collection of App Service Plans in a resource group for a given subscription. - * Gets collection of App Service Plans in a resource group for a given subscription. + * Get all App Service plans in a resource group. + * Get all App Service plans in a resource group. * * @param nextPageLink The NextLink from the previous successful call to List operation. * @return the observable to the PagedList<AppServicePlanInner> object @@ -3752,8 +3568,8 @@ public Observable>> call(ServiceRespon } /** - * Gets collection of App Service Plans in a resource group for a given subscription. - * Gets collection of App Service Plans in a resource group for a given subscription. + * Get all App Service plans in a resource group. + * Get all App Service plans in a resource group. * ServiceResponse> * @param nextPageLink The NextLink from the previous successful call to List operation. * @return the PagedList<AppServicePlanInner> object wrapped in {@link ServiceResponse} if successful. @@ -3784,37 +3600,253 @@ private ServiceResponse> listByResourceGroupNextDe } /** - * List of metrics that can be queried for an App Service Plan. - * List of metrics that can be queried for an App Service Plan. + * Get all apps that use a Hybrid Connection in an App Service Plan. + * Get all apps that use a Hybrid Connection in an App Service Plan. + * + * @param nextPageLink The NextLink from the previous successful call to List operation. + * @return the PagedList<String> object if successful. + */ + public PagedList listWebAppsByHybridConnectionNext(final String nextPageLink) { + ServiceResponse> response = listWebAppsByHybridConnectionNextSinglePageAsync(nextPageLink).toBlocking().single(); + return new PagedList(response.getBody()) { + @Override + public Page nextPage(String nextPageLink) { + return listWebAppsByHybridConnectionNextSinglePageAsync(nextPageLink).toBlocking().single().getBody(); + } + }; + } + + /** + * Get all apps that use a Hybrid Connection in an App Service Plan. + * Get all apps that use a Hybrid Connection in an App Service Plan. + * + * @param nextPageLink The NextLink from the previous successful call to List operation. + * @param serviceCall the ServiceCall object tracking the Retrofit calls + * @param serviceCallback the async ServiceCallback to handle successful and failed responses. + * @return the {@link ServiceCall} object + */ + public ServiceCall> listWebAppsByHybridConnectionNextAsync(final String nextPageLink, final ServiceCall> serviceCall, final ListOperationCallback serviceCallback) { + return AzureServiceCall.create( + listWebAppsByHybridConnectionNextSinglePageAsync(nextPageLink), + new Func1>>>() { + @Override + public Observable>> call(String nextPageLink) { + return listWebAppsByHybridConnectionNextSinglePageAsync(nextPageLink); + } + }, + serviceCallback); + } + + /** + * Get all apps that use a Hybrid Connection in an App Service Plan. + * Get all apps that use a Hybrid Connection in an App Service Plan. + * + * @param nextPageLink The NextLink from the previous successful call to List operation. + * @return the observable to the PagedList<String> object + */ + public Observable> listWebAppsByHybridConnectionNextAsync(final String nextPageLink) { + return listWebAppsByHybridConnectionNextWithServiceResponseAsync(nextPageLink) + .map(new Func1>, Page>() { + @Override + public Page call(ServiceResponse> response) { + return response.getBody(); + } + }); + } + + /** + * Get all apps that use a Hybrid Connection in an App Service Plan. + * Get all apps that use a Hybrid Connection in an App Service Plan. + * + * @param nextPageLink The NextLink from the previous successful call to List operation. + * @return the observable to the PagedList<String> object + */ + public Observable>> listWebAppsByHybridConnectionNextWithServiceResponseAsync(final String nextPageLink) { + return listWebAppsByHybridConnectionNextSinglePageAsync(nextPageLink) + .concatMap(new Func1>, Observable>>>() { + @Override + public Observable>> call(ServiceResponse> page) { + String nextPageLink = page.getBody().getNextPageLink(); + if (nextPageLink == null) { + return Observable.just(page); + } + return Observable.just(page).concatWith(listWebAppsByHybridConnectionNextWithServiceResponseAsync(nextPageLink)); + } + }); + } + + /** + * Get all apps that use a Hybrid Connection in an App Service Plan. + * Get all apps that use a Hybrid Connection in an App Service Plan. + * + ServiceResponse> * @param nextPageLink The NextLink from the previous successful call to List operation. + * @return the PagedList<String> object wrapped in {@link ServiceResponse} if successful. + */ + public Observable>> listWebAppsByHybridConnectionNextSinglePageAsync(final String nextPageLink) { + if (nextPageLink == null) { + throw new IllegalArgumentException("Parameter nextPageLink is required and cannot be null."); + } + return service.listWebAppsByHybridConnectionNext(nextPageLink, this.client.acceptLanguage(), this.client.userAgent()) + .flatMap(new Func1, Observable>>>() { + @Override + public Observable>> call(Response response) { + try { + ServiceResponse> result = listWebAppsByHybridConnectionNextDelegate(response); + return Observable.just(new ServiceResponse>(result.getBody(), result.getResponse())); + } catch (Throwable t) { + return Observable.error(t); + } + } + }); + } + + private ServiceResponse> listWebAppsByHybridConnectionNextDelegate(Response response) throws CloudException, IOException, IllegalArgumentException { + return new AzureServiceResponseBuilder, CloudException>(this.client.mapperAdapter()) + .register(200, new TypeToken>() { }.getType()) + .registerError(CloudException.class) + .build(response); + } + + /** + * Retrieve all Hybrid Connections in use in an App Service plan. + * Retrieve all Hybrid Connections in use in an App Service plan. + * + * @param nextPageLink The NextLink from the previous successful call to List operation. + * @return the PagedList<HybridConnectionInner> object if successful. + */ + public PagedList listHybridConnectionsNext(final String nextPageLink) { + ServiceResponse> response = listHybridConnectionsNextSinglePageAsync(nextPageLink).toBlocking().single(); + return new PagedList(response.getBody()) { + @Override + public Page nextPage(String nextPageLink) { + return listHybridConnectionsNextSinglePageAsync(nextPageLink).toBlocking().single().getBody(); + } + }; + } + + /** + * Retrieve all Hybrid Connections in use in an App Service plan. + * Retrieve all Hybrid Connections in use in an App Service plan. + * + * @param nextPageLink The NextLink from the previous successful call to List operation. + * @param serviceCall the ServiceCall object tracking the Retrofit calls + * @param serviceCallback the async ServiceCallback to handle successful and failed responses. + * @return the {@link ServiceCall} object + */ + public ServiceCall> listHybridConnectionsNextAsync(final String nextPageLink, final ServiceCall> serviceCall, final ListOperationCallback serviceCallback) { + return AzureServiceCall.create( + listHybridConnectionsNextSinglePageAsync(nextPageLink), + new Func1>>>() { + @Override + public Observable>> call(String nextPageLink) { + return listHybridConnectionsNextSinglePageAsync(nextPageLink); + } + }, + serviceCallback); + } + + /** + * Retrieve all Hybrid Connections in use in an App Service plan. + * Retrieve all Hybrid Connections in use in an App Service plan. + * + * @param nextPageLink The NextLink from the previous successful call to List operation. + * @return the observable to the PagedList<HybridConnectionInner> object + */ + public Observable> listHybridConnectionsNextAsync(final String nextPageLink) { + return listHybridConnectionsNextWithServiceResponseAsync(nextPageLink) + .map(new Func1>, Page>() { + @Override + public Page call(ServiceResponse> response) { + return response.getBody(); + } + }); + } + + /** + * Retrieve all Hybrid Connections in use in an App Service plan. + * Retrieve all Hybrid Connections in use in an App Service plan. + * + * @param nextPageLink The NextLink from the previous successful call to List operation. + * @return the observable to the PagedList<HybridConnectionInner> object + */ + public Observable>> listHybridConnectionsNextWithServiceResponseAsync(final String nextPageLink) { + return listHybridConnectionsNextSinglePageAsync(nextPageLink) + .concatMap(new Func1>, Observable>>>() { + @Override + public Observable>> call(ServiceResponse> page) { + String nextPageLink = page.getBody().getNextPageLink(); + if (nextPageLink == null) { + return Observable.just(page); + } + return Observable.just(page).concatWith(listHybridConnectionsNextWithServiceResponseAsync(nextPageLink)); + } + }); + } + + /** + * Retrieve all Hybrid Connections in use in an App Service plan. + * Retrieve all Hybrid Connections in use in an App Service plan. + * + ServiceResponse> * @param nextPageLink The NextLink from the previous successful call to List operation. + * @return the PagedList<HybridConnectionInner> object wrapped in {@link ServiceResponse} if successful. + */ + public Observable>> listHybridConnectionsNextSinglePageAsync(final String nextPageLink) { + if (nextPageLink == null) { + throw new IllegalArgumentException("Parameter nextPageLink is required and cannot be null."); + } + return service.listHybridConnectionsNext(nextPageLink, this.client.acceptLanguage(), this.client.userAgent()) + .flatMap(new Func1, Observable>>>() { + @Override + public Observable>> call(Response response) { + try { + ServiceResponse> result = listHybridConnectionsNextDelegate(response); + return Observable.just(new ServiceResponse>(result.getBody(), result.getResponse())); + } catch (Throwable t) { + return Observable.error(t); + } + } + }); + } + + private ServiceResponse> listHybridConnectionsNextDelegate(Response response) throws CloudException, IOException, IllegalArgumentException { + return new AzureServiceResponseBuilder, CloudException>(this.client.mapperAdapter()) + .register(200, new TypeToken>() { }.getType()) + .registerError(CloudException.class) + .build(response); + } + + /** + * Get metrics that can be queried for an App Service plan, and their definitions. + * Get metrics that can be queried for an App Service plan, and their definitions. * * @param nextPageLink The NextLink from the previous successful call to List operation. - * @return the PagedList<MetricDefinitionInner> object if successful. + * @return the PagedList<ResourceMetricDefinitionInner> object if successful. */ - public PagedList listMetricDefintionsNext(final String nextPageLink) { - ServiceResponse> response = listMetricDefintionsNextSinglePageAsync(nextPageLink).toBlocking().single(); - return new PagedList(response.getBody()) { + public PagedList listMetricDefintionsNext(final String nextPageLink) { + ServiceResponse> response = listMetricDefintionsNextSinglePageAsync(nextPageLink).toBlocking().single(); + return new PagedList(response.getBody()) { @Override - public Page nextPage(String nextPageLink) { + public Page nextPage(String nextPageLink) { return listMetricDefintionsNextSinglePageAsync(nextPageLink).toBlocking().single().getBody(); } }; } /** - * List of metrics that can be queried for an App Service Plan. - * List of metrics that can be queried for an App Service Plan. + * Get metrics that can be queried for an App Service plan, and their definitions. + * Get metrics that can be queried for an App Service plan, and their definitions. * * @param nextPageLink The NextLink from the previous successful call to List operation. * @param serviceCall the ServiceCall object tracking the Retrofit calls * @param serviceCallback the async ServiceCallback to handle successful and failed responses. * @return the {@link ServiceCall} object */ - public ServiceCall> listMetricDefintionsNextAsync(final String nextPageLink, final ServiceCall> serviceCall, final ListOperationCallback serviceCallback) { + public ServiceCall> listMetricDefintionsNextAsync(final String nextPageLink, final ServiceCall> serviceCall, final ListOperationCallback serviceCallback) { return AzureServiceCall.create( listMetricDefintionsNextSinglePageAsync(nextPageLink), - new Func1>>>() { + new Func1>>>() { @Override - public Observable>> call(String nextPageLink) { + public Observable>> call(String nextPageLink) { return listMetricDefintionsNextSinglePageAsync(nextPageLink); } }, @@ -3822,34 +3854,34 @@ public Observable>> call(String next } /** - * List of metrics that can be queried for an App Service Plan. - * List of metrics that can be queried for an App Service Plan. + * Get metrics that can be queried for an App Service plan, and their definitions. + * Get metrics that can be queried for an App Service plan, and their definitions. * * @param nextPageLink The NextLink from the previous successful call to List operation. - * @return the observable to the PagedList<MetricDefinitionInner> object + * @return the observable to the PagedList<ResourceMetricDefinitionInner> object */ - public Observable> listMetricDefintionsNextAsync(final String nextPageLink) { + public Observable> listMetricDefintionsNextAsync(final String nextPageLink) { return listMetricDefintionsNextWithServiceResponseAsync(nextPageLink) - .map(new Func1>, Page>() { + .map(new Func1>, Page>() { @Override - public Page call(ServiceResponse> response) { + public Page call(ServiceResponse> response) { return response.getBody(); } }); } /** - * List of metrics that can be queried for an App Service Plan. - * List of metrics that can be queried for an App Service Plan. + * Get metrics that can be queried for an App Service plan, and their definitions. + * Get metrics that can be queried for an App Service plan, and their definitions. * * @param nextPageLink The NextLink from the previous successful call to List operation. - * @return the observable to the PagedList<MetricDefinitionInner> object + * @return the observable to the PagedList<ResourceMetricDefinitionInner> object */ - public Observable>> listMetricDefintionsNextWithServiceResponseAsync(final String nextPageLink) { + public Observable>> listMetricDefintionsNextWithServiceResponseAsync(final String nextPageLink) { return listMetricDefintionsNextSinglePageAsync(nextPageLink) - .concatMap(new Func1>, Observable>>>() { + .concatMap(new Func1>, Observable>>>() { @Override - public Observable>> call(ServiceResponse> page) { + public Observable>> call(ServiceResponse> page) { String nextPageLink = page.getBody().getNextPageLink(); if (nextPageLink == null) { return Observable.just(page); @@ -3860,23 +3892,23 @@ public Observable>> call(ServiceResp } /** - * List of metrics that can be queried for an App Service Plan. - * List of metrics that can be queried for an App Service Plan. + * Get metrics that can be queried for an App Service plan, and their definitions. + * Get metrics that can be queried for an App Service plan, and their definitions. * - ServiceResponse> * @param nextPageLink The NextLink from the previous successful call to List operation. - * @return the PagedList<MetricDefinitionInner> object wrapped in {@link ServiceResponse} if successful. + ServiceResponse> * @param nextPageLink The NextLink from the previous successful call to List operation. + * @return the PagedList<ResourceMetricDefinitionInner> object wrapped in {@link ServiceResponse} if successful. */ - public Observable>> listMetricDefintionsNextSinglePageAsync(final String nextPageLink) { + public Observable>> listMetricDefintionsNextSinglePageAsync(final String nextPageLink) { if (nextPageLink == null) { throw new IllegalArgumentException("Parameter nextPageLink is required and cannot be null."); } return service.listMetricDefintionsNext(nextPageLink, this.client.acceptLanguage(), this.client.userAgent()) - .flatMap(new Func1, Observable>>>() { + .flatMap(new Func1, Observable>>>() { @Override - public Observable>> call(Response response) { + public Observable>> call(Response response) { try { - ServiceResponse> result = listMetricDefintionsNextDelegate(response); - return Observable.just(new ServiceResponse>(result.getBody(), result.getResponse())); + ServiceResponse> result = listMetricDefintionsNextDelegate(response); + return Observable.just(new ServiceResponse>(result.getBody(), result.getResponse())); } catch (Throwable t) { return Observable.error(t); } @@ -3884,16 +3916,16 @@ public Observable>> call(Response> listMetricDefintionsNextDelegate(Response response) throws CloudException, IOException, IllegalArgumentException { - return new AzureServiceResponseBuilder, CloudException>(this.client.mapperAdapter()) - .register(200, new TypeToken>() { }.getType()) + private ServiceResponse> listMetricDefintionsNextDelegate(Response response) throws CloudException, IOException, IllegalArgumentException { + return new AzureServiceResponseBuilder, CloudException>(this.client.mapperAdapter()) + .register(200, new TypeToken>() { }.getType()) .registerError(CloudException.class) .build(response); } /** - * Queries for App Serice Plan metrics. - * Queries for App Serice Plan metrics. + * Get metrics for an App Serice plan. + * Get metrics for an App Serice plan. * * @param nextPageLink The NextLink from the previous successful call to List operation. * @return the PagedList<ResourceMetricInner> object if successful. @@ -3909,8 +3941,8 @@ public Page nextPage(String nextPageLink) { } /** - * Queries for App Serice Plan metrics. - * Queries for App Serice Plan metrics. + * Get metrics for an App Serice plan. + * Get metrics for an App Serice plan. * * @param nextPageLink The NextLink from the previous successful call to List operation. * @param serviceCall the ServiceCall object tracking the Retrofit calls @@ -3930,8 +3962,8 @@ public Observable>> call(String nextPa } /** - * Queries for App Serice Plan metrics. - * Queries for App Serice Plan metrics. + * Get metrics for an App Serice plan. + * Get metrics for an App Serice plan. * * @param nextPageLink The NextLink from the previous successful call to List operation. * @return the observable to the PagedList<ResourceMetricInner> object @@ -3947,8 +3979,8 @@ public Page call(ServiceResponse> } /** - * Queries for App Serice Plan metrics. - * Queries for App Serice Plan metrics. + * Get metrics for an App Serice plan. + * Get metrics for an App Serice plan. * * @param nextPageLink The NextLink from the previous successful call to List operation. * @return the observable to the PagedList<ResourceMetricInner> object @@ -3968,8 +4000,8 @@ public Observable>> call(ServiceRespon } /** - * Queries for App Serice Plan metrics. - * Queries for App Serice Plan metrics. + * Get metrics for an App Serice plan. + * Get metrics for an App Serice plan. * ServiceResponse> * @param nextPageLink The NextLink from the previous successful call to List operation. * @return the PagedList<ResourceMetricInner> object wrapped in {@link ServiceResponse} if successful. @@ -4000,8 +4032,8 @@ private ServiceResponse> listMetricsNextDelegate(R } /** - * Gets list of Apps associated with an App Service Plan. - * Gets list of Apps associated with an App Service Plan. + * Get all apps associated with an App Service plan. + * Get all apps associated with an App Service plan. * * @param nextPageLink The NextLink from the previous successful call to List operation. * @return the PagedList<SiteInner> object if successful. @@ -4017,8 +4049,8 @@ public Page nextPage(String nextPageLink) { } /** - * Gets list of Apps associated with an App Service Plan. - * Gets list of Apps associated with an App Service Plan. + * Get all apps associated with an App Service plan. + * Get all apps associated with an App Service plan. * * @param nextPageLink The NextLink from the previous successful call to List operation. * @param serviceCall the ServiceCall object tracking the Retrofit calls @@ -4038,8 +4070,8 @@ public Observable>> call(String nextPageLink) { } /** - * Gets list of Apps associated with an App Service Plan. - * Gets list of Apps associated with an App Service Plan. + * Get all apps associated with an App Service plan. + * Get all apps associated with an App Service plan. * * @param nextPageLink The NextLink from the previous successful call to List operation. * @return the observable to the PagedList<SiteInner> object @@ -4055,8 +4087,8 @@ public Page call(ServiceResponse> response) { } /** - * Gets list of Apps associated with an App Service Plan. - * Gets list of Apps associated with an App Service Plan. + * Get all apps associated with an App Service plan. + * Get all apps associated with an App Service plan. * * @param nextPageLink The NextLink from the previous successful call to List operation. * @return the observable to the PagedList<SiteInner> object @@ -4076,8 +4108,8 @@ public Observable>> call(ServiceResponse> * @param nextPageLink The NextLink from the previous successful call to List operation. * @return the PagedList<SiteInner> object wrapped in {@link ServiceResponse} if successful. diff --git a/azure-mgmt-website/src/main/java/com/microsoft/azure/management/website/implementation/BackupItemInner.java b/azure-mgmt-website/src/main/java/com/microsoft/azure/management/website/implementation/BackupItemInner.java index f043e946c91ab..45179c1f70040 100644 --- a/azure-mgmt-website/src/main/java/com/microsoft/azure/management/website/implementation/BackupItemInner.java +++ b/azure-mgmt-website/src/main/java/com/microsoft/azure/management/website/implementation/BackupItemInner.java @@ -24,25 +24,25 @@ public class BackupItemInner extends Resource { /** * Id of the backup. */ - @JsonProperty(value = "properties.id") - private Integer backupItemId; + @JsonProperty(value = "properties.id", access = JsonProperty.Access.WRITE_ONLY) + private Integer backupId; /** * SAS URL for the storage account container which contains this backup. */ - @JsonProperty(value = "properties.storageAccountUrl") + @JsonProperty(value = "properties.storageAccountUrl", access = JsonProperty.Access.WRITE_ONLY) private String storageAccountUrl; /** * Name of the blob which contains data for this backup. */ - @JsonProperty(value = "properties.blobName") + @JsonProperty(value = "properties.blobName", access = JsonProperty.Access.WRITE_ONLY) private String blobName; /** * Name of this backup. */ - @JsonProperty(value = "properties.name") + @JsonProperty(value = "properties.name", access = JsonProperty.Access.WRITE_ONLY) private String backupItemName; /** @@ -50,82 +50,71 @@ public class BackupItemInner extends Resource { * 'Succeeded', 'TimedOut', 'Created', 'Skipped', 'PartiallySucceeded', * 'DeleteInProgress', 'DeleteFailed', 'Deleted'. */ - @JsonProperty(value = "properties.status") + @JsonProperty(value = "properties.status", access = JsonProperty.Access.WRITE_ONLY) private BackupItemStatus status; /** * Size of the backup in bytes. */ - @JsonProperty(value = "properties.sizeInBytes") + @JsonProperty(value = "properties.sizeInBytes", access = JsonProperty.Access.WRITE_ONLY) private Long sizeInBytes; /** * Timestamp of the backup creation. */ - @JsonProperty(value = "properties.created") + @JsonProperty(value = "properties.created", access = JsonProperty.Access.WRITE_ONLY) private DateTime created; /** * Details regarding this backup. Might contain an error message. */ - @JsonProperty(value = "properties.log") + @JsonProperty(value = "properties.log", access = JsonProperty.Access.WRITE_ONLY) private String log; /** * List of databases included in the backup. */ - @JsonProperty(value = "properties.databases") + @JsonProperty(value = "properties.databases", access = JsonProperty.Access.WRITE_ONLY) private List databases; /** * True if this backup has been created due to a schedule being triggered. */ - @JsonProperty(value = "properties.scheduled") + @JsonProperty(value = "properties.scheduled", access = JsonProperty.Access.WRITE_ONLY) private Boolean scheduled; /** * Timestamp of a last restore operation which used this backup. */ - @JsonProperty(value = "properties.lastRestoreTimeStamp") + @JsonProperty(value = "properties.lastRestoreTimeStamp", access = JsonProperty.Access.WRITE_ONLY) private DateTime lastRestoreTimeStamp; /** * Timestamp when this backup finished. */ - @JsonProperty(value = "properties.finishedTimeStamp") + @JsonProperty(value = "properties.finishedTimeStamp", access = JsonProperty.Access.WRITE_ONLY) private DateTime finishedTimeStamp; /** * Unique correlation identifier. Please use this along with the timestamp * while communicating with Azure support. */ - @JsonProperty(value = "properties.correlationId") + @JsonProperty(value = "properties.correlationId", access = JsonProperty.Access.WRITE_ONLY) private String correlationId; /** * Size of the original web app which has been backed up. */ - @JsonProperty(value = "properties.websiteSizeInBytes") + @JsonProperty(value = "properties.websiteSizeInBytes", access = JsonProperty.Access.WRITE_ONLY) private Long websiteSizeInBytes; /** - * Get the backupItemId value. + * Get the backupId value. * - * @return the backupItemId value + * @return the backupId value */ - public Integer backupItemId() { - return this.backupItemId; - } - - /** - * Set the backupItemId value. - * - * @param backupItemId the backupItemId value to set - * @return the BackupItemInner object itself. - */ - public BackupItemInner withBackupItemId(Integer backupItemId) { - this.backupItemId = backupItemId; - return this; + public Integer backupId() { + return this.backupId; } /** @@ -137,17 +126,6 @@ public String storageAccountUrl() { return this.storageAccountUrl; } - /** - * Set the storageAccountUrl value. - * - * @param storageAccountUrl the storageAccountUrl value to set - * @return the BackupItemInner object itself. - */ - public BackupItemInner withStorageAccountUrl(String storageAccountUrl) { - this.storageAccountUrl = storageAccountUrl; - return this; - } - /** * Get the blobName value. * @@ -157,17 +135,6 @@ public String blobName() { return this.blobName; } - /** - * Set the blobName value. - * - * @param blobName the blobName value to set - * @return the BackupItemInner object itself. - */ - public BackupItemInner withBlobName(String blobName) { - this.blobName = blobName; - return this; - } - /** * Get the backupItemName value. * @@ -177,17 +144,6 @@ public String backupItemName() { return this.backupItemName; } - /** - * Set the backupItemName value. - * - * @param backupItemName the backupItemName value to set - * @return the BackupItemInner object itself. - */ - public BackupItemInner withBackupItemName(String backupItemName) { - this.backupItemName = backupItemName; - return this; - } - /** * Get the status value. * @@ -197,17 +153,6 @@ public BackupItemStatus status() { return this.status; } - /** - * Set the status value. - * - * @param status the status value to set - * @return the BackupItemInner object itself. - */ - public BackupItemInner withStatus(BackupItemStatus status) { - this.status = status; - return this; - } - /** * Get the sizeInBytes value. * @@ -217,17 +162,6 @@ public Long sizeInBytes() { return this.sizeInBytes; } - /** - * Set the sizeInBytes value. - * - * @param sizeInBytes the sizeInBytes value to set - * @return the BackupItemInner object itself. - */ - public BackupItemInner withSizeInBytes(Long sizeInBytes) { - this.sizeInBytes = sizeInBytes; - return this; - } - /** * Get the created value. * @@ -237,17 +171,6 @@ public DateTime created() { return this.created; } - /** - * Set the created value. - * - * @param created the created value to set - * @return the BackupItemInner object itself. - */ - public BackupItemInner withCreated(DateTime created) { - this.created = created; - return this; - } - /** * Get the log value. * @@ -257,17 +180,6 @@ public String log() { return this.log; } - /** - * Set the log value. - * - * @param log the log value to set - * @return the BackupItemInner object itself. - */ - public BackupItemInner withLog(String log) { - this.log = log; - return this; - } - /** * Get the databases value. * @@ -277,17 +189,6 @@ public List databases() { return this.databases; } - /** - * Set the databases value. - * - * @param databases the databases value to set - * @return the BackupItemInner object itself. - */ - public BackupItemInner withDatabases(List databases) { - this.databases = databases; - return this; - } - /** * Get the scheduled value. * @@ -297,17 +198,6 @@ public Boolean scheduled() { return this.scheduled; } - /** - * Set the scheduled value. - * - * @param scheduled the scheduled value to set - * @return the BackupItemInner object itself. - */ - public BackupItemInner withScheduled(Boolean scheduled) { - this.scheduled = scheduled; - return this; - } - /** * Get the lastRestoreTimeStamp value. * @@ -317,17 +207,6 @@ public DateTime lastRestoreTimeStamp() { return this.lastRestoreTimeStamp; } - /** - * Set the lastRestoreTimeStamp value. - * - * @param lastRestoreTimeStamp the lastRestoreTimeStamp value to set - * @return the BackupItemInner object itself. - */ - public BackupItemInner withLastRestoreTimeStamp(DateTime lastRestoreTimeStamp) { - this.lastRestoreTimeStamp = lastRestoreTimeStamp; - return this; - } - /** * Get the finishedTimeStamp value. * @@ -337,17 +216,6 @@ public DateTime finishedTimeStamp() { return this.finishedTimeStamp; } - /** - * Set the finishedTimeStamp value. - * - * @param finishedTimeStamp the finishedTimeStamp value to set - * @return the BackupItemInner object itself. - */ - public BackupItemInner withFinishedTimeStamp(DateTime finishedTimeStamp) { - this.finishedTimeStamp = finishedTimeStamp; - return this; - } - /** * Get the correlationId value. * @@ -357,17 +225,6 @@ public String correlationId() { return this.correlationId; } - /** - * Set the correlationId value. - * - * @param correlationId the correlationId value to set - * @return the BackupItemInner object itself. - */ - public BackupItemInner withCorrelationId(String correlationId) { - this.correlationId = correlationId; - return this; - } - /** * Get the websiteSizeInBytes value. * @@ -377,15 +234,4 @@ public Long websiteSizeInBytes() { return this.websiteSizeInBytes; } - /** - * Set the websiteSizeInBytes value. - * - * @param websiteSizeInBytes the websiteSizeInBytes value to set - * @return the BackupItemInner object itself. - */ - public BackupItemInner withWebsiteSizeInBytes(Long websiteSizeInBytes) { - this.websiteSizeInBytes = websiteSizeInBytes; - return this; - } - } diff --git a/azure-mgmt-website/src/main/java/com/microsoft/azure/management/website/implementation/CapabilityInner.java b/azure-mgmt-website/src/main/java/com/microsoft/azure/management/website/implementation/CapabilityInner.java index 3c802234df6b1..84f1ac55c5e27 100644 --- a/azure-mgmt-website/src/main/java/com/microsoft/azure/management/website/implementation/CapabilityInner.java +++ b/azure-mgmt-website/src/main/java/com/microsoft/azure/management/website/implementation/CapabilityInner.java @@ -10,21 +10,21 @@ /** - * Description of a Sku Capability. + * Describes the capabilities/features allowed for a specific SKU. */ public class CapabilityInner { /** - * Name of the sku capability. + * Name of the SKU capability. */ private String name; /** - * Value of the sku capability. + * Value of the SKU capability. */ private String value; /** - * Reason of the sku capability. + * Reason of the SKU capability. */ private String reason; diff --git a/azure-mgmt-website/src/main/java/com/microsoft/azure/management/website/implementation/CertificateDetailsInner.java b/azure-mgmt-website/src/main/java/com/microsoft/azure/management/website/implementation/CertificateDetailsInner.java index 1adabb80244a9..8ce000fada8cb 100644 --- a/azure-mgmt-website/src/main/java/com/microsoft/azure/management/website/implementation/CertificateDetailsInner.java +++ b/azure-mgmt-website/src/main/java/com/microsoft/azure/management/website/implementation/CertificateDetailsInner.java @@ -8,58 +8,68 @@ package com.microsoft.azure.management.website.implementation; -import com.microsoft.azure.Resource; -import com.microsoft.rest.serializer.JsonFlatten; import org.joda.time.DateTime; +import com.fasterxml.jackson.annotation.JsonProperty; +import com.microsoft.rest.serializer.JsonFlatten; +import com.microsoft.azure.Resource; /** - * Certificate Details. + * SSL certificate details. */ @JsonFlatten public class CertificateDetailsInner extends Resource { /** * Version. */ + @JsonProperty(value = "properties.version", access = JsonProperty.Access.WRITE_ONLY) private Integer version; /** * Serial Number. */ + @JsonProperty(value = "properties.serialNumber", access = JsonProperty.Access.WRITE_ONLY) private String serialNumber; /** * Thumbprint. */ + @JsonProperty(value = "properties.thumbprint", access = JsonProperty.Access.WRITE_ONLY) private String thumbprint; /** * Subject. */ + @JsonProperty(value = "properties.subject", access = JsonProperty.Access.WRITE_ONLY) private String subject; /** * Valid from. */ + @JsonProperty(value = "properties.notBefore", access = JsonProperty.Access.WRITE_ONLY) private DateTime notBefore; /** * Valid to. */ + @JsonProperty(value = "properties.notAfter", access = JsonProperty.Access.WRITE_ONLY) private DateTime notAfter; /** - * Signature Algorithm. + * Signature algorithm. */ + @JsonProperty(value = "properties.signatureAlgorithm", access = JsonProperty.Access.WRITE_ONLY) private String signatureAlgorithm; /** * Issuer. */ + @JsonProperty(value = "properties.issuer", access = JsonProperty.Access.WRITE_ONLY) private String issuer; /** * Raw certificate data. */ + @JsonProperty(value = "properties.rawData", access = JsonProperty.Access.WRITE_ONLY) private String rawData; /** @@ -71,17 +81,6 @@ public Integer version() { return this.version; } - /** - * Set the version value. - * - * @param version the version value to set - * @return the CertificateDetailsInner object itself. - */ - public CertificateDetailsInner withVersion(Integer version) { - this.version = version; - return this; - } - /** * Get the serialNumber value. * @@ -91,17 +90,6 @@ public String serialNumber() { return this.serialNumber; } - /** - * Set the serialNumber value. - * - * @param serialNumber the serialNumber value to set - * @return the CertificateDetailsInner object itself. - */ - public CertificateDetailsInner withSerialNumber(String serialNumber) { - this.serialNumber = serialNumber; - return this; - } - /** * Get the thumbprint value. * @@ -111,17 +99,6 @@ public String thumbprint() { return this.thumbprint; } - /** - * Set the thumbprint value. - * - * @param thumbprint the thumbprint value to set - * @return the CertificateDetailsInner object itself. - */ - public CertificateDetailsInner withThumbprint(String thumbprint) { - this.thumbprint = thumbprint; - return this; - } - /** * Get the subject value. * @@ -131,17 +108,6 @@ public String subject() { return this.subject; } - /** - * Set the subject value. - * - * @param subject the subject value to set - * @return the CertificateDetailsInner object itself. - */ - public CertificateDetailsInner withSubject(String subject) { - this.subject = subject; - return this; - } - /** * Get the notBefore value. * @@ -151,17 +117,6 @@ public DateTime notBefore() { return this.notBefore; } - /** - * Set the notBefore value. - * - * @param notBefore the notBefore value to set - * @return the CertificateDetailsInner object itself. - */ - public CertificateDetailsInner withNotBefore(DateTime notBefore) { - this.notBefore = notBefore; - return this; - } - /** * Get the notAfter value. * @@ -171,17 +126,6 @@ public DateTime notAfter() { return this.notAfter; } - /** - * Set the notAfter value. - * - * @param notAfter the notAfter value to set - * @return the CertificateDetailsInner object itself. - */ - public CertificateDetailsInner withNotAfter(DateTime notAfter) { - this.notAfter = notAfter; - return this; - } - /** * Get the signatureAlgorithm value. * @@ -191,17 +135,6 @@ public String signatureAlgorithm() { return this.signatureAlgorithm; } - /** - * Set the signatureAlgorithm value. - * - * @param signatureAlgorithm the signatureAlgorithm value to set - * @return the CertificateDetailsInner object itself. - */ - public CertificateDetailsInner withSignatureAlgorithm(String signatureAlgorithm) { - this.signatureAlgorithm = signatureAlgorithm; - return this; - } - /** * Get the issuer value. * @@ -211,17 +144,6 @@ public String issuer() { return this.issuer; } - /** - * Set the issuer value. - * - * @param issuer the issuer value to set - * @return the CertificateDetailsInner object itself. - */ - public CertificateDetailsInner withIssuer(String issuer) { - this.issuer = issuer; - return this; - } - /** * Get the rawData value. * @@ -231,15 +153,4 @@ public String rawData() { return this.rawData; } - /** - * Set the rawData value. - * - * @param rawData the rawData value to set - * @return the CertificateDetailsInner object itself. - */ - public CertificateDetailsInner withRawData(String rawData) { - this.rawData = rawData; - return this; - } - } diff --git a/azure-mgmt-website/src/main/java/com/microsoft/azure/management/website/implementation/CertificateEmailInner.java b/azure-mgmt-website/src/main/java/com/microsoft/azure/management/website/implementation/CertificateEmailInner.java index 8ab9c9207a70e..85842b3463138 100644 --- a/azure-mgmt-website/src/main/java/com/microsoft/azure/management/website/implementation/CertificateEmailInner.java +++ b/azure-mgmt-website/src/main/java/com/microsoft/azure/management/website/implementation/CertificateEmailInner.java @@ -14,7 +14,7 @@ import com.microsoft.azure.Resource; /** - * Certificate Email. + * SSL certificate email. */ @JsonFlatten public class CertificateEmailInner extends Resource { diff --git a/azure-mgmt-website/src/main/java/com/microsoft/azure/management/website/implementation/CertificateInner.java b/azure-mgmt-website/src/main/java/com/microsoft/azure/management/website/implementation/CertificateInner.java index 8914002f6d534..659301f389f1d 100644 --- a/azure-mgmt-website/src/main/java/com/microsoft/azure/management/website/implementation/CertificateInner.java +++ b/azure-mgmt-website/src/main/java/com/microsoft/azure/management/website/implementation/CertificateInner.java @@ -8,29 +8,29 @@ package com.microsoft.azure.management.website.implementation; -import com.fasterxml.jackson.annotation.JsonProperty; -import com.microsoft.azure.Resource; +import java.util.List; +import org.joda.time.DateTime; import com.microsoft.azure.management.website.HostingEnvironmentProfile; +import com.microsoft.azure.management.website.KeyVaultSecretStatus; +import com.fasterxml.jackson.annotation.JsonProperty; import com.microsoft.rest.serializer.JsonFlatten; -import org.joda.time.DateTime; - -import java.util.List; +import com.microsoft.azure.Resource; /** - * App certificate. + * SSL certificate for an app. */ @JsonFlatten public class CertificateInner extends Resource { /** * Friendly name of the certificate. */ - @JsonProperty(value = "properties.friendlyName") + @JsonProperty(value = "properties.friendlyName", access = JsonProperty.Access.WRITE_ONLY) private String friendlyName; /** * Subject name of the certificate. */ - @JsonProperty(value = "properties.subjectName") + @JsonProperty(value = "properties.subjectName", access = JsonProperty.Access.WRITE_ONLY) private String subjectName; /** @@ -43,36 +43,36 @@ public class CertificateInner extends Resource { * Pfx blob. */ @JsonProperty(value = "properties.pfxBlob") - private String pfxBlob; + private byte[] pfxBlob; /** * App name. */ - @JsonProperty(value = "properties.siteName") + @JsonProperty(value = "properties.siteName", access = JsonProperty.Access.WRITE_ONLY) private String siteName; /** * Self link. */ - @JsonProperty(value = "properties.selfLink") + @JsonProperty(value = "properties.selfLink", access = JsonProperty.Access.WRITE_ONLY) private String selfLink; /** * Certificate issuer. */ - @JsonProperty(value = "properties.issuer") + @JsonProperty(value = "properties.issuer", access = JsonProperty.Access.WRITE_ONLY) private String issuer; /** * Certificate issue Date. */ - @JsonProperty(value = "properties.issueDate") + @JsonProperty(value = "properties.issueDate", access = JsonProperty.Access.WRITE_ONLY) private DateTime issueDate; /** * Certificate expriration date. */ - @JsonProperty(value = "properties.expirationDate") + @JsonProperty(value = "properties.expirationDate", access = JsonProperty.Access.WRITE_ONLY) private DateTime expirationDate; /** @@ -84,13 +84,13 @@ public class CertificateInner extends Resource { /** * Certificate thumbprint. */ - @JsonProperty(value = "properties.thumbprint") + @JsonProperty(value = "properties.thumbprint", access = JsonProperty.Access.WRITE_ONLY) private String thumbprint; /** * Is the certificate valid?. */ - @JsonProperty(value = "properties.valid") + @JsonProperty(value = "properties.valid", access = JsonProperty.Access.WRITE_ONLY) private Boolean valid; /** @@ -102,39 +102,45 @@ public class CertificateInner extends Resource { /** * Public key hash. */ - @JsonProperty(value = "properties.publicKeyHash") + @JsonProperty(value = "properties.publicKeyHash", access = JsonProperty.Access.WRITE_ONLY) private String publicKeyHash; - public String keyVaultId() { - return keyVaultId; - } - - public CertificateInner withKeyVaultId(String keyVaultId) { - this.keyVaultId = keyVaultId; - return this; - } - - public String keyVaultSecretName() { - return keyVaultSecretName; - } - - public CertificateInner withKeyVaultSecretName(String keyVaultSecretName) { - this.keyVaultSecretName = keyVaultSecretName; - return this; - } + /** + * Specification for the App Service Environment to use for the + * certificate. + */ + @JsonProperty(value = "properties.hostingEnvironmentProfile", access = JsonProperty.Access.WRITE_ONLY) + private HostingEnvironmentProfile hostingEnvironmentProfile; + /** + * Key Vault Csm resource Id. + */ @JsonProperty(value = "properties.keyVaultId") private String keyVaultId; + /** + * Key Vault secret name. + */ @JsonProperty(value = "properties.keyVaultSecretName") private String keyVaultSecretName; /** - * Specification for the hosting environment (App Service Environment) to - * use for the certificate. + * Status of the Key Vault secret. Possible values include: 'Initialized', + * 'WaitingOnCertificateOrder', 'Succeeded', 'CertificateOrderFailed', + * 'OperationNotPermittedOnKeyVault', + * 'AzureServiceUnauthorizedToAccessKeyVault', 'KeyVaultDoesNotExist', + * 'KeyVaultSecretDoesNotExist', 'UnknownError', 'ExternalPrivateKey', + * 'Unknown'. */ - @JsonProperty(value = "properties.hostingEnvironmentProfile") - private HostingEnvironmentProfile hostingEnvironmentProfile; + @JsonProperty(value = "properties.keyVaultSecretStatus", access = JsonProperty.Access.WRITE_ONLY) + private KeyVaultSecretStatus keyVaultSecretStatus; + + /** + * Resource ID of the associated App Service plan, formatted as: + * "/subscriptions/{subscriptionID}/resourceGroups/{groupName}/providers/Microsoft.Web/serverfarms/{appServicePlanName}". + */ + @JsonProperty(value = "properties.serverFarmId") + private String serverFarmId; /** * Get the friendlyName value. @@ -145,17 +151,6 @@ public String friendlyName() { return this.friendlyName; } - /** - * Set the friendlyName value. - * - * @param friendlyName the friendlyName value to set - * @return the CertificateInner object itself. - */ - public CertificateInner withFriendlyName(String friendlyName) { - this.friendlyName = friendlyName; - return this; - } - /** * Get the subjectName value. * @@ -165,17 +160,6 @@ public String subjectName() { return this.subjectName; } - /** - * Set the subjectName value. - * - * @param subjectName the subjectName value to set - * @return the CertificateInner object itself. - */ - public CertificateInner withSubjectName(String subjectName) { - this.subjectName = subjectName; - return this; - } - /** * Get the hostNames value. * @@ -201,7 +185,7 @@ public CertificateInner withHostNames(List hostNames) { * * @return the pfxBlob value */ - public String pfxBlob() { + public byte[] pfxBlob() { return this.pfxBlob; } @@ -211,7 +195,7 @@ public String pfxBlob() { * @param pfxBlob the pfxBlob value to set * @return the CertificateInner object itself. */ - public CertificateInner withPfxBlob(String pfxBlob) { + public CertificateInner withPfxBlob(byte[] pfxBlob) { this.pfxBlob = pfxBlob; return this; } @@ -225,17 +209,6 @@ public String siteName() { return this.siteName; } - /** - * Set the siteName value. - * - * @param siteName the siteName value to set - * @return the CertificateInner object itself. - */ - public CertificateInner withSiteName(String siteName) { - this.siteName = siteName; - return this; - } - /** * Get the selfLink value. * @@ -245,17 +218,6 @@ public String selfLink() { return this.selfLink; } - /** - * Set the selfLink value. - * - * @param selfLink the selfLink value to set - * @return the CertificateInner object itself. - */ - public CertificateInner withSelfLink(String selfLink) { - this.selfLink = selfLink; - return this; - } - /** * Get the issuer value. * @@ -265,17 +227,6 @@ public String issuer() { return this.issuer; } - /** - * Set the issuer value. - * - * @param issuer the issuer value to set - * @return the CertificateInner object itself. - */ - public CertificateInner withIssuer(String issuer) { - this.issuer = issuer; - return this; - } - /** * Get the issueDate value. * @@ -285,17 +236,6 @@ public DateTime issueDate() { return this.issueDate; } - /** - * Set the issueDate value. - * - * @param issueDate the issueDate value to set - * @return the CertificateInner object itself. - */ - public CertificateInner withIssueDate(DateTime issueDate) { - this.issueDate = issueDate; - return this; - } - /** * Get the expirationDate value. * @@ -305,17 +245,6 @@ public DateTime expirationDate() { return this.expirationDate; } - /** - * Set the expirationDate value. - * - * @param expirationDate the expirationDate value to set - * @return the CertificateInner object itself. - */ - public CertificateInner withExpirationDate(DateTime expirationDate) { - this.expirationDate = expirationDate; - return this; - } - /** * Get the password value. * @@ -345,17 +274,6 @@ public String thumbprint() { return this.thumbprint; } - /** - * Set the thumbprint value. - * - * @param thumbprint the thumbprint value to set - * @return the CertificateInner object itself. - */ - public CertificateInner withThumbprint(String thumbprint) { - this.thumbprint = thumbprint; - return this; - } - /** * Get the valid value. * @@ -365,17 +283,6 @@ public Boolean valid() { return this.valid; } - /** - * Set the valid value. - * - * @param valid the valid value to set - * @return the CertificateInner object itself. - */ - public CertificateInner withValid(Boolean valid) { - this.valid = valid; - return this; - } - /** * Get the cerBlob value. * @@ -406,33 +313,80 @@ public String publicKeyHash() { } /** - * Set the publicKeyHash value. + * Get the hostingEnvironmentProfile value. * - * @param publicKeyHash the publicKeyHash value to set + * @return the hostingEnvironmentProfile value + */ + public HostingEnvironmentProfile hostingEnvironmentProfile() { + return this.hostingEnvironmentProfile; + } + + /** + * Get the keyVaultId value. + * + * @return the keyVaultId value + */ + public String keyVaultId() { + return this.keyVaultId; + } + + /** + * Set the keyVaultId value. + * + * @param keyVaultId the keyVaultId value to set * @return the CertificateInner object itself. */ - public CertificateInner withPublicKeyHash(String publicKeyHash) { - this.publicKeyHash = publicKeyHash; + public CertificateInner withKeyVaultId(String keyVaultId) { + this.keyVaultId = keyVaultId; return this; } /** - * Get the hostingEnvironmentProfile value. + * Get the keyVaultSecretName value. * - * @return the hostingEnvironmentProfile value + * @return the keyVaultSecretName value */ - public HostingEnvironmentProfile hostingEnvironmentProfile() { - return this.hostingEnvironmentProfile; + public String keyVaultSecretName() { + return this.keyVaultSecretName; + } + + /** + * Set the keyVaultSecretName value. + * + * @param keyVaultSecretName the keyVaultSecretName value to set + * @return the CertificateInner object itself. + */ + public CertificateInner withKeyVaultSecretName(String keyVaultSecretName) { + this.keyVaultSecretName = keyVaultSecretName; + return this; + } + + /** + * Get the keyVaultSecretStatus value. + * + * @return the keyVaultSecretStatus value + */ + public KeyVaultSecretStatus keyVaultSecretStatus() { + return this.keyVaultSecretStatus; + } + + /** + * Get the serverFarmId value. + * + * @return the serverFarmId value + */ + public String serverFarmId() { + return this.serverFarmId; } /** - * Set the hostingEnvironmentProfile value. + * Set the serverFarmId value. * - * @param hostingEnvironmentProfile the hostingEnvironmentProfile value to set + * @param serverFarmId the serverFarmId value to set * @return the CertificateInner object itself. */ - public CertificateInner withHostingEnvironmentProfile(HostingEnvironmentProfile hostingEnvironmentProfile) { - this.hostingEnvironmentProfile = hostingEnvironmentProfile; + public CertificateInner withServerFarmId(String serverFarmId) { + this.serverFarmId = serverFarmId; return this; } diff --git a/azure-mgmt-website/src/main/java/com/microsoft/azure/management/website/implementation/CertificateOrderActionInner.java b/azure-mgmt-website/src/main/java/com/microsoft/azure/management/website/implementation/CertificateOrderActionInner.java index f9cfef31dc03f..4d86210eb052b 100644 --- a/azure-mgmt-website/src/main/java/com/microsoft/azure/management/website/implementation/CertificateOrderActionInner.java +++ b/azure-mgmt-website/src/main/java/com/microsoft/azure/management/website/implementation/CertificateOrderActionInner.java @@ -15,15 +15,16 @@ import com.microsoft.azure.Resource; /** - * Represents a certificate action. + * Certificate order action. */ @JsonFlatten public class CertificateOrderActionInner extends Resource { /** - * Type. Possible values include: 'CertificateIssued', + * Action type. Possible values include: 'CertificateIssued', * 'CertificateOrderCanceled', 'CertificateOrderCreated', * 'CertificateRevoked', 'DomainValidationComplete', 'FraudDetected', - * 'OrgNameChange', 'OrgValidationComplete', 'SanDrop'. + * 'OrgNameChange', 'OrgValidationComplete', 'SanDrop', 'FraudCleared', + * 'Unknown'. */ @JsonProperty(value = "properties.type") private CertificateOrderActionType certificateOrderActionType; diff --git a/azure-mgmt-website/src/main/java/com/microsoft/azure/management/website/implementation/CertificatesInner.java b/azure-mgmt-website/src/main/java/com/microsoft/azure/management/website/implementation/CertificatesInner.java index e94e7d88953d2..8c71652f4a47a 100644 --- a/azure-mgmt-website/src/main/java/com/microsoft/azure/management/website/implementation/CertificatesInner.java +++ b/azure-mgmt-website/src/main/java/com/microsoft/azure/management/website/implementation/CertificatesInner.java @@ -88,23 +88,23 @@ interface CertificatesService { @Headers("Content-Type: application/json; charset=utf-8") @GET("subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.Web/csrs") - Observable> listCsrs(@Path("resourceGroupName") String resourceGroupName, @Path("subscriptionId") String subscriptionId, @Query("api-version") String apiVersion, @Header("accept-language") String acceptLanguage, @Header("User-Agent") String userAgent); + Observable> listSigningRequestByResourceGroup(@Path("resourceGroupName") String resourceGroupName, @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") @GET("subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.Web/csrs/{name}") - Observable> getCsr(@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> getSigningRequest(@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") @PUT("subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.Web/csrs/{name}") - Observable> createOrUpdateCsr(@Path("resourceGroupName") String resourceGroupName, @Path("name") String name, @Path("subscriptionId") String subscriptionId, @Body CsrInner csrEnvelope, @Query("api-version") String apiVersion, @Header("accept-language") String acceptLanguage, @Header("User-Agent") String userAgent); + Observable> createOrUpdateSigningRequest(@Path("resourceGroupName") String resourceGroupName, @Path("name") String name, @Path("subscriptionId") String subscriptionId, @Body CsrInner csrEnvelope, @Query("api-version") String apiVersion, @Header("accept-language") String acceptLanguage, @Header("User-Agent") String userAgent); @Headers("Content-Type: application/json; charset=utf-8") @HTTP(path = "subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.Web/csrs/{name}", method = "DELETE", hasBody = true) - Observable> deleteCsr(@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> deleteSigningRequest(@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") @PATCH("subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.Web/csrs/{name}") - Observable> updateCsr(@Path("resourceGroupName") String resourceGroupName, @Path("name") String name, @Path("subscriptionId") String subscriptionId, @Body CsrInner csrEnvelope, @Query("api-version") String apiVersion, @Header("accept-language") String acceptLanguage, @Header("User-Agent") String userAgent); + Observable> updateSigningRequest(@Path("resourceGroupName") String resourceGroupName, @Path("name") String name, @Path("subscriptionId") String subscriptionId, @Body CsrInner csrEnvelope, @Query("api-version") String apiVersion, @Header("accept-language") String acceptLanguage, @Header("User-Agent") String userAgent); @Headers("Content-Type: application/json; charset=utf-8") @GET("{nextLink}") @@ -114,6 +114,10 @@ interface CertificatesService { @GET("{nextLink}") Observable> listByResourceGroupNext(@Path(value = "nextLink", encoded = true) String nextPageLink, @Header("accept-language") String acceptLanguage, @Header("User-Agent") String userAgent); + @Headers("Content-Type: application/json; charset=utf-8") + @GET("{nextLink}") + Observable> listSigningRequestByResourceGroupNext(@Path(value = "nextLink", encoded = true) String nextPageLink, @Header("accept-language") String acceptLanguage, @Header("User-Agent") String userAgent); + } /** @@ -220,10 +224,10 @@ private ServiceResponse> listDelegate(Response listByResourceGroup(final String resourceGroupName) { @@ -237,10 +241,10 @@ public Page nextPage(String nextPageLink) { } /** - * Get certificates for a subscription in the specified resource group. - * Get certificates for a subscription in the specified resource group. + * Get all certificates in a resource group. + * Get all certificates in a resource group. * - * @param resourceGroupName Name of the resource group + * @param resourceGroupName Name of the resource group to which the resource belongs. * @param serviceCallback the async ServiceCallback to handle successful and failed responses. * @return the {@link ServiceCall} object */ @@ -257,10 +261,10 @@ public Observable>> call(String nextPageL } /** - * Get certificates for a subscription in the specified resource group. - * Get certificates for a subscription in the specified resource group. + * Get all certificates in a resource group. + * Get all certificates in a resource group. * - * @param resourceGroupName Name of the resource group + * @param resourceGroupName Name of the resource group to which the resource belongs. * @return the observable to the PagedList<CertificateInner> object */ public Observable> listByResourceGroupAsync(final String resourceGroupName) { @@ -274,10 +278,10 @@ public Page call(ServiceResponse> respo } /** - * Get certificates for a subscription in the specified resource group. - * Get certificates for a subscription in the specified resource group. + * Get all certificates in a resource group. + * Get all certificates in a resource group. * - * @param resourceGroupName Name of the resource group + * @param resourceGroupName Name of the resource group to which the resource belongs. * @return the observable to the PagedList<CertificateInner> object */ public Observable>> listByResourceGroupWithServiceResponseAsync(final String resourceGroupName) { @@ -295,10 +299,10 @@ public Observable>> call(ServiceResponse< } /** - * Get certificates for a subscription in the specified resource group. - * Get certificates for a subscription in the specified resource group. + * Get all certificates in a resource group. + * Get all certificates in a resource group. * - ServiceResponse> * @param resourceGroupName Name of the resource group + ServiceResponse> * @param resourceGroupName Name of the resource group to which the resource belongs. * @return the PagedList<CertificateInner> object wrapped in {@link ServiceResponse} if successful. */ public Observable>> listByResourceGroupSinglePageAsync(final String resourceGroupName) { @@ -331,10 +335,10 @@ private ServiceResponse> listByResourceGroupDelegate( } /** - * Get a certificate by certificate name for a subscription in the specified resource group. - * Get a certificate by certificate name for a subscription in the specified resource group. + * Get a certificate. + * Get a certificate. * - * @param resourceGroupName Name of the resource group + * @param resourceGroupName Name of the resource group to which the resource belongs. * @param name Name of the certificate. * @return the CertificateInner object if successful. */ @@ -343,10 +347,10 @@ public CertificateInner get(String resourceGroupName, String name) { } /** - * Get a certificate by certificate name for a subscription in the specified resource group. - * Get a certificate by certificate name for a subscription in the specified resource group. + * Get a certificate. + * Get a certificate. * - * @param resourceGroupName Name of the resource group + * @param resourceGroupName Name of the resource group to which the resource belongs. * @param name Name of the certificate. * @param serviceCallback the async ServiceCallback to handle successful and failed responses. * @return the {@link ServiceCall} object @@ -356,10 +360,10 @@ public ServiceCall getAsync(String resourceGroupName, String n } /** - * Get a certificate by certificate name for a subscription in the specified resource group. - * Get a certificate by certificate name for a subscription in the specified resource group. + * Get a certificate. + * Get a certificate. * - * @param resourceGroupName Name of the resource group + * @param resourceGroupName Name of the resource group to which the resource belongs. * @param name Name of the certificate. * @return the observable to the CertificateInner object */ @@ -373,10 +377,10 @@ public CertificateInner call(ServiceResponse response) { } /** - * Get a certificate by certificate name for a subscription in the specified resource group. - * Get a certificate by certificate name for a subscription in the specified resource group. + * Get a certificate. + * Get a certificate. * - * @param resourceGroupName Name of the resource group + * @param resourceGroupName Name of the resource group to which the resource belongs. * @param name Name of the certificate. * @return the observable to the CertificateInner object */ @@ -413,12 +417,12 @@ private ServiceResponse getDelegate(Response res } /** - * Creates or modifies an existing certificate. - * Creates or modifies an existing certificate. + * Create or update a certificate. + * Create or update a certificate. * - * @param resourceGroupName Name of the resource group + * @param resourceGroupName Name of the resource group to which the resource belongs. * @param name Name of the certificate. - * @param certificateEnvelope Details of certificate if it exists already. + * @param certificateEnvelope Details of certificate, if it exists already. * @return the CertificateInner object if successful. */ public CertificateInner createOrUpdate(String resourceGroupName, String name, CertificateInner certificateEnvelope) { @@ -426,12 +430,12 @@ public CertificateInner createOrUpdate(String resourceGroupName, String name, Ce } /** - * Creates or modifies an existing certificate. - * Creates or modifies an existing certificate. + * Create or update a certificate. + * Create or update a certificate. * - * @param resourceGroupName Name of the resource group + * @param resourceGroupName Name of the resource group to which the resource belongs. * @param name Name of the certificate. - * @param certificateEnvelope Details of certificate if it exists already. + * @param certificateEnvelope Details of certificate, if it exists already. * @param serviceCallback the async ServiceCallback to handle successful and failed responses. * @return the {@link ServiceCall} object */ @@ -440,12 +444,12 @@ public ServiceCall createOrUpdateAsync(String resourceGroupNam } /** - * Creates or modifies an existing certificate. - * Creates or modifies an existing certificate. + * Create or update a certificate. + * Create or update a certificate. * - * @param resourceGroupName Name of the resource group + * @param resourceGroupName Name of the resource group to which the resource belongs. * @param name Name of the certificate. - * @param certificateEnvelope Details of certificate if it exists already. + * @param certificateEnvelope Details of certificate, if it exists already. * @return the observable to the CertificateInner object */ public Observable createOrUpdateAsync(String resourceGroupName, String name, CertificateInner certificateEnvelope) { @@ -458,12 +462,12 @@ public CertificateInner call(ServiceResponse response) { } /** - * Creates or modifies an existing certificate. - * Creates or modifies an existing certificate. + * Create or update a certificate. + * Create or update a certificate. * - * @param resourceGroupName Name of the resource group + * @param resourceGroupName Name of the resource group to which the resource belongs. * @param name Name of the certificate. - * @param certificateEnvelope Details of certificate if it exists already. + * @param certificateEnvelope Details of certificate, if it exists already. * @return the observable to the CertificateInner object */ public Observable> createOrUpdateWithServiceResponseAsync(String resourceGroupName, String name, CertificateInner certificateEnvelope) { @@ -503,56 +507,55 @@ private ServiceResponse createOrUpdateDelegate(Response deleteAsync(String resourceGroupName, String name, final ServiceCallback serviceCallback) { + public ServiceCall deleteAsync(String resourceGroupName, String name, final ServiceCallback serviceCallback) { return ServiceCall.create(deleteWithServiceResponseAsync(resourceGroupName, name), serviceCallback); } /** - * Delete a certificate by name in a specificed subscription and resourcegroup. - * Delete a certificate by name in a specificed subscription and resourcegroup. + * Delete a certificate. + * Delete a certificate. * - * @param resourceGroupName Name of the resource group - * @param name Name of the certificate to be deleted. - * @return the observable to the Object object + * @param resourceGroupName Name of the resource group to which the resource belongs. + * @param name Name of the certificate. + * @return the {@link ServiceResponse} object if successful. */ - public Observable deleteAsync(String resourceGroupName, String name) { - return deleteWithServiceResponseAsync(resourceGroupName, name).map(new Func1, Object>() { + public Observable deleteAsync(String resourceGroupName, String name) { + return deleteWithServiceResponseAsync(resourceGroupName, name).map(new Func1, Void>() { @Override - public Object call(ServiceResponse response) { + public Void call(ServiceResponse response) { return response.getBody(); } }); } /** - * Delete a certificate by name in a specificed subscription and resourcegroup. - * Delete a certificate by name in a specificed subscription and resourcegroup. + * Delete a certificate. + * Delete a certificate. * - * @param resourceGroupName Name of the resource group - * @param name Name of the certificate to be deleted. - * @return the observable to the Object object + * @param resourceGroupName Name of the resource group to which the resource belongs. + * @param name Name of the certificate. + * @return the {@link ServiceResponse} object if successful. */ - public Observable> deleteWithServiceResponseAsync(String resourceGroupName, String name) { + public Observable> deleteWithServiceResponseAsync(String resourceGroupName, String name) { if (resourceGroupName == null) { throw new IllegalArgumentException("Parameter resourceGroupName is required and cannot be null."); } @@ -564,11 +567,11 @@ public Observable> deleteWithServiceResponseAsync(String } final String apiVersion = "2016-03-01"; return service.delete(resourceGroupName, name, this.client.subscriptionId(), apiVersion, this.client.acceptLanguage(), this.client.userAgent()) - .flatMap(new Func1, Observable>>() { + .flatMap(new Func1, Observable>>() { @Override - public Observable> call(Response response) { + public Observable> call(Response response) { try { - ServiceResponse clientResponse = deleteDelegate(response); + ServiceResponse clientResponse = deleteDelegate(response); return Observable.just(clientResponse); } catch (Throwable t) { return Observable.error(t); @@ -577,20 +580,20 @@ public Observable> call(Response response) }); } - private ServiceResponse deleteDelegate(Response response) throws CloudException, IOException, IllegalArgumentException { - return new AzureServiceResponseBuilder(this.client.mapperAdapter()) - .register(200, new TypeToken() { }.getType()) - .registerError(CloudException.class) + private ServiceResponse deleteDelegate(Response response) throws CloudException, IOException, IllegalArgumentException { + return new AzureServiceResponseBuilder(this.client.mapperAdapter()) + .register(200, new TypeToken() { }.getType()) + .register(204, new TypeToken() { }.getType()) .build(response); } /** - * Creates or modifies an existing certificate. - * Creates or modifies an existing certificate. + * Create or update a certificate. + * Create or update a certificate. * - * @param resourceGroupName Name of the resource group + * @param resourceGroupName Name of the resource group to which the resource belongs. * @param name Name of the certificate. - * @param certificateEnvelope Details of certificate if it exists already. + * @param certificateEnvelope Details of certificate, if it exists already. * @return the CertificateInner object if successful. */ public CertificateInner update(String resourceGroupName, String name, CertificateInner certificateEnvelope) { @@ -598,12 +601,12 @@ public CertificateInner update(String resourceGroupName, String name, Certificat } /** - * Creates or modifies an existing certificate. - * Creates or modifies an existing certificate. + * Create or update a certificate. + * Create or update a certificate. * - * @param resourceGroupName Name of the resource group + * @param resourceGroupName Name of the resource group to which the resource belongs. * @param name Name of the certificate. - * @param certificateEnvelope Details of certificate if it exists already. + * @param certificateEnvelope Details of certificate, if it exists already. * @param serviceCallback the async ServiceCallback to handle successful and failed responses. * @return the {@link ServiceCall} object */ @@ -612,12 +615,12 @@ public ServiceCall updateAsync(String resourceGroupName, Strin } /** - * Creates or modifies an existing certificate. - * Creates or modifies an existing certificate. + * Create or update a certificate. + * Create or update a certificate. * - * @param resourceGroupName Name of the resource group + * @param resourceGroupName Name of the resource group to which the resource belongs. * @param name Name of the certificate. - * @param certificateEnvelope Details of certificate if it exists already. + * @param certificateEnvelope Details of certificate, if it exists already. * @return the observable to the CertificateInner object */ public Observable updateAsync(String resourceGroupName, String name, CertificateInner certificateEnvelope) { @@ -630,12 +633,12 @@ public CertificateInner call(ServiceResponse response) { } /** - * Creates or modifies an existing certificate. - * Creates or modifies an existing certificate. + * Create or update a certificate. + * Create or update a certificate. * - * @param resourceGroupName Name of the resource group + * @param resourceGroupName Name of the resource group to which the resource belongs. * @param name Name of the certificate. - * @param certificateEnvelope Details of certificate if it exists already. + * @param certificateEnvelope Details of certificate, if it exists already. * @return the observable to the CertificateInner object */ public Observable> updateWithServiceResponseAsync(String resourceGroupName, String name, CertificateInner certificateEnvelope) { @@ -675,52 +678,88 @@ private ServiceResponse updateDelegate(Response } /** - * Gets the certificate signing requests for a subscription in the specified resource group. - * Gets the certificate signing requests for a subscription in the specified resource group. + * Get all certificate signing requests in a resource group. + * Get all certificate signing requests in a resource group. * - * @param resourceGroupName Name of the resource group - * @return the List<CsrInner> object if successful. + * @param resourceGroupName Name of the resource group to which the resource belongs. + * @return the PagedList<CsrInner> object if successful. */ - public List listCsrs(String resourceGroupName) { - return listCsrsWithServiceResponseAsync(resourceGroupName).toBlocking().single().getBody(); + public PagedList listSigningRequestByResourceGroup(final String resourceGroupName) { + ServiceResponse> response = listSigningRequestByResourceGroupSinglePageAsync(resourceGroupName).toBlocking().single(); + return new PagedList(response.getBody()) { + @Override + public Page nextPage(String nextPageLink) { + return listSigningRequestByResourceGroupNextSinglePageAsync(nextPageLink).toBlocking().single().getBody(); + } + }; } /** - * Gets the certificate signing requests for a subscription in the specified resource group. - * Gets the certificate signing requests for a subscription in the specified resource group. + * Get all certificate signing requests in a resource group. + * Get all certificate signing requests in a resource group. * - * @param resourceGroupName Name of the resource group + * @param resourceGroupName Name of the resource group to which the resource belongs. * @param serviceCallback the async ServiceCallback to handle successful and failed responses. * @return the {@link ServiceCall} object */ - public ServiceCall> listCsrsAsync(String resourceGroupName, final ServiceCallback> serviceCallback) { - return ServiceCall.create(listCsrsWithServiceResponseAsync(resourceGroupName), serviceCallback); + public ServiceCall> listSigningRequestByResourceGroupAsync(final String resourceGroupName, final ListOperationCallback serviceCallback) { + return AzureServiceCall.create( + listSigningRequestByResourceGroupSinglePageAsync(resourceGroupName), + new Func1>>>() { + @Override + public Observable>> call(String nextPageLink) { + return listSigningRequestByResourceGroupNextSinglePageAsync(nextPageLink); + } + }, + serviceCallback); + } + + /** + * Get all certificate signing requests in a resource group. + * Get all certificate signing requests in a resource group. + * + * @param resourceGroupName Name of the resource group to which the resource belongs. + * @return the observable to the PagedList<CsrInner> object + */ + public Observable> listSigningRequestByResourceGroupAsync(final String resourceGroupName) { + return listSigningRequestByResourceGroupWithServiceResponseAsync(resourceGroupName) + .map(new Func1>, Page>() { + @Override + public Page call(ServiceResponse> response) { + return response.getBody(); + } + }); } /** - * Gets the certificate signing requests for a subscription in the specified resource group. - * Gets the certificate signing requests for a subscription in the specified resource group. + * Get all certificate signing requests in a resource group. + * Get all certificate signing requests in a resource group. * - * @param resourceGroupName Name of the resource group - * @return the observable to the List<CsrInner> object + * @param resourceGroupName Name of the resource group to which the resource belongs. + * @return the observable to the PagedList<CsrInner> object */ - public Observable> listCsrsAsync(String resourceGroupName) { - return listCsrsWithServiceResponseAsync(resourceGroupName).map(new Func1>, List>() { - @Override - public List call(ServiceResponse> response) { - return response.getBody(); - } - }); + public Observable>> listSigningRequestByResourceGroupWithServiceResponseAsync(final String resourceGroupName) { + return listSigningRequestByResourceGroupSinglePageAsync(resourceGroupName) + .concatMap(new Func1>, Observable>>>() { + @Override + public Observable>> call(ServiceResponse> page) { + String nextPageLink = page.getBody().getNextPageLink(); + if (nextPageLink == null) { + return Observable.just(page); + } + return Observable.just(page).concatWith(listSigningRequestByResourceGroupNextWithServiceResponseAsync(nextPageLink)); + } + }); } /** - * Gets the certificate signing requests for a subscription in the specified resource group. - * Gets the certificate signing requests for a subscription in the specified resource group. + * Get all certificate signing requests in a resource group. + * Get all certificate signing requests in a resource group. * - * @param resourceGroupName Name of the resource group - * @return the observable to the List<CsrInner> object + ServiceResponse> * @param resourceGroupName Name of the resource group to which the resource belongs. + * @return the PagedList<CsrInner> object wrapped in {@link ServiceResponse} if successful. */ - public Observable>> listCsrsWithServiceResponseAsync(String resourceGroupName) { + public Observable>> listSigningRequestByResourceGroupSinglePageAsync(final String resourceGroupName) { if (resourceGroupName == null) { throw new IllegalArgumentException("Parameter resourceGroupName is required and cannot be null."); } @@ -728,13 +767,13 @@ public Observable>> listCsrsWithServiceResponseAs throw new IllegalArgumentException("Parameter this.client.subscriptionId() is required and cannot be null."); } final String apiVersion = "2016-03-01"; - return service.listCsrs(resourceGroupName, this.client.subscriptionId(), apiVersion, this.client.acceptLanguage(), this.client.userAgent()) - .flatMap(new Func1, Observable>>>() { + return service.listSigningRequestByResourceGroup(resourceGroupName, this.client.subscriptionId(), apiVersion, this.client.acceptLanguage(), this.client.userAgent()) + .flatMap(new Func1, Observable>>>() { @Override - public Observable>> call(Response response) { + public Observable>> call(Response response) { try { - ServiceResponse> clientResponse = listCsrsDelegate(response); - return Observable.just(clientResponse); + ServiceResponse> result = listSigningRequestByResourceGroupDelegate(response); + return Observable.just(new ServiceResponse>(result.getBody(), result.getResponse())); } catch (Throwable t) { return Observable.error(t); } @@ -742,48 +781,48 @@ public Observable>> call(Response r }); } - private ServiceResponse> listCsrsDelegate(Response response) throws CloudException, IOException, IllegalArgumentException { - return new AzureServiceResponseBuilder, CloudException>(this.client.mapperAdapter()) - .register(200, new TypeToken>() { }.getType()) + private ServiceResponse> listSigningRequestByResourceGroupDelegate(Response response) throws CloudException, IOException, IllegalArgumentException { + return new AzureServiceResponseBuilder, CloudException>(this.client.mapperAdapter()) + .register(200, new TypeToken>() { }.getType()) .registerError(CloudException.class) .build(response); } /** - * Gets a certificate signing request by certificate name for a subscription in the specified resource group. - * Gets a certificate signing request by certificate name for a subscription in the specified resource group. + * Get a certificate signing request. + * Get a certificate signing request. * - * @param resourceGroupName Name of the resource group - * @param name Name of the certificate. + * @param resourceGroupName Name of the resource group to which the resource belongs. + * @param name Name of the certificate signing request. * @return the CsrInner object if successful. */ - public CsrInner getCsr(String resourceGroupName, String name) { - return getCsrWithServiceResponseAsync(resourceGroupName, name).toBlocking().single().getBody(); + public CsrInner getSigningRequest(String resourceGroupName, String name) { + return getSigningRequestWithServiceResponseAsync(resourceGroupName, name).toBlocking().single().getBody(); } /** - * Gets a certificate signing request by certificate name for a subscription in the specified resource group. - * Gets a certificate signing request by certificate name for a subscription in the specified resource group. + * Get a certificate signing request. + * Get a certificate signing request. * - * @param resourceGroupName Name of the resource group - * @param name Name of the certificate. + * @param resourceGroupName Name of the resource group to which the resource belongs. + * @param name Name of the certificate signing request. * @param serviceCallback the async ServiceCallback to handle successful and failed responses. * @return the {@link ServiceCall} object */ - public ServiceCall getCsrAsync(String resourceGroupName, String name, final ServiceCallback serviceCallback) { - return ServiceCall.create(getCsrWithServiceResponseAsync(resourceGroupName, name), serviceCallback); + public ServiceCall getSigningRequestAsync(String resourceGroupName, String name, final ServiceCallback serviceCallback) { + return ServiceCall.create(getSigningRequestWithServiceResponseAsync(resourceGroupName, name), serviceCallback); } /** - * Gets a certificate signing request by certificate name for a subscription in the specified resource group. - * Gets a certificate signing request by certificate name for a subscription in the specified resource group. + * Get a certificate signing request. + * Get a certificate signing request. * - * @param resourceGroupName Name of the resource group - * @param name Name of the certificate. + * @param resourceGroupName Name of the resource group to which the resource belongs. + * @param name Name of the certificate signing request. * @return the observable to the CsrInner object */ - public Observable getCsrAsync(String resourceGroupName, String name) { - return getCsrWithServiceResponseAsync(resourceGroupName, name).map(new Func1, CsrInner>() { + public Observable getSigningRequestAsync(String resourceGroupName, String name) { + return getSigningRequestWithServiceResponseAsync(resourceGroupName, name).map(new Func1, CsrInner>() { @Override public CsrInner call(ServiceResponse response) { return response.getBody(); @@ -792,14 +831,14 @@ public CsrInner call(ServiceResponse response) { } /** - * Gets a certificate signing request by certificate name for a subscription in the specified resource group. - * Gets a certificate signing request by certificate name for a subscription in the specified resource group. + * Get a certificate signing request. + * Get a certificate signing request. * - * @param resourceGroupName Name of the resource group - * @param name Name of the certificate. + * @param resourceGroupName Name of the resource group to which the resource belongs. + * @param name Name of the certificate signing request. * @return the observable to the CsrInner object */ - public Observable> getCsrWithServiceResponseAsync(String resourceGroupName, String name) { + public Observable> getSigningRequestWithServiceResponseAsync(String resourceGroupName, String name) { if (resourceGroupName == null) { throw new IllegalArgumentException("Parameter resourceGroupName is required and cannot be null."); } @@ -810,12 +849,12 @@ public Observable> getCsrWithServiceResponseAsync(Stri throw new IllegalArgumentException("Parameter this.client.subscriptionId() is required and cannot be null."); } final String apiVersion = "2016-03-01"; - return service.getCsr(resourceGroupName, name, this.client.subscriptionId(), apiVersion, this.client.acceptLanguage(), this.client.userAgent()) + return service.getSigningRequest(resourceGroupName, name, this.client.subscriptionId(), apiVersion, this.client.acceptLanguage(), this.client.userAgent()) .flatMap(new Func1, Observable>>() { @Override public Observable> call(Response response) { try { - ServiceResponse clientResponse = getCsrDelegate(response); + ServiceResponse clientResponse = getSigningRequestDelegate(response); return Observable.just(clientResponse); } catch (Throwable t) { return Observable.error(t); @@ -824,7 +863,7 @@ public Observable> call(Response respons }); } - private ServiceResponse getCsrDelegate(Response response) throws CloudException, IOException, IllegalArgumentException { + private ServiceResponse getSigningRequestDelegate(Response response) throws CloudException, IOException, IllegalArgumentException { return new AzureServiceResponseBuilder(this.client.mapperAdapter()) .register(200, new TypeToken() { }.getType()) .registerError(CloudException.class) @@ -832,43 +871,43 @@ private ServiceResponse getCsrDelegate(Response response } /** - * Creates or modifies an existing certificate signing request. - * Creates or modifies an existing certificate signing request. + * Create or update a certificate signing request. + * Create or update a certificate signing request. * - * @param resourceGroupName Name of the resource group - * @param name Name of the certificate. - * @param csrEnvelope Details of certificate signing request if it exists already. + * @param resourceGroupName Name of the resource group to which the resource belongs. + * @param name Name of the certificate signing request. + * @param csrEnvelope Details of certificate signing request, if it exists already. * @return the CsrInner object if successful. */ - public CsrInner createOrUpdateCsr(String resourceGroupName, String name, CsrInner csrEnvelope) { - return createOrUpdateCsrWithServiceResponseAsync(resourceGroupName, name, csrEnvelope).toBlocking().single().getBody(); + public CsrInner createOrUpdateSigningRequest(String resourceGroupName, String name, CsrInner csrEnvelope) { + return createOrUpdateSigningRequestWithServiceResponseAsync(resourceGroupName, name, csrEnvelope).toBlocking().single().getBody(); } /** - * Creates or modifies an existing certificate signing request. - * Creates or modifies an existing certificate signing request. + * Create or update a certificate signing request. + * Create or update a certificate signing request. * - * @param resourceGroupName Name of the resource group - * @param name Name of the certificate. - * @param csrEnvelope Details of certificate signing request if it exists already. + * @param resourceGroupName Name of the resource group to which the resource belongs. + * @param name Name of the certificate signing request. + * @param csrEnvelope Details of certificate signing request, if it exists already. * @param serviceCallback the async ServiceCallback to handle successful and failed responses. * @return the {@link ServiceCall} object */ - public ServiceCall createOrUpdateCsrAsync(String resourceGroupName, String name, CsrInner csrEnvelope, final ServiceCallback serviceCallback) { - return ServiceCall.create(createOrUpdateCsrWithServiceResponseAsync(resourceGroupName, name, csrEnvelope), serviceCallback); + public ServiceCall createOrUpdateSigningRequestAsync(String resourceGroupName, String name, CsrInner csrEnvelope, final ServiceCallback serviceCallback) { + return ServiceCall.create(createOrUpdateSigningRequestWithServiceResponseAsync(resourceGroupName, name, csrEnvelope), serviceCallback); } /** - * Creates or modifies an existing certificate signing request. - * Creates or modifies an existing certificate signing request. + * Create or update a certificate signing request. + * Create or update a certificate signing request. * - * @param resourceGroupName Name of the resource group - * @param name Name of the certificate. - * @param csrEnvelope Details of certificate signing request if it exists already. + * @param resourceGroupName Name of the resource group to which the resource belongs. + * @param name Name of the certificate signing request. + * @param csrEnvelope Details of certificate signing request, if it exists already. * @return the observable to the CsrInner object */ - public Observable createOrUpdateCsrAsync(String resourceGroupName, String name, CsrInner csrEnvelope) { - return createOrUpdateCsrWithServiceResponseAsync(resourceGroupName, name, csrEnvelope).map(new Func1, CsrInner>() { + public Observable createOrUpdateSigningRequestAsync(String resourceGroupName, String name, CsrInner csrEnvelope) { + return createOrUpdateSigningRequestWithServiceResponseAsync(resourceGroupName, name, csrEnvelope).map(new Func1, CsrInner>() { @Override public CsrInner call(ServiceResponse response) { return response.getBody(); @@ -877,15 +916,15 @@ public CsrInner call(ServiceResponse response) { } /** - * Creates or modifies an existing certificate signing request. - * Creates or modifies an existing certificate signing request. + * Create or update a certificate signing request. + * Create or update a certificate signing request. * - * @param resourceGroupName Name of the resource group - * @param name Name of the certificate. - * @param csrEnvelope Details of certificate signing request if it exists already. + * @param resourceGroupName Name of the resource group to which the resource belongs. + * @param name Name of the certificate signing request. + * @param csrEnvelope Details of certificate signing request, if it exists already. * @return the observable to the CsrInner object */ - public Observable> createOrUpdateCsrWithServiceResponseAsync(String resourceGroupName, String name, CsrInner csrEnvelope) { + public Observable> createOrUpdateSigningRequestWithServiceResponseAsync(String resourceGroupName, String name, CsrInner csrEnvelope) { if (resourceGroupName == null) { throw new IllegalArgumentException("Parameter resourceGroupName is required and cannot be null."); } @@ -900,12 +939,12 @@ public Observable> createOrUpdateCsrWithServiceRespons } Validator.validate(csrEnvelope); final String apiVersion = "2016-03-01"; - return service.createOrUpdateCsr(resourceGroupName, name, this.client.subscriptionId(), csrEnvelope, apiVersion, this.client.acceptLanguage(), this.client.userAgent()) + return service.createOrUpdateSigningRequest(resourceGroupName, name, this.client.subscriptionId(), csrEnvelope, apiVersion, this.client.acceptLanguage(), this.client.userAgent()) .flatMap(new Func1, Observable>>() { @Override public Observable> call(Response response) { try { - ServiceResponse clientResponse = createOrUpdateCsrDelegate(response); + ServiceResponse clientResponse = createOrUpdateSigningRequestDelegate(response); return Observable.just(clientResponse); } catch (Throwable t) { return Observable.error(t); @@ -914,7 +953,7 @@ public Observable> call(Response respons }); } - private ServiceResponse createOrUpdateCsrDelegate(Response response) throws CloudException, IOException, IllegalArgumentException { + private ServiceResponse createOrUpdateSigningRequestDelegate(Response response) throws CloudException, IOException, IllegalArgumentException { return new AzureServiceResponseBuilder(this.client.mapperAdapter()) .register(200, new TypeToken() { }.getType()) .registerError(CloudException.class) @@ -922,56 +961,55 @@ private ServiceResponse createOrUpdateCsrDelegate(Response deleteCsrAsync(String resourceGroupName, String name, final ServiceCallback serviceCallback) { - return ServiceCall.create(deleteCsrWithServiceResponseAsync(resourceGroupName, name), serviceCallback); + public ServiceCall deleteSigningRequestAsync(String resourceGroupName, String name, final ServiceCallback serviceCallback) { + return ServiceCall.create(deleteSigningRequestWithServiceResponseAsync(resourceGroupName, name), serviceCallback); } /** - * Delete the certificate signing request. - * Delete the certificate signing request. + * Delete a certificate signing request. + * Delete a certificate signing request. * - * @param resourceGroupName Name of the resource group + * @param resourceGroupName Name of the resource group to which the resource belongs. * @param name Name of the certificate signing request. - * @return the observable to the Object object + * @return the {@link ServiceResponse} object if successful. */ - public Observable deleteCsrAsync(String resourceGroupName, String name) { - return deleteCsrWithServiceResponseAsync(resourceGroupName, name).map(new Func1, Object>() { + public Observable deleteSigningRequestAsync(String resourceGroupName, String name) { + return deleteSigningRequestWithServiceResponseAsync(resourceGroupName, name).map(new Func1, Void>() { @Override - public Object call(ServiceResponse response) { + public Void call(ServiceResponse response) { return response.getBody(); } }); } /** - * Delete the certificate signing request. - * Delete the certificate signing request. + * Delete a certificate signing request. + * Delete a certificate signing request. * - * @param resourceGroupName Name of the resource group + * @param resourceGroupName Name of the resource group to which the resource belongs. * @param name Name of the certificate signing request. - * @return the observable to the Object object + * @return the {@link ServiceResponse} object if successful. */ - public Observable> deleteCsrWithServiceResponseAsync(String resourceGroupName, String name) { + public Observable> deleteSigningRequestWithServiceResponseAsync(String resourceGroupName, String name) { if (resourceGroupName == null) { throw new IllegalArgumentException("Parameter resourceGroupName is required and cannot be null."); } @@ -982,12 +1020,12 @@ public Observable> deleteCsrWithServiceResponseAsync(Str throw new IllegalArgumentException("Parameter this.client.subscriptionId() is required and cannot be null."); } final String apiVersion = "2016-03-01"; - return service.deleteCsr(resourceGroupName, name, this.client.subscriptionId(), apiVersion, this.client.acceptLanguage(), this.client.userAgent()) - .flatMap(new Func1, Observable>>() { + return service.deleteSigningRequest(resourceGroupName, name, this.client.subscriptionId(), apiVersion, this.client.acceptLanguage(), this.client.userAgent()) + .flatMap(new Func1, Observable>>() { @Override - public Observable> call(Response response) { + public Observable> call(Response response) { try { - ServiceResponse clientResponse = deleteCsrDelegate(response); + ServiceResponse clientResponse = deleteSigningRequestDelegate(response); return Observable.just(clientResponse); } catch (Throwable t) { return Observable.error(t); @@ -996,51 +1034,51 @@ public Observable> call(Response response) }); } - private ServiceResponse deleteCsrDelegate(Response response) throws CloudException, IOException, IllegalArgumentException { - return new AzureServiceResponseBuilder(this.client.mapperAdapter()) - .register(200, new TypeToken() { }.getType()) - .registerError(CloudException.class) + private ServiceResponse deleteSigningRequestDelegate(Response response) throws CloudException, IOException, IllegalArgumentException { + return new AzureServiceResponseBuilder(this.client.mapperAdapter()) + .register(200, new TypeToken() { }.getType()) + .register(204, new TypeToken() { }.getType()) .build(response); } /** - * Creates or modifies an existing certificate signing request. - * Creates or modifies an existing certificate signing request. + * Create or update a certificate signing request. + * Create or update a certificate signing request. * - * @param resourceGroupName Name of the resource group - * @param name Name of the certificate. - * @param csrEnvelope Details of certificate signing request if it exists already. + * @param resourceGroupName Name of the resource group to which the resource belongs. + * @param name Name of the certificate signing request. + * @param csrEnvelope Details of certificate signing request, if it exists already. * @return the CsrInner object if successful. */ - public CsrInner updateCsr(String resourceGroupName, String name, CsrInner csrEnvelope) { - return updateCsrWithServiceResponseAsync(resourceGroupName, name, csrEnvelope).toBlocking().single().getBody(); + public CsrInner updateSigningRequest(String resourceGroupName, String name, CsrInner csrEnvelope) { + return updateSigningRequestWithServiceResponseAsync(resourceGroupName, name, csrEnvelope).toBlocking().single().getBody(); } /** - * Creates or modifies an existing certificate signing request. - * Creates or modifies an existing certificate signing request. + * Create or update a certificate signing request. + * Create or update a certificate signing request. * - * @param resourceGroupName Name of the resource group - * @param name Name of the certificate. - * @param csrEnvelope Details of certificate signing request if it exists already. + * @param resourceGroupName Name of the resource group to which the resource belongs. + * @param name Name of the certificate signing request. + * @param csrEnvelope Details of certificate signing request, if it exists already. * @param serviceCallback the async ServiceCallback to handle successful and failed responses. * @return the {@link ServiceCall} object */ - public ServiceCall updateCsrAsync(String resourceGroupName, String name, CsrInner csrEnvelope, final ServiceCallback serviceCallback) { - return ServiceCall.create(updateCsrWithServiceResponseAsync(resourceGroupName, name, csrEnvelope), serviceCallback); + public ServiceCall updateSigningRequestAsync(String resourceGroupName, String name, CsrInner csrEnvelope, final ServiceCallback serviceCallback) { + return ServiceCall.create(updateSigningRequestWithServiceResponseAsync(resourceGroupName, name, csrEnvelope), serviceCallback); } /** - * Creates or modifies an existing certificate signing request. - * Creates or modifies an existing certificate signing request. + * Create or update a certificate signing request. + * Create or update a certificate signing request. * - * @param resourceGroupName Name of the resource group - * @param name Name of the certificate. - * @param csrEnvelope Details of certificate signing request if it exists already. + * @param resourceGroupName Name of the resource group to which the resource belongs. + * @param name Name of the certificate signing request. + * @param csrEnvelope Details of certificate signing request, if it exists already. * @return the observable to the CsrInner object */ - public Observable updateCsrAsync(String resourceGroupName, String name, CsrInner csrEnvelope) { - return updateCsrWithServiceResponseAsync(resourceGroupName, name, csrEnvelope).map(new Func1, CsrInner>() { + public Observable updateSigningRequestAsync(String resourceGroupName, String name, CsrInner csrEnvelope) { + return updateSigningRequestWithServiceResponseAsync(resourceGroupName, name, csrEnvelope).map(new Func1, CsrInner>() { @Override public CsrInner call(ServiceResponse response) { return response.getBody(); @@ -1049,15 +1087,15 @@ public CsrInner call(ServiceResponse response) { } /** - * Creates or modifies an existing certificate signing request. - * Creates or modifies an existing certificate signing request. + * Create or update a certificate signing request. + * Create or update a certificate signing request. * - * @param resourceGroupName Name of the resource group - * @param name Name of the certificate. - * @param csrEnvelope Details of certificate signing request if it exists already. + * @param resourceGroupName Name of the resource group to which the resource belongs. + * @param name Name of the certificate signing request. + * @param csrEnvelope Details of certificate signing request, if it exists already. * @return the observable to the CsrInner object */ - public Observable> updateCsrWithServiceResponseAsync(String resourceGroupName, String name, CsrInner csrEnvelope) { + public Observable> updateSigningRequestWithServiceResponseAsync(String resourceGroupName, String name, CsrInner csrEnvelope) { if (resourceGroupName == null) { throw new IllegalArgumentException("Parameter resourceGroupName is required and cannot be null."); } @@ -1072,12 +1110,12 @@ public Observable> updateCsrWithServiceResponseAsync(S } Validator.validate(csrEnvelope); final String apiVersion = "2016-03-01"; - return service.updateCsr(resourceGroupName, name, this.client.subscriptionId(), csrEnvelope, apiVersion, this.client.acceptLanguage(), this.client.userAgent()) + return service.updateSigningRequest(resourceGroupName, name, this.client.subscriptionId(), csrEnvelope, apiVersion, this.client.acceptLanguage(), this.client.userAgent()) .flatMap(new Func1, Observable>>() { @Override public Observable> call(Response response) { try { - ServiceResponse clientResponse = updateCsrDelegate(response); + ServiceResponse clientResponse = updateSigningRequestDelegate(response); return Observable.just(clientResponse); } catch (Throwable t) { return Observable.error(t); @@ -1086,7 +1124,7 @@ public Observable> call(Response respons }); } - private ServiceResponse updateCsrDelegate(Response response) throws CloudException, IOException, IllegalArgumentException { + private ServiceResponse updateSigningRequestDelegate(Response response) throws CloudException, IOException, IllegalArgumentException { return new AzureServiceResponseBuilder(this.client.mapperAdapter()) .register(200, new TypeToken() { }.getType()) .registerError(CloudException.class) @@ -1202,8 +1240,8 @@ private ServiceResponse> listNextDelegate(Response nextPage(String nextPageLink) { } /** - * Get certificates for a subscription in the specified resource group. - * Get certificates for a subscription in the specified resource group. + * Get all certificates in a resource group. + * Get all certificates in a resource group. * * @param nextPageLink The NextLink from the previous successful call to List operation. * @param serviceCall the ServiceCall object tracking the Retrofit calls @@ -1240,8 +1278,8 @@ public Observable>> call(String nextPageL } /** - * Get certificates for a subscription in the specified resource group. - * Get certificates for a subscription in the specified resource group. + * Get all certificates in a resource group. + * Get all certificates in a resource group. * * @param nextPageLink The NextLink from the previous successful call to List operation. * @return the observable to the PagedList<CertificateInner> object @@ -1257,8 +1295,8 @@ public Page call(ServiceResponse> respo } /** - * Get certificates for a subscription in the specified resource group. - * Get certificates for a subscription in the specified resource group. + * Get all certificates in a resource group. + * Get all certificates in a resource group. * * @param nextPageLink The NextLink from the previous successful call to List operation. * @return the observable to the PagedList<CertificateInner> object @@ -1278,8 +1316,8 @@ public Observable>> call(ServiceResponse< } /** - * Get certificates for a subscription in the specified resource group. - * Get certificates for a subscription in the specified resource group. + * Get all certificates in a resource group. + * Get all certificates in a resource group. * ServiceResponse> * @param nextPageLink The NextLink from the previous successful call to List operation. * @return the PagedList<CertificateInner> object wrapped in {@link ServiceResponse} if successful. @@ -1309,4 +1347,112 @@ private ServiceResponse> listByResourceGroupNextDeleg .build(response); } + /** + * Get all certificate signing requests in a resource group. + * Get all certificate signing requests in a resource group. + * + * @param nextPageLink The NextLink from the previous successful call to List operation. + * @return the PagedList<CsrInner> object if successful. + */ + public PagedList listSigningRequestByResourceGroupNext(final String nextPageLink) { + ServiceResponse> response = listSigningRequestByResourceGroupNextSinglePageAsync(nextPageLink).toBlocking().single(); + return new PagedList(response.getBody()) { + @Override + public Page nextPage(String nextPageLink) { + return listSigningRequestByResourceGroupNextSinglePageAsync(nextPageLink).toBlocking().single().getBody(); + } + }; + } + + /** + * Get all certificate signing requests in a resource group. + * Get all certificate signing requests in a resource group. + * + * @param nextPageLink The NextLink from the previous successful call to List operation. + * @param serviceCall the ServiceCall object tracking the Retrofit calls + * @param serviceCallback the async ServiceCallback to handle successful and failed responses. + * @return the {@link ServiceCall} object + */ + public ServiceCall> listSigningRequestByResourceGroupNextAsync(final String nextPageLink, final ServiceCall> serviceCall, final ListOperationCallback serviceCallback) { + return AzureServiceCall.create( + listSigningRequestByResourceGroupNextSinglePageAsync(nextPageLink), + new Func1>>>() { + @Override + public Observable>> call(String nextPageLink) { + return listSigningRequestByResourceGroupNextSinglePageAsync(nextPageLink); + } + }, + serviceCallback); + } + + /** + * Get all certificate signing requests in a resource group. + * Get all certificate signing requests in a resource group. + * + * @param nextPageLink The NextLink from the previous successful call to List operation. + * @return the observable to the PagedList<CsrInner> object + */ + public Observable> listSigningRequestByResourceGroupNextAsync(final String nextPageLink) { + return listSigningRequestByResourceGroupNextWithServiceResponseAsync(nextPageLink) + .map(new Func1>, Page>() { + @Override + public Page call(ServiceResponse> response) { + return response.getBody(); + } + }); + } + + /** + * Get all certificate signing requests in a resource group. + * Get all certificate signing requests in a resource group. + * + * @param nextPageLink The NextLink from the previous successful call to List operation. + * @return the observable to the PagedList<CsrInner> object + */ + public Observable>> listSigningRequestByResourceGroupNextWithServiceResponseAsync(final String nextPageLink) { + return listSigningRequestByResourceGroupNextSinglePageAsync(nextPageLink) + .concatMap(new Func1>, Observable>>>() { + @Override + public Observable>> call(ServiceResponse> page) { + String nextPageLink = page.getBody().getNextPageLink(); + if (nextPageLink == null) { + return Observable.just(page); + } + return Observable.just(page).concatWith(listSigningRequestByResourceGroupNextWithServiceResponseAsync(nextPageLink)); + } + }); + } + + /** + * Get all certificate signing requests in a resource group. + * Get all certificate signing requests in a resource group. + * + ServiceResponse> * @param nextPageLink The NextLink from the previous successful call to List operation. + * @return the PagedList<CsrInner> object wrapped in {@link ServiceResponse} if successful. + */ + public Observable>> listSigningRequestByResourceGroupNextSinglePageAsync(final String nextPageLink) { + if (nextPageLink == null) { + throw new IllegalArgumentException("Parameter nextPageLink is required and cannot be null."); + } + return service.listSigningRequestByResourceGroupNext(nextPageLink, this.client.acceptLanguage(), this.client.userAgent()) + .flatMap(new Func1, Observable>>>() { + @Override + public Observable>> call(Response response) { + try { + ServiceResponse> result = listSigningRequestByResourceGroupNextDelegate(response); + return Observable.just(new ServiceResponse>(result.getBody(), result.getResponse())); + } catch (Throwable t) { + return Observable.error(t); + } + } + }); + } + + private ServiceResponse> listSigningRequestByResourceGroupNextDelegate(Response response) throws CloudException, IOException, IllegalArgumentException { + return new AzureServiceResponseBuilder, CloudException>(this.client.mapperAdapter()) + .register(200, new TypeToken>() { }.getType()) + .registerError(CloudException.class) + .build(response); + } + } diff --git a/azure-mgmt-website/src/main/java/com/microsoft/azure/management/website/implementation/ClassicMobileServiceInner.java b/azure-mgmt-website/src/main/java/com/microsoft/azure/management/website/implementation/ClassicMobileServiceInner.java deleted file mode 100644 index 8197ddaaf16c8..0000000000000 --- a/azure-mgmt-website/src/main/java/com/microsoft/azure/management/website/implementation/ClassicMobileServiceInner.java +++ /dev/null @@ -1,46 +0,0 @@ -/** - * 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.website.implementation; - -import com.fasterxml.jackson.annotation.JsonProperty; -import com.microsoft.rest.serializer.JsonFlatten; -import com.microsoft.azure.Resource; - -/** - * A mobile service. - */ -@JsonFlatten -public class ClassicMobileServiceInner extends Resource { - /** - * Name of the mobile service. - */ - @JsonProperty(value = "properties.name") - private String classicMobileServiceName; - - /** - * Get the classicMobileServiceName value. - * - * @return the classicMobileServiceName value - */ - public String classicMobileServiceName() { - return this.classicMobileServiceName; - } - - /** - * Set the classicMobileServiceName value. - * - * @param classicMobileServiceName the classicMobileServiceName value to set - * @return the ClassicMobileServiceInner object itself. - */ - public ClassicMobileServiceInner withClassicMobileServiceName(String classicMobileServiceName) { - this.classicMobileServiceName = classicMobileServiceName; - return this; - } - -} diff --git a/azure-mgmt-website/src/main/java/com/microsoft/azure/management/website/implementation/CsmMoveResourceEnvelopeInner.java b/azure-mgmt-website/src/main/java/com/microsoft/azure/management/website/implementation/CsmMoveResourceEnvelopeInner.java index f5152c90df3af..049ee9a3dc13c 100644 --- a/azure-mgmt-website/src/main/java/com/microsoft/azure/management/website/implementation/CsmMoveResourceEnvelopeInner.java +++ b/azure-mgmt-website/src/main/java/com/microsoft/azure/management/website/implementation/CsmMoveResourceEnvelopeInner.java @@ -11,8 +11,8 @@ import java.util.List; /** - * Class containing a list of the resources that need to be moved and the - * resource group they should be moved to. + * Object with a list of the resources that need to be moved and the resource + * group they should be moved to. */ public class CsmMoveResourceEnvelopeInner { /** diff --git a/azure-mgmt-website/src/main/java/com/microsoft/azure/management/website/implementation/CsmSiteRecoveryEntityInner.java b/azure-mgmt-website/src/main/java/com/microsoft/azure/management/website/implementation/CsmSiteRecoveryEntityInner.java index f016b9a7b1677..7657aef7d3b0d 100644 --- a/azure-mgmt-website/src/main/java/com/microsoft/azure/management/website/implementation/CsmSiteRecoveryEntityInner.java +++ b/azure-mgmt-website/src/main/java/com/microsoft/azure/management/website/implementation/CsmSiteRecoveryEntityInner.java @@ -11,29 +11,28 @@ import org.joda.time.DateTime; /** - * Class containting details about site recovery operation. + * Details about app recovery operation. */ public class CsmSiteRecoveryEntityInner { /** - * Point in time in which the site recover should be attempted. + * Point in time in which the app recovery should be attempted. */ private DateTime snapshotTime; /** - * If true, then the website's configuration will be reverted to its state - * at SnapshotTime. + * If <code>true</code>, then the app's configuration will be + * reverted to its state at <code>SnapshotTime</code>. */ private Boolean recoverConfig; /** - * [Optional] Destination web app name into which web app should be - * recovered. This is case when new web app should be created instead. + * [Optional] Destination app name into which app should be recovered. + * This is case when new app should be created instead. */ private String siteName; /** - * [Optional] Destination web app slot name into which web app should be - * recovered. + * [Optional] Destination app slot name into which app should be recovered. */ private String slotName; diff --git a/azure-mgmt-website/src/main/java/com/microsoft/azure/management/website/implementation/CsmSlotEntityInner.java b/azure-mgmt-website/src/main/java/com/microsoft/azure/management/website/implementation/CsmSlotEntityInner.java index 406a866f5dba0..ec1e9a50b89e6 100644 --- a/azure-mgmt-website/src/main/java/com/microsoft/azure/management/website/implementation/CsmSlotEntityInner.java +++ b/azure-mgmt-website/src/main/java/com/microsoft/azure/management/website/implementation/CsmSlotEntityInner.java @@ -8,21 +8,24 @@ package com.microsoft.azure.management.website.implementation; +import com.fasterxml.jackson.annotation.JsonProperty; /** - * Class containing deployment slot parameters. + * Deployment slot parameters. */ public class CsmSlotEntityInner { /** - * Set the destination deployment slot during swap operation. + * Destination deployment slot during swap operation. */ + @JsonProperty(required = true) private String targetSlot; /** - * Get or set the flag indicating it should preserve VNet to the slot - * during swap. + * <code>true</code> to preserve Virtual Network to the slot + * during swap; otherwise, <code>false</code>. */ - private Boolean preserveVnet; + @JsonProperty(required = true) + private boolean preserveVnet; /** * Get the targetSlot value. @@ -49,7 +52,7 @@ public CsmSlotEntityInner withTargetSlot(String targetSlot) { * * @return the preserveVnet value */ - public Boolean preserveVnet() { + public boolean preserveVnet() { return this.preserveVnet; } @@ -59,7 +62,7 @@ public Boolean preserveVnet() { * @param preserveVnet the preserveVnet value to set * @return the CsmSlotEntityInner object itself. */ - public CsmSlotEntityInner withPreserveVnet(Boolean preserveVnet) { + public CsmSlotEntityInner withPreserveVnet(boolean preserveVnet) { this.preserveVnet = preserveVnet; return this; } diff --git a/azure-mgmt-website/src/main/java/com/microsoft/azure/management/website/implementation/CsrInner.java b/azure-mgmt-website/src/main/java/com/microsoft/azure/management/website/implementation/CsrInner.java index 4cf7b106d928e..ddc612b464186 100644 --- a/azure-mgmt-website/src/main/java/com/microsoft/azure/management/website/implementation/CsrInner.java +++ b/azure-mgmt-website/src/main/java/com/microsoft/azure/management/website/implementation/CsrInner.java @@ -13,7 +13,7 @@ import com.microsoft.azure.Resource; /** - * Certificate signing request object. + * Certificate signing request. */ @JsonFlatten public class CsrInner extends Resource { @@ -48,13 +48,13 @@ public class CsrInner extends Resource { private String password; /** - * Hash of the certificates public key. + * Hash of the certificate's public key. */ @JsonProperty(value = "properties.publicKeyHash") private String publicKeyHash; /** - * Hosting environment. + * App Service Environment. */ @JsonProperty(value = "properties.hostingEnvironment") private String hostingEnvironment; diff --git a/azure-mgmt-website/src/main/java/com/microsoft/azure/management/website/implementation/CustomHostnameAnalysisResultInner.java b/azure-mgmt-website/src/main/java/com/microsoft/azure/management/website/implementation/CustomHostnameAnalysisResultInner.java index 50625baf61bf9..73682ed410174 100644 --- a/azure-mgmt-website/src/main/java/com/microsoft/azure/management/website/implementation/CustomHostnameAnalysisResultInner.java +++ b/azure-mgmt-website/src/main/java/com/microsoft/azure/management/website/implementation/CustomHostnameAnalysisResultInner.java @@ -16,74 +16,77 @@ import com.microsoft.azure.Resource; /** - * Represents a custom domain analysis. + * Custom domain analysis. */ @JsonFlatten public class CustomHostnameAnalysisResultInner extends Resource { /** - * Is hostname already verified?. + * <code>true</code> if hostname is already verified; + * otherwise, <code>false</code>. */ - @JsonProperty(value = "properties.isHostnameAlreadyVerified") + @JsonProperty(value = "properties.isHostnameAlreadyVerified", access = JsonProperty.Access.WRITE_ONLY) private Boolean isHostnameAlreadyVerified; /** - * Dns verification test result. Possible values include: 'Passed', + * DNS verification test result. Possible values include: 'Passed', * 'Failed', 'Skipped'. */ - @JsonProperty(value = "properties.customDomainVerificationTest") + @JsonProperty(value = "properties.customDomainVerificationTest", access = JsonProperty.Access.WRITE_ONLY) private DnsVerificationTestResult customDomainVerificationTest; /** - * Raw failure info if Dns verification fails. + * Raw failure information if DNS verification fails. */ - @JsonProperty(value = "properties.customDomainVerificationFailureInfo") + @JsonProperty(value = "properties.customDomainVerificationFailureInfo", access = JsonProperty.Access.WRITE_ONLY) private ErrorEntity customDomainVerificationFailureInfo; /** - * Does it have conflict on scale unit?. + * <code>true</code> if there is a conflict on a scale unit; + * otherwise, <code>false</code>. */ - @JsonProperty(value = "properties.hasConflictOnScaleUnit") + @JsonProperty(value = "properties.hasConflictOnScaleUnit", access = JsonProperty.Access.WRITE_ONLY) private Boolean hasConflictOnScaleUnit; /** - * Does it have conflict across subscription?. + * <code>true</code> if htere is a conflict across + * subscriptions; otherwise, <code>false</code>. */ - @JsonProperty(value = "properties.hasConflictAcrossSubscription") + @JsonProperty(value = "properties.hasConflictAcrossSubscription", access = JsonProperty.Access.WRITE_ONLY) private Boolean hasConflictAcrossSubscription; /** - * Name of the conflicting App on scale unit if it's within the same + * Name of the conflicting app on scale unit if it's within the same * subscription. */ - @JsonProperty(value = "properties.conflictingAppResourceId") + @JsonProperty(value = "properties.conflictingAppResourceId", access = JsonProperty.Access.WRITE_ONLY) private String conflictingAppResourceId; /** - * CName records controller could see for this hostname. + * CName records controller can see for this hostname. */ @JsonProperty(value = "properties.cNameRecords") private List cNameRecords; /** - * TxT records controller could see for this hostname. + * TXT records controller can see for this hostname. */ @JsonProperty(value = "properties.txtRecords") private List txtRecords; /** - * A records controller could see for this hostname. + * A records controller can see for this hostname. */ @JsonProperty(value = "properties.aRecords") private List aRecords; /** - * Alternate CName records controller could see for this hostname. + * Alternate CName records controller can see for this hostname. */ @JsonProperty(value = "properties.alternateCNameRecords") private List alternateCNameRecords; /** - * Alternate TxT records controller could see for this hostname. + * Alternate TXT records controller can see for this hostname. */ @JsonProperty(value = "properties.alternateTxtRecords") private List alternateTxtRecords; @@ -97,17 +100,6 @@ public Boolean isHostnameAlreadyVerified() { return this.isHostnameAlreadyVerified; } - /** - * Set the isHostnameAlreadyVerified value. - * - * @param isHostnameAlreadyVerified the isHostnameAlreadyVerified value to set - * @return the CustomHostnameAnalysisResultInner object itself. - */ - public CustomHostnameAnalysisResultInner withIsHostnameAlreadyVerified(Boolean isHostnameAlreadyVerified) { - this.isHostnameAlreadyVerified = isHostnameAlreadyVerified; - return this; - } - /** * Get the customDomainVerificationTest value. * @@ -117,17 +109,6 @@ public DnsVerificationTestResult customDomainVerificationTest() { return this.customDomainVerificationTest; } - /** - * Set the customDomainVerificationTest value. - * - * @param customDomainVerificationTest the customDomainVerificationTest value to set - * @return the CustomHostnameAnalysisResultInner object itself. - */ - public CustomHostnameAnalysisResultInner withCustomDomainVerificationTest(DnsVerificationTestResult customDomainVerificationTest) { - this.customDomainVerificationTest = customDomainVerificationTest; - return this; - } - /** * Get the customDomainVerificationFailureInfo value. * @@ -137,17 +118,6 @@ public ErrorEntity customDomainVerificationFailureInfo() { return this.customDomainVerificationFailureInfo; } - /** - * Set the customDomainVerificationFailureInfo value. - * - * @param customDomainVerificationFailureInfo the customDomainVerificationFailureInfo value to set - * @return the CustomHostnameAnalysisResultInner object itself. - */ - public CustomHostnameAnalysisResultInner withCustomDomainVerificationFailureInfo(ErrorEntity customDomainVerificationFailureInfo) { - this.customDomainVerificationFailureInfo = customDomainVerificationFailureInfo; - return this; - } - /** * Get the hasConflictOnScaleUnit value. * @@ -157,17 +127,6 @@ public Boolean hasConflictOnScaleUnit() { return this.hasConflictOnScaleUnit; } - /** - * Set the hasConflictOnScaleUnit value. - * - * @param hasConflictOnScaleUnit the hasConflictOnScaleUnit value to set - * @return the CustomHostnameAnalysisResultInner object itself. - */ - public CustomHostnameAnalysisResultInner withHasConflictOnScaleUnit(Boolean hasConflictOnScaleUnit) { - this.hasConflictOnScaleUnit = hasConflictOnScaleUnit; - return this; - } - /** * Get the hasConflictAcrossSubscription value. * @@ -177,17 +136,6 @@ public Boolean hasConflictAcrossSubscription() { return this.hasConflictAcrossSubscription; } - /** - * Set the hasConflictAcrossSubscription value. - * - * @param hasConflictAcrossSubscription the hasConflictAcrossSubscription value to set - * @return the CustomHostnameAnalysisResultInner object itself. - */ - public CustomHostnameAnalysisResultInner withHasConflictAcrossSubscription(Boolean hasConflictAcrossSubscription) { - this.hasConflictAcrossSubscription = hasConflictAcrossSubscription; - return this; - } - /** * Get the conflictingAppResourceId value. * @@ -197,17 +145,6 @@ public String conflictingAppResourceId() { return this.conflictingAppResourceId; } - /** - * Set the conflictingAppResourceId value. - * - * @param conflictingAppResourceId the conflictingAppResourceId value to set - * @return the CustomHostnameAnalysisResultInner object itself. - */ - public CustomHostnameAnalysisResultInner withConflictingAppResourceId(String conflictingAppResourceId) { - this.conflictingAppResourceId = conflictingAppResourceId; - return this; - } - /** * Get the cNameRecords value. * diff --git a/azure-mgmt-website/src/main/java/com/microsoft/azure/management/website/implementation/DeletedSiteInner.java b/azure-mgmt-website/src/main/java/com/microsoft/azure/management/website/implementation/DeletedSiteInner.java index a3ce0d3b5d8a2..c87116a7012f3 100644 --- a/azure-mgmt-website/src/main/java/com/microsoft/azure/management/website/implementation/DeletedSiteInner.java +++ b/azure-mgmt-website/src/main/java/com/microsoft/azure/management/website/implementation/DeletedSiteInner.java @@ -15,231 +15,238 @@ import com.microsoft.azure.management.website.HostNameSslState; import com.microsoft.azure.management.website.HostingEnvironmentProfile; import com.microsoft.azure.management.website.CloningInfo; +import com.microsoft.azure.management.website.SlotSwapStatus; import com.fasterxml.jackson.annotation.JsonProperty; import com.microsoft.rest.serializer.JsonFlatten; import com.microsoft.azure.Resource; /** - * Reports deleted site including the timestamp of operation. + * A deleted app. */ @JsonFlatten public class DeletedSiteInner extends Resource { /** - * Time when the site was deleted. + * Time in UTC when the app was deleted. */ - @JsonProperty(value = "properties.deletedTimestamp") + @JsonProperty(value = "properties.deletedTimestamp", access = JsonProperty.Access.WRITE_ONLY) private DateTime deletedTimestamp; /** - * State of the web app. + * Current state of the app. */ - @JsonProperty(value = "properties.state") + @JsonProperty(value = "properties.state", access = JsonProperty.Access.WRITE_ONLY) private String state; /** - * Hostnames associated with web app. + * Hostnames associated with the app. */ - @JsonProperty(value = "properties.hostNames") + @JsonProperty(value = "properties.hostNames", access = JsonProperty.Access.WRITE_ONLY) private List hostNames; /** - * Name of repository site. + * Name of the repository site. */ - @JsonProperty(value = "properties.repositorySiteName") + @JsonProperty(value = "properties.repositorySiteName", access = JsonProperty.Access.WRITE_ONLY) private String repositorySiteName; /** - * State indicating whether web app has exceeded its quota usage. Possible - * values include: 'Normal', 'Exceeded'. + * State indicating whether the app has exceeded its quota usage. + * Read-only. Possible values include: 'Normal', 'Exceeded'. */ - @JsonProperty(value = "properties.usageState") + @JsonProperty(value = "properties.usageState", access = JsonProperty.Access.WRITE_ONLY) private UsageState usageState; /** - * True if the site is enabled; otherwise, false. Setting this value to - * false disables the site (takes the site off line). + * <code>true</code> if the app is enabled; otherwise, + * <code>false</code>. Setting this value to false disables + * the app (takes the app offline). */ @JsonProperty(value = "properties.enabled") private Boolean enabled; /** - * Hostnames for the web app that are enabled. Hostnames need to be - * assigned and enabled. If some hostnames are assigned but not enabled + * Enabled hostnames for the app.Hostnames need to be assigned (see + * HostNames) AND enabled. Otherwise, * the app is not served on those hostnames. */ - @JsonProperty(value = "properties.enabledHostNames") + @JsonProperty(value = "properties.enabledHostNames", access = JsonProperty.Access.WRITE_ONLY) private List enabledHostNames; /** - * Management information availability state for the web app. Possible - * values are Normal or Limited. - * Normal means that the site is running correctly and that - * management information for the site is available. - * Limited means that only partial management information for - * the site is available and that detailed site information is - * unavailable. Possible values include: 'Normal', 'Limited', - * 'DisasterRecoveryMode'. + * Management information availability state for the app. Possible values + * include: 'Normal', 'Limited', 'DisasterRecoveryMode'. */ - @JsonProperty(value = "properties.availabilityState") + @JsonProperty(value = "properties.availabilityState", access = JsonProperty.Access.WRITE_ONLY) private SiteAvailabilityState availabilityState; /** - * Hostname SSL states are used to manage the SSL bindings for site's + * Hostname SSL states are used to manage the SSL bindings for app's * hostnames. */ @JsonProperty(value = "properties.hostNameSslStates") private List hostNameSslStates; /** - * The serverFarmId property. + * Resource ID of the associated App Service plan, formatted as: + * "/subscriptions/{subscriptionID}/resourceGroups/{groupName}/providers/Microsoft.Web/serverfarms/{appServicePlanName}". */ @JsonProperty(value = "properties.serverFarmId") private String serverFarmId; /** - * Reserved. + * <code>true</code> if reserved; otherwise, + * <code>false</code>. */ @JsonProperty(value = "properties.reserved") private Boolean reserved; /** - * Last time web app was modified in UTC. + * Last time the app was modified, in UTC. Read-only. */ - @JsonProperty(value = "properties.lastModifiedTimeUtc") + @JsonProperty(value = "properties.lastModifiedTimeUtc", access = JsonProperty.Access.WRITE_ONLY) private DateTime lastModifiedTimeUtc; /** - * Configuration of web app. + * Configuration of the app. */ @JsonProperty(value = "properties.siteConfig") private SiteConfigInner siteConfig; /** - * Read-only list of Azure Traffic manager hostnames associated with web - * app. + * Azure Traffic Manager hostnames associated with the app. Read-only. */ - @JsonProperty(value = "properties.trafficManagerHostNames") + @JsonProperty(value = "properties.trafficManagerHostNames", access = JsonProperty.Access.WRITE_ONLY) private List trafficManagerHostNames; /** - * If set indicates whether web app is deployed as a premium app. + * Indicates whether app is deployed as a premium app. */ - @JsonProperty(value = "properties.premiumAppDeployed") + @JsonProperty(value = "properties.premiumAppDeployed", access = JsonProperty.Access.WRITE_ONLY) private Boolean premiumAppDeployed; /** - * If set indicates whether to stop SCM (KUDU) site when the web app is - * stopped. Default is false. + * <code>true</code> to stop SCM (KUDU) site when the app is + * stopped; otherwise, <code>false</code>. The default is + * <code>false</code>. */ @JsonProperty(value = "properties.scmSiteAlsoStopped") private Boolean scmSiteAlsoStopped; /** - * Read-only property that specifies which slot this app will swap into. + * Specifies which deployment slot this app will swap into. Read-only. */ - @JsonProperty(value = "properties.targetSwapSlot") + @JsonProperty(value = "properties.targetSwapSlot", access = JsonProperty.Access.WRITE_ONLY) private String targetSwapSlot; /** - * Specification for the hosting environment (App Service Environment) to - * use for the web app. + * App Service Environment to use for the app. */ @JsonProperty(value = "properties.hostingEnvironmentProfile") private HostingEnvironmentProfile hostingEnvironmentProfile; /** - * Micro services like WebSites, Logic Apps. + * Micro services like apps, logic apps. */ @JsonProperty(value = "properties.microService") private String microService; /** - * Name of gateway app associated with web app. + * Name of gateway app associated with the app. */ @JsonProperty(value = "properties.gatewaySiteName") private String gatewaySiteName; /** - * Specifies if the client affinity is enabled when load balancing http - * request for multiple instances of the web app. + * <code>true</code> to enable client affinity; + * <code>false</code> to stop sending session affinity + * cookies, which route client requests in the same session to the same + * instance. Default is <code>true</code>. */ @JsonProperty(value = "properties.clientAffinityEnabled") private Boolean clientAffinityEnabled; /** - * Specifies if the client certificate is enabled for the web app. + * <code>true</code> to enable client certificate + * authentication (TLS mutual authentication); otherwise, + * <code>false</code>. Default is + * <code>false</code>. */ @JsonProperty(value = "properties.clientCertEnabled") private Boolean clientCertEnabled; /** - * Specifies if the public hostnames are disabled the web app. - * If set to true the app is only accessible via API - * Management process. + * <code>true</code> to disable the public hostnames of the + * app; otherwise, <code>false</code>. + * If <code>true</code>, the app is only accessible via API + * management process. */ @JsonProperty(value = "properties.hostNamesDisabled") private Boolean hostNamesDisabled; /** - * List of comma separated IP addresses that this web app uses for - * outbound connections. Those can be used when configuring firewall - * rules for databases accessed by this web app. + * List of IP addresses that the app uses for outbound connections (e.g. + * database access). Read-only. */ - @JsonProperty(value = "properties.outboundIpAddresses") + @JsonProperty(value = "properties.outboundIpAddresses", access = JsonProperty.Access.WRITE_ONLY) private String outboundIpAddresses; /** - * Size of a function container. + * Size of the function container. */ @JsonProperty(value = "properties.containerSize") private Integer containerSize; /** - * Maximum allowed daily memory-time quota (applicable on dynamic sites + * Maximum allowed daily memory-time quota (applicable on dynamic apps * only). */ @JsonProperty(value = "properties.dailyMemoryTimeQuota") private Integer dailyMemoryTimeQuota; /** - * Site suspended till in case memory-time quota is exceeded. + * App suspended till in case memory-time quota is exceeded. */ - @JsonProperty(value = "properties.suspendedTill") + @JsonProperty(value = "properties.suspendedTill", access = JsonProperty.Access.WRITE_ONLY) private DateTime suspendedTill; /** - * Maximum number of workers - * This only applies to function container. + * Maximum number of workers. + * This only applies to Functions container. */ - @JsonProperty(value = "properties.maxNumberOfWorkers") + @JsonProperty(value = "properties.maxNumberOfWorkers", access = JsonProperty.Access.WRITE_ONLY) private Integer maxNumberOfWorkers; /** - * This is only valid for web app creation. If specified, web app is - * cloned from - * a source web app. + * If specified during app creation, the app is cloned from a source app. */ @JsonProperty(value = "properties.cloningInfo") private CloningInfo cloningInfo; /** - * Resource group web app belongs to. + * Name of the resource group the app belongs to. Read-only. */ - @JsonProperty(value = "properties.resourceGroup") + @JsonProperty(value = "properties.resourceGroup", access = JsonProperty.Access.WRITE_ONLY) private String resourceGroup; /** - * Site is a default container. + * <code>true</code> if the app is a default container; + * otherwise, <code>false</code>. */ - @JsonProperty(value = "properties.isDefaultContainer") + @JsonProperty(value = "properties.isDefaultContainer", access = JsonProperty.Access.WRITE_ONLY) private Boolean isDefaultContainer; /** - * Default hostname of the web app. + * Default hostname of the app. Read-only. */ - @JsonProperty(value = "properties.defaultHostName") + @JsonProperty(value = "properties.defaultHostName", access = JsonProperty.Access.WRITE_ONLY) private String defaultHostName; + /** + * Status of the last deployment slot swap operation. + */ + @JsonProperty(value = "properties.slotSwapStatus", access = JsonProperty.Access.WRITE_ONLY) + private SlotSwapStatus slotSwapStatus; + /** * Get the deletedTimestamp value. * @@ -249,17 +256,6 @@ public DateTime deletedTimestamp() { return this.deletedTimestamp; } - /** - * Set the deletedTimestamp value. - * - * @param deletedTimestamp the deletedTimestamp value to set - * @return the DeletedSiteInner object itself. - */ - public DeletedSiteInner withDeletedTimestamp(DateTime deletedTimestamp) { - this.deletedTimestamp = deletedTimestamp; - return this; - } - /** * Get the state value. * @@ -269,17 +265,6 @@ public String state() { return this.state; } - /** - * Set the state value. - * - * @param state the state value to set - * @return the DeletedSiteInner object itself. - */ - public DeletedSiteInner withState(String state) { - this.state = state; - return this; - } - /** * Get the hostNames value. * @@ -289,17 +274,6 @@ public List hostNames() { return this.hostNames; } - /** - * Set the hostNames value. - * - * @param hostNames the hostNames value to set - * @return the DeletedSiteInner object itself. - */ - public DeletedSiteInner withHostNames(List hostNames) { - this.hostNames = hostNames; - return this; - } - /** * Get the repositorySiteName value. * @@ -309,17 +283,6 @@ public String repositorySiteName() { return this.repositorySiteName; } - /** - * Set the repositorySiteName value. - * - * @param repositorySiteName the repositorySiteName value to set - * @return the DeletedSiteInner object itself. - */ - public DeletedSiteInner withRepositorySiteName(String repositorySiteName) { - this.repositorySiteName = repositorySiteName; - return this; - } - /** * Get the usageState value. * @@ -329,17 +292,6 @@ public UsageState usageState() { return this.usageState; } - /** - * Set the usageState value. - * - * @param usageState the usageState value to set - * @return the DeletedSiteInner object itself. - */ - public DeletedSiteInner withUsageState(UsageState usageState) { - this.usageState = usageState; - return this; - } - /** * Get the enabled value. * @@ -369,17 +321,6 @@ public List enabledHostNames() { return this.enabledHostNames; } - /** - * Set the enabledHostNames value. - * - * @param enabledHostNames the enabledHostNames value to set - * @return the DeletedSiteInner object itself. - */ - public DeletedSiteInner withEnabledHostNames(List enabledHostNames) { - this.enabledHostNames = enabledHostNames; - return this; - } - /** * Get the availabilityState value. * @@ -389,17 +330,6 @@ public SiteAvailabilityState availabilityState() { return this.availabilityState; } - /** - * Set the availabilityState value. - * - * @param availabilityState the availabilityState value to set - * @return the DeletedSiteInner object itself. - */ - public DeletedSiteInner withAvailabilityState(SiteAvailabilityState availabilityState) { - this.availabilityState = availabilityState; - return this; - } - /** * Get the hostNameSslStates value. * @@ -469,17 +399,6 @@ public DateTime lastModifiedTimeUtc() { return this.lastModifiedTimeUtc; } - /** - * Set the lastModifiedTimeUtc value. - * - * @param lastModifiedTimeUtc the lastModifiedTimeUtc value to set - * @return the DeletedSiteInner object itself. - */ - public DeletedSiteInner withLastModifiedTimeUtc(DateTime lastModifiedTimeUtc) { - this.lastModifiedTimeUtc = lastModifiedTimeUtc; - return this; - } - /** * Get the siteConfig value. * @@ -509,17 +428,6 @@ public List trafficManagerHostNames() { return this.trafficManagerHostNames; } - /** - * Set the trafficManagerHostNames value. - * - * @param trafficManagerHostNames the trafficManagerHostNames value to set - * @return the DeletedSiteInner object itself. - */ - public DeletedSiteInner withTrafficManagerHostNames(List trafficManagerHostNames) { - this.trafficManagerHostNames = trafficManagerHostNames; - return this; - } - /** * Get the premiumAppDeployed value. * @@ -529,17 +437,6 @@ public Boolean premiumAppDeployed() { return this.premiumAppDeployed; } - /** - * Set the premiumAppDeployed value. - * - * @param premiumAppDeployed the premiumAppDeployed value to set - * @return the DeletedSiteInner object itself. - */ - public DeletedSiteInner withPremiumAppDeployed(Boolean premiumAppDeployed) { - this.premiumAppDeployed = premiumAppDeployed; - return this; - } - /** * Get the scmSiteAlsoStopped value. * @@ -569,17 +466,6 @@ public String targetSwapSlot() { return this.targetSwapSlot; } - /** - * Set the targetSwapSlot value. - * - * @param targetSwapSlot the targetSwapSlot value to set - * @return the DeletedSiteInner object itself. - */ - public DeletedSiteInner withTargetSwapSlot(String targetSwapSlot) { - this.targetSwapSlot = targetSwapSlot; - return this; - } - /** * Get the hostingEnvironmentProfile value. * @@ -709,17 +595,6 @@ public String outboundIpAddresses() { return this.outboundIpAddresses; } - /** - * Set the outboundIpAddresses value. - * - * @param outboundIpAddresses the outboundIpAddresses value to set - * @return the DeletedSiteInner object itself. - */ - public DeletedSiteInner withOutboundIpAddresses(String outboundIpAddresses) { - this.outboundIpAddresses = outboundIpAddresses; - return this; - } - /** * Get the containerSize value. * @@ -769,17 +644,6 @@ public DateTime suspendedTill() { return this.suspendedTill; } - /** - * Set the suspendedTill value. - * - * @param suspendedTill the suspendedTill value to set - * @return the DeletedSiteInner object itself. - */ - public DeletedSiteInner withSuspendedTill(DateTime suspendedTill) { - this.suspendedTill = suspendedTill; - return this; - } - /** * Get the maxNumberOfWorkers value. * @@ -789,17 +653,6 @@ public Integer maxNumberOfWorkers() { return this.maxNumberOfWorkers; } - /** - * Set the maxNumberOfWorkers value. - * - * @param maxNumberOfWorkers the maxNumberOfWorkers value to set - * @return the DeletedSiteInner object itself. - */ - public DeletedSiteInner withMaxNumberOfWorkers(Integer maxNumberOfWorkers) { - this.maxNumberOfWorkers = maxNumberOfWorkers; - return this; - } - /** * Get the cloningInfo value. * @@ -829,17 +682,6 @@ public String resourceGroup() { return this.resourceGroup; } - /** - * Set the resourceGroup value. - * - * @param resourceGroup the resourceGroup value to set - * @return the DeletedSiteInner object itself. - */ - public DeletedSiteInner withResourceGroup(String resourceGroup) { - this.resourceGroup = resourceGroup; - return this; - } - /** * Get the isDefaultContainer value. * @@ -849,17 +691,6 @@ public Boolean isDefaultContainer() { return this.isDefaultContainer; } - /** - * Set the isDefaultContainer value. - * - * @param isDefaultContainer the isDefaultContainer value to set - * @return the DeletedSiteInner object itself. - */ - public DeletedSiteInner withIsDefaultContainer(Boolean isDefaultContainer) { - this.isDefaultContainer = isDefaultContainer; - return this; - } - /** * Get the defaultHostName value. * @@ -870,14 +701,12 @@ public String defaultHostName() { } /** - * Set the defaultHostName value. + * Get the slotSwapStatus value. * - * @param defaultHostName the defaultHostName value to set - * @return the DeletedSiteInner object itself. + * @return the slotSwapStatus value */ - public DeletedSiteInner withDefaultHostName(String defaultHostName) { - this.defaultHostName = defaultHostName; - return this; + public SlotSwapStatus slotSwapStatus() { + return this.slotSwapStatus; } } diff --git a/azure-mgmt-website/src/main/java/com/microsoft/azure/management/website/implementation/DeletedWebAppsInner.java b/azure-mgmt-website/src/main/java/com/microsoft/azure/management/website/implementation/DeletedWebAppsInner.java new file mode 100644 index 0000000000000..e7212178c2ae8 --- /dev/null +++ b/azure-mgmt-website/src/main/java/com/microsoft/azure/management/website/implementation/DeletedWebAppsInner.java @@ -0,0 +1,508 @@ +/** + * 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.website.implementation; + +import retrofit2.Retrofit; +import com.google.common.reflect.TypeToken; +import com.microsoft.azure.AzureServiceCall; +import com.microsoft.azure.AzureServiceResponseBuilder; +import com.microsoft.azure.CloudException; +import com.microsoft.azure.ListOperationCallback; +import com.microsoft.azure.Page; +import com.microsoft.azure.PagedList; +import com.microsoft.rest.ServiceCall; +import com.microsoft.rest.ServiceResponse; +import java.io.IOException; +import java.util.List; +import okhttp3.ResponseBody; +import retrofit2.http.GET; +import retrofit2.http.Header; +import retrofit2.http.Headers; +import retrofit2.http.Path; +import retrofit2.http.POST; +import retrofit2.http.Query; +import retrofit2.Response; +import rx.functions.Func1; +import rx.Observable; + +/** + * An instance of this class provides access to all the operations defined + * in DeletedWebApps. + */ +public final class DeletedWebAppsInner { + /** The Retrofit service to perform REST calls. */ + private DeletedWebAppsService service; + /** The service client containing this operation class. */ + private WebSiteManagementClientImpl client; + + /** + * Initializes an instance of DeletedWebAppsInner. + * + * @param retrofit the Retrofit instance built from a Retrofit Builder. + * @param client the instance of the service client containing this operation class. + */ + public DeletedWebAppsInner(Retrofit retrofit, WebSiteManagementClientImpl client) { + this.service = retrofit.create(DeletedWebAppsService.class); + this.client = client; + } + + /** + * The interface defining all the services for DeletedWebApps to be + * used by Retrofit to perform actually REST calls. + */ + interface DeletedWebAppsService { + @Headers("Content-Type: application/json; charset=utf-8") + @POST("subscriptions/{subscriptionId}/providers/Microsoft.Web/deletedSites") + Observable> list(@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") + @GET("subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.Web/deletedSites") + Observable> listByResourceGroup(@Path("resourceGroupName") String resourceGroupName, @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("{nextLink}") + Observable> listNext(@Path(value = "nextLink", encoded = true) String nextPageLink, @Header("accept-language") String acceptLanguage, @Header("User-Agent") String userAgent); + + @Headers("Content-Type: application/json; charset=utf-8") + @GET("{nextLink}") + Observable> listByResourceGroupNext(@Path(value = "nextLink", encoded = true) String nextPageLink, @Header("accept-language") String acceptLanguage, @Header("User-Agent") String userAgent); + + } + + /** + * Get all deleted apps for a subscription. + * Get all deleted apps for a subscription. + * + * @return the PagedList<DeletedSiteInner> object if successful. + */ + public PagedList list() { + ServiceResponse> response = listSinglePageAsync().toBlocking().single(); + return new PagedList(response.getBody()) { + @Override + public Page nextPage(String nextPageLink) { + return listNextSinglePageAsync(nextPageLink).toBlocking().single().getBody(); + } + }; + } + + /** + * Get all deleted apps for a subscription. + * Get all deleted apps for a subscription. + * + * @param serviceCallback the async ServiceCallback to handle successful and failed responses. + * @return the {@link ServiceCall} object + */ + public ServiceCall> listAsync(final ListOperationCallback serviceCallback) { + return AzureServiceCall.create( + listSinglePageAsync(), + new Func1>>>() { + @Override + public Observable>> call(String nextPageLink) { + return listNextSinglePageAsync(nextPageLink); + } + }, + serviceCallback); + } + + /** + * Get all deleted apps for a subscription. + * Get all deleted apps for a subscription. + * + * @return the observable to the PagedList<DeletedSiteInner> object + */ + public Observable> listAsync() { + return listWithServiceResponseAsync() + .map(new Func1>, Page>() { + @Override + public Page call(ServiceResponse> response) { + return response.getBody(); + } + }); + } + + /** + * Get all deleted apps for a subscription. + * Get all deleted apps for a subscription. + * + * @return the observable to the PagedList<DeletedSiteInner> object + */ + public Observable>> listWithServiceResponseAsync() { + return listSinglePageAsync() + .concatMap(new Func1>, Observable>>>() { + @Override + public Observable>> call(ServiceResponse> page) { + String nextPageLink = page.getBody().getNextPageLink(); + if (nextPageLink == null) { + return Observable.just(page); + } + return Observable.just(page).concatWith(listNextWithServiceResponseAsync(nextPageLink)); + } + }); + } + + /** + * Get all deleted apps for a subscription. + * Get all deleted apps for a subscription. + * + * @return the PagedList<DeletedSiteInner> object wrapped in {@link ServiceResponse} if successful. + */ + public Observable>> listSinglePageAsync() { + if (this.client.subscriptionId() == null) { + throw new IllegalArgumentException("Parameter this.client.subscriptionId() is required and cannot be null."); + } + final String apiVersion = "2016-03-01"; + return service.list(this.client.subscriptionId(), apiVersion, this.client.acceptLanguage(), this.client.userAgent()) + .flatMap(new Func1, Observable>>>() { + @Override + public Observable>> call(Response response) { + try { + ServiceResponse> result = listDelegate(response); + return Observable.just(new ServiceResponse>(result.getBody(), result.getResponse())); + } catch (Throwable t) { + return Observable.error(t); + } + } + }); + } + + private ServiceResponse> listDelegate(Response response) throws CloudException, IOException, IllegalArgumentException { + return new AzureServiceResponseBuilder, CloudException>(this.client.mapperAdapter()) + .register(200, new TypeToken>() { }.getType()) + .registerError(CloudException.class) + .build(response); + } + + /** + * Gets deleted web apps in subscription. + * Gets deleted web apps in subscription. + * + * @param resourceGroupName Name of the resource group to which the resource belongs. + * @return the PagedList<DeletedSiteInner> object if successful. + */ + public PagedList listByResourceGroup(final String resourceGroupName) { + ServiceResponse> response = listByResourceGroupSinglePageAsync(resourceGroupName).toBlocking().single(); + return new PagedList(response.getBody()) { + @Override + public Page nextPage(String nextPageLink) { + return listByResourceGroupNextSinglePageAsync(nextPageLink).toBlocking().single().getBody(); + } + }; + } + + /** + * Gets deleted web apps in subscription. + * Gets deleted web apps in subscription. + * + * @param resourceGroupName Name of the resource group to which the resource belongs. + * @param serviceCallback the async ServiceCallback to handle successful and failed responses. + * @return the {@link ServiceCall} object + */ + public ServiceCall> listByResourceGroupAsync(final String resourceGroupName, final ListOperationCallback serviceCallback) { + return AzureServiceCall.create( + listByResourceGroupSinglePageAsync(resourceGroupName), + new Func1>>>() { + @Override + public Observable>> call(String nextPageLink) { + return listByResourceGroupNextSinglePageAsync(nextPageLink); + } + }, + serviceCallback); + } + + /** + * Gets deleted web apps in subscription. + * Gets deleted web apps in subscription. + * + * @param resourceGroupName Name of the resource group to which the resource belongs. + * @return the observable to the PagedList<DeletedSiteInner> object + */ + public Observable> listByResourceGroupAsync(final String resourceGroupName) { + return listByResourceGroupWithServiceResponseAsync(resourceGroupName) + .map(new Func1>, Page>() { + @Override + public Page call(ServiceResponse> response) { + return response.getBody(); + } + }); + } + + /** + * Gets deleted web apps in subscription. + * Gets deleted web apps in subscription. + * + * @param resourceGroupName Name of the resource group to which the resource belongs. + * @return the observable to the PagedList<DeletedSiteInner> object + */ + public Observable>> listByResourceGroupWithServiceResponseAsync(final String resourceGroupName) { + return listByResourceGroupSinglePageAsync(resourceGroupName) + .concatMap(new Func1>, Observable>>>() { + @Override + public Observable>> call(ServiceResponse> page) { + String nextPageLink = page.getBody().getNextPageLink(); + if (nextPageLink == null) { + return Observable.just(page); + } + return Observable.just(page).concatWith(listByResourceGroupNextWithServiceResponseAsync(nextPageLink)); + } + }); + } + + /** + * Gets deleted web apps in subscription. + * Gets deleted web apps in subscription. + * + ServiceResponse> * @param resourceGroupName Name of the resource group to which the resource belongs. + * @return the PagedList<DeletedSiteInner> object wrapped in {@link ServiceResponse} if successful. + */ + public Observable>> listByResourceGroupSinglePageAsync(final String resourceGroupName) { + if (resourceGroupName == null) { + throw new IllegalArgumentException("Parameter resourceGroupName is required and cannot be null."); + } + if (this.client.subscriptionId() == null) { + throw new IllegalArgumentException("Parameter this.client.subscriptionId() is required and cannot be null."); + } + final String apiVersion = "2016-03-01"; + return service.listByResourceGroup(resourceGroupName, this.client.subscriptionId(), apiVersion, this.client.acceptLanguage(), this.client.userAgent()) + .flatMap(new Func1, Observable>>>() { + @Override + public Observable>> call(Response response) { + try { + ServiceResponse> result = listByResourceGroupDelegate(response); + return Observable.just(new ServiceResponse>(result.getBody(), result.getResponse())); + } catch (Throwable t) { + return Observable.error(t); + } + } + }); + } + + private ServiceResponse> listByResourceGroupDelegate(Response response) throws CloudException, IOException, IllegalArgumentException { + return new AzureServiceResponseBuilder, CloudException>(this.client.mapperAdapter()) + .register(200, new TypeToken>() { }.getType()) + .registerError(CloudException.class) + .build(response); + } + + /** + * Get all deleted apps for a subscription. + * Get all deleted apps for a subscription. + * + * @param nextPageLink The NextLink from the previous successful call to List operation. + * @return the PagedList<DeletedSiteInner> object if successful. + */ + public PagedList listNext(final String nextPageLink) { + ServiceResponse> response = listNextSinglePageAsync(nextPageLink).toBlocking().single(); + return new PagedList(response.getBody()) { + @Override + public Page nextPage(String nextPageLink) { + return listNextSinglePageAsync(nextPageLink).toBlocking().single().getBody(); + } + }; + } + + /** + * Get all deleted apps for a subscription. + * Get all deleted apps for a subscription. + * + * @param nextPageLink The NextLink from the previous successful call to List operation. + * @param serviceCall the ServiceCall object tracking the Retrofit calls + * @param serviceCallback the async ServiceCallback to handle successful and failed responses. + * @return the {@link ServiceCall} object + */ + public ServiceCall> listNextAsync(final String nextPageLink, final ServiceCall> serviceCall, final ListOperationCallback serviceCallback) { + return AzureServiceCall.create( + listNextSinglePageAsync(nextPageLink), + new Func1>>>() { + @Override + public Observable>> call(String nextPageLink) { + return listNextSinglePageAsync(nextPageLink); + } + }, + serviceCallback); + } + + /** + * Get all deleted apps for a subscription. + * Get all deleted apps for a subscription. + * + * @param nextPageLink The NextLink from the previous successful call to List operation. + * @return the observable to the PagedList<DeletedSiteInner> object + */ + public Observable> listNextAsync(final String nextPageLink) { + return listNextWithServiceResponseAsync(nextPageLink) + .map(new Func1>, Page>() { + @Override + public Page call(ServiceResponse> response) { + return response.getBody(); + } + }); + } + + /** + * Get all deleted apps for a subscription. + * Get all deleted apps for a subscription. + * + * @param nextPageLink The NextLink from the previous successful call to List operation. + * @return the observable to the PagedList<DeletedSiteInner> object + */ + public Observable>> listNextWithServiceResponseAsync(final String nextPageLink) { + return listNextSinglePageAsync(nextPageLink) + .concatMap(new Func1>, Observable>>>() { + @Override + public Observable>> call(ServiceResponse> page) { + String nextPageLink = page.getBody().getNextPageLink(); + if (nextPageLink == null) { + return Observable.just(page); + } + return Observable.just(page).concatWith(listNextWithServiceResponseAsync(nextPageLink)); + } + }); + } + + /** + * Get all deleted apps for a subscription. + * Get all deleted apps for a subscription. + * + ServiceResponse> * @param nextPageLink The NextLink from the previous successful call to List operation. + * @return the PagedList<DeletedSiteInner> object wrapped in {@link ServiceResponse} if successful. + */ + public Observable>> listNextSinglePageAsync(final String nextPageLink) { + if (nextPageLink == null) { + throw new IllegalArgumentException("Parameter nextPageLink is required and cannot be null."); + } + return service.listNext(nextPageLink, this.client.acceptLanguage(), this.client.userAgent()) + .flatMap(new Func1, Observable>>>() { + @Override + public Observable>> call(Response response) { + try { + ServiceResponse> result = listNextDelegate(response); + return Observable.just(new ServiceResponse>(result.getBody(), result.getResponse())); + } catch (Throwable t) { + return Observable.error(t); + } + } + }); + } + + private ServiceResponse> listNextDelegate(Response response) throws CloudException, IOException, IllegalArgumentException { + return new AzureServiceResponseBuilder, CloudException>(this.client.mapperAdapter()) + .register(200, new TypeToken>() { }.getType()) + .registerError(CloudException.class) + .build(response); + } + + /** + * Gets deleted web apps in subscription. + * Gets deleted web apps in subscription. + * + * @param nextPageLink The NextLink from the previous successful call to List operation. + * @return the PagedList<DeletedSiteInner> object if successful. + */ + public PagedList listByResourceGroupNext(final String nextPageLink) { + ServiceResponse> response = listByResourceGroupNextSinglePageAsync(nextPageLink).toBlocking().single(); + return new PagedList(response.getBody()) { + @Override + public Page nextPage(String nextPageLink) { + return listByResourceGroupNextSinglePageAsync(nextPageLink).toBlocking().single().getBody(); + } + }; + } + + /** + * Gets deleted web apps in subscription. + * Gets deleted web apps in subscription. + * + * @param nextPageLink The NextLink from the previous successful call to List operation. + * @param serviceCall the ServiceCall object tracking the Retrofit calls + * @param serviceCallback the async ServiceCallback to handle successful and failed responses. + * @return the {@link ServiceCall} object + */ + public ServiceCall> listByResourceGroupNextAsync(final String nextPageLink, final ServiceCall> serviceCall, final ListOperationCallback serviceCallback) { + return AzureServiceCall.create( + listByResourceGroupNextSinglePageAsync(nextPageLink), + new Func1>>>() { + @Override + public Observable>> call(String nextPageLink) { + return listByResourceGroupNextSinglePageAsync(nextPageLink); + } + }, + serviceCallback); + } + + /** + * Gets deleted web apps in subscription. + * Gets deleted web apps in subscription. + * + * @param nextPageLink The NextLink from the previous successful call to List operation. + * @return the observable to the PagedList<DeletedSiteInner> object + */ + public Observable> listByResourceGroupNextAsync(final String nextPageLink) { + return listByResourceGroupNextWithServiceResponseAsync(nextPageLink) + .map(new Func1>, Page>() { + @Override + public Page call(ServiceResponse> response) { + return response.getBody(); + } + }); + } + + /** + * Gets deleted web apps in subscription. + * Gets deleted web apps in subscription. + * + * @param nextPageLink The NextLink from the previous successful call to List operation. + * @return the observable to the PagedList<DeletedSiteInner> object + */ + public Observable>> listByResourceGroupNextWithServiceResponseAsync(final String nextPageLink) { + return listByResourceGroupNextSinglePageAsync(nextPageLink) + .concatMap(new Func1>, Observable>>>() { + @Override + public Observable>> call(ServiceResponse> page) { + String nextPageLink = page.getBody().getNextPageLink(); + if (nextPageLink == null) { + return Observable.just(page); + } + return Observable.just(page).concatWith(listByResourceGroupNextWithServiceResponseAsync(nextPageLink)); + } + }); + } + + /** + * Gets deleted web apps in subscription. + * Gets deleted web apps in subscription. + * + ServiceResponse> * @param nextPageLink The NextLink from the previous successful call to List operation. + * @return the PagedList<DeletedSiteInner> object wrapped in {@link ServiceResponse} if successful. + */ + public Observable>> listByResourceGroupNextSinglePageAsync(final String nextPageLink) { + if (nextPageLink == null) { + throw new IllegalArgumentException("Parameter nextPageLink is required and cannot be null."); + } + return service.listByResourceGroupNext(nextPageLink, this.client.acceptLanguage(), this.client.userAgent()) + .flatMap(new Func1, Observable>>>() { + @Override + public Observable>> call(Response response) { + try { + ServiceResponse> result = listByResourceGroupNextDelegate(response); + return Observable.just(new ServiceResponse>(result.getBody(), result.getResponse())); + } catch (Throwable t) { + return Observable.error(t); + } + } + }); + } + + private ServiceResponse> listByResourceGroupNextDelegate(Response response) throws CloudException, IOException, IllegalArgumentException { + return new AzureServiceResponseBuilder, CloudException>(this.client.mapperAdapter()) + .register(200, new TypeToken>() { }.getType()) + .registerError(CloudException.class) + .build(response); + } + +} diff --git a/azure-mgmt-website/src/main/java/com/microsoft/azure/management/website/implementation/DeploymentInner.java b/azure-mgmt-website/src/main/java/com/microsoft/azure/management/website/implementation/DeploymentInner.java index 8fabe52cf3197..389acf0abb1b5 100644 --- a/azure-mgmt-website/src/main/java/com/microsoft/azure/management/website/implementation/DeploymentInner.java +++ b/azure-mgmt-website/src/main/java/com/microsoft/azure/management/website/implementation/DeploymentInner.java @@ -14,12 +14,12 @@ import com.microsoft.azure.Resource; /** - * Represents user crendentials used for publishing activity. + * User crendentials used for publishing activity. */ @JsonFlatten public class DeploymentInner extends Resource { /** - * Id. + * ID. */ @JsonProperty(value = "properties.id") private String deploymentId; @@ -49,19 +49,19 @@ public class DeploymentInner extends Resource { private String deployer; /** - * AuthorEmail. + * Author email. */ @JsonProperty(value = "properties.author_email") private String authorEmail; /** - * StartTime. + * Start time. */ @JsonProperty(value = "properties.start_time") private DateTime startTime; /** - * EndTime. + * End time. */ @JsonProperty(value = "properties.end_time") private DateTime endTime; diff --git a/azure-mgmt-website/src/main/java/com/microsoft/azure/management/website/implementation/DeploymentSlotImpl.java b/azure-mgmt-website/src/main/java/com/microsoft/azure/management/website/implementation/DeploymentSlotImpl.java index 719c438cc6d68..a2d1f735a677c 100644 --- a/azure-mgmt-website/src/main/java/com/microsoft/azure/management/website/implementation/DeploymentSlotImpl.java +++ b/azure-mgmt-website/src/main/java/com/microsoft/azure/management/website/implementation/DeploymentSlotImpl.java @@ -127,7 +127,7 @@ Observable createOrUpdateSiteConfig(SiteConfigInner siteConfig) } @Override - Observable deleteHostNameBinding(String hostname) { + Observable deleteHostNameBinding(String hostname) { return client.deleteHostNameBindingSlotAsync(resourceGroupName(), parent().name(), name(), hostname); } @@ -168,7 +168,7 @@ Observable createOrUpdateSourceControl(SiteSourceControl @Override public void swap(String slotName) { - client.swapSlotsSlot(resourceGroupName(), parent().name(), name(), new CsmSlotEntityInner().withTargetSlot(slotName)); + client.swapSlotSlot(resourceGroupName(), parent().name(), name(), new CsmSlotEntityInner().withTargetSlot(slotName)); } @Override diff --git a/azure-mgmt-website/src/main/java/com/microsoft/azure/management/website/implementation/DomainAvailablilityCheckResultInner.java b/azure-mgmt-website/src/main/java/com/microsoft/azure/management/website/implementation/DomainAvailablilityCheckResultInner.java index 2b55d6847646a..93849c1a87d37 100644 --- a/azure-mgmt-website/src/main/java/com/microsoft/azure/management/website/implementation/DomainAvailablilityCheckResultInner.java +++ b/azure-mgmt-website/src/main/java/com/microsoft/azure/management/website/implementation/DomainAvailablilityCheckResultInner.java @@ -20,12 +20,16 @@ public class DomainAvailablilityCheckResultInner { private String name; /** - * If true then domain can be purchased using CreateDomain Api. + * <code>true</code> if domain can be purchased using + * CreateDomain API; otherwise, <code>false</code>. */ private Boolean available; /** - * Domain type. Possible values include: 'Regular', 'SoftDeleted'. + * Valid values are Regular domain: Azure will charge the full price of + * domain registration, SoftDeleted: Purchasing this domain will simply + * restore it and this operation will not cost anything. Possible values + * include: 'Regular', 'SoftDeleted'. */ private DomainType domainType; diff --git a/azure-mgmt-website/src/main/java/com/microsoft/azure/management/website/implementation/DomainControlCenterSsoRequestInner.java b/azure-mgmt-website/src/main/java/com/microsoft/azure/management/website/implementation/DomainControlCenterSsoRequestInner.java index d543c6beb2569..57f71dd579864 100644 --- a/azure-mgmt-website/src/main/java/com/microsoft/azure/management/website/implementation/DomainControlCenterSsoRequestInner.java +++ b/azure-mgmt-website/src/main/java/com/microsoft/azure/management/website/implementation/DomainControlCenterSsoRequestInner.java @@ -8,25 +8,29 @@ package com.microsoft.azure.management.website.implementation; +import com.fasterxml.jackson.annotation.JsonProperty; /** - * Single sign on request information for domain management. + * Single sign-on request information for domain management. */ public class DomainControlCenterSsoRequestInner { /** - * Url where the single sign on request is to be made. + * URL where the single sign-on request is to be made. */ + @JsonProperty(access = JsonProperty.Access.WRITE_ONLY) private String url; /** * Post parameter key. */ + @JsonProperty(access = JsonProperty.Access.WRITE_ONLY) private String postParameterKey; /** * Post parameter value. Client should use * 'application/x-www-form-urlencoded' encoding for this value. */ + @JsonProperty(access = JsonProperty.Access.WRITE_ONLY) private String postParameterValue; /** @@ -38,17 +42,6 @@ public String url() { return this.url; } - /** - * Set the url value. - * - * @param url the url value to set - * @return the DomainControlCenterSsoRequestInner object itself. - */ - public DomainControlCenterSsoRequestInner withUrl(String url) { - this.url = url; - return this; - } - /** * Get the postParameterKey value. * @@ -58,17 +51,6 @@ public String postParameterKey() { return this.postParameterKey; } - /** - * Set the postParameterKey value. - * - * @param postParameterKey the postParameterKey value to set - * @return the DomainControlCenterSsoRequestInner object itself. - */ - public DomainControlCenterSsoRequestInner withPostParameterKey(String postParameterKey) { - this.postParameterKey = postParameterKey; - return this; - } - /** * Get the postParameterValue value. * @@ -78,15 +60,4 @@ public String postParameterValue() { return this.postParameterValue; } - /** - * Set the postParameterValue value. - * - * @param postParameterValue the postParameterValue value to set - * @return the DomainControlCenterSsoRequestInner object itself. - */ - public DomainControlCenterSsoRequestInner withPostParameterValue(String postParameterValue) { - this.postParameterValue = postParameterValue; - return this; - } - } diff --git a/azure-mgmt-website/src/main/java/com/microsoft/azure/management/website/implementation/DomainInner.java b/azure-mgmt-website/src/main/java/com/microsoft/azure/management/website/implementation/DomainInner.java index c22943ffc6d54..9cf31d98509c9 100644 --- a/azure-mgmt-website/src/main/java/com/microsoft/azure/management/website/implementation/DomainInner.java +++ b/azure-mgmt-website/src/main/java/com/microsoft/azure/management/website/implementation/DomainInner.java @@ -20,30 +20,30 @@ import com.microsoft.azure.Resource; /** - * Represents a domain. + * Information about a domain. */ @JsonFlatten public class DomainInner extends Resource { /** - * Admin contact information. + * Administrative contact. */ @JsonProperty(value = "properties.contactAdmin") private Contact contactAdmin; /** - * Billing contact information. + * Billing contact. */ @JsonProperty(value = "properties.contactBilling") private Contact contactBilling; /** - * Registrant contact information. + * Registrant contact. */ @JsonProperty(value = "properties.contactRegistrant") private Contact contactRegistrant; /** - * Technical contact information. + * Technical contact. */ @JsonProperty(value = "properties.contactTech") private Contact contactTech; @@ -55,14 +55,14 @@ public class DomainInner extends Resource { * 'Reserved', 'Reverted', 'Suspended', 'Transferred', 'Unknown', * 'Unlocked', 'Unparked', 'Updated', 'JsonConverterFailed'. */ - @JsonProperty(value = "properties.registrationStatus") + @JsonProperty(value = "properties.registrationStatus", access = JsonProperty.Access.WRITE_ONLY) private DomainStatus registrationStatus; /** * Domain provisioning state. Possible values include: 'Succeeded', * 'Failed', 'Canceled', 'InProgress', 'Deleting'. */ - @JsonProperty(value = "properties.provisioningState") + @JsonProperty(value = "properties.provisioningState", access = JsonProperty.Access.WRITE_ONLY) private ProvisioningState provisioningState; /** @@ -72,7 +72,8 @@ public class DomainInner extends Resource { private List nameServers; /** - * If true then domain privacy is enabled for this domain. + * <code>true</code> if domain privacy is enabled for this + * domain; otherwise, <code>false</code>. */ @JsonProperty(value = "properties.privacy") private Boolean privacy; @@ -80,33 +81,36 @@ public class DomainInner extends Resource { /** * Domain creation timestamp. */ - @JsonProperty(value = "properties.createdTime") + @JsonProperty(value = "properties.createdTime", access = JsonProperty.Access.WRITE_ONLY) private DateTime createdTime; /** * Domain expiration timestamp. */ - @JsonProperty(value = "properties.expirationTime") + @JsonProperty(value = "properties.expirationTime", access = JsonProperty.Access.WRITE_ONLY) private DateTime expirationTime; /** * Timestamp when the domain was renewed last time. */ - @JsonProperty(value = "properties.lastRenewedTime") + @JsonProperty(value = "properties.lastRenewedTime", access = JsonProperty.Access.WRITE_ONLY) private DateTime lastRenewedTime; /** - * If true then domain will renewed automatically. + * <code>true</code> if the domain should be automatically + * renewed; otherwise, <code>false</code>. */ @JsonProperty(value = "properties.autoRenew") private Boolean autoRenew; /** - * If true then Azure can assign this domain to Web Apps. This value will - * be true if domain registration status is active and it is hosted on - * name servers Azure has programmatic access to. + * <code>true</code> if Azure can assign this domain to App + * Service apps; otherwise, <code>false</code>. This value + * will be <code>true</code> if domain registration status is + * active and + * it is hosted on name servers Azure has programmatic access to. */ - @JsonProperty(value = "properties.readyForDnsRecordManagement") + @JsonProperty(value = "properties.readyForDnsRecordManagement", access = JsonProperty.Access.WRITE_ONLY) private Boolean readyForDnsRecordManagement; /** @@ -216,17 +220,6 @@ public DomainStatus registrationStatus() { return this.registrationStatus; } - /** - * Set the registrationStatus value. - * - * @param registrationStatus the registrationStatus value to set - * @return the DomainInner object itself. - */ - public DomainInner withRegistrationStatus(DomainStatus registrationStatus) { - this.registrationStatus = registrationStatus; - return this; - } - /** * Get the provisioningState value. * @@ -236,17 +229,6 @@ public ProvisioningState provisioningState() { return this.provisioningState; } - /** - * Set the provisioningState value. - * - * @param provisioningState the provisioningState value to set - * @return the DomainInner object itself. - */ - public DomainInner withProvisioningState(ProvisioningState provisioningState) { - this.provisioningState = provisioningState; - return this; - } - /** * Get the nameServers value. * @@ -296,17 +278,6 @@ public DateTime createdTime() { return this.createdTime; } - /** - * Set the createdTime value. - * - * @param createdTime the createdTime value to set - * @return the DomainInner object itself. - */ - public DomainInner withCreatedTime(DateTime createdTime) { - this.createdTime = createdTime; - return this; - } - /** * Get the expirationTime value. * @@ -316,17 +287,6 @@ public DateTime expirationTime() { return this.expirationTime; } - /** - * Set the expirationTime value. - * - * @param expirationTime the expirationTime value to set - * @return the DomainInner object itself. - */ - public DomainInner withExpirationTime(DateTime expirationTime) { - this.expirationTime = expirationTime; - return this; - } - /** * Get the lastRenewedTime value. * @@ -336,17 +296,6 @@ public DateTime lastRenewedTime() { return this.lastRenewedTime; } - /** - * Set the lastRenewedTime value. - * - * @param lastRenewedTime the lastRenewedTime value to set - * @return the DomainInner object itself. - */ - public DomainInner withLastRenewedTime(DateTime lastRenewedTime) { - this.lastRenewedTime = lastRenewedTime; - return this; - } - /** * Get the autoRenew value. * @@ -376,17 +325,6 @@ public Boolean readyForDnsRecordManagement() { return this.readyForDnsRecordManagement; } - /** - * Set the readyForDnsRecordManagement value. - * - * @param readyForDnsRecordManagement the readyForDnsRecordManagement value to set - * @return the DomainInner object itself. - */ - public DomainInner withReadyForDnsRecordManagement(Boolean readyForDnsRecordManagement) { - this.readyForDnsRecordManagement = readyForDnsRecordManagement; - return this; - } - /** * Get the managedHostNames value. * diff --git a/azure-mgmt-website/src/main/java/com/microsoft/azure/management/website/implementation/DomainOwnershipIdentifierInner.java b/azure-mgmt-website/src/main/java/com/microsoft/azure/management/website/implementation/DomainOwnershipIdentifierInner.java new file mode 100644 index 0000000000000..4e0af0c14a118 --- /dev/null +++ b/azure-mgmt-website/src/main/java/com/microsoft/azure/management/website/implementation/DomainOwnershipIdentifierInner.java @@ -0,0 +1,46 @@ +/** + * 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.website.implementation; + +import com.fasterxml.jackson.annotation.JsonProperty; +import com.microsoft.rest.serializer.JsonFlatten; +import com.microsoft.azure.Resource; + +/** + * Domain ownership Identifier. + */ +@JsonFlatten +public class DomainOwnershipIdentifierInner extends Resource { + /** + * Ownership Id. + */ + @JsonProperty(value = "properties.ownershipId") + private String ownershipId; + + /** + * Get the ownershipId value. + * + * @return the ownershipId value + */ + public String ownershipId() { + return this.ownershipId; + } + + /** + * Set the ownershipId value. + * + * @param ownershipId the ownershipId value to set + * @return the DomainOwnershipIdentifierInner object itself. + */ + public DomainOwnershipIdentifierInner withOwnershipId(String ownershipId) { + this.ownershipId = ownershipId; + return this; + } + +} diff --git a/azure-mgmt-website/src/main/java/com/microsoft/azure/management/website/implementation/DomainRegistrationInputInner.java b/azure-mgmt-website/src/main/java/com/microsoft/azure/management/website/implementation/DomainRegistrationInputInner.java deleted file mode 100644 index a4ca1cd131184..0000000000000 --- a/azure-mgmt-website/src/main/java/com/microsoft/azure/management/website/implementation/DomainRegistrationInputInner.java +++ /dev/null @@ -1,476 +0,0 @@ -/** - * 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.website.implementation; - -import com.microsoft.azure.management.website.Contact; -import com.microsoft.azure.management.website.DomainStatus; -import com.microsoft.azure.management.website.ProvisioningState; -import java.util.List; -import org.joda.time.DateTime; -import com.microsoft.azure.management.website.HostName; -import com.microsoft.azure.management.website.DomainPurchaseConsent; -import com.fasterxml.jackson.annotation.JsonProperty; -import com.microsoft.rest.serializer.JsonFlatten; -import com.microsoft.azure.Resource; - -/** - * Domain registration input for validation Api. - */ -@JsonFlatten -public class DomainRegistrationInputInner extends Resource { - /** - * Name of the domain. - */ - @JsonProperty(value = "properties.name") - private String domainRegistrationInputName; - - /** - * Admin contact information. - */ - @JsonProperty(value = "properties.contactAdmin") - private Contact contactAdmin; - - /** - * Billing contact information. - */ - @JsonProperty(value = "properties.contactBilling") - private Contact contactBilling; - - /** - * Registrant contact information. - */ - @JsonProperty(value = "properties.contactRegistrant") - private Contact contactRegistrant; - - /** - * Technical contact information. - */ - @JsonProperty(value = "properties.contactTech") - private Contact contactTech; - - /** - * Domain registration status. Possible values include: 'Active', - * 'Awaiting', 'Cancelled', 'Confiscated', 'Disabled', 'Excluded', - * 'Expired', 'Failed', 'Held', 'Locked', 'Parked', 'Pending', - * 'Reserved', 'Reverted', 'Suspended', 'Transferred', 'Unknown', - * 'Unlocked', 'Unparked', 'Updated', 'JsonConverterFailed'. - */ - @JsonProperty(value = "properties.registrationStatus") - private DomainStatus registrationStatus; - - /** - * Domain provisioning state. Possible values include: 'Succeeded', - * 'Failed', 'Canceled', 'InProgress', 'Deleting'. - */ - @JsonProperty(value = "properties.provisioningState") - private ProvisioningState provisioningState; - - /** - * Name servers. - */ - @JsonProperty(value = "properties.nameServers") - private List nameServers; - - /** - * If true then domain privacy is enabled for this domain. - */ - @JsonProperty(value = "properties.privacy") - private Boolean privacy; - - /** - * Domain creation timestamp. - */ - @JsonProperty(value = "properties.createdTime") - private DateTime createdTime; - - /** - * Domain expiration timestamp. - */ - @JsonProperty(value = "properties.expirationTime") - private DateTime expirationTime; - - /** - * Timestamp when the domain was renewed last time. - */ - @JsonProperty(value = "properties.lastRenewedTime") - private DateTime lastRenewedTime; - - /** - * If true then domain will renewed automatically. - */ - @JsonProperty(value = "properties.autoRenew") - private Boolean autoRenew; - - /** - * If true then Azure can assign this domain to Web Apps. This value will - * be true if domain registration status is active and it is hosted on - * name servers Azure has programmatic access to. - */ - @JsonProperty(value = "properties.readyForDnsRecordManagement") - private Boolean readyForDnsRecordManagement; - - /** - * All hostnames derived from the domain and assigned to Azure resources. - */ - @JsonProperty(value = "properties.managedHostNames") - private List managedHostNames; - - /** - * Legal agreement consent. - */ - @JsonProperty(value = "properties.consent") - private DomainPurchaseConsent consent; - - /** - * Reasons why domain is not renewable. - */ - @JsonProperty(value = "properties.domainNotRenewableReasons") - private List domainNotRenewableReasons; - - /** - * Get the domainRegistrationInputName value. - * - * @return the domainRegistrationInputName value - */ - public String domainRegistrationInputName() { - return this.domainRegistrationInputName; - } - - /** - * Set the domainRegistrationInputName value. - * - * @param domainRegistrationInputName the domainRegistrationInputName value to set - * @return the DomainRegistrationInputInner object itself. - */ - public DomainRegistrationInputInner withDomainRegistrationInputName(String domainRegistrationInputName) { - this.domainRegistrationInputName = domainRegistrationInputName; - return this; - } - - /** - * Get the contactAdmin value. - * - * @return the contactAdmin value - */ - public Contact contactAdmin() { - return this.contactAdmin; - } - - /** - * Set the contactAdmin value. - * - * @param contactAdmin the contactAdmin value to set - * @return the DomainRegistrationInputInner object itself. - */ - public DomainRegistrationInputInner withContactAdmin(Contact contactAdmin) { - this.contactAdmin = contactAdmin; - return this; - } - - /** - * Get the contactBilling value. - * - * @return the contactBilling value - */ - public Contact contactBilling() { - return this.contactBilling; - } - - /** - * Set the contactBilling value. - * - * @param contactBilling the contactBilling value to set - * @return the DomainRegistrationInputInner object itself. - */ - public DomainRegistrationInputInner withContactBilling(Contact contactBilling) { - this.contactBilling = contactBilling; - return this; - } - - /** - * Get the contactRegistrant value. - * - * @return the contactRegistrant value - */ - public Contact contactRegistrant() { - return this.contactRegistrant; - } - - /** - * Set the contactRegistrant value. - * - * @param contactRegistrant the contactRegistrant value to set - * @return the DomainRegistrationInputInner object itself. - */ - public DomainRegistrationInputInner withContactRegistrant(Contact contactRegistrant) { - this.contactRegistrant = contactRegistrant; - return this; - } - - /** - * Get the contactTech value. - * - * @return the contactTech value - */ - public Contact contactTech() { - return this.contactTech; - } - - /** - * Set the contactTech value. - * - * @param contactTech the contactTech value to set - * @return the DomainRegistrationInputInner object itself. - */ - public DomainRegistrationInputInner withContactTech(Contact contactTech) { - this.contactTech = contactTech; - return this; - } - - /** - * Get the registrationStatus value. - * - * @return the registrationStatus value - */ - public DomainStatus registrationStatus() { - return this.registrationStatus; - } - - /** - * Set the registrationStatus value. - * - * @param registrationStatus the registrationStatus value to set - * @return the DomainRegistrationInputInner object itself. - */ - public DomainRegistrationInputInner withRegistrationStatus(DomainStatus registrationStatus) { - this.registrationStatus = registrationStatus; - return this; - } - - /** - * Get the provisioningState value. - * - * @return the provisioningState value - */ - public ProvisioningState provisioningState() { - return this.provisioningState; - } - - /** - * Set the provisioningState value. - * - * @param provisioningState the provisioningState value to set - * @return the DomainRegistrationInputInner object itself. - */ - public DomainRegistrationInputInner withProvisioningState(ProvisioningState provisioningState) { - this.provisioningState = provisioningState; - return this; - } - - /** - * Get the nameServers value. - * - * @return the nameServers value - */ - public List nameServers() { - return this.nameServers; - } - - /** - * Set the nameServers value. - * - * @param nameServers the nameServers value to set - * @return the DomainRegistrationInputInner object itself. - */ - public DomainRegistrationInputInner withNameServers(List nameServers) { - this.nameServers = nameServers; - return this; - } - - /** - * Get the privacy value. - * - * @return the privacy value - */ - public Boolean privacy() { - return this.privacy; - } - - /** - * Set the privacy value. - * - * @param privacy the privacy value to set - * @return the DomainRegistrationInputInner object itself. - */ - public DomainRegistrationInputInner withPrivacy(Boolean privacy) { - this.privacy = privacy; - return this; - } - - /** - * Get the createdTime value. - * - * @return the createdTime value - */ - public DateTime createdTime() { - return this.createdTime; - } - - /** - * Set the createdTime value. - * - * @param createdTime the createdTime value to set - * @return the DomainRegistrationInputInner object itself. - */ - public DomainRegistrationInputInner withCreatedTime(DateTime createdTime) { - this.createdTime = createdTime; - return this; - } - - /** - * Get the expirationTime value. - * - * @return the expirationTime value - */ - public DateTime expirationTime() { - return this.expirationTime; - } - - /** - * Set the expirationTime value. - * - * @param expirationTime the expirationTime value to set - * @return the DomainRegistrationInputInner object itself. - */ - public DomainRegistrationInputInner withExpirationTime(DateTime expirationTime) { - this.expirationTime = expirationTime; - return this; - } - - /** - * Get the lastRenewedTime value. - * - * @return the lastRenewedTime value - */ - public DateTime lastRenewedTime() { - return this.lastRenewedTime; - } - - /** - * Set the lastRenewedTime value. - * - * @param lastRenewedTime the lastRenewedTime value to set - * @return the DomainRegistrationInputInner object itself. - */ - public DomainRegistrationInputInner withLastRenewedTime(DateTime lastRenewedTime) { - this.lastRenewedTime = lastRenewedTime; - return this; - } - - /** - * Get the autoRenew value. - * - * @return the autoRenew value - */ - public Boolean autoRenew() { - return this.autoRenew; - } - - /** - * Set the autoRenew value. - * - * @param autoRenew the autoRenew value to set - * @return the DomainRegistrationInputInner object itself. - */ - public DomainRegistrationInputInner withAutoRenew(Boolean autoRenew) { - this.autoRenew = autoRenew; - return this; - } - - /** - * Get the readyForDnsRecordManagement value. - * - * @return the readyForDnsRecordManagement value - */ - public Boolean readyForDnsRecordManagement() { - return this.readyForDnsRecordManagement; - } - - /** - * Set the readyForDnsRecordManagement value. - * - * @param readyForDnsRecordManagement the readyForDnsRecordManagement value to set - * @return the DomainRegistrationInputInner object itself. - */ - public DomainRegistrationInputInner withReadyForDnsRecordManagement(Boolean readyForDnsRecordManagement) { - this.readyForDnsRecordManagement = readyForDnsRecordManagement; - return this; - } - - /** - * Get the managedHostNames value. - * - * @return the managedHostNames value - */ - public List managedHostNames() { - return this.managedHostNames; - } - - /** - * Set the managedHostNames value. - * - * @param managedHostNames the managedHostNames value to set - * @return the DomainRegistrationInputInner object itself. - */ - public DomainRegistrationInputInner withManagedHostNames(List managedHostNames) { - this.managedHostNames = managedHostNames; - return this; - } - - /** - * Get the consent value. - * - * @return the consent value - */ - public DomainPurchaseConsent consent() { - return this.consent; - } - - /** - * Set the consent value. - * - * @param consent the consent value to set - * @return the DomainRegistrationInputInner object itself. - */ - public DomainRegistrationInputInner withConsent(DomainPurchaseConsent consent) { - this.consent = consent; - return this; - } - - /** - * Get the domainNotRenewableReasons value. - * - * @return the domainNotRenewableReasons value - */ - public List domainNotRenewableReasons() { - return this.domainNotRenewableReasons; - } - - /** - * Set the domainNotRenewableReasons value. - * - * @param domainNotRenewableReasons the domainNotRenewableReasons value to set - * @return the DomainRegistrationInputInner object itself. - */ - public DomainRegistrationInputInner withDomainNotRenewableReasons(List domainNotRenewableReasons) { - this.domainNotRenewableReasons = domainNotRenewableReasons; - return this; - } - -} diff --git a/azure-mgmt-website/src/main/java/com/microsoft/azure/management/website/implementation/DomainsInner.java b/azure-mgmt-website/src/main/java/com/microsoft/azure/management/website/implementation/DomainsInner.java index 705a255975ef6..1105b99c9a7c0 100644 --- a/azure-mgmt-website/src/main/java/com/microsoft/azure/management/website/implementation/DomainsInner.java +++ b/azure-mgmt-website/src/main/java/com/microsoft/azure/management/website/implementation/DomainsInner.java @@ -8,6 +8,7 @@ package com.microsoft.azure.management.website.implementation; +import retrofit2.Retrofit; import com.google.common.reflect.TypeToken; import com.microsoft.azure.AzureServiceCall; import com.microsoft.azure.AzureServiceResponseBuilder; @@ -19,23 +20,22 @@ 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.PATCH; +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 @@ -79,10 +79,6 @@ interface DomainsService { @POST("subscriptions/{subscriptionId}/providers/Microsoft.DomainRegistration/listDomainRecommendations") Observable> listRecommendations(@Path("subscriptionId") String subscriptionId, @Body DomainRecommendationSearchParametersInner parameters, @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}/providers/Microsoft.DomainRegistration/validateDomainRegistrationInformation") - Observable> validatePurchaseInformation(@Path("subscriptionId") String subscriptionId, @Body DomainRegistrationInputInner domainRegistrationInput, @Query("api-version") String apiVersion, @Header("accept-language") String acceptLanguage, @Header("User-Agent") String userAgent); - @Headers("Content-Type: application/json; charset=utf-8") @GET("subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.DomainRegistration/domains") Observable> listByResourceGroup(@Path("resourceGroupName") String resourceGroupName, @Path("subscriptionId") String subscriptionId, @Query("api-version") String apiVersion, @Header("accept-language") String acceptLanguage, @Header("User-Agent") String userAgent); @@ -104,8 +100,24 @@ interface DomainsService { Observable> delete(@Path("resourceGroupName") String resourceGroupName, @Path("domainName") String domainName, @Path("subscriptionId") String subscriptionId, @Query("forceHardDeleteDomain") Boolean forceHardDeleteDomain, @Query("api-version") String apiVersion, @Header("accept-language") String acceptLanguage, @Header("User-Agent") String userAgent); @Headers("Content-Type: application/json; charset=utf-8") - @GET("subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.DomainRegistration/domains/{domainName}/operationresults/{operationId}") - Observable> getOperation(@Path("resourceGroupName") String resourceGroupName, @Path("domainName") String domainName, @Path("operationId") String operationId, @Path("subscriptionId") String subscriptionId, @Query("api-version") String apiVersion, @Header("accept-language") String acceptLanguage, @Header("User-Agent") String userAgent); + @GET("subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.DomainRegistration/domains/{domainName}/domainOwnershipIdentifiers") + Observable> listOwnershipIdentifiers(@Path("resourceGroupName") String resourceGroupName, @Path("domainName") String domainName, @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") + @GET("subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.DomainRegistration/domains/{domainName}/domainOwnershipIdentifiers/{name}") + Observable> getOwnershipIdentifier(@Path("resourceGroupName") String resourceGroupName, @Path("domainName") String domainName, @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") + @PUT("subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.DomainRegistration/domains/{domainName}/domainOwnershipIdentifiers/{name}") + Observable> createOrUpdateOwnershipIdentifier(@Path("resourceGroupName") String resourceGroupName, @Path("domainName") String domainName, @Path("name") String name, @Path("subscriptionId") String subscriptionId, @Body DomainOwnershipIdentifierInner domainOwnershipIdentifier, @Query("api-version") String apiVersion, @Header("accept-language") String acceptLanguage, @Header("User-Agent") String userAgent); + + @Headers("Content-Type: application/json; charset=utf-8") + @HTTP(path = "subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.DomainRegistration/domains/{domainName}/domainOwnershipIdentifiers/{name}", method = "DELETE", hasBody = true) + Observable> deleteOwnershipIdentifier(@Path("resourceGroupName") String resourceGroupName, @Path("domainName") String domainName, @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") + @PATCH("subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.DomainRegistration/domains/{domainName}/domainOwnershipIdentifiers/{name}") + Observable> updateOwnershipIdentifier(@Path("resourceGroupName") String resourceGroupName, @Path("domainName") String domainName, @Path("name") String name, @Path("subscriptionId") String subscriptionId, @Body DomainOwnershipIdentifierInner domainOwnershipIdentifier, @Query("api-version") String apiVersion, @Header("accept-language") String acceptLanguage, @Header("User-Agent") String userAgent); @Headers("Content-Type: application/json; charset=utf-8") @GET("{nextLink}") @@ -119,11 +131,15 @@ interface DomainsService { @GET("{nextLink}") Observable> listByResourceGroupNext(@Path(value = "nextLink", encoded = true) String nextPageLink, @Header("accept-language") String acceptLanguage, @Header("User-Agent") String userAgent); + @Headers("Content-Type: application/json; charset=utf-8") + @GET("{nextLink}") + Observable> listOwnershipIdentifiersNext(@Path(value = "nextLink", encoded = true) String nextPageLink, @Header("accept-language") String acceptLanguage, @Header("User-Agent") String userAgent); + } /** - * Checks if a domain is available for registration. - * Checks if a domain is available for registration. + * Check if a domain is available for registration. + * Check if a domain is available for registration. * * @return the DomainAvailablilityCheckResultInner object if successful. */ @@ -132,8 +148,8 @@ public DomainAvailablilityCheckResultInner checkAvailability() { } /** - * Checks if a domain is available for registration. - * Checks if a domain is available for registration. + * Check if a domain is available for registration. + * Check if a domain is available for registration. * * @param serviceCallback the async ServiceCallback to handle successful and failed responses. * @return the {@link ServiceCall} object @@ -143,8 +159,8 @@ public ServiceCall checkAvailabilityAsync(f } /** - * Checks if a domain is available for registration. - * Checks if a domain is available for registration. + * Check if a domain is available for registration. + * Check if a domain is available for registration. * * @return the observable to the DomainAvailablilityCheckResultInner object */ @@ -158,8 +174,8 @@ public DomainAvailablilityCheckResultInner call(ServiceResponse> call(Res } /** - * Checks if a domain is available for registration. - * Checks if a domain is available for registration. + * Check if a domain is available for registration. + * Check if a domain is available for registration. * - * @param name Name of the object + * @param name Name of the object. * @return the DomainAvailablilityCheckResultInner object if successful. */ public DomainAvailablilityCheckResultInner checkAvailability(String name) { @@ -197,10 +213,10 @@ public DomainAvailablilityCheckResultInner checkAvailability(String name) { } /** - * Checks if a domain is available for registration. - * Checks if a domain is available for registration. + * Check if a domain is available for registration. + * Check if a domain is available for registration. * - * @param name Name of the object + * @param name Name of the object. * @param serviceCallback the async ServiceCallback to handle successful and failed responses. * @return the {@link ServiceCall} object */ @@ -209,10 +225,10 @@ public ServiceCall checkAvailabilityAsync(S } /** - * Checks if a domain is available for registration. - * Checks if a domain is available for registration. + * Check if a domain is available for registration. + * Check if a domain is available for registration. * - * @param name Name of the object + * @param name Name of the object. * @return the observable to the DomainAvailablilityCheckResultInner object */ public Observable checkAvailabilityAsync(String name) { @@ -225,10 +241,10 @@ public DomainAvailablilityCheckResultInner call(ServiceResponse> checkAvailabilityWithServiceResponseAsync(String name) { @@ -260,8 +276,8 @@ private ServiceResponse checkAvailabilityDe } /** - * Lists all domains in a subscription. - * Lists all domains in a subscription. + * Get all domains in a subscription. + * Get all domains in a subscription. * * @return the PagedList<DomainInner> object if successful. */ @@ -276,8 +292,8 @@ public Page nextPage(String nextPageLink) { } /** - * Lists all domains in a subscription. - * Lists all domains in a subscription. + * Get all domains in a subscription. + * Get all domains in a subscription. * * @param serviceCallback the async ServiceCallback to handle successful and failed responses. * @return the {@link ServiceCall} object @@ -295,8 +311,8 @@ public Observable>> call(String nextPageLink) } /** - * Lists all domains in a subscription. - * Lists all domains in a subscription. + * Get all domains in a subscription. + * Get all domains in a subscription. * * @return the observable to the PagedList<DomainInner> object */ @@ -311,8 +327,8 @@ public Page call(ServiceResponse> response) { } /** - * Lists all domains in a subscription. - * Lists all domains in a subscription. + * Get all domains in a subscription. + * Get all domains in a subscription. * * @return the observable to the PagedList<DomainInner> object */ @@ -331,8 +347,8 @@ public Observable>> call(ServiceResponse> listDelegate(Response getControlCenterSsoReques } /** - * Generates a single sign on request for domain management portal. - * Generates a single sign on request for domain management portal. + * Generate a single sign-on request for the domain management portal. + * Generate a single sign-on request for the domain management portal. * * @return the observable to the DomainControlCenterSsoRequestInner object */ @@ -399,8 +415,8 @@ public DomainControlCenterSsoRequestInner call(ServiceResponse getControlCenterSsoR } /** - * Lists domain recommendations based on keywords. - * Lists domain recommendations based on keywords. + * Get domain name recommendations based on keywords. + * Get domain name recommendations based on keywords. * - * @param parameters Domain recommendation search parameters + * @param parameters Search parameters for domain name recommendations. * @return the PagedList<NameIdentifierInner> object if successful. */ public PagedList listRecommendations(final DomainRecommendationSearchParametersInner parameters) { @@ -448,10 +464,10 @@ public Page nextPage(String nextPageLink) { } /** - * Lists domain recommendations based on keywords. - * Lists domain recommendations based on keywords. + * Get domain name recommendations based on keywords. + * Get domain name recommendations based on keywords. * - * @param parameters Domain recommendation search parameters + * @param parameters Search parameters for domain name recommendations. * @param serviceCallback the async ServiceCallback to handle successful and failed responses. * @return the {@link ServiceCall} object */ @@ -468,10 +484,10 @@ public Observable>> call(String nextPa } /** - * Lists domain recommendations based on keywords. - * Lists domain recommendations based on keywords. + * Get domain name recommendations based on keywords. + * Get domain name recommendations based on keywords. * - * @param parameters Domain recommendation search parameters + * @param parameters Search parameters for domain name recommendations. * @return the observable to the PagedList<NameIdentifierInner> object */ public Observable> listRecommendationsAsync(final DomainRecommendationSearchParametersInner parameters) { @@ -485,10 +501,10 @@ public Page call(ServiceResponse> } /** - * Lists domain recommendations based on keywords. - * Lists domain recommendations based on keywords. + * Get domain name recommendations based on keywords. + * Get domain name recommendations based on keywords. * - * @param parameters Domain recommendation search parameters + * @param parameters Search parameters for domain name recommendations. * @return the observable to the PagedList<NameIdentifierInner> object */ public Observable>> listRecommendationsWithServiceResponseAsync(final DomainRecommendationSearchParametersInner parameters) { @@ -506,10 +522,10 @@ public Observable>> call(ServiceRespon } /** - * Lists domain recommendations based on keywords. - * Lists domain recommendations based on keywords. + * Get domain name recommendations based on keywords. + * Get domain name recommendations based on keywords. * - ServiceResponse> * @param parameters Domain recommendation search parameters + ServiceResponse> * @param parameters Search parameters for domain name recommendations. * @return the PagedList<NameIdentifierInner> object wrapped in {@link ServiceResponse} if successful. */ public Observable>> listRecommendationsSinglePageAsync(final DomainRecommendationSearchParametersInner parameters) { @@ -543,86 +559,10 @@ private ServiceResponse> listRecommendationsDelega } /** - * Validates domain registration information. - * Validates domain registration information. - * - * @param domainRegistrationInput Domain registration information - * @return the Object object if successful. - */ - public Object validatePurchaseInformation(DomainRegistrationInputInner domainRegistrationInput) { - return validatePurchaseInformationWithServiceResponseAsync(domainRegistrationInput).toBlocking().single().getBody(); - } - - /** - * Validates domain registration information. - * Validates domain registration information. - * - * @param domainRegistrationInput Domain registration information - * @param serviceCallback the async ServiceCallback to handle successful and failed responses. - * @return the {@link ServiceCall} object - */ - public ServiceCall validatePurchaseInformationAsync(DomainRegistrationInputInner domainRegistrationInput, final ServiceCallback serviceCallback) { - return ServiceCall.create(validatePurchaseInformationWithServiceResponseAsync(domainRegistrationInput), serviceCallback); - } - - /** - * Validates domain registration information. - * Validates domain registration information. - * - * @param domainRegistrationInput Domain registration information - * @return the observable to the Object object - */ - public Observable validatePurchaseInformationAsync(DomainRegistrationInputInner domainRegistrationInput) { - return validatePurchaseInformationWithServiceResponseAsync(domainRegistrationInput).map(new Func1, Object>() { - @Override - public Object call(ServiceResponse response) { - return response.getBody(); - } - }); - } - - /** - * Validates domain registration information. - * Validates domain registration information. - * - * @param domainRegistrationInput Domain registration information - * @return the observable to the Object object - */ - public Observable> validatePurchaseInformationWithServiceResponseAsync(DomainRegistrationInputInner domainRegistrationInput) { - if (this.client.subscriptionId() == null) { - throw new IllegalArgumentException("Parameter this.client.subscriptionId() is required and cannot be null."); - } - if (domainRegistrationInput == null) { - throw new IllegalArgumentException("Parameter domainRegistrationInput is required and cannot be null."); - } - Validator.validate(domainRegistrationInput); - final String apiVersion = "2015-04-01"; - return service.validatePurchaseInformation(this.client.subscriptionId(), domainRegistrationInput, apiVersion, this.client.acceptLanguage(), this.client.userAgent()) - .flatMap(new Func1, Observable>>() { - @Override - public Observable> call(Response response) { - try { - ServiceResponse clientResponse = validatePurchaseInformationDelegate(response); - return Observable.just(clientResponse); - } catch (Throwable t) { - return Observable.error(t); - } - } - }); - } - - private ServiceResponse validatePurchaseInformationDelegate(Response response) throws CloudException, IOException, IllegalArgumentException { - return new AzureServiceResponseBuilder(this.client.mapperAdapter()) - .register(200, new TypeToken() { }.getType()) - .registerError(CloudException.class) - .build(response); - } - - /** - * Lists domains under a resource group. - * Lists domains under a resource group. + * Get all domains in a resource group. + * Get all domains in a resource group. * - * @param resourceGroupName Name of the resource group + * @param resourceGroupName Name of the resource group to which the resource belongs. * @return the PagedList<DomainInner> object if successful. */ public PagedList listByResourceGroup(final String resourceGroupName) { @@ -636,10 +576,10 @@ public Page nextPage(String nextPageLink) { } /** - * Lists domains under a resource group. - * Lists domains under a resource group. + * Get all domains in a resource group. + * Get all domains in a resource group. * - * @param resourceGroupName Name of the resource group + * @param resourceGroupName Name of the resource group to which the resource belongs. * @param serviceCallback the async ServiceCallback to handle successful and failed responses. * @return the {@link ServiceCall} object */ @@ -656,10 +596,10 @@ public Observable>> call(String nextPageLink) } /** - * Lists domains under a resource group. - * Lists domains under a resource group. + * Get all domains in a resource group. + * Get all domains in a resource group. * - * @param resourceGroupName Name of the resource group + * @param resourceGroupName Name of the resource group to which the resource belongs. * @return the observable to the PagedList<DomainInner> object */ public Observable> listByResourceGroupAsync(final String resourceGroupName) { @@ -673,10 +613,10 @@ public Page call(ServiceResponse> response) { } /** - * Lists domains under a resource group. - * Lists domains under a resource group. + * Get all domains in a resource group. + * Get all domains in a resource group. * - * @param resourceGroupName Name of the resource group + * @param resourceGroupName Name of the resource group to which the resource belongs. * @return the observable to the PagedList<DomainInner> object */ public Observable>> listByResourceGroupWithServiceResponseAsync(final String resourceGroupName) { @@ -694,10 +634,10 @@ public Observable>> call(ServiceResponse> * @param resourceGroupName Name of the resource group + ServiceResponse> * @param resourceGroupName Name of the resource group to which the resource belongs. * @return the PagedList<DomainInner> object wrapped in {@link ServiceResponse} if successful. */ public Observable>> listByResourceGroupSinglePageAsync(final String resourceGroupName) { @@ -730,11 +670,11 @@ private ServiceResponse> listByResourceGroupDelegate(Respo } /** - * Gets details of a domain. - * Gets details of a domain. + * Get a domain. + * Get a domain. * - * @param resourceGroupName Name of the resource group - * @param domainName Name of the domain + * @param resourceGroupName Name of the resource group to which the resource belongs. + * @param domainName Name of the domain. * @return the DomainInner object if successful. */ public DomainInner get(String resourceGroupName, String domainName) { @@ -742,11 +682,11 @@ public DomainInner get(String resourceGroupName, String domainName) { } /** - * Gets details of a domain. - * Gets details of a domain. + * Get a domain. + * Get a domain. * - * @param resourceGroupName Name of the resource group - * @param domainName Name of the domain + * @param resourceGroupName Name of the resource group to which the resource belongs. + * @param domainName Name of the domain. * @param serviceCallback the async ServiceCallback to handle successful and failed responses. * @return the {@link ServiceCall} object */ @@ -755,11 +695,11 @@ public ServiceCall getAsync(String resourceGroupName, String domain } /** - * Gets details of a domain. - * Gets details of a domain. + * Get a domain. + * Get a domain. * - * @param resourceGroupName Name of the resource group - * @param domainName Name of the domain + * @param resourceGroupName Name of the resource group to which the resource belongs. + * @param domainName Name of the domain. * @return the observable to the DomainInner object */ public Observable getAsync(String resourceGroupName, String domainName) { @@ -772,11 +712,11 @@ public DomainInner call(ServiceResponse response) { } /** - * Gets details of a domain. - * Gets details of a domain. + * Get a domain. + * Get a domain. * - * @param resourceGroupName Name of the resource group - * @param domainName Name of the domain + * @param resourceGroupName Name of the resource group to which the resource belongs. + * @param domainName Name of the domain. * @return the observable to the DomainInner object */ public Observable> getWithServiceResponseAsync(String resourceGroupName, String domainName) { @@ -812,12 +752,12 @@ private ServiceResponse getDelegate(Response response } /** - * Creates a domain. - * Creates a domain. + * Creates or updates a domain. + * Creates or updates a domain. * - * @param resourceGroupName &gt;Name of the resource group - * @param domainName Name of the domain - * @param domain Domain registration information + * @param resourceGroupName Name of the resource group to which the resource belongs. + * @param domainName Name of the domain. + * @param domain Domain registration information. * @return the DomainInner object if successful. */ public DomainInner createOrUpdate(String resourceGroupName, String domainName, DomainInner domain) { @@ -825,12 +765,12 @@ public DomainInner createOrUpdate(String resourceGroupName, String domainName, D } /** - * Creates a domain. - * Creates a domain. + * Creates or updates a domain. + * Creates or updates a domain. * - * @param resourceGroupName &gt;Name of the resource group - * @param domainName Name of the domain - * @param domain Domain registration information + * @param resourceGroupName Name of the resource group to which the resource belongs. + * @param domainName Name of the domain. + * @param domain Domain registration information. * @param serviceCallback the async ServiceCallback to handle successful and failed responses. * @return the {@link ServiceCall} object */ @@ -839,12 +779,12 @@ public ServiceCall createOrUpdateAsync(String resourceGroupName, St } /** - * Creates a domain. - * Creates a domain. + * Creates or updates a domain. + * Creates or updates a domain. * - * @param resourceGroupName &gt;Name of the resource group - * @param domainName Name of the domain - * @param domain Domain registration information + * @param resourceGroupName Name of the resource group to which the resource belongs. + * @param domainName Name of the domain. + * @param domain Domain registration information. * @return the observable for the request */ public Observable createOrUpdateAsync(String resourceGroupName, String domainName, DomainInner domain) { @@ -857,12 +797,12 @@ public DomainInner call(ServiceResponse response) { } /** - * Creates a domain. - * Creates a domain. + * Creates or updates a domain. + * Creates or updates a domain. * - * @param resourceGroupName &gt;Name of the resource group - * @param domainName Name of the domain - * @param domain Domain registration information + * @param resourceGroupName Name of the resource group to which the resource belongs. + * @param domainName Name of the domain. + * @param domain Domain registration information. * @return the observable for the request */ public Observable> createOrUpdateWithServiceResponseAsync(String resourceGroupName, String domainName, DomainInner domain) { @@ -885,12 +825,12 @@ public Observable> createOrUpdateWithServiceRespons } /** - * Creates a domain. - * Creates a domain. + * Creates or updates a domain. + * Creates or updates a domain. * - * @param resourceGroupName &gt;Name of the resource group - * @param domainName Name of the domain - * @param domain Domain registration information + * @param resourceGroupName Name of the resource group to which the resource belongs. + * @param domainName Name of the domain. + * @param domain Domain registration information. * @return the DomainInner object if successful. */ public DomainInner beginCreateOrUpdate(String resourceGroupName, String domainName, DomainInner domain) { @@ -898,12 +838,12 @@ public DomainInner beginCreateOrUpdate(String resourceGroupName, String domainNa } /** - * Creates a domain. - * Creates a domain. + * Creates or updates a domain. + * Creates or updates a domain. * - * @param resourceGroupName &gt;Name of the resource group - * @param domainName Name of the domain - * @param domain Domain registration information + * @param resourceGroupName Name of the resource group to which the resource belongs. + * @param domainName Name of the domain. + * @param domain Domain registration information. * @param serviceCallback the async ServiceCallback to handle successful and failed responses. * @return the {@link ServiceCall} object */ @@ -912,12 +852,12 @@ public ServiceCall beginCreateOrUpdateAsync(String resourceGroupNam } /** - * Creates a domain. - * Creates a domain. + * Creates or updates a domain. + * Creates or updates a domain. * - * @param resourceGroupName &gt;Name of the resource group - * @param domainName Name of the domain - * @param domain Domain registration information + * @param resourceGroupName Name of the resource group to which the resource belongs. + * @param domainName Name of the domain. + * @param domain Domain registration information. * @return the observable to the DomainInner object */ public Observable beginCreateOrUpdateAsync(String resourceGroupName, String domainName, DomainInner domain) { @@ -930,12 +870,12 @@ public DomainInner call(ServiceResponse response) { } /** - * Creates a domain. - * Creates a domain. + * Creates or updates a domain. + * Creates or updates a domain. * - * @param resourceGroupName &gt;Name of the resource group - * @param domainName Name of the domain - * @param domain Domain registration information + * @param resourceGroupName Name of the resource group to which the resource belongs. + * @param domainName Name of the domain. + * @param domain Domain registration information. * @return the observable to the DomainInner object */ public Observable> beginCreateOrUpdateWithServiceResponseAsync(String resourceGroupName, String domainName, DomainInner domain) { @@ -976,56 +916,55 @@ private ServiceResponse beginCreateOrUpdateDelegate(Response deleteAsync(String resourceGroupName, String domainName, final ServiceCallback serviceCallback) { + public ServiceCall deleteAsync(String resourceGroupName, String domainName, final ServiceCallback serviceCallback) { return ServiceCall.create(deleteWithServiceResponseAsync(resourceGroupName, domainName), serviceCallback); } /** - * Deletes a domain. - * Deletes a domain. + * Delete a domain. + * Delete a domain. * - * @param resourceGroupName Name of the resource group - * @param domainName Name of the domain - * @return the observable to the Object object + * @param resourceGroupName Name of the resource group to which the resource belongs. + * @param domainName Name of the domain. + * @return the {@link ServiceResponse} object if successful. */ - public Observable deleteAsync(String resourceGroupName, String domainName) { - return deleteWithServiceResponseAsync(resourceGroupName, domainName).map(new Func1, Object>() { + public Observable deleteAsync(String resourceGroupName, String domainName) { + return deleteWithServiceResponseAsync(resourceGroupName, domainName).map(new Func1, Void>() { @Override - public Object call(ServiceResponse response) { + public Void call(ServiceResponse response) { return response.getBody(); } }); } /** - * Deletes a domain. - * Deletes a domain. + * Delete a domain. + * Delete a domain. * - * @param resourceGroupName Name of the resource group - * @param domainName Name of the domain - * @return the observable to the Object object + * @param resourceGroupName Name of the resource group to which the resource belongs. + * @param domainName Name of the domain. + * @return the {@link ServiceResponse} object if successful. */ - public Observable> deleteWithServiceResponseAsync(String resourceGroupName, String domainName) { + public Observable> deleteWithServiceResponseAsync(String resourceGroupName, String domainName) { if (resourceGroupName == null) { throw new IllegalArgumentException("Parameter resourceGroupName is required and cannot be null."); } @@ -1038,11 +977,11 @@ public Observable> deleteWithServiceResponseAsync(String final String apiVersion = "2015-04-01"; final Boolean forceHardDeleteDomain = null; return service.delete(resourceGroupName, domainName, this.client.subscriptionId(), forceHardDeleteDomain, apiVersion, this.client.acceptLanguage(), this.client.userAgent()) - .flatMap(new Func1, Observable>>() { + .flatMap(new Func1, Observable>>() { @Override - public Observable> call(Response response) { + public Observable> call(Response response) { try { - ServiceResponse clientResponse = deleteDelegate(response); + ServiceResponse clientResponse = deleteDelegate(response); return Observable.just(clientResponse); } catch (Throwable t) { return Observable.error(t); @@ -1052,60 +991,59 @@ public Observable> call(Response response) } /** - * Deletes a domain. - * Deletes a domain. + * Delete a domain. + * Delete a domain. * - * @param resourceGroupName Name of the resource group - * @param domainName Name of the domain - * @param forceHardDeleteDomain If true then the domain will be deleted immediately instead of after 24 hours - * @return the Object object if successful. + * @param resourceGroupName Name of the resource group to which the resource belongs. + * @param domainName Name of the domain. + * @param forceHardDeleteDomain Specify <code>true</code> to delete the domain immediately. The default is <code>false</code> which deletes the domain after 24 hours. */ - public Object delete(String resourceGroupName, String domainName, Boolean forceHardDeleteDomain) { - return deleteWithServiceResponseAsync(resourceGroupName, domainName, forceHardDeleteDomain).toBlocking().single().getBody(); + public void delete(String resourceGroupName, String domainName, Boolean forceHardDeleteDomain) { + deleteWithServiceResponseAsync(resourceGroupName, domainName, forceHardDeleteDomain).toBlocking().single().getBody(); } /** - * Deletes a domain. - * Deletes a domain. + * Delete a domain. + * Delete a domain. * - * @param resourceGroupName Name of the resource group - * @param domainName Name of the domain - * @param forceHardDeleteDomain If true then the domain will be deleted immediately instead of after 24 hours + * @param resourceGroupName Name of the resource group to which the resource belongs. + * @param domainName Name of the domain. + * @param forceHardDeleteDomain Specify <code>true</code> to delete the domain immediately. The default is <code>false</code> which deletes the domain after 24 hours. * @param serviceCallback the async ServiceCallback to handle successful and failed responses. * @return the {@link ServiceCall} object */ - public ServiceCall deleteAsync(String resourceGroupName, String domainName, Boolean forceHardDeleteDomain, final ServiceCallback serviceCallback) { + public ServiceCall deleteAsync(String resourceGroupName, String domainName, Boolean forceHardDeleteDomain, final ServiceCallback serviceCallback) { return ServiceCall.create(deleteWithServiceResponseAsync(resourceGroupName, domainName, forceHardDeleteDomain), serviceCallback); } /** - * Deletes a domain. - * Deletes a domain. + * Delete a domain. + * Delete a domain. * - * @param resourceGroupName Name of the resource group - * @param domainName Name of the domain - * @param forceHardDeleteDomain If true then the domain will be deleted immediately instead of after 24 hours - * @return the observable to the Object object + * @param resourceGroupName Name of the resource group to which the resource belongs. + * @param domainName Name of the domain. + * @param forceHardDeleteDomain Specify <code>true</code> to delete the domain immediately. The default is <code>false</code> which deletes the domain after 24 hours. + * @return the {@link ServiceResponse} object if successful. */ - public Observable deleteAsync(String resourceGroupName, String domainName, Boolean forceHardDeleteDomain) { - return deleteWithServiceResponseAsync(resourceGroupName, domainName, forceHardDeleteDomain).map(new Func1, Object>() { + public Observable deleteAsync(String resourceGroupName, String domainName, Boolean forceHardDeleteDomain) { + return deleteWithServiceResponseAsync(resourceGroupName, domainName, forceHardDeleteDomain).map(new Func1, Void>() { @Override - public Object call(ServiceResponse response) { + public Void call(ServiceResponse response) { return response.getBody(); } }); } /** - * Deletes a domain. - * Deletes a domain. + * Delete a domain. + * Delete a domain. * - * @param resourceGroupName Name of the resource group - * @param domainName Name of the domain - * @param forceHardDeleteDomain If true then the domain will be deleted immediately instead of after 24 hours - * @return the observable to the Object object + * @param resourceGroupName Name of the resource group to which the resource belongs. + * @param domainName Name of the domain. + * @param forceHardDeleteDomain Specify <code>true</code> to delete the domain immediately. The default is <code>false</code> which deletes the domain after 24 hours. + * @return the {@link ServiceResponse} object if successful. */ - public Observable> deleteWithServiceResponseAsync(String resourceGroupName, String domainName, Boolean forceHardDeleteDomain) { + public Observable> deleteWithServiceResponseAsync(String resourceGroupName, String domainName, Boolean forceHardDeleteDomain) { if (resourceGroupName == null) { throw new IllegalArgumentException("Parameter resourceGroupName is required and cannot be null."); } @@ -1117,11 +1055,11 @@ public Observable> deleteWithServiceResponseAsync(String } final String apiVersion = "2015-04-01"; return service.delete(resourceGroupName, domainName, this.client.subscriptionId(), forceHardDeleteDomain, apiVersion, this.client.acceptLanguage(), this.client.userAgent()) - .flatMap(new Func1, Observable>>() { + .flatMap(new Func1, Observable>>() { @Override - public Observable> call(Response response) { + public Observable> call(Response response) { try { - ServiceResponse clientResponse = deleteDelegate(response); + ServiceResponse clientResponse = deleteDelegate(response); return Observable.just(clientResponse); } catch (Throwable t) { return Observable.error(t); @@ -1130,88 +1068,206 @@ public Observable> call(Response response) }); } - private ServiceResponse deleteDelegate(Response response) throws CloudException, IOException, IllegalArgumentException { - return new AzureServiceResponseBuilder(this.client.mapperAdapter()) - .register(200, new TypeToken() { }.getType()) - .register(204, new TypeToken() { }.getType()) + private ServiceResponse deleteDelegate(Response response) throws CloudException, IOException, IllegalArgumentException { + return new AzureServiceResponseBuilder(this.client.mapperAdapter()) + .register(200, new TypeToken() { }.getType()) + .register(204, new TypeToken() { }.getType()) + .build(response); + } + + /** + * Lists domain ownership identifiers. + * Lists domain ownership identifiers. + * + * @param resourceGroupName Name of the resource group to which the resource belongs. + * @param domainName Name of domain. + * @return the PagedList<DomainOwnershipIdentifierInner> object if successful. + */ + public PagedList listOwnershipIdentifiers(final String resourceGroupName, final String domainName) { + ServiceResponse> response = listOwnershipIdentifiersSinglePageAsync(resourceGroupName, domainName).toBlocking().single(); + return new PagedList(response.getBody()) { + @Override + public Page nextPage(String nextPageLink) { + return listOwnershipIdentifiersNextSinglePageAsync(nextPageLink).toBlocking().single().getBody(); + } + }; + } + + /** + * Lists domain ownership identifiers. + * Lists domain ownership identifiers. + * + * @param resourceGroupName Name of the resource group to which the resource belongs. + * @param domainName Name of domain. + * @param serviceCallback the async ServiceCallback to handle successful and failed responses. + * @return the {@link ServiceCall} object + */ + public ServiceCall> listOwnershipIdentifiersAsync(final String resourceGroupName, final String domainName, final ListOperationCallback serviceCallback) { + return AzureServiceCall.create( + listOwnershipIdentifiersSinglePageAsync(resourceGroupName, domainName), + new Func1>>>() { + @Override + public Observable>> call(String nextPageLink) { + return listOwnershipIdentifiersNextSinglePageAsync(nextPageLink); + } + }, + serviceCallback); + } + + /** + * Lists domain ownership identifiers. + * Lists domain ownership identifiers. + * + * @param resourceGroupName Name of the resource group to which the resource belongs. + * @param domainName Name of domain. + * @return the observable to the PagedList<DomainOwnershipIdentifierInner> object + */ + public Observable> listOwnershipIdentifiersAsync(final String resourceGroupName, final String domainName) { + return listOwnershipIdentifiersWithServiceResponseAsync(resourceGroupName, domainName) + .map(new Func1>, Page>() { + @Override + public Page call(ServiceResponse> response) { + return response.getBody(); + } + }); + } + + /** + * Lists domain ownership identifiers. + * Lists domain ownership identifiers. + * + * @param resourceGroupName Name of the resource group to which the resource belongs. + * @param domainName Name of domain. + * @return the observable to the PagedList<DomainOwnershipIdentifierInner> object + */ + public Observable>> listOwnershipIdentifiersWithServiceResponseAsync(final String resourceGroupName, final String domainName) { + return listOwnershipIdentifiersSinglePageAsync(resourceGroupName, domainName) + .concatMap(new Func1>, Observable>>>() { + @Override + public Observable>> call(ServiceResponse> page) { + String nextPageLink = page.getBody().getNextPageLink(); + if (nextPageLink == null) { + return Observable.just(page); + } + return Observable.just(page).concatWith(listOwnershipIdentifiersNextWithServiceResponseAsync(nextPageLink)); + } + }); + } + + /** + * Lists domain ownership identifiers. + * Lists domain ownership identifiers. + * + ServiceResponse> * @param resourceGroupName Name of the resource group to which the resource belongs. + ServiceResponse> * @param domainName Name of domain. + * @return the PagedList<DomainOwnershipIdentifierInner> object wrapped in {@link ServiceResponse} if successful. + */ + public Observable>> listOwnershipIdentifiersSinglePageAsync(final String resourceGroupName, final String domainName) { + if (resourceGroupName == null) { + throw new IllegalArgumentException("Parameter resourceGroupName is required and cannot be null."); + } + if (domainName == null) { + throw new IllegalArgumentException("Parameter domainName is required and cannot be null."); + } + if (this.client.subscriptionId() == null) { + throw new IllegalArgumentException("Parameter this.client.subscriptionId() is required and cannot be null."); + } + final String apiVersion = "2015-04-01"; + return service.listOwnershipIdentifiers(resourceGroupName, domainName, this.client.subscriptionId(), apiVersion, this.client.acceptLanguage(), this.client.userAgent()) + .flatMap(new Func1, Observable>>>() { + @Override + public Observable>> call(Response response) { + try { + ServiceResponse> result = listOwnershipIdentifiersDelegate(response); + return Observable.just(new ServiceResponse>(result.getBody(), result.getResponse())); + } catch (Throwable t) { + return Observable.error(t); + } + } + }); + } + + private ServiceResponse> listOwnershipIdentifiersDelegate(Response response) throws CloudException, IOException, IllegalArgumentException { + return new AzureServiceResponseBuilder, CloudException>(this.client.mapperAdapter()) + .register(200, new TypeToken>() { }.getType()) .registerError(CloudException.class) .build(response); } /** - * Retrieves the latest status of a domain purchase operation. - * Retrieves the latest status of a domain purchase operation. + * Get ownership identifier for domain. + * Get ownership identifier for domain. * - * @param resourceGroupName Name of the resource group - * @param domainName Name of the domain - * @param operationId Domain purchase operation Id - * @return the DomainInner object if successful. + * @param resourceGroupName Name of the resource group to which the resource belongs. + * @param domainName Name of domain. + * @param name Name of identifier. + * @return the DomainOwnershipIdentifierInner object if successful. */ - public DomainInner getOperation(String resourceGroupName, String domainName, String operationId) { - return getOperationWithServiceResponseAsync(resourceGroupName, domainName, operationId).toBlocking().single().getBody(); + public DomainOwnershipIdentifierInner getOwnershipIdentifier(String resourceGroupName, String domainName, String name) { + return getOwnershipIdentifierWithServiceResponseAsync(resourceGroupName, domainName, name).toBlocking().single().getBody(); } /** - * Retrieves the latest status of a domain purchase operation. - * Retrieves the latest status of a domain purchase operation. + * Get ownership identifier for domain. + * Get ownership identifier for domain. * - * @param resourceGroupName Name of the resource group - * @param domainName Name of the domain - * @param operationId Domain purchase operation Id + * @param resourceGroupName Name of the resource group to which the resource belongs. + * @param domainName Name of domain. + * @param name Name of identifier. * @param serviceCallback the async ServiceCallback to handle successful and failed responses. * @return the {@link ServiceCall} object */ - public ServiceCall getOperationAsync(String resourceGroupName, String domainName, String operationId, final ServiceCallback serviceCallback) { - return ServiceCall.create(getOperationWithServiceResponseAsync(resourceGroupName, domainName, operationId), serviceCallback); + public ServiceCall getOwnershipIdentifierAsync(String resourceGroupName, String domainName, String name, final ServiceCallback serviceCallback) { + return ServiceCall.create(getOwnershipIdentifierWithServiceResponseAsync(resourceGroupName, domainName, name), serviceCallback); } /** - * Retrieves the latest status of a domain purchase operation. - * Retrieves the latest status of a domain purchase operation. + * Get ownership identifier for domain. + * Get ownership identifier for domain. * - * @param resourceGroupName Name of the resource group - * @param domainName Name of the domain - * @param operationId Domain purchase operation Id - * @return the observable to the DomainInner object + * @param resourceGroupName Name of the resource group to which the resource belongs. + * @param domainName Name of domain. + * @param name Name of identifier. + * @return the observable to the DomainOwnershipIdentifierInner object */ - public Observable getOperationAsync(String resourceGroupName, String domainName, String operationId) { - return getOperationWithServiceResponseAsync(resourceGroupName, domainName, operationId).map(new Func1, DomainInner>() { + public Observable getOwnershipIdentifierAsync(String resourceGroupName, String domainName, String name) { + return getOwnershipIdentifierWithServiceResponseAsync(resourceGroupName, domainName, name).map(new Func1, DomainOwnershipIdentifierInner>() { @Override - public DomainInner call(ServiceResponse response) { + public DomainOwnershipIdentifierInner call(ServiceResponse response) { return response.getBody(); } }); } /** - * Retrieves the latest status of a domain purchase operation. - * Retrieves the latest status of a domain purchase operation. + * Get ownership identifier for domain. + * Get ownership identifier for domain. * - * @param resourceGroupName Name of the resource group - * @param domainName Name of the domain - * @param operationId Domain purchase operation Id - * @return the observable to the DomainInner object + * @param resourceGroupName Name of the resource group to which the resource belongs. + * @param domainName Name of domain. + * @param name Name of identifier. + * @return the observable to the DomainOwnershipIdentifierInner object */ - public Observable> getOperationWithServiceResponseAsync(String resourceGroupName, String domainName, String operationId) { + public Observable> getOwnershipIdentifierWithServiceResponseAsync(String resourceGroupName, String domainName, String name) { if (resourceGroupName == null) { throw new IllegalArgumentException("Parameter resourceGroupName is required and cannot be null."); } if (domainName == null) { throw new IllegalArgumentException("Parameter domainName is required and cannot be null."); } - if (operationId == null) { - throw new IllegalArgumentException("Parameter operationId is required and cannot be null."); + if (name == null) { + throw new IllegalArgumentException("Parameter name is required and cannot be null."); } if (this.client.subscriptionId() == null) { throw new IllegalArgumentException("Parameter this.client.subscriptionId() is required and cannot be null."); } final String apiVersion = "2015-04-01"; - return service.getOperation(resourceGroupName, domainName, operationId, this.client.subscriptionId(), apiVersion, this.client.acceptLanguage(), this.client.userAgent()) - .flatMap(new Func1, Observable>>() { + return service.getOwnershipIdentifier(resourceGroupName, domainName, name, this.client.subscriptionId(), apiVersion, this.client.acceptLanguage(), this.client.userAgent()) + .flatMap(new Func1, Observable>>() { @Override - public Observable> call(Response response) { + public Observable> call(Response response) { try { - ServiceResponse clientResponse = getOperationDelegate(response); + ServiceResponse clientResponse = getOwnershipIdentifierDelegate(response); return Observable.just(clientResponse); } catch (Throwable t) { return Observable.error(t); @@ -1220,18 +1276,298 @@ public Observable> call(Response resp }); } - private ServiceResponse getOperationDelegate(Response response) throws CloudException, IOException, IllegalArgumentException { - return new AzureServiceResponseBuilder(this.client.mapperAdapter()) - .register(202, new TypeToken() { }.getType()) - .register(200, new TypeToken() { }.getType()) - .register(500, new TypeToken() { }.getType()) + private ServiceResponse getOwnershipIdentifierDelegate(Response response) throws CloudException, IOException, IllegalArgumentException { + return new AzureServiceResponseBuilder(this.client.mapperAdapter()) + .register(200, new TypeToken() { }.getType()) .registerError(CloudException.class) .build(response); } /** - * Lists all domains in a subscription. - * Lists all domains in a subscription. + * Creates an ownership identifier for a domain or updates identifier details for an existing identifer. + * Creates an ownership identifier for a domain or updates identifier details for an existing identifer. + * + * @param resourceGroupName Name of the resource group to which the resource belongs. + * @param domainName Name of domain. + * @param name Name of identifier. + * @param domainOwnershipIdentifier A JSON representation of the domain ownership properties. + * @return the DomainOwnershipIdentifierInner object if successful. + */ + public DomainOwnershipIdentifierInner createOrUpdateOwnershipIdentifier(String resourceGroupName, String domainName, String name, DomainOwnershipIdentifierInner domainOwnershipIdentifier) { + return createOrUpdateOwnershipIdentifierWithServiceResponseAsync(resourceGroupName, domainName, name, domainOwnershipIdentifier).toBlocking().single().getBody(); + } + + /** + * Creates an ownership identifier for a domain or updates identifier details for an existing identifer. + * Creates an ownership identifier for a domain or updates identifier details for an existing identifer. + * + * @param resourceGroupName Name of the resource group to which the resource belongs. + * @param domainName Name of domain. + * @param name Name of identifier. + * @param domainOwnershipIdentifier A JSON representation of the domain ownership properties. + * @param serviceCallback the async ServiceCallback to handle successful and failed responses. + * @return the {@link ServiceCall} object + */ + public ServiceCall createOrUpdateOwnershipIdentifierAsync(String resourceGroupName, String domainName, String name, DomainOwnershipIdentifierInner domainOwnershipIdentifier, final ServiceCallback serviceCallback) { + return ServiceCall.create(createOrUpdateOwnershipIdentifierWithServiceResponseAsync(resourceGroupName, domainName, name, domainOwnershipIdentifier), serviceCallback); + } + + /** + * Creates an ownership identifier for a domain or updates identifier details for an existing identifer. + * Creates an ownership identifier for a domain or updates identifier details for an existing identifer. + * + * @param resourceGroupName Name of the resource group to which the resource belongs. + * @param domainName Name of domain. + * @param name Name of identifier. + * @param domainOwnershipIdentifier A JSON representation of the domain ownership properties. + * @return the observable to the DomainOwnershipIdentifierInner object + */ + public Observable createOrUpdateOwnershipIdentifierAsync(String resourceGroupName, String domainName, String name, DomainOwnershipIdentifierInner domainOwnershipIdentifier) { + return createOrUpdateOwnershipIdentifierWithServiceResponseAsync(resourceGroupName, domainName, name, domainOwnershipIdentifier).map(new Func1, DomainOwnershipIdentifierInner>() { + @Override + public DomainOwnershipIdentifierInner call(ServiceResponse response) { + return response.getBody(); + } + }); + } + + /** + * Creates an ownership identifier for a domain or updates identifier details for an existing identifer. + * Creates an ownership identifier for a domain or updates identifier details for an existing identifer. + * + * @param resourceGroupName Name of the resource group to which the resource belongs. + * @param domainName Name of domain. + * @param name Name of identifier. + * @param domainOwnershipIdentifier A JSON representation of the domain ownership properties. + * @return the observable to the DomainOwnershipIdentifierInner object + */ + public Observable> createOrUpdateOwnershipIdentifierWithServiceResponseAsync(String resourceGroupName, String domainName, String name, DomainOwnershipIdentifierInner domainOwnershipIdentifier) { + if (resourceGroupName == null) { + throw new IllegalArgumentException("Parameter resourceGroupName is required and cannot be null."); + } + if (domainName == null) { + throw new IllegalArgumentException("Parameter domainName is required and cannot be null."); + } + if (name == null) { + throw new IllegalArgumentException("Parameter name is required and cannot be null."); + } + if (this.client.subscriptionId() == null) { + throw new IllegalArgumentException("Parameter this.client.subscriptionId() is required and cannot be null."); + } + if (domainOwnershipIdentifier == null) { + throw new IllegalArgumentException("Parameter domainOwnershipIdentifier is required and cannot be null."); + } + Validator.validate(domainOwnershipIdentifier); + final String apiVersion = "2015-04-01"; + return service.createOrUpdateOwnershipIdentifier(resourceGroupName, domainName, name, this.client.subscriptionId(), domainOwnershipIdentifier, apiVersion, this.client.acceptLanguage(), this.client.userAgent()) + .flatMap(new Func1, Observable>>() { + @Override + public Observable> call(Response response) { + try { + ServiceResponse clientResponse = createOrUpdateOwnershipIdentifierDelegate(response); + return Observable.just(clientResponse); + } catch (Throwable t) { + return Observable.error(t); + } + } + }); + } + + private ServiceResponse createOrUpdateOwnershipIdentifierDelegate(Response response) throws CloudException, IOException, IllegalArgumentException { + return new AzureServiceResponseBuilder(this.client.mapperAdapter()) + .register(200, new TypeToken() { }.getType()) + .registerError(CloudException.class) + .build(response); + } + + /** + * Delete ownership identifier for domain. + * Delete ownership identifier for domain. + * + * @param resourceGroupName Name of the resource group to which the resource belongs. + * @param domainName Name of domain. + * @param name Name of identifier. + */ + public void deleteOwnershipIdentifier(String resourceGroupName, String domainName, String name) { + deleteOwnershipIdentifierWithServiceResponseAsync(resourceGroupName, domainName, name).toBlocking().single().getBody(); + } + + /** + * Delete ownership identifier for domain. + * Delete ownership identifier for domain. + * + * @param resourceGroupName Name of the resource group to which the resource belongs. + * @param domainName Name of domain. + * @param name Name of identifier. + * @param serviceCallback the async ServiceCallback to handle successful and failed responses. + * @return the {@link ServiceCall} object + */ + public ServiceCall deleteOwnershipIdentifierAsync(String resourceGroupName, String domainName, String name, final ServiceCallback serviceCallback) { + return ServiceCall.create(deleteOwnershipIdentifierWithServiceResponseAsync(resourceGroupName, domainName, name), serviceCallback); + } + + /** + * Delete ownership identifier for domain. + * Delete ownership identifier for domain. + * + * @param resourceGroupName Name of the resource group to which the resource belongs. + * @param domainName Name of domain. + * @param name Name of identifier. + * @return the {@link ServiceResponse} object if successful. + */ + public Observable deleteOwnershipIdentifierAsync(String resourceGroupName, String domainName, String name) { + return deleteOwnershipIdentifierWithServiceResponseAsync(resourceGroupName, domainName, name).map(new Func1, Void>() { + @Override + public Void call(ServiceResponse response) { + return response.getBody(); + } + }); + } + + /** + * Delete ownership identifier for domain. + * Delete ownership identifier for domain. + * + * @param resourceGroupName Name of the resource group to which the resource belongs. + * @param domainName Name of domain. + * @param name Name of identifier. + * @return the {@link ServiceResponse} object if successful. + */ + public Observable> deleteOwnershipIdentifierWithServiceResponseAsync(String resourceGroupName, String domainName, String name) { + if (resourceGroupName == null) { + throw new IllegalArgumentException("Parameter resourceGroupName is required and cannot be null."); + } + if (domainName == null) { + throw new IllegalArgumentException("Parameter domainName is required and cannot be null."); + } + if (name == null) { + throw new IllegalArgumentException("Parameter name is required and cannot be null."); + } + if (this.client.subscriptionId() == null) { + throw new IllegalArgumentException("Parameter this.client.subscriptionId() is required and cannot be null."); + } + final String apiVersion = "2015-04-01"; + return service.deleteOwnershipIdentifier(resourceGroupName, domainName, name, this.client.subscriptionId(), apiVersion, this.client.acceptLanguage(), this.client.userAgent()) + .flatMap(new Func1, Observable>>() { + @Override + public Observable> call(Response response) { + try { + ServiceResponse clientResponse = deleteOwnershipIdentifierDelegate(response); + return Observable.just(clientResponse); + } catch (Throwable t) { + return Observable.error(t); + } + } + }); + } + + private ServiceResponse deleteOwnershipIdentifierDelegate(Response response) throws CloudException, IOException, IllegalArgumentException { + return new AzureServiceResponseBuilder(this.client.mapperAdapter()) + .register(200, new TypeToken() { }.getType()) + .register(204, new TypeToken() { }.getType()) + .build(response); + } + + /** + * Creates an ownership identifier for a domain or updates identifier details for an existing identifer. + * Creates an ownership identifier for a domain or updates identifier details for an existing identifer. + * + * @param resourceGroupName Name of the resource group to which the resource belongs. + * @param domainName Name of domain. + * @param name Name of identifier. + * @param domainOwnershipIdentifier A JSON representation of the domain ownership properties. + * @return the DomainOwnershipIdentifierInner object if successful. + */ + public DomainOwnershipIdentifierInner updateOwnershipIdentifier(String resourceGroupName, String domainName, String name, DomainOwnershipIdentifierInner domainOwnershipIdentifier) { + return updateOwnershipIdentifierWithServiceResponseAsync(resourceGroupName, domainName, name, domainOwnershipIdentifier).toBlocking().single().getBody(); + } + + /** + * Creates an ownership identifier for a domain or updates identifier details for an existing identifer. + * Creates an ownership identifier for a domain or updates identifier details for an existing identifer. + * + * @param resourceGroupName Name of the resource group to which the resource belongs. + * @param domainName Name of domain. + * @param name Name of identifier. + * @param domainOwnershipIdentifier A JSON representation of the domain ownership properties. + * @param serviceCallback the async ServiceCallback to handle successful and failed responses. + * @return the {@link ServiceCall} object + */ + public ServiceCall updateOwnershipIdentifierAsync(String resourceGroupName, String domainName, String name, DomainOwnershipIdentifierInner domainOwnershipIdentifier, final ServiceCallback serviceCallback) { + return ServiceCall.create(updateOwnershipIdentifierWithServiceResponseAsync(resourceGroupName, domainName, name, domainOwnershipIdentifier), serviceCallback); + } + + /** + * Creates an ownership identifier for a domain or updates identifier details for an existing identifer. + * Creates an ownership identifier for a domain or updates identifier details for an existing identifer. + * + * @param resourceGroupName Name of the resource group to which the resource belongs. + * @param domainName Name of domain. + * @param name Name of identifier. + * @param domainOwnershipIdentifier A JSON representation of the domain ownership properties. + * @return the observable to the DomainOwnershipIdentifierInner object + */ + public Observable updateOwnershipIdentifierAsync(String resourceGroupName, String domainName, String name, DomainOwnershipIdentifierInner domainOwnershipIdentifier) { + return updateOwnershipIdentifierWithServiceResponseAsync(resourceGroupName, domainName, name, domainOwnershipIdentifier).map(new Func1, DomainOwnershipIdentifierInner>() { + @Override + public DomainOwnershipIdentifierInner call(ServiceResponse response) { + return response.getBody(); + } + }); + } + + /** + * Creates an ownership identifier for a domain or updates identifier details for an existing identifer. + * Creates an ownership identifier for a domain or updates identifier details for an existing identifer. + * + * @param resourceGroupName Name of the resource group to which the resource belongs. + * @param domainName Name of domain. + * @param name Name of identifier. + * @param domainOwnershipIdentifier A JSON representation of the domain ownership properties. + * @return the observable to the DomainOwnershipIdentifierInner object + */ + public Observable> updateOwnershipIdentifierWithServiceResponseAsync(String resourceGroupName, String domainName, String name, DomainOwnershipIdentifierInner domainOwnershipIdentifier) { + if (resourceGroupName == null) { + throw new IllegalArgumentException("Parameter resourceGroupName is required and cannot be null."); + } + if (domainName == null) { + throw new IllegalArgumentException("Parameter domainName is required and cannot be null."); + } + if (name == null) { + throw new IllegalArgumentException("Parameter name is required and cannot be null."); + } + if (this.client.subscriptionId() == null) { + throw new IllegalArgumentException("Parameter this.client.subscriptionId() is required and cannot be null."); + } + if (domainOwnershipIdentifier == null) { + throw new IllegalArgumentException("Parameter domainOwnershipIdentifier is required and cannot be null."); + } + Validator.validate(domainOwnershipIdentifier); + final String apiVersion = "2015-04-01"; + return service.updateOwnershipIdentifier(resourceGroupName, domainName, name, this.client.subscriptionId(), domainOwnershipIdentifier, apiVersion, this.client.acceptLanguage(), this.client.userAgent()) + .flatMap(new Func1, Observable>>() { + @Override + public Observable> call(Response response) { + try { + ServiceResponse clientResponse = updateOwnershipIdentifierDelegate(response); + return Observable.just(clientResponse); + } catch (Throwable t) { + return Observable.error(t); + } + } + }); + } + + private ServiceResponse updateOwnershipIdentifierDelegate(Response response) throws CloudException, IOException, IllegalArgumentException { + return new AzureServiceResponseBuilder(this.client.mapperAdapter()) + .register(200, new TypeToken() { }.getType()) + .registerError(CloudException.class) + .build(response); + } + + /** + * Get all domains in a subscription. + * Get all domains in a subscription. * * @param nextPageLink The NextLink from the previous successful call to List operation. * @return the PagedList<DomainInner> object if successful. @@ -1247,8 +1583,8 @@ public Page nextPage(String nextPageLink) { } /** - * Lists all domains in a subscription. - * Lists all domains in a subscription. + * Get all domains in a subscription. + * Get all domains in a subscription. * * @param nextPageLink The NextLink from the previous successful call to List operation. * @param serviceCall the ServiceCall object tracking the Retrofit calls @@ -1268,8 +1604,8 @@ public Observable>> call(String nextPageLink) } /** - * Lists all domains in a subscription. - * Lists all domains in a subscription. + * Get all domains in a subscription. + * Get all domains in a subscription. * * @param nextPageLink The NextLink from the previous successful call to List operation. * @return the observable to the PagedList<DomainInner> object @@ -1285,8 +1621,8 @@ public Page call(ServiceResponse> response) { } /** - * Lists all domains in a subscription. - * Lists all domains in a subscription. + * Get all domains in a subscription. + * Get all domains in a subscription. * * @param nextPageLink The NextLink from the previous successful call to List operation. * @return the observable to the PagedList<DomainInner> object @@ -1306,8 +1642,8 @@ public Observable>> call(ServiceResponse> * @param nextPageLink The NextLink from the previous successful call to List operation. * @return the PagedList<DomainInner> object wrapped in {@link ServiceResponse} if successful. @@ -1338,8 +1674,8 @@ private ServiceResponse> listNextDelegate(Response nextPage(String nextPageLink) { } /** - * Lists domain recommendations based on keywords. - * Lists domain recommendations based on keywords. + * Get domain name recommendations based on keywords. + * Get domain name recommendations based on keywords. * * @param nextPageLink The NextLink from the previous successful call to List operation. * @param serviceCall the ServiceCall object tracking the Retrofit calls @@ -1376,8 +1712,8 @@ public Observable>> call(String nextPa } /** - * Lists domain recommendations based on keywords. - * Lists domain recommendations based on keywords. + * Get domain name recommendations based on keywords. + * Get domain name recommendations based on keywords. * * @param nextPageLink The NextLink from the previous successful call to List operation. * @return the observable to the PagedList<NameIdentifierInner> object @@ -1393,8 +1729,8 @@ public Page call(ServiceResponse> } /** - * Lists domain recommendations based on keywords. - * Lists domain recommendations based on keywords. + * Get domain name recommendations based on keywords. + * Get domain name recommendations based on keywords. * * @param nextPageLink The NextLink from the previous successful call to List operation. * @return the observable to the PagedList<NameIdentifierInner> object @@ -1414,8 +1750,8 @@ public Observable>> call(ServiceRespon } /** - * Lists domain recommendations based on keywords. - * Lists domain recommendations based on keywords. + * Get domain name recommendations based on keywords. + * Get domain name recommendations based on keywords. * ServiceResponse> * @param nextPageLink The NextLink from the previous successful call to List operation. * @return the PagedList<NameIdentifierInner> object wrapped in {@link ServiceResponse} if successful. @@ -1446,8 +1782,8 @@ private ServiceResponse> listRecommendationsNextDe } /** - * Lists domains under a resource group. - * Lists domains under a resource group. + * Get all domains in a resource group. + * Get all domains in a resource group. * * @param nextPageLink The NextLink from the previous successful call to List operation. * @return the PagedList<DomainInner> object if successful. @@ -1463,8 +1799,8 @@ public Page nextPage(String nextPageLink) { } /** - * Lists domains under a resource group. - * Lists domains under a resource group. + * Get all domains in a resource group. + * Get all domains in a resource group. * * @param nextPageLink The NextLink from the previous successful call to List operation. * @param serviceCall the ServiceCall object tracking the Retrofit calls @@ -1484,8 +1820,8 @@ public Observable>> call(String nextPageLink) } /** - * Lists domains under a resource group. - * Lists domains under a resource group. + * Get all domains in a resource group. + * Get all domains in a resource group. * * @param nextPageLink The NextLink from the previous successful call to List operation. * @return the observable to the PagedList<DomainInner> object @@ -1501,8 +1837,8 @@ public Page call(ServiceResponse> response) { } /** - * Lists domains under a resource group. - * Lists domains under a resource group. + * Get all domains in a resource group. + * Get all domains in a resource group. * * @param nextPageLink The NextLink from the previous successful call to List operation. * @return the observable to the PagedList<DomainInner> object @@ -1522,8 +1858,8 @@ public Observable>> call(ServiceResponse> * @param nextPageLink The NextLink from the previous successful call to List operation. * @return the PagedList<DomainInner> object wrapped in {@link ServiceResponse} if successful. @@ -1553,4 +1889,112 @@ private ServiceResponse> listByResourceGroupNextDelegate(R .build(response); } + /** + * Lists domain ownership identifiers. + * Lists domain ownership identifiers. + * + * @param nextPageLink The NextLink from the previous successful call to List operation. + * @return the PagedList<DomainOwnershipIdentifierInner> object if successful. + */ + public PagedList listOwnershipIdentifiersNext(final String nextPageLink) { + ServiceResponse> response = listOwnershipIdentifiersNextSinglePageAsync(nextPageLink).toBlocking().single(); + return new PagedList(response.getBody()) { + @Override + public Page nextPage(String nextPageLink) { + return listOwnershipIdentifiersNextSinglePageAsync(nextPageLink).toBlocking().single().getBody(); + } + }; + } + + /** + * Lists domain ownership identifiers. + * Lists domain ownership identifiers. + * + * @param nextPageLink The NextLink from the previous successful call to List operation. + * @param serviceCall the ServiceCall object tracking the Retrofit calls + * @param serviceCallback the async ServiceCallback to handle successful and failed responses. + * @return the {@link ServiceCall} object + */ + public ServiceCall> listOwnershipIdentifiersNextAsync(final String nextPageLink, final ServiceCall> serviceCall, final ListOperationCallback serviceCallback) { + return AzureServiceCall.create( + listOwnershipIdentifiersNextSinglePageAsync(nextPageLink), + new Func1>>>() { + @Override + public Observable>> call(String nextPageLink) { + return listOwnershipIdentifiersNextSinglePageAsync(nextPageLink); + } + }, + serviceCallback); + } + + /** + * Lists domain ownership identifiers. + * Lists domain ownership identifiers. + * + * @param nextPageLink The NextLink from the previous successful call to List operation. + * @return the observable to the PagedList<DomainOwnershipIdentifierInner> object + */ + public Observable> listOwnershipIdentifiersNextAsync(final String nextPageLink) { + return listOwnershipIdentifiersNextWithServiceResponseAsync(nextPageLink) + .map(new Func1>, Page>() { + @Override + public Page call(ServiceResponse> response) { + return response.getBody(); + } + }); + } + + /** + * Lists domain ownership identifiers. + * Lists domain ownership identifiers. + * + * @param nextPageLink The NextLink from the previous successful call to List operation. + * @return the observable to the PagedList<DomainOwnershipIdentifierInner> object + */ + public Observable>> listOwnershipIdentifiersNextWithServiceResponseAsync(final String nextPageLink) { + return listOwnershipIdentifiersNextSinglePageAsync(nextPageLink) + .concatMap(new Func1>, Observable>>>() { + @Override + public Observable>> call(ServiceResponse> page) { + String nextPageLink = page.getBody().getNextPageLink(); + if (nextPageLink == null) { + return Observable.just(page); + } + return Observable.just(page).concatWith(listOwnershipIdentifiersNextWithServiceResponseAsync(nextPageLink)); + } + }); + } + + /** + * Lists domain ownership identifiers. + * Lists domain ownership identifiers. + * + ServiceResponse> * @param nextPageLink The NextLink from the previous successful call to List operation. + * @return the PagedList<DomainOwnershipIdentifierInner> object wrapped in {@link ServiceResponse} if successful. + */ + public Observable>> listOwnershipIdentifiersNextSinglePageAsync(final String nextPageLink) { + if (nextPageLink == null) { + throw new IllegalArgumentException("Parameter nextPageLink is required and cannot be null."); + } + return service.listOwnershipIdentifiersNext(nextPageLink, this.client.acceptLanguage(), this.client.userAgent()) + .flatMap(new Func1, Observable>>>() { + @Override + public Observable>> call(Response response) { + try { + ServiceResponse> result = listOwnershipIdentifiersNextDelegate(response); + return Observable.just(new ServiceResponse>(result.getBody(), result.getResponse())); + } catch (Throwable t) { + return Observable.error(t); + } + } + }); + } + + private ServiceResponse> listOwnershipIdentifiersNextDelegate(Response response) throws CloudException, IOException, IllegalArgumentException { + return new AzureServiceResponseBuilder, CloudException>(this.client.mapperAdapter()) + .register(200, new TypeToken>() { }.getType()) + .registerError(CloudException.class) + .build(response); + } + } diff --git a/azure-mgmt-website/src/main/java/com/microsoft/azure/management/website/implementation/GeoRegionInner.java b/azure-mgmt-website/src/main/java/com/microsoft/azure/management/website/implementation/GeoRegionInner.java index a3692dafa8d8f..fcc436a58f043 100644 --- a/azure-mgmt-website/src/main/java/com/microsoft/azure/management/website/implementation/GeoRegionInner.java +++ b/azure-mgmt-website/src/main/java/com/microsoft/azure/management/website/implementation/GeoRegionInner.java @@ -20,19 +20,19 @@ public class GeoRegionInner extends Resource { /** * Region name. */ - @JsonProperty(value = "properties.name") + @JsonProperty(value = "properties.name", access = JsonProperty.Access.WRITE_ONLY) private String geoRegionName; /** * Region description. */ - @JsonProperty(value = "properties.description") + @JsonProperty(value = "properties.description", access = JsonProperty.Access.WRITE_ONLY) private String description; /** * Display name for region. */ - @JsonProperty(value = "properties.displayName") + @JsonProperty(value = "properties.displayName", access = JsonProperty.Access.WRITE_ONLY) private String displayName; /** @@ -44,17 +44,6 @@ public String geoRegionName() { return this.geoRegionName; } - /** - * Set the geoRegionName value. - * - * @param geoRegionName the geoRegionName value to set - * @return the GeoRegionInner object itself. - */ - public GeoRegionInner withGeoRegionName(String geoRegionName) { - this.geoRegionName = geoRegionName; - return this; - } - /** * Get the description value. * @@ -64,17 +53,6 @@ public String description() { return this.description; } - /** - * Set the description value. - * - * @param description the description value to set - * @return the GeoRegionInner object itself. - */ - public GeoRegionInner withDescription(String description) { - this.description = description; - return this; - } - /** * Get the displayName value. * @@ -84,15 +62,4 @@ public String displayName() { return this.displayName; } - /** - * Set the displayName value. - * - * @param displayName the displayName value to set - * @return the GeoRegionInner object itself. - */ - public GeoRegionInner withDisplayName(String displayName) { - this.displayName = displayName; - return this; - } - } diff --git a/azure-mgmt-website/src/main/java/com/microsoft/azure/management/website/implementation/HostNameBindingInner.java b/azure-mgmt-website/src/main/java/com/microsoft/azure/management/website/implementation/HostNameBindingInner.java index 8f30b84d08552..df18bf93698c7 100644 --- a/azure-mgmt-website/src/main/java/com/microsoft/azure/management/website/implementation/HostNameBindingInner.java +++ b/azure-mgmt-website/src/main/java/com/microsoft/azure/management/website/implementation/HostNameBindingInner.java @@ -16,7 +16,7 @@ import com.microsoft.azure.Resource; /** - * A host name binding object. + * A hostname binding object. */ @JsonFlatten public class HostNameBindingInner extends Resource { @@ -27,7 +27,7 @@ public class HostNameBindingInner extends Resource { private String hostNameBindingName; /** - * Web app name. + * App Service app name. */ @JsonProperty(value = "properties.siteName") private String siteName; @@ -58,7 +58,7 @@ public class HostNameBindingInner extends Resource { private CustomHostNameDnsRecordType customHostNameDnsRecordType; /** - * Host name type. Possible values include: 'Verified', 'Managed'. + * Hostname type. Possible values include: 'Verified', 'Managed'. */ @JsonProperty(value = "properties.hostNameType") private HostNameType hostNameType; diff --git a/azure-mgmt-website/src/main/java/com/microsoft/azure/management/website/implementation/HostingEnvironmentDiagnosticsInner.java b/azure-mgmt-website/src/main/java/com/microsoft/azure/management/website/implementation/HostingEnvironmentDiagnosticsInner.java index 5e6ec336cf203..50ae664e82a8f 100644 --- a/azure-mgmt-website/src/main/java/com/microsoft/azure/management/website/implementation/HostingEnvironmentDiagnosticsInner.java +++ b/azure-mgmt-website/src/main/java/com/microsoft/azure/management/website/implementation/HostingEnvironmentDiagnosticsInner.java @@ -10,7 +10,7 @@ /** - * Diagnostics for a hosting environment (App Service Environment). + * Diagnostics for an App Service Environment. */ public class HostingEnvironmentDiagnosticsInner { /** diff --git a/azure-mgmt-website/src/main/java/com/microsoft/azure/management/website/implementation/HybridConnectionInner.java b/azure-mgmt-website/src/main/java/com/microsoft/azure/management/website/implementation/HybridConnectionInner.java index 74e6a2bb89dd6..a072143ff19f8 100644 --- a/azure-mgmt-website/src/main/java/com/microsoft/azure/management/website/implementation/HybridConnectionInner.java +++ b/azure-mgmt-website/src/main/java/com/microsoft/azure/management/website/implementation/HybridConnectionInner.java @@ -18,19 +18,19 @@ @JsonFlatten public class HybridConnectionInner extends Resource { /** - * The name of the Service Bus Namespace. + * The name of the Service Bus namespace. */ @JsonProperty(value = "properties.serviceBusNamespace") private String serviceBusNamespace; /** - * The name of the Service Bus Relay. + * The name of the Service Bus relay. */ @JsonProperty(value = "properties.relayName") private String relayName; /** - * The ARM URI to the Service Bus Relay. + * The ARM URI to the Service Bus relay. */ @JsonProperty(value = "properties.relayArmUri") private String relayArmUri; diff --git a/azure-mgmt-website/src/main/java/com/microsoft/azure/management/website/implementation/HybridConnectionKeyInner.java b/azure-mgmt-website/src/main/java/com/microsoft/azure/management/website/implementation/HybridConnectionKeyInner.java index c55b9a844d555..b7d53a8027d1b 100644 --- a/azure-mgmt-website/src/main/java/com/microsoft/azure/management/website/implementation/HybridConnectionKeyInner.java +++ b/azure-mgmt-website/src/main/java/com/microsoft/azure/management/website/implementation/HybridConnectionKeyInner.java @@ -21,13 +21,13 @@ public class HybridConnectionKeyInner extends Resource { /** * The name of the send key. */ - @JsonProperty(value = "properties.sendKeyName") + @JsonProperty(value = "properties.sendKeyName", access = JsonProperty.Access.WRITE_ONLY) private String sendKeyName; /** * The value of the send key. */ - @JsonProperty(value = "properties.sendKeyValue") + @JsonProperty(value = "properties.sendKeyValue", access = JsonProperty.Access.WRITE_ONLY) private String sendKeyValue; /** @@ -39,17 +39,6 @@ public String sendKeyName() { return this.sendKeyName; } - /** - * Set the sendKeyName value. - * - * @param sendKeyName the sendKeyName value to set - * @return the HybridConnectionKeyInner object itself. - */ - public HybridConnectionKeyInner withSendKeyName(String sendKeyName) { - this.sendKeyName = sendKeyName; - return this; - } - /** * Get the sendKeyValue value. * @@ -59,15 +48,4 @@ public String sendKeyValue() { return this.sendKeyValue; } - /** - * Set the sendKeyValue value. - * - * @param sendKeyValue the sendKeyValue value to set - * @return the HybridConnectionKeyInner object itself. - */ - public HybridConnectionKeyInner withSendKeyValue(String sendKeyValue) { - this.sendKeyValue = sendKeyValue; - return this; - } - } diff --git a/azure-mgmt-website/src/main/java/com/microsoft/azure/management/website/implementation/HybridConnectionLimitsInner.java b/azure-mgmt-website/src/main/java/com/microsoft/azure/management/website/implementation/HybridConnectionLimitsInner.java new file mode 100644 index 0000000000000..1d058324df2be --- /dev/null +++ b/azure-mgmt-website/src/main/java/com/microsoft/azure/management/website/implementation/HybridConnectionLimitsInner.java @@ -0,0 +1,51 @@ +/** + * 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.website.implementation; + +import com.fasterxml.jackson.annotation.JsonProperty; +import com.microsoft.rest.serializer.JsonFlatten; +import com.microsoft.azure.Resource; + +/** + * Hybrid Connection limits contract. This is used to return the plan limits + * of Hybrid Connections. + */ +@JsonFlatten +public class HybridConnectionLimitsInner extends Resource { + /** + * The current number of Hybrid Connections. + */ + @JsonProperty(value = "properties.current", access = JsonProperty.Access.WRITE_ONLY) + private Integer current; + + /** + * The maximum number of Hybrid Connections allowed. + */ + @JsonProperty(value = "properties.maximum", access = JsonProperty.Access.WRITE_ONLY) + private Integer maximum; + + /** + * Get the current value. + * + * @return the current value + */ + public Integer current() { + return this.current; + } + + /** + * Get the maximum value. + * + * @return the maximum value + */ + public Integer maximum() { + return this.maximum; + } + +} diff --git a/azure-mgmt-website/src/main/java/com/microsoft/azure/management/website/implementation/IdentifierInner.java b/azure-mgmt-website/src/main/java/com/microsoft/azure/management/website/implementation/IdentifierInner.java new file mode 100644 index 0000000000000..6c59383ec35ac --- /dev/null +++ b/azure-mgmt-website/src/main/java/com/microsoft/azure/management/website/implementation/IdentifierInner.java @@ -0,0 +1,46 @@ +/** + * 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.website.implementation; + +import com.fasterxml.jackson.annotation.JsonProperty; +import com.microsoft.rest.serializer.JsonFlatten; +import com.microsoft.azure.Resource; + +/** + * Identifier. + */ +@JsonFlatten +public class IdentifierInner extends Resource { + /** + * ID. + */ + @JsonProperty(value = "properties.id") + private String identifierId; + + /** + * Get the identifierId value. + * + * @return the identifierId value + */ + public String identifierId() { + return this.identifierId; + } + + /** + * Set the identifierId value. + * + * @param identifierId the identifierId value to set + * @return the IdentifierInner object itself. + */ + public IdentifierInner withIdentifierId(String identifierId) { + this.identifierId = identifierId; + return this; + } + +} diff --git a/azure-mgmt-website/src/main/java/com/microsoft/azure/management/website/implementation/MetricDefinitionInner.java b/azure-mgmt-website/src/main/java/com/microsoft/azure/management/website/implementation/MetricDefinitionInner.java index 60949f5b3b98c..5cb3fba71e8c5 100644 --- a/azure-mgmt-website/src/main/java/com/microsoft/azure/management/website/implementation/MetricDefinitionInner.java +++ b/azure-mgmt-website/src/main/java/com/microsoft/azure/management/website/implementation/MetricDefinitionInner.java @@ -15,39 +15,39 @@ import com.microsoft.azure.Resource; /** - * Class repesenting metadata for the metrics. + * Metadata for a metric. */ @JsonFlatten public class MetricDefinitionInner extends Resource { /** * Name of the metric. */ - @JsonProperty(value = "properties.name") + @JsonProperty(value = "properties.name", access = JsonProperty.Access.WRITE_ONLY) private String metricDefinitionName; /** * Unit of the metric. */ - @JsonProperty(value = "properties.unit") + @JsonProperty(value = "properties.unit", access = JsonProperty.Access.WRITE_ONLY) private String unit; /** * Primary aggregation type. */ - @JsonProperty(value = "properties.primaryAggregationType") + @JsonProperty(value = "properties.primaryAggregationType", access = JsonProperty.Access.WRITE_ONLY) private String primaryAggregationType; /** * List of time grains supported for the metric together with retention * period. */ - @JsonProperty(value = "properties.metricAvailabilities") + @JsonProperty(value = "properties.metricAvailabilities", access = JsonProperty.Access.WRITE_ONLY) private List metricAvailabilities; /** * Friendly name shown in the UI. */ - @JsonProperty(value = "properties.displayName") + @JsonProperty(value = "properties.displayName", access = JsonProperty.Access.WRITE_ONLY) private String displayName; /** @@ -59,17 +59,6 @@ public String metricDefinitionName() { return this.metricDefinitionName; } - /** - * Set the metricDefinitionName value. - * - * @param metricDefinitionName the metricDefinitionName value to set - * @return the MetricDefinitionInner object itself. - */ - public MetricDefinitionInner withMetricDefinitionName(String metricDefinitionName) { - this.metricDefinitionName = metricDefinitionName; - return this; - } - /** * Get the unit value. * @@ -79,17 +68,6 @@ public String unit() { return this.unit; } - /** - * Set the unit value. - * - * @param unit the unit value to set - * @return the MetricDefinitionInner object itself. - */ - public MetricDefinitionInner withUnit(String unit) { - this.unit = unit; - return this; - } - /** * Get the primaryAggregationType value. * @@ -99,17 +77,6 @@ public String primaryAggregationType() { return this.primaryAggregationType; } - /** - * Set the primaryAggregationType value. - * - * @param primaryAggregationType the primaryAggregationType value to set - * @return the MetricDefinitionInner object itself. - */ - public MetricDefinitionInner withPrimaryAggregationType(String primaryAggregationType) { - this.primaryAggregationType = primaryAggregationType; - return this; - } - /** * Get the metricAvailabilities value. * @@ -119,17 +86,6 @@ public List metricAvailabilities() { return this.metricAvailabilities; } - /** - * Set the metricAvailabilities value. - * - * @param metricAvailabilities the metricAvailabilities value to set - * @return the MetricDefinitionInner object itself. - */ - public MetricDefinitionInner withMetricAvailabilities(List metricAvailabilities) { - this.metricAvailabilities = metricAvailabilities; - return this; - } - /** * Get the displayName value. * @@ -139,15 +95,4 @@ public String displayName() { return this.displayName; } - /** - * Set the displayName value. - * - * @param displayName the displayName value to set - * @return the MetricDefinitionInner object itself. - */ - public MetricDefinitionInner withDisplayName(String displayName) { - this.displayName = displayName; - return this; - } - } diff --git a/azure-mgmt-website/src/main/java/com/microsoft/azure/management/website/implementation/MigrateMySqlRequestInner.java b/azure-mgmt-website/src/main/java/com/microsoft/azure/management/website/implementation/MigrateMySqlRequestInner.java index 9b4e270c96ae6..c1df96ff7d6c0 100644 --- a/azure-mgmt-website/src/main/java/com/microsoft/azure/management/website/implementation/MigrateMySqlRequestInner.java +++ b/azure-mgmt-website/src/main/java/com/microsoft/azure/management/website/implementation/MigrateMySqlRequestInner.java @@ -13,12 +13,12 @@ import com.microsoft.azure.Resource; /** - * Description of a MySql migration request. + * MySQL migration request. */ @JsonFlatten public class MigrateMySqlRequestInner extends Resource { /** - * Connection string to the remote MySql database to which data should be + * Connection string to the remote MySQL database to which data should be * migrated. */ @JsonProperty(value = "properties.connectionString") diff --git a/azure-mgmt-website/src/main/java/com/microsoft/azure/management/website/implementation/NetworkFeaturesInner.java b/azure-mgmt-website/src/main/java/com/microsoft/azure/management/website/implementation/NetworkFeaturesInner.java index e31f718742b0f..77f5b1acfd5ba 100644 --- a/azure-mgmt-website/src/main/java/com/microsoft/azure/management/website/implementation/NetworkFeaturesInner.java +++ b/azure-mgmt-website/src/main/java/com/microsoft/azure/management/website/implementation/NetworkFeaturesInner.java @@ -14,34 +14,33 @@ import com.microsoft.azure.Resource; /** - * This is an object used to store a full view of network features (presently - * VNET integration and Hybrid Connections) - * for a web app. + * Full view of network features for an app (presently VNET integration and + * Hybrid Connections). */ @JsonFlatten public class NetworkFeaturesInner extends Resource { /** - * The Vnet Name. + * The Virtual Network name. */ - @JsonProperty(value = "properties.virtualNetworkName") + @JsonProperty(value = "properties.virtualNetworkName", access = JsonProperty.Access.WRITE_ONLY) private String virtualNetworkName; /** - * The Vnet Summary view. + * The Virtual Network summary view. */ - @JsonProperty(value = "properties.virtualNetworkConnection") + @JsonProperty(value = "properties.virtualNetworkConnection", access = JsonProperty.Access.WRITE_ONLY) private VnetInfoInner virtualNetworkConnection; /** - * The Hybrid Connections Summary view. + * The Hybrid Connections summary view. */ - @JsonProperty(value = "properties.hybridConnections") + @JsonProperty(value = "properties.hybridConnections", access = JsonProperty.Access.WRITE_ONLY) private List hybridConnections; /** - * The Hybrid Connection V2 (service bus) view. + * The Hybrid Connection V2 (Service Bus) view. */ - @JsonProperty(value = "properties.hybridConnectionsV2") + @JsonProperty(value = "properties.hybridConnectionsV2", access = JsonProperty.Access.WRITE_ONLY) private List hybridConnectionsV2; /** @@ -53,17 +52,6 @@ public String virtualNetworkName() { return this.virtualNetworkName; } - /** - * Set the virtualNetworkName value. - * - * @param virtualNetworkName the virtualNetworkName value to set - * @return the NetworkFeaturesInner object itself. - */ - public NetworkFeaturesInner withVirtualNetworkName(String virtualNetworkName) { - this.virtualNetworkName = virtualNetworkName; - return this; - } - /** * Get the virtualNetworkConnection value. * @@ -73,17 +61,6 @@ public VnetInfoInner virtualNetworkConnection() { return this.virtualNetworkConnection; } - /** - * Set the virtualNetworkConnection value. - * - * @param virtualNetworkConnection the virtualNetworkConnection value to set - * @return the NetworkFeaturesInner object itself. - */ - public NetworkFeaturesInner withVirtualNetworkConnection(VnetInfoInner virtualNetworkConnection) { - this.virtualNetworkConnection = virtualNetworkConnection; - return this; - } - /** * Get the hybridConnections value. * @@ -93,17 +70,6 @@ public List hybridConnections() { return this.hybridConnections; } - /** - * Set the hybridConnections value. - * - * @param hybridConnections the hybridConnections value to set - * @return the NetworkFeaturesInner object itself. - */ - public NetworkFeaturesInner withHybridConnections(List hybridConnections) { - this.hybridConnections = hybridConnections; - return this; - } - /** * Get the hybridConnectionsV2 value. * @@ -113,15 +79,4 @@ public List hybridConnectionsV2() { return this.hybridConnectionsV2; } - /** - * Set the hybridConnectionsV2 value. - * - * @param hybridConnectionsV2 the hybridConnectionsV2 value to set - * @return the NetworkFeaturesInner object itself. - */ - public NetworkFeaturesInner withHybridConnectionsV2(List hybridConnectionsV2) { - this.hybridConnectionsV2 = hybridConnectionsV2; - return this; - } - } diff --git a/azure-mgmt-website/src/main/java/com/microsoft/azure/management/website/implementation/OperationInner.java b/azure-mgmt-website/src/main/java/com/microsoft/azure/management/website/implementation/OperationInner.java index 4dae406ece77b..e583327203661 100644 --- a/azure-mgmt-website/src/main/java/com/microsoft/azure/management/website/implementation/OperationInner.java +++ b/azure-mgmt-website/src/main/java/com/microsoft/azure/management/website/implementation/OperationInner.java @@ -12,19 +12,18 @@ import java.util.List; import com.microsoft.azure.management.website.ErrorEntity; import org.joda.time.DateTime; -import com.fasterxml.jackson.annotation.JsonProperty; /** - * Class that represents an operation. + * Operation. */ public class OperationInner { /** - * Operation Id. + * Operation ID. */ private String id; /** - * Operation Name. + * Operation name. */ private String name; @@ -32,7 +31,6 @@ public class OperationInner { * The current status of the operation. Possible values include: * 'InProgress', 'Failed', 'Succeeded', 'TimedOut', 'Created'. */ - @JsonProperty(required = true) private OperationStatus status; /** diff --git a/azure-mgmt-website/src/main/java/com/microsoft/azure/management/website/implementation/PerfMonResponseInner.java b/azure-mgmt-website/src/main/java/com/microsoft/azure/management/website/implementation/PerfMonResponseInner.java index a50dbac216fe4..0cdc5066bf666 100644 --- a/azure-mgmt-website/src/main/java/com/microsoft/azure/management/website/implementation/PerfMonResponseInner.java +++ b/azure-mgmt-website/src/main/java/com/microsoft/azure/management/website/implementation/PerfMonResponseInner.java @@ -11,21 +11,21 @@ import com.microsoft.azure.management.website.PerfMonSet; /** - * Represents the perf monitor api reponse. + * Performance monitor API response. */ public class PerfMonResponseInner { /** - * Gets or sets the response code. + * The response code. */ private String code; /** - * Gets or sets the message. + * The message. */ private String message; /** - * Gets or sets the perf mon counters. + * The performance monitor counters. */ private PerfMonSet data; diff --git a/azure-mgmt-website/src/main/java/com/microsoft/azure/management/website/implementation/PremierAddOnInner.java b/azure-mgmt-website/src/main/java/com/microsoft/azure/management/website/implementation/PremierAddOnInner.java new file mode 100644 index 0000000000000..c70c4df5433fb --- /dev/null +++ b/azure-mgmt-website/src/main/java/com/microsoft/azure/management/website/implementation/PremierAddOnInner.java @@ -0,0 +1,229 @@ +/** + * 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.website.implementation; + +import java.util.Map; +import com.fasterxml.jackson.annotation.JsonProperty; +import com.microsoft.rest.serializer.JsonFlatten; +import com.microsoft.azure.Resource; + +/** + * Premier add-on. + */ +@JsonFlatten +public class PremierAddOnInner extends Resource { + /** + * SKU. + */ + @JsonProperty(value = "properties.sku") + private String sku; + + /** + * Product. + */ + @JsonProperty(value = "properties.product") + private String product; + + /** + * Vendor. + */ + @JsonProperty(value = "properties.vendor") + private String vendor; + + /** + * Name. + */ + @JsonProperty(value = "properties.name") + private String premierAddOnName; + + /** + * Location. + */ + @JsonProperty(value = "properties.location") + private String premierAddOnLocation; + + /** + * Tags. + */ + @JsonProperty(value = "properties.tags") + private Map premierAddOnTags; + + /** + * Marketplace publisher. + */ + @JsonProperty(value = "properties.marketplacePublisher") + private String marketplacePublisher; + + /** + * Marketplace offer. + */ + @JsonProperty(value = "properties.marketplaceOffer") + private String marketplaceOffer; + + /** + * Get the sku value. + * + * @return the sku value + */ + public String sku() { + return this.sku; + } + + /** + * Set the sku value. + * + * @param sku the sku value to set + * @return the PremierAddOnInner object itself. + */ + public PremierAddOnInner withSku(String sku) { + this.sku = sku; + return this; + } + + /** + * Get the product value. + * + * @return the product value + */ + public String product() { + return this.product; + } + + /** + * Set the product value. + * + * @param product the product value to set + * @return the PremierAddOnInner object itself. + */ + public PremierAddOnInner withProduct(String product) { + this.product = product; + return this; + } + + /** + * Get the vendor value. + * + * @return the vendor value + */ + public String vendor() { + return this.vendor; + } + + /** + * Set the vendor value. + * + * @param vendor the vendor value to set + * @return the PremierAddOnInner object itself. + */ + public PremierAddOnInner withVendor(String vendor) { + this.vendor = vendor; + return this; + } + + /** + * Get the premierAddOnName value. + * + * @return the premierAddOnName value + */ + public String premierAddOnName() { + return this.premierAddOnName; + } + + /** + * Set the premierAddOnName value. + * + * @param premierAddOnName the premierAddOnName value to set + * @return the PremierAddOnInner object itself. + */ + public PremierAddOnInner withPremierAddOnName(String premierAddOnName) { + this.premierAddOnName = premierAddOnName; + return this; + } + + /** + * Get the premierAddOnLocation value. + * + * @return the premierAddOnLocation value + */ + public String premierAddOnLocation() { + return this.premierAddOnLocation; + } + + /** + * Set the premierAddOnLocation value. + * + * @param premierAddOnLocation the premierAddOnLocation value to set + * @return the PremierAddOnInner object itself. + */ + public PremierAddOnInner withPremierAddOnLocation(String premierAddOnLocation) { + this.premierAddOnLocation = premierAddOnLocation; + return this; + } + + /** + * Get the premierAddOnTags value. + * + * @return the premierAddOnTags value + */ + public Map premierAddOnTags() { + return this.premierAddOnTags; + } + + /** + * Set the premierAddOnTags value. + * + * @param premierAddOnTags the premierAddOnTags value to set + * @return the PremierAddOnInner object itself. + */ + public PremierAddOnInner withPremierAddOnTags(Map premierAddOnTags) { + this.premierAddOnTags = premierAddOnTags; + return this; + } + + /** + * Get the marketplacePublisher value. + * + * @return the marketplacePublisher value + */ + public String marketplacePublisher() { + return this.marketplacePublisher; + } + + /** + * Set the marketplacePublisher value. + * + * @param marketplacePublisher the marketplacePublisher value to set + * @return the PremierAddOnInner object itself. + */ + public PremierAddOnInner withMarketplacePublisher(String marketplacePublisher) { + this.marketplacePublisher = marketplacePublisher; + return this; + } + + /** + * Get the marketplaceOffer value. + * + * @return the marketplaceOffer value + */ + public String marketplaceOffer() { + return this.marketplaceOffer; + } + + /** + * Set the marketplaceOffer value. + * + * @param marketplaceOffer the marketplaceOffer value to set + * @return the PremierAddOnInner object itself. + */ + public PremierAddOnInner withMarketplaceOffer(String marketplaceOffer) { + this.marketplaceOffer = marketplaceOffer; + return this; + } + +} diff --git a/azure-mgmt-website/src/main/java/com/microsoft/azure/management/website/implementation/PremierAddOnOfferInner.java b/azure-mgmt-website/src/main/java/com/microsoft/azure/management/website/implementation/PremierAddOnOfferInner.java new file mode 100644 index 0000000000000..3c69f599abd01 --- /dev/null +++ b/azure-mgmt-website/src/main/java/com/microsoft/azure/management/website/implementation/PremierAddOnOfferInner.java @@ -0,0 +1,309 @@ +/** + * 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.website.implementation; + +import com.microsoft.azure.management.website.AppServicePlanRestrictions; +import com.fasterxml.jackson.annotation.JsonProperty; +import com.microsoft.rest.serializer.JsonFlatten; +import com.microsoft.azure.Resource; + +/** + * Premier add-on offer. + */ +@JsonFlatten +public class PremierAddOnOfferInner extends Resource { + /** + * SKU. + */ + @JsonProperty(value = "properties.sku") + private String sku; + + /** + * Product. + */ + @JsonProperty(value = "properties.product") + private String product; + + /** + * Vendor. + */ + @JsonProperty(value = "properties.vendor") + private String vendor; + + /** + * Name. + */ + @JsonProperty(value = "properties.name") + private String premierAddOnOfferName; + + /** + * <code>true</code> if promotion code is required; otherwise, + * <code>false</code>. + */ + @JsonProperty(value = "properties.promoCodeRequired") + private Boolean promoCodeRequired; + + /** + * Quota. + */ + @JsonProperty(value = "properties.quota") + private Integer quota; + + /** + * App Service plans this offer is restricted to. Possible values include: + * 'None', 'Free', 'Shared', 'Basic', 'Standard', 'Premium'. + */ + @JsonProperty(value = "properties.webHostingPlanRestrictions") + private AppServicePlanRestrictions webHostingPlanRestrictions; + + /** + * Privacy policy URL. + */ + @JsonProperty(value = "properties.privacyPolicyUrl") + private String privacyPolicyUrl; + + /** + * Legal terms URL. + */ + @JsonProperty(value = "properties.legalTermsUrl") + private String legalTermsUrl; + + /** + * Marketplace publisher. + */ + @JsonProperty(value = "properties.marketplacePublisher") + private String marketplacePublisher; + + /** + * Marketplace offer. + */ + @JsonProperty(value = "properties.marketplaceOffer") + private String marketplaceOffer; + + /** + * Get the sku value. + * + * @return the sku value + */ + public String sku() { + return this.sku; + } + + /** + * Set the sku value. + * + * @param sku the sku value to set + * @return the PremierAddOnOfferInner object itself. + */ + public PremierAddOnOfferInner withSku(String sku) { + this.sku = sku; + return this; + } + + /** + * Get the product value. + * + * @return the product value + */ + public String product() { + return this.product; + } + + /** + * Set the product value. + * + * @param product the product value to set + * @return the PremierAddOnOfferInner object itself. + */ + public PremierAddOnOfferInner withProduct(String product) { + this.product = product; + return this; + } + + /** + * Get the vendor value. + * + * @return the vendor value + */ + public String vendor() { + return this.vendor; + } + + /** + * Set the vendor value. + * + * @param vendor the vendor value to set + * @return the PremierAddOnOfferInner object itself. + */ + public PremierAddOnOfferInner withVendor(String vendor) { + this.vendor = vendor; + return this; + } + + /** + * Get the premierAddOnOfferName value. + * + * @return the premierAddOnOfferName value + */ + public String premierAddOnOfferName() { + return this.premierAddOnOfferName; + } + + /** + * Set the premierAddOnOfferName value. + * + * @param premierAddOnOfferName the premierAddOnOfferName value to set + * @return the PremierAddOnOfferInner object itself. + */ + public PremierAddOnOfferInner withPremierAddOnOfferName(String premierAddOnOfferName) { + this.premierAddOnOfferName = premierAddOnOfferName; + return this; + } + + /** + * Get the promoCodeRequired value. + * + * @return the promoCodeRequired value + */ + public Boolean promoCodeRequired() { + return this.promoCodeRequired; + } + + /** + * Set the promoCodeRequired value. + * + * @param promoCodeRequired the promoCodeRequired value to set + * @return the PremierAddOnOfferInner object itself. + */ + public PremierAddOnOfferInner withPromoCodeRequired(Boolean promoCodeRequired) { + this.promoCodeRequired = promoCodeRequired; + return this; + } + + /** + * Get the quota value. + * + * @return the quota value + */ + public Integer quota() { + return this.quota; + } + + /** + * Set the quota value. + * + * @param quota the quota value to set + * @return the PremierAddOnOfferInner object itself. + */ + public PremierAddOnOfferInner withQuota(Integer quota) { + this.quota = quota; + return this; + } + + /** + * Get the webHostingPlanRestrictions value. + * + * @return the webHostingPlanRestrictions value + */ + public AppServicePlanRestrictions webHostingPlanRestrictions() { + return this.webHostingPlanRestrictions; + } + + /** + * Set the webHostingPlanRestrictions value. + * + * @param webHostingPlanRestrictions the webHostingPlanRestrictions value to set + * @return the PremierAddOnOfferInner object itself. + */ + public PremierAddOnOfferInner withWebHostingPlanRestrictions(AppServicePlanRestrictions webHostingPlanRestrictions) { + this.webHostingPlanRestrictions = webHostingPlanRestrictions; + return this; + } + + /** + * Get the privacyPolicyUrl value. + * + * @return the privacyPolicyUrl value + */ + public String privacyPolicyUrl() { + return this.privacyPolicyUrl; + } + + /** + * Set the privacyPolicyUrl value. + * + * @param privacyPolicyUrl the privacyPolicyUrl value to set + * @return the PremierAddOnOfferInner object itself. + */ + public PremierAddOnOfferInner withPrivacyPolicyUrl(String privacyPolicyUrl) { + this.privacyPolicyUrl = privacyPolicyUrl; + return this; + } + + /** + * Get the legalTermsUrl value. + * + * @return the legalTermsUrl value + */ + public String legalTermsUrl() { + return this.legalTermsUrl; + } + + /** + * Set the legalTermsUrl value. + * + * @param legalTermsUrl the legalTermsUrl value to set + * @return the PremierAddOnOfferInner object itself. + */ + public PremierAddOnOfferInner withLegalTermsUrl(String legalTermsUrl) { + this.legalTermsUrl = legalTermsUrl; + return this; + } + + /** + * Get the marketplacePublisher value. + * + * @return the marketplacePublisher value + */ + public String marketplacePublisher() { + return this.marketplacePublisher; + } + + /** + * Set the marketplacePublisher value. + * + * @param marketplacePublisher the marketplacePublisher value to set + * @return the PremierAddOnOfferInner object itself. + */ + public PremierAddOnOfferInner withMarketplacePublisher(String marketplacePublisher) { + this.marketplacePublisher = marketplacePublisher; + return this; + } + + /** + * Get the marketplaceOffer value. + * + * @return the marketplaceOffer value + */ + public String marketplaceOffer() { + return this.marketplaceOffer; + } + + /** + * Set the marketplaceOffer value. + * + * @param marketplaceOffer the marketplaceOffer value to set + * @return the PremierAddOnOfferInner object itself. + */ + public PremierAddOnOfferInner withMarketplaceOffer(String marketplaceOffer) { + this.marketplaceOffer = marketplaceOffer; + return this; + } + +} diff --git a/azure-mgmt-website/src/main/java/com/microsoft/azure/management/website/implementation/PremierAddOnRequestInner.java b/azure-mgmt-website/src/main/java/com/microsoft/azure/management/website/implementation/PremierAddOnRequestInner.java deleted file mode 100644 index 7f2c8cc872830..0000000000000 --- a/azure-mgmt-website/src/main/java/com/microsoft/azure/management/website/implementation/PremierAddOnRequestInner.java +++ /dev/null @@ -1,144 +0,0 @@ -/** - * 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.website.implementation; - -import java.util.Map; -import com.microsoft.azure.management.website.ArmPlan; -import com.microsoft.azure.management.website.SkuDescription; - -/** - * Request representing premier add-on. - */ -public class PremierAddOnRequestInner { - /** - * Geo region resource belongs to e.g. SouthCentralUS, SouthEastAsia. - */ - private String location; - - /** - * Tags associated with resource. - */ - private Map tags; - - /** - * Azure resource manager plan. - */ - private ArmPlan plan; - - /** - * Resource specific properties. - */ - private Object properties; - - /** - * Sku description of the resource. - */ - private SkuDescription sku; - - /** - * Get the location value. - * - * @return the location value - */ - public String location() { - return this.location; - } - - /** - * Set the location value. - * - * @param location the location value to set - * @return the PremierAddOnRequestInner object itself. - */ - public PremierAddOnRequestInner withLocation(String location) { - this.location = location; - return this; - } - - /** - * Get the tags value. - * - * @return the tags value - */ - public Map tags() { - return this.tags; - } - - /** - * Set the tags value. - * - * @param tags the tags value to set - * @return the PremierAddOnRequestInner object itself. - */ - public PremierAddOnRequestInner withTags(Map tags) { - this.tags = tags; - return this; - } - - /** - * Get the plan value. - * - * @return the plan value - */ - public ArmPlan plan() { - return this.plan; - } - - /** - * Set the plan value. - * - * @param plan the plan value to set - * @return the PremierAddOnRequestInner object itself. - */ - public PremierAddOnRequestInner withPlan(ArmPlan plan) { - this.plan = plan; - return this; - } - - /** - * Get the properties value. - * - * @return the properties value - */ - public Object properties() { - return this.properties; - } - - /** - * Set the properties value. - * - * @param properties the properties value to set - * @return the PremierAddOnRequestInner object itself. - */ - public PremierAddOnRequestInner withProperties(Object properties) { - this.properties = properties; - return this; - } - - /** - * Get the sku value. - * - * @return the sku value - */ - public SkuDescription sku() { - return this.sku; - } - - /** - * Set the sku value. - * - * @param sku the sku value to set - * @return the PremierAddOnRequestInner object itself. - */ - public PremierAddOnRequestInner withSku(SkuDescription sku) { - this.sku = sku; - return this; - } - -} diff --git a/azure-mgmt-website/src/main/java/com/microsoft/azure/management/website/implementation/PushSettingsInner.java b/azure-mgmt-website/src/main/java/com/microsoft/azure/management/website/implementation/PushSettingsInner.java index acb2e8e4be31a..c6ad8a5c0c688 100644 --- a/azure-mgmt-website/src/main/java/com/microsoft/azure/management/website/implementation/PushSettingsInner.java +++ b/azure-mgmt-website/src/main/java/com/microsoft/azure/management/website/implementation/PushSettingsInner.java @@ -8,15 +8,17 @@ package com.microsoft.azure.management.website.implementation; +import com.fasterxml.jackson.annotation.JsonProperty; /** - * Push settings for the Web App. + * Push settings for the App. */ public class PushSettingsInner { /** * Gets or sets a flag indicating whether the Push endpoint is enabled. */ - private Boolean isPushEnabled; + @JsonProperty(required = true) + private boolean isPushEnabled; /** * Gets or sets a JSON string containing a list of tags that are @@ -27,6 +29,9 @@ public class PushSettingsInner { /** * Gets or sets a JSON string containing a list of tags that require user * authentication to be used in the push registration endpoint. + * Tags can consist of alphanumeric characters and the following: + * '_', '@', '#', '.', ':', '-'. + * Validation should be performed at the PushRequestHandler. */ private String tagsRequiringAuth; @@ -41,7 +46,7 @@ public class PushSettingsInner { * * @return the isPushEnabled value */ - public Boolean isPushEnabled() { + public boolean isPushEnabled() { return this.isPushEnabled; } @@ -51,7 +56,7 @@ public Boolean isPushEnabled() { * @param isPushEnabled the isPushEnabled value to set * @return the PushSettingsInner object itself. */ - public PushSettingsInner withIsPushEnabled(Boolean isPushEnabled) { + public PushSettingsInner withIsPushEnabled(boolean isPushEnabled) { this.isPushEnabled = isPushEnabled; return this; } diff --git a/azure-mgmt-website/src/main/java/com/microsoft/azure/management/website/implementation/RecommendationInner.java b/azure-mgmt-website/src/main/java/com/microsoft/azure/management/website/implementation/RecommendationInner.java index 7a318d45d2841..ed1537f462520 100644 --- a/azure-mgmt-website/src/main/java/com/microsoft/azure/management/website/implementation/RecommendationInner.java +++ b/azure-mgmt-website/src/main/java/com/microsoft/azure/management/website/implementation/RecommendationInner.java @@ -9,10 +9,10 @@ package com.microsoft.azure.management.website.implementation; import org.joda.time.DateTime; +import com.microsoft.azure.management.website.ResourceScopeType; import com.microsoft.azure.management.website.NotificationLevel; import com.microsoft.azure.management.website.Channels; import java.util.List; -import com.fasterxml.jackson.annotation.JsonProperty; /** * Represents a recommendation result generated by the recommendation engine. @@ -36,9 +36,10 @@ public class RecommendationInner { /** * Name of a resource type this recommendation applies, e.g. Subscription, - * ServerFarm, Site. + * ServerFarm, Site. Possible values include: 'ServerFarm', + * 'Subscription', 'WebSite'. */ - private String resourceScope; + private ResourceScopeType resourceScope; /** * Unique name of the rule. @@ -51,7 +52,7 @@ public class RecommendationInner { private String displayName; /** - * Localized text of recommendation, good for UI. + * Recommendation text. */ private String message; @@ -60,14 +61,12 @@ public class RecommendationInner { * values include: 'Critical', 'Warning', 'Information', * 'NonUrgentSuggestion'. */ - @JsonProperty(required = true) private NotificationLevel level; /** * List of channels that this recommendation can apply. Possible values - * include: 'Notification', 'Api', 'Email', 'All'. + * include: 'Notification', 'Api', 'Email', 'Webhook', 'All'. */ - @JsonProperty(required = true) private Channels channels; /** @@ -81,34 +80,29 @@ public class RecommendationInner { private String actionName; /** - * On/off flag indicating the rule is currently enabled or disabled. - */ - private Integer enabled; - - /** - * The beginning time of a range that the recommendation refers to. + * The beginning time in UTC of a range that the recommendation refers to. */ private DateTime startTime; /** - * The end time of a range that the recommendation refers to. + * The end time in UTC of a range that the recommendation refers to. */ private DateTime endTime; /** - * When to notify this recommendation next. Null means that this will - * never be notified anymore. + * When to notify this recommendation next in UTC. Null means that this + * will never be notified anymore. */ private DateTime nextNotificationTime; /** - * Date and time when this notification expires. + * Date and time in UTC when this notification expires. */ private DateTime notificationExpirationTime; /** - * Last timestamp this instance was actually notified. Null means that - * this recommendation hasn't been notified yet. + * Last timestamp in UTC this instance was actually notified. Null means + * that this recommendation hasn't been notified yet. */ private DateTime notifiedTime; @@ -182,7 +176,7 @@ public RecommendationInner withResourceId(String resourceId) { * * @return the resourceScope value */ - public String resourceScope() { + public ResourceScopeType resourceScope() { return this.resourceScope; } @@ -192,7 +186,7 @@ public String resourceScope() { * @param resourceScope the resourceScope value to set * @return the RecommendationInner object itself. */ - public RecommendationInner withResourceScope(String resourceScope) { + public RecommendationInner withResourceScope(ResourceScopeType resourceScope) { this.resourceScope = resourceScope; return this; } @@ -337,26 +331,6 @@ public RecommendationInner withActionName(String actionName) { return this; } - /** - * Get the enabled value. - * - * @return the enabled value - */ - public Integer enabled() { - return this.enabled; - } - - /** - * Set the enabled value. - * - * @param enabled the enabled value to set - * @return the RecommendationInner object itself. - */ - public RecommendationInner withEnabled(Integer enabled) { - this.enabled = enabled; - return this; - } - /** * Get the startTime value. * diff --git a/azure-mgmt-website/src/main/java/com/microsoft/azure/management/website/implementation/RecommendationRuleInner.java b/azure-mgmt-website/src/main/java/com/microsoft/azure/management/website/implementation/RecommendationRuleInner.java index 24756bb6f5b7a..651929a88c0e5 100644 --- a/azure-mgmt-website/src/main/java/com/microsoft/azure/management/website/implementation/RecommendationRuleInner.java +++ b/azure-mgmt-website/src/main/java/com/microsoft/azure/management/website/implementation/RecommendationRuleInner.java @@ -8,10 +8,10 @@ package com.microsoft.azure.management.website.implementation; +import java.util.UUID; import com.microsoft.azure.management.website.NotificationLevel; import com.microsoft.azure.management.website.Channels; import java.util.List; -import com.fasterxml.jackson.annotation.JsonProperty; /** * Represents a recommendation rule that the recommendation engine can perform. @@ -37,7 +37,7 @@ public class RecommendationRuleInner { * rule, if exists. * If such an object doesn't exist, it is set to null. */ - private String recommendationId; + private UUID recommendationId; /** * Localized detailed description of the rule. @@ -49,23 +49,16 @@ public class RecommendationRuleInner { */ private String actionName; - /** - * On/off flag indicating the rule is currently enabled or disabled. - */ - private Integer enabled; - /** * Level of impact indicating how critical this rule is. Possible values * include: 'Critical', 'Warning', 'Information', 'NonUrgentSuggestion'. */ - @JsonProperty(required = true) private NotificationLevel level; /** * List of available channels that this rule applies. Possible values - * include: 'Notification', 'Api', 'Email', 'All'. + * include: 'Notification', 'Api', 'Email', 'Webhook', 'All'. */ - @JsonProperty(required = true) private Channels channels; /** @@ -138,7 +131,7 @@ public RecommendationRuleInner withMessage(String message) { * * @return the recommendationId value */ - public String recommendationId() { + public UUID recommendationId() { return this.recommendationId; } @@ -148,7 +141,7 @@ public String recommendationId() { * @param recommendationId the recommendationId value to set * @return the RecommendationRuleInner object itself. */ - public RecommendationRuleInner withRecommendationId(String recommendationId) { + public RecommendationRuleInner withRecommendationId(UUID recommendationId) { this.recommendationId = recommendationId; return this; } @@ -193,26 +186,6 @@ public RecommendationRuleInner withActionName(String actionName) { return this; } - /** - * Get the enabled value. - * - * @return the enabled value - */ - public Integer enabled() { - return this.enabled; - } - - /** - * Set the enabled value. - * - * @param enabled the enabled value to set - * @return the RecommendationRuleInner object itself. - */ - public RecommendationRuleInner withEnabled(Integer enabled) { - this.enabled = enabled; - return this; - } - /** * Get the level value. * diff --git a/azure-mgmt-website/src/main/java/com/microsoft/azure/management/website/implementation/RecommendationsInner.java b/azure-mgmt-website/src/main/java/com/microsoft/azure/management/website/implementation/RecommendationsInner.java index b5aa7e0098100..83e3659607153 100644 --- a/azure-mgmt-website/src/main/java/com/microsoft/azure/management/website/implementation/RecommendationsInner.java +++ b/azure-mgmt-website/src/main/java/com/microsoft/azure/management/website/implementation/RecommendationsInner.java @@ -22,6 +22,7 @@ import retrofit2.http.Header; import retrofit2.http.Headers; import retrofit2.http.Path; +import retrofit2.http.POST; import retrofit2.http.Query; import retrofit2.Response; import rx.functions.Func1; @@ -55,15 +56,27 @@ public RecommendationsInner(Retrofit retrofit, WebSiteManagementClientImpl clien interface RecommendationsService { @Headers("Content-Type: application/json; charset=utf-8") @GET("subscriptions/{subscriptionId}/providers/Microsoft.Web/recommendations") - Observable> get(@Path("subscriptionId") String subscriptionId, @Query("featured") Boolean featured, @Query("$filter") String filter, @Query("api-version") String apiVersion, @Header("accept-language") String acceptLanguage, @Header("User-Agent") String userAgent); + Observable> list(@Path("subscriptionId") String subscriptionId, @Query("featured") Boolean featured, @Query(value = "$filter", encoded = true) String filter, @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}/providers/Microsoft.Web/recommendations/reset") + Observable> resetAllFilters(@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") @GET("subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.Web/sites/{siteName}/recommendationHistory") - Observable> listHistoryForWebApp(@Path("resourceGroupName") String resourceGroupName, @Path("siteName") String siteName, @Path("subscriptionId") String subscriptionId, @Query("startTime") String startTime, @Query("endTime") String endTime, @Query("api-version") String apiVersion, @Header("accept-language") String acceptLanguage, @Header("User-Agent") String userAgent); + Observable> listHistoryForWebApp(@Path("resourceGroupName") String resourceGroupName, @Path("siteName") String siteName, @Path("subscriptionId") String subscriptionId, @Query(value = "$filter", encoded = true) String filter, @Query("api-version") String apiVersion, @Header("accept-language") String acceptLanguage, @Header("User-Agent") String userAgent); @Headers("Content-Type: application/json; charset=utf-8") @GET("subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.Web/sites/{siteName}/recommendations") - Observable> listRecommendedRulesForWebApp(@Path("resourceGroupName") String resourceGroupName, @Path("siteName") String siteName, @Path("subscriptionId") String subscriptionId, @Query("featured") Boolean featured, @Query("webAppSku") String webAppSku, @Query("numSlots") Integer numSlots, @Query("liveHours") Integer liveHours, @Query("api-version") String apiVersion, @Header("accept-language") String acceptLanguage, @Header("User-Agent") String userAgent); + Observable> listRecommendedRulesForWebApp(@Path("resourceGroupName") String resourceGroupName, @Path("siteName") String siteName, @Path("subscriptionId") String subscriptionId, @Query("featured") Boolean featured, @Query("webAppSku") String webAppSku, @Query("numSlots") Integer numSlots, @Query("liveHours") Integer liveHours, @Query(value = "$filter", encoded = true) String filter, @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.Web/sites/{siteName}/recommendations/disable") + Observable> disableAllForWebApp(@Path("resourceGroupName") String resourceGroupName, @Path("siteName") String siteName, @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.Web/sites/{siteName}/recommendations/reset") + Observable> resetAllFiltersForWebApp(@Path("resourceGroupName") String resourceGroupName, @Path("siteName") String siteName, @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") @GET("subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.Web/sites/{siteName}/recommendations/{name}") @@ -72,34 +85,34 @@ interface RecommendationsService { } /** - * Gets a list of recommendations associated with the specified subscription. - * Gets a list of recommendations associated with the specified subscription. + * List all recommendations for a subscription. + * List all recommendations for a subscription. * * @return the List<RecommendationInner> object if successful. */ - public List get() { - return getWithServiceResponseAsync().toBlocking().single().getBody(); + public List list() { + return listWithServiceResponseAsync().toBlocking().single().getBody(); } /** - * Gets a list of recommendations associated with the specified subscription. - * Gets a list of recommendations associated with the specified subscription. + * List all recommendations for a subscription. + * List all recommendations for a subscription. * * @param serviceCallback the async ServiceCallback to handle successful and failed responses. * @return the {@link ServiceCall} object */ - public ServiceCall> getAsync(final ServiceCallback> serviceCallback) { - return ServiceCall.create(getWithServiceResponseAsync(), serviceCallback); + public ServiceCall> listAsync(final ServiceCallback> serviceCallback) { + return ServiceCall.create(listWithServiceResponseAsync(), serviceCallback); } /** - * Gets a list of recommendations associated with the specified subscription. - * Gets a list of recommendations associated with the specified subscription. + * List all recommendations for a subscription. + * List all recommendations for a subscription. * * @return the observable to the List<RecommendationInner> object */ - public Observable> getAsync() { - return getWithServiceResponseAsync().map(new Func1>, List>() { + public Observable> listAsync() { + return listWithServiceResponseAsync().map(new Func1>, List>() { @Override public List call(ServiceResponse> response) { return response.getBody(); @@ -108,24 +121,24 @@ public List call(ServiceResponse> } /** - * Gets a list of recommendations associated with the specified subscription. - * Gets a list of recommendations associated with the specified subscription. + * List all recommendations for a subscription. + * List all recommendations for a subscription. * * @return the observable to the List<RecommendationInner> object */ - public Observable>> getWithServiceResponseAsync() { + public Observable>> listWithServiceResponseAsync() { if (this.client.subscriptionId() == null) { throw new IllegalArgumentException("Parameter this.client.subscriptionId() is required and cannot be null."); } final String apiVersion = "2016-03-01"; final Boolean featured = null; final String filter = null; - return service.get(this.client.subscriptionId(), featured, filter, apiVersion, this.client.acceptLanguage(), this.client.userAgent()) + return service.list(this.client.subscriptionId(), featured, filter, apiVersion, this.client.acceptLanguage(), this.client.userAgent()) .flatMap(new Func1, Observable>>>() { @Override public Observable>> call(Response response) { try { - ServiceResponse> clientResponse = getDelegate(response); + ServiceResponse> clientResponse = listDelegate(response); return Observable.just(clientResponse); } catch (Throwable t) { return Observable.error(t); @@ -135,40 +148,40 @@ public Observable>> call(Response get(Boolean featured, String filter) { - return getWithServiceResponseAsync(featured, filter).toBlocking().single().getBody(); + public List list(Boolean featured, String filter) { + return listWithServiceResponseAsync(featured, filter).toBlocking().single().getBody(); } /** - * Gets a list of recommendations associated with the specified subscription. - * Gets a list of recommendations associated with the specified subscription. + * List all recommendations for a subscription. + * List all recommendations for a subscription. * - * @param featured If set, this API returns only the most critical recommendation among the others. Otherwise this API returns all recommendations available - * @param filter Return only channels specified in the filter. Filter is specified by using OData syntax. Example: $filter=channels eq 'Api' or channel eq 'Notification' + * @param featured Specify <code>true</code> to return only the most critical recommendations. The default is <code>false</code>, which returns all recommendations. + * @param filter Filter is specified by using OData syntax. Example: $filter=channels eq 'Api' or channel eq 'Notification' and startTime eq '2014-01-01T00:00:00Z' and endTime eq '2014-12-31T23:59:59Z' and timeGrain eq duration'[PT1H|PT1M|P1D] * @param serviceCallback the async ServiceCallback to handle successful and failed responses. * @return the {@link ServiceCall} object */ - public ServiceCall> getAsync(Boolean featured, String filter, final ServiceCallback> serviceCallback) { - return ServiceCall.create(getWithServiceResponseAsync(featured, filter), serviceCallback); + public ServiceCall> listAsync(Boolean featured, String filter, final ServiceCallback> serviceCallback) { + return ServiceCall.create(listWithServiceResponseAsync(featured, filter), serviceCallback); } /** - * Gets a list of recommendations associated with the specified subscription. - * Gets a list of recommendations associated with the specified subscription. + * List all recommendations for a subscription. + * List all recommendations for a subscription. * - * @param featured If set, this API returns only the most critical recommendation among the others. Otherwise this API returns all recommendations available - * @param filter Return only channels specified in the filter. Filter is specified by using OData syntax. Example: $filter=channels eq 'Api' or channel eq 'Notification' + * @param featured Specify <code>true</code> to return only the most critical recommendations. The default is <code>false</code>, which returns all recommendations. + * @param filter Filter is specified by using OData syntax. Example: $filter=channels eq 'Api' or channel eq 'Notification' and startTime eq '2014-01-01T00:00:00Z' and endTime eq '2014-12-31T23:59:59Z' and timeGrain eq duration'[PT1H|PT1M|P1D] * @return the observable to the List<RecommendationInner> object */ - public Observable> getAsync(Boolean featured, String filter) { - return getWithServiceResponseAsync(featured, filter).map(new Func1>, List>() { + public Observable> listAsync(Boolean featured, String filter) { + return listWithServiceResponseAsync(featured, filter).map(new Func1>, List>() { @Override public List call(ServiceResponse> response) { return response.getBody(); @@ -177,24 +190,24 @@ public List call(ServiceResponse> } /** - * Gets a list of recommendations associated with the specified subscription. - * Gets a list of recommendations associated with the specified subscription. + * List all recommendations for a subscription. + * List all recommendations for a subscription. * - * @param featured If set, this API returns only the most critical recommendation among the others. Otherwise this API returns all recommendations available - * @param filter Return only channels specified in the filter. Filter is specified by using OData syntax. Example: $filter=channels eq 'Api' or channel eq 'Notification' + * @param featured Specify <code>true</code> to return only the most critical recommendations. The default is <code>false</code>, which returns all recommendations. + * @param filter Filter is specified by using OData syntax. Example: $filter=channels eq 'Api' or channel eq 'Notification' and startTime eq '2014-01-01T00:00:00Z' and endTime eq '2014-12-31T23:59:59Z' and timeGrain eq duration'[PT1H|PT1M|P1D] * @return the observable to the List<RecommendationInner> object */ - public Observable>> getWithServiceResponseAsync(Boolean featured, String filter) { + public Observable>> listWithServiceResponseAsync(Boolean featured, String filter) { if (this.client.subscriptionId() == null) { throw new IllegalArgumentException("Parameter this.client.subscriptionId() is required and cannot be null."); } final String apiVersion = "2016-03-01"; - return service.get(this.client.subscriptionId(), featured, filter, apiVersion, this.client.acceptLanguage(), this.client.userAgent()) + return service.list(this.client.subscriptionId(), featured, filter, apiVersion, this.client.acceptLanguage(), this.client.userAgent()) .flatMap(new Func1, Observable>>>() { @Override public Observable>> call(Response response) { try { - ServiceResponse> clientResponse = getDelegate(response); + ServiceResponse> clientResponse = listDelegate(response); return Observable.just(clientResponse); } catch (Throwable t) { return Observable.error(t); @@ -203,7 +216,7 @@ public Observable>> call(Response> getDelegate(Response response) throws CloudException, IOException, IllegalArgumentException { + private ServiceResponse> listDelegate(Response response) throws CloudException, IOException, IllegalArgumentException { return new AzureServiceResponseBuilder, CloudException>(this.client.mapperAdapter()) .register(200, new TypeToken>() { }.getType()) .registerError(CloudException.class) @@ -211,11 +224,77 @@ private ServiceResponse> getDelegate(Response resetAllFiltersAsync(final ServiceCallback serviceCallback) { + return ServiceCall.create(resetAllFiltersWithServiceResponseAsync(), serviceCallback); + } + + /** + * Reset all recommendation opt-out settings for a subscription. + * Reset all recommendation opt-out settings for a subscription. + * + * @return the {@link ServiceResponse} object if successful. + */ + public Observable resetAllFiltersAsync() { + return resetAllFiltersWithServiceResponseAsync().map(new Func1, Void>() { + @Override + public Void call(ServiceResponse response) { + return response.getBody(); + } + }); + } + + /** + * Reset all recommendation opt-out settings for a subscription. + * Reset all recommendation opt-out settings for a subscription. + * + * @return the {@link ServiceResponse} object if successful. + */ + public Observable> resetAllFiltersWithServiceResponseAsync() { + if (this.client.subscriptionId() == null) { + throw new IllegalArgumentException("Parameter this.client.subscriptionId() is required and cannot be null."); + } + final String apiVersion = "2016-03-01"; + return service.resetAllFilters(this.client.subscriptionId(), apiVersion, this.client.acceptLanguage(), this.client.userAgent()) + .flatMap(new Func1, Observable>>() { + @Override + public Observable> call(Response response) { + try { + ServiceResponse clientResponse = resetAllFiltersDelegate(response); + return Observable.just(clientResponse); + } catch (Throwable t) { + return Observable.error(t); + } + } + }); + } + + private ServiceResponse resetAllFiltersDelegate(Response response) throws CloudException, IOException, IllegalArgumentException { + return new AzureServiceResponseBuilder(this.client.mapperAdapter()) + .register(204, new TypeToken() { }.getType()) + .build(response); + } + + /** + * Get past recommendations for an app, optionally specified by the time range. + * Get past recommendations for an app, optionally specified by the time range. * - * @param resourceGroupName Resource group name - * @param siteName Site name + * @param resourceGroupName Name of the resource group to which the resource belongs. + * @param siteName Name of the app. * @return the List<RecommendationInner> object if successful. */ public List listHistoryForWebApp(String resourceGroupName, String siteName) { @@ -223,11 +302,11 @@ public List listHistoryForWebApp(String resourceGroupName, } /** - * Gets the list of past recommendations optionally specified by the time range. - * Gets the list of past recommendations optionally specified by the time range. + * Get past recommendations for an app, optionally specified by the time range. + * Get past recommendations for an app, optionally specified by the time range. * - * @param resourceGroupName Resource group name - * @param siteName Site name + * @param resourceGroupName Name of the resource group to which the resource belongs. + * @param siteName Name of the app. * @param serviceCallback the async ServiceCallback to handle successful and failed responses. * @return the {@link ServiceCall} object */ @@ -236,11 +315,11 @@ public ServiceCall> listHistoryForWebAppAsync(String r } /** - * Gets the list of past recommendations optionally specified by the time range. - * Gets the list of past recommendations optionally specified by the time range. + * Get past recommendations for an app, optionally specified by the time range. + * Get past recommendations for an app, optionally specified by the time range. * - * @param resourceGroupName Resource group name - * @param siteName Site name + * @param resourceGroupName Name of the resource group to which the resource belongs. + * @param siteName Name of the app. * @return the observable to the List<RecommendationInner> object */ public Observable> listHistoryForWebAppAsync(String resourceGroupName, String siteName) { @@ -253,11 +332,11 @@ public List call(ServiceResponse> } /** - * Gets the list of past recommendations optionally specified by the time range. - * Gets the list of past recommendations optionally specified by the time range. + * Get past recommendations for an app, optionally specified by the time range. + * Get past recommendations for an app, optionally specified by the time range. * - * @param resourceGroupName Resource group name - * @param siteName Site name + * @param resourceGroupName Name of the resource group to which the resource belongs. + * @param siteName Name of the app. * @return the observable to the List<RecommendationInner> object */ public Observable>> listHistoryForWebAppWithServiceResponseAsync(String resourceGroupName, String siteName) { @@ -271,9 +350,8 @@ public Observable>> listHistoryForWebA throw new IllegalArgumentException("Parameter this.client.subscriptionId() is required and cannot be null."); } final String apiVersion = "2016-03-01"; - final String startTime = null; - final String endTime = null; - return service.listHistoryForWebApp(resourceGroupName, siteName, this.client.subscriptionId(), startTime, endTime, apiVersion, this.client.acceptLanguage(), this.client.userAgent()) + final String filter = null; + return service.listHistoryForWebApp(resourceGroupName, siteName, this.client.subscriptionId(), filter, apiVersion, this.client.acceptLanguage(), this.client.userAgent()) .flatMap(new Func1, Observable>>>() { @Override public Observable>> call(Response response) { @@ -288,46 +366,43 @@ public Observable>> call(Response listHistoryForWebApp(String resourceGroupName, String siteName, String startTime, String endTime) { - return listHistoryForWebAppWithServiceResponseAsync(resourceGroupName, siteName, startTime, endTime).toBlocking().single().getBody(); + public List listHistoryForWebApp(String resourceGroupName, String siteName, String filter) { + return listHistoryForWebAppWithServiceResponseAsync(resourceGroupName, siteName, filter).toBlocking().single().getBody(); } /** - * Gets the list of past recommendations optionally specified by the time range. - * Gets the list of past recommendations optionally specified by the time range. + * Get past recommendations for an app, optionally specified by the time range. + * Get past recommendations for an app, optionally specified by the time range. * - * @param resourceGroupName Resource group name - * @param siteName Site name - * @param startTime The start time of a time range to query, e.g. $filter=startTime eq '2015-01-01T00:00:00Z' and endTime eq '2015-01-02T00:00:00Z' - * @param endTime The end time of a time range to query, e.g. $filter=startTime eq '2015-01-01T00:00:00Z' and endTime eq '2015-01-02T00:00:00Z' + * @param resourceGroupName Name of the resource group to which the resource belongs. + * @param siteName Name of the app. + * @param filter Filter is specified by using OData syntax. Example: $filter=channels eq 'Api' or channel eq 'Notification' and startTime eq '2014-01-01T00:00:00Z' and endTime eq '2014-12-31T23:59:59Z' and timeGrain eq duration'[PT1H|PT1M|P1D] * @param serviceCallback the async ServiceCallback to handle successful and failed responses. * @return the {@link ServiceCall} object */ - public ServiceCall> listHistoryForWebAppAsync(String resourceGroupName, String siteName, String startTime, String endTime, final ServiceCallback> serviceCallback) { - return ServiceCall.create(listHistoryForWebAppWithServiceResponseAsync(resourceGroupName, siteName, startTime, endTime), serviceCallback); + public ServiceCall> listHistoryForWebAppAsync(String resourceGroupName, String siteName, String filter, final ServiceCallback> serviceCallback) { + return ServiceCall.create(listHistoryForWebAppWithServiceResponseAsync(resourceGroupName, siteName, filter), serviceCallback); } /** - * Gets the list of past recommendations optionally specified by the time range. - * Gets the list of past recommendations optionally specified by the time range. + * Get past recommendations for an app, optionally specified by the time range. + * Get past recommendations for an app, optionally specified by the time range. * - * @param resourceGroupName Resource group name - * @param siteName Site name - * @param startTime The start time of a time range to query, e.g. $filter=startTime eq '2015-01-01T00:00:00Z' and endTime eq '2015-01-02T00:00:00Z' - * @param endTime The end time of a time range to query, e.g. $filter=startTime eq '2015-01-01T00:00:00Z' and endTime eq '2015-01-02T00:00:00Z' + * @param resourceGroupName Name of the resource group to which the resource belongs. + * @param siteName Name of the app. + * @param filter Filter is specified by using OData syntax. Example: $filter=channels eq 'Api' or channel eq 'Notification' and startTime eq '2014-01-01T00:00:00Z' and endTime eq '2014-12-31T23:59:59Z' and timeGrain eq duration'[PT1H|PT1M|P1D] * @return the observable to the List<RecommendationInner> object */ - public Observable> listHistoryForWebAppAsync(String resourceGroupName, String siteName, String startTime, String endTime) { - return listHistoryForWebAppWithServiceResponseAsync(resourceGroupName, siteName, startTime, endTime).map(new Func1>, List>() { + public Observable> listHistoryForWebAppAsync(String resourceGroupName, String siteName, String filter) { + return listHistoryForWebAppWithServiceResponseAsync(resourceGroupName, siteName, filter).map(new Func1>, List>() { @Override public List call(ServiceResponse> response) { return response.getBody(); @@ -336,16 +411,15 @@ public List call(ServiceResponse> } /** - * Gets the list of past recommendations optionally specified by the time range. - * Gets the list of past recommendations optionally specified by the time range. + * Get past recommendations for an app, optionally specified by the time range. + * Get past recommendations for an app, optionally specified by the time range. * - * @param resourceGroupName Resource group name - * @param siteName Site name - * @param startTime The start time of a time range to query, e.g. $filter=startTime eq '2015-01-01T00:00:00Z' and endTime eq '2015-01-02T00:00:00Z' - * @param endTime The end time of a time range to query, e.g. $filter=startTime eq '2015-01-01T00:00:00Z' and endTime eq '2015-01-02T00:00:00Z' + * @param resourceGroupName Name of the resource group to which the resource belongs. + * @param siteName Name of the app. + * @param filter Filter is specified by using OData syntax. Example: $filter=channels eq 'Api' or channel eq 'Notification' and startTime eq '2014-01-01T00:00:00Z' and endTime eq '2014-12-31T23:59:59Z' and timeGrain eq duration'[PT1H|PT1M|P1D] * @return the observable to the List<RecommendationInner> object */ - public Observable>> listHistoryForWebAppWithServiceResponseAsync(String resourceGroupName, String siteName, String startTime, String endTime) { + public Observable>> listHistoryForWebAppWithServiceResponseAsync(String resourceGroupName, String siteName, String filter) { if (resourceGroupName == null) { throw new IllegalArgumentException("Parameter resourceGroupName is required and cannot be null."); } @@ -356,7 +430,7 @@ public Observable>> listHistoryForWebA throw new IllegalArgumentException("Parameter this.client.subscriptionId() is required and cannot be null."); } final String apiVersion = "2016-03-01"; - return service.listHistoryForWebApp(resourceGroupName, siteName, this.client.subscriptionId(), startTime, endTime, apiVersion, this.client.acceptLanguage(), this.client.userAgent()) + return service.listHistoryForWebApp(resourceGroupName, siteName, this.client.subscriptionId(), filter, apiVersion, this.client.acceptLanguage(), this.client.userAgent()) .flatMap(new Func1, Observable>>>() { @Override public Observable>> call(Response response) { @@ -378,11 +452,11 @@ private ServiceResponse> listHistoryForWebAppDelegate( } /** - * Gets a list of recommendations associated with the specified web site. - * Gets a list of recommendations associated with the specified web site. + * Get all recommendations for an app. + * Get all recommendations for an app. * - * @param resourceGroupName Resource group name - * @param siteName Site name + * @param resourceGroupName Name of the resource group to which the resource belongs. + * @param siteName Name of the app. * @return the List<RecommendationInner> object if successful. */ public List listRecommendedRulesForWebApp(String resourceGroupName, String siteName) { @@ -390,11 +464,11 @@ public List listRecommendedRulesForWebApp(String resourceGr } /** - * Gets a list of recommendations associated with the specified web site. - * Gets a list of recommendations associated with the specified web site. + * Get all recommendations for an app. + * Get all recommendations for an app. * - * @param resourceGroupName Resource group name - * @param siteName Site name + * @param resourceGroupName Name of the resource group to which the resource belongs. + * @param siteName Name of the app. * @param serviceCallback the async ServiceCallback to handle successful and failed responses. * @return the {@link ServiceCall} object */ @@ -403,11 +477,11 @@ public ServiceCall> listRecommendedRulesForWebAppAsync } /** - * Gets a list of recommendations associated with the specified web site. - * Gets a list of recommendations associated with the specified web site. + * Get all recommendations for an app. + * Get all recommendations for an app. * - * @param resourceGroupName Resource group name - * @param siteName Site name + * @param resourceGroupName Name of the resource group to which the resource belongs. + * @param siteName Name of the app. * @return the observable to the List<RecommendationInner> object */ public Observable> listRecommendedRulesForWebAppAsync(String resourceGroupName, String siteName) { @@ -420,11 +494,11 @@ public List call(ServiceResponse> } /** - * Gets a list of recommendations associated with the specified web site. - * Gets a list of recommendations associated with the specified web site. + * Get all recommendations for an app. + * Get all recommendations for an app. * - * @param resourceGroupName Resource group name - * @param siteName Site name + * @param resourceGroupName Name of the resource group to which the resource belongs. + * @param siteName Name of the app. * @return the observable to the List<RecommendationInner> object */ public Observable>> listRecommendedRulesForWebAppWithServiceResponseAsync(String resourceGroupName, String siteName) { @@ -442,7 +516,8 @@ public Observable>> listRecommendedRul final String webAppSku = null; final Integer numSlots = null; final Integer liveHours = null; - return service.listRecommendedRulesForWebApp(resourceGroupName, siteName, this.client.subscriptionId(), featured, webAppSku, numSlots, liveHours, apiVersion, this.client.acceptLanguage(), this.client.userAgent()) + final String filter = null; + return service.listRecommendedRulesForWebApp(resourceGroupName, siteName, this.client.subscriptionId(), featured, webAppSku, numSlots, liveHours, filter, apiVersion, this.client.acceptLanguage(), this.client.userAgent()) .flatMap(new Func1, Observable>>>() { @Override public Observable>> call(Response response) { @@ -457,52 +532,55 @@ public Observable>> call(Response listRecommendedRulesForWebApp(String resourceGroupName, String siteName, Boolean featured, String webAppSku, Integer numSlots, Integer liveHours) { - return listRecommendedRulesForWebAppWithServiceResponseAsync(resourceGroupName, siteName, featured, webAppSku, numSlots, liveHours).toBlocking().single().getBody(); + public List listRecommendedRulesForWebApp(String resourceGroupName, String siteName, Boolean featured, String webAppSku, Integer numSlots, Integer liveHours, String filter) { + return listRecommendedRulesForWebAppWithServiceResponseAsync(resourceGroupName, siteName, featured, webAppSku, numSlots, liveHours, filter).toBlocking().single().getBody(); } /** - * Gets a list of recommendations associated with the specified web site. - * Gets a list of recommendations associated with the specified web site. + * Get all recommendations for an app. + * Get all recommendations for an app. * - * @param resourceGroupName Resource group name - * @param siteName Site name - * @param featured If set, this API returns only the most critical recommendation among the others. Otherwise this API returns all recommendations available - * @param webAppSku The name of web app SKU. - * @param numSlots The number of site slots associated to the site - * @param liveHours If greater than zero, this API scans the last active live site symptoms, dynamically generate on-the-fly recommendations + * @param resourceGroupName Name of the resource group to which the resource belongs. + * @param siteName Name of the app. + * @param featured Specify <code>true</code> to return only the most critical recommendations. The default is <code>false</code>, which returns all recommendations. + * @param webAppSku SKU of the app. + * @param numSlots Number of deployment slots in the app. + * @param liveHours If greater than zero, this operation scans the last active live site symptoms and dynamically generate on-the-fly recommendations. + * @param filter Return only channels specified in the filter. Filter is specified by using OData syntax. Example: $filter=channels eq 'Api' or channel eq 'Notification' * @param serviceCallback the async ServiceCallback to handle successful and failed responses. * @return the {@link ServiceCall} object */ - public ServiceCall> listRecommendedRulesForWebAppAsync(String resourceGroupName, String siteName, Boolean featured, String webAppSku, Integer numSlots, Integer liveHours, final ServiceCallback> serviceCallback) { - return ServiceCall.create(listRecommendedRulesForWebAppWithServiceResponseAsync(resourceGroupName, siteName, featured, webAppSku, numSlots, liveHours), serviceCallback); + public ServiceCall> listRecommendedRulesForWebAppAsync(String resourceGroupName, String siteName, Boolean featured, String webAppSku, Integer numSlots, Integer liveHours, String filter, final ServiceCallback> serviceCallback) { + return ServiceCall.create(listRecommendedRulesForWebAppWithServiceResponseAsync(resourceGroupName, siteName, featured, webAppSku, numSlots, liveHours, filter), serviceCallback); } /** - * Gets a list of recommendations associated with the specified web site. - * Gets a list of recommendations associated with the specified web site. + * Get all recommendations for an app. + * Get all recommendations for an app. * - * @param resourceGroupName Resource group name - * @param siteName Site name - * @param featured If set, this API returns only the most critical recommendation among the others. Otherwise this API returns all recommendations available - * @param webAppSku The name of web app SKU. - * @param numSlots The number of site slots associated to the site - * @param liveHours If greater than zero, this API scans the last active live site symptoms, dynamically generate on-the-fly recommendations + * @param resourceGroupName Name of the resource group to which the resource belongs. + * @param siteName Name of the app. + * @param featured Specify <code>true</code> to return only the most critical recommendations. The default is <code>false</code>, which returns all recommendations. + * @param webAppSku SKU of the app. + * @param numSlots Number of deployment slots in the app. + * @param liveHours If greater than zero, this operation scans the last active live site symptoms and dynamically generate on-the-fly recommendations. + * @param filter Return only channels specified in the filter. Filter is specified by using OData syntax. Example: $filter=channels eq 'Api' or channel eq 'Notification' * @return the observable to the List<RecommendationInner> object */ - public Observable> listRecommendedRulesForWebAppAsync(String resourceGroupName, String siteName, Boolean featured, String webAppSku, Integer numSlots, Integer liveHours) { - return listRecommendedRulesForWebAppWithServiceResponseAsync(resourceGroupName, siteName, featured, webAppSku, numSlots, liveHours).map(new Func1>, List>() { + public Observable> listRecommendedRulesForWebAppAsync(String resourceGroupName, String siteName, Boolean featured, String webAppSku, Integer numSlots, Integer liveHours, String filter) { + return listRecommendedRulesForWebAppWithServiceResponseAsync(resourceGroupName, siteName, featured, webAppSku, numSlots, liveHours, filter).map(new Func1>, List>() { @Override public List call(ServiceResponse> response) { return response.getBody(); @@ -511,18 +589,19 @@ public List call(ServiceResponse> } /** - * Gets a list of recommendations associated with the specified web site. - * Gets a list of recommendations associated with the specified web site. + * Get all recommendations for an app. + * Get all recommendations for an app. * - * @param resourceGroupName Resource group name - * @param siteName Site name - * @param featured If set, this API returns only the most critical recommendation among the others. Otherwise this API returns all recommendations available - * @param webAppSku The name of web app SKU. - * @param numSlots The number of site slots associated to the site - * @param liveHours If greater than zero, this API scans the last active live site symptoms, dynamically generate on-the-fly recommendations + * @param resourceGroupName Name of the resource group to which the resource belongs. + * @param siteName Name of the app. + * @param featured Specify <code>true</code> to return only the most critical recommendations. The default is <code>false</code>, which returns all recommendations. + * @param webAppSku SKU of the app. + * @param numSlots Number of deployment slots in the app. + * @param liveHours If greater than zero, this operation scans the last active live site symptoms and dynamically generate on-the-fly recommendations. + * @param filter Return only channels specified in the filter. Filter is specified by using OData syntax. Example: $filter=channels eq 'Api' or channel eq 'Notification' * @return the observable to the List<RecommendationInner> object */ - public Observable>> listRecommendedRulesForWebAppWithServiceResponseAsync(String resourceGroupName, String siteName, Boolean featured, String webAppSku, Integer numSlots, Integer liveHours) { + public Observable>> listRecommendedRulesForWebAppWithServiceResponseAsync(String resourceGroupName, String siteName, Boolean featured, String webAppSku, Integer numSlots, Integer liveHours, String filter) { if (resourceGroupName == null) { throw new IllegalArgumentException("Parameter resourceGroupName is required and cannot be null."); } @@ -533,7 +612,7 @@ public Observable>> listRecommendedRul throw new IllegalArgumentException("Parameter this.client.subscriptionId() is required and cannot be null."); } final String apiVersion = "2016-03-01"; - return service.listRecommendedRulesForWebApp(resourceGroupName, siteName, this.client.subscriptionId(), featured, webAppSku, numSlots, liveHours, apiVersion, this.client.acceptLanguage(), this.client.userAgent()) + return service.listRecommendedRulesForWebApp(resourceGroupName, siteName, this.client.subscriptionId(), featured, webAppSku, numSlots, liveHours, filter, apiVersion, this.client.acceptLanguage(), this.client.userAgent()) .flatMap(new Func1, Observable>>>() { @Override public Observable>> call(Response response) { @@ -555,12 +634,172 @@ private ServiceResponse> listRecommendedRulesForWebApp } /** - * Gets the detailed properties of the recommendation object for the specified web site. - * Gets the detailed properties of the recommendation object for the specified web site. + * Disable all recommendations for an app. + * Disable all recommendations for an app. + * + * @param resourceGroupName Name of the resource group to which the resource belongs. + * @param siteName Name of the app. + */ + public void disableAllForWebApp(String resourceGroupName, String siteName) { + disableAllForWebAppWithServiceResponseAsync(resourceGroupName, siteName).toBlocking().single().getBody(); + } + + /** + * Disable all recommendations for an app. + * Disable all recommendations for an app. + * + * @param resourceGroupName Name of the resource group to which the resource belongs. + * @param siteName Name of the app. + * @param serviceCallback the async ServiceCallback to handle successful and failed responses. + * @return the {@link ServiceCall} object + */ + public ServiceCall disableAllForWebAppAsync(String resourceGroupName, String siteName, final ServiceCallback serviceCallback) { + return ServiceCall.create(disableAllForWebAppWithServiceResponseAsync(resourceGroupName, siteName), serviceCallback); + } + + /** + * Disable all recommendations for an app. + * Disable all recommendations for an app. + * + * @param resourceGroupName Name of the resource group to which the resource belongs. + * @param siteName Name of the app. + * @return the {@link ServiceResponse} object if successful. + */ + public Observable disableAllForWebAppAsync(String resourceGroupName, String siteName) { + return disableAllForWebAppWithServiceResponseAsync(resourceGroupName, siteName).map(new Func1, Void>() { + @Override + public Void call(ServiceResponse response) { + return response.getBody(); + } + }); + } + + /** + * Disable all recommendations for an app. + * Disable all recommendations for an app. + * + * @param resourceGroupName Name of the resource group to which the resource belongs. + * @param siteName Name of the app. + * @return the {@link ServiceResponse} object if successful. + */ + public Observable> disableAllForWebAppWithServiceResponseAsync(String resourceGroupName, String siteName) { + if (resourceGroupName == null) { + throw new IllegalArgumentException("Parameter resourceGroupName is required and cannot be null."); + } + if (siteName == null) { + throw new IllegalArgumentException("Parameter siteName is required and cannot be null."); + } + if (this.client.subscriptionId() == null) { + throw new IllegalArgumentException("Parameter this.client.subscriptionId() is required and cannot be null."); + } + final String apiVersion = "2016-03-01"; + return service.disableAllForWebApp(resourceGroupName, siteName, this.client.subscriptionId(), apiVersion, this.client.acceptLanguage(), this.client.userAgent()) + .flatMap(new Func1, Observable>>() { + @Override + public Observable> call(Response response) { + try { + ServiceResponse clientResponse = disableAllForWebAppDelegate(response); + return Observable.just(clientResponse); + } catch (Throwable t) { + return Observable.error(t); + } + } + }); + } + + private ServiceResponse disableAllForWebAppDelegate(Response response) throws CloudException, IOException, IllegalArgumentException { + return new AzureServiceResponseBuilder(this.client.mapperAdapter()) + .register(204, new TypeToken() { }.getType()) + .build(response); + } + + /** + * Reset all recommendation opt-out settings for an app. + * Reset all recommendation opt-out settings for an app. + * + * @param resourceGroupName Name of the resource group to which the resource belongs. + * @param siteName Name of the app. + */ + public void resetAllFiltersForWebApp(String resourceGroupName, String siteName) { + resetAllFiltersForWebAppWithServiceResponseAsync(resourceGroupName, siteName).toBlocking().single().getBody(); + } + + /** + * Reset all recommendation opt-out settings for an app. + * Reset all recommendation opt-out settings for an app. + * + * @param resourceGroupName Name of the resource group to which the resource belongs. + * @param siteName Name of the app. + * @param serviceCallback the async ServiceCallback to handle successful and failed responses. + * @return the {@link ServiceCall} object + */ + public ServiceCall resetAllFiltersForWebAppAsync(String resourceGroupName, String siteName, final ServiceCallback serviceCallback) { + return ServiceCall.create(resetAllFiltersForWebAppWithServiceResponseAsync(resourceGroupName, siteName), serviceCallback); + } + + /** + * Reset all recommendation opt-out settings for an app. + * Reset all recommendation opt-out settings for an app. + * + * @param resourceGroupName Name of the resource group to which the resource belongs. + * @param siteName Name of the app. + * @return the {@link ServiceResponse} object if successful. + */ + public Observable resetAllFiltersForWebAppAsync(String resourceGroupName, String siteName) { + return resetAllFiltersForWebAppWithServiceResponseAsync(resourceGroupName, siteName).map(new Func1, Void>() { + @Override + public Void call(ServiceResponse response) { + return response.getBody(); + } + }); + } + + /** + * Reset all recommendation opt-out settings for an app. + * Reset all recommendation opt-out settings for an app. + * + * @param resourceGroupName Name of the resource group to which the resource belongs. + * @param siteName Name of the app. + * @return the {@link ServiceResponse} object if successful. + */ + public Observable> resetAllFiltersForWebAppWithServiceResponseAsync(String resourceGroupName, String siteName) { + if (resourceGroupName == null) { + throw new IllegalArgumentException("Parameter resourceGroupName is required and cannot be null."); + } + if (siteName == null) { + throw new IllegalArgumentException("Parameter siteName is required and cannot be null."); + } + if (this.client.subscriptionId() == null) { + throw new IllegalArgumentException("Parameter this.client.subscriptionId() is required and cannot be null."); + } + final String apiVersion = "2016-03-01"; + return service.resetAllFiltersForWebApp(resourceGroupName, siteName, this.client.subscriptionId(), apiVersion, this.client.acceptLanguage(), this.client.userAgent()) + .flatMap(new Func1, Observable>>() { + @Override + public Observable> call(Response response) { + try { + ServiceResponse clientResponse = resetAllFiltersForWebAppDelegate(response); + return Observable.just(clientResponse); + } catch (Throwable t) { + return Observable.error(t); + } + } + }); + } + + private ServiceResponse resetAllFiltersForWebAppDelegate(Response response) throws CloudException, IOException, IllegalArgumentException { + return new AzureServiceResponseBuilder(this.client.mapperAdapter()) + .register(204, new TypeToken() { }.getType()) + .build(response); + } + + /** + * Get a recommendation rule for an app. + * Get a recommendation rule for an app. * - * @param resourceGroupName Resource group name - * @param siteName Name of web app - * @param name Recommendation rule name + * @param resourceGroupName Name of the resource group to which the resource belongs. + * @param siteName Name of the app. + * @param name Name of the recommendation. * @return the RecommendationRuleInner object if successful. */ public RecommendationRuleInner getRuleDetailsByWebApp(String resourceGroupName, String siteName, String name) { @@ -568,12 +807,12 @@ public RecommendationRuleInner getRuleDetailsByWebApp(String resourceGroupName, } /** - * Gets the detailed properties of the recommendation object for the specified web site. - * Gets the detailed properties of the recommendation object for the specified web site. + * Get a recommendation rule for an app. + * Get a recommendation rule for an app. * - * @param resourceGroupName Resource group name - * @param siteName Name of web app - * @param name Recommendation rule name + * @param resourceGroupName Name of the resource group to which the resource belongs. + * @param siteName Name of the app. + * @param name Name of the recommendation. * @param serviceCallback the async ServiceCallback to handle successful and failed responses. * @return the {@link ServiceCall} object */ @@ -582,12 +821,12 @@ public ServiceCall getRuleDetailsByWebAppAsync(String r } /** - * Gets the detailed properties of the recommendation object for the specified web site. - * Gets the detailed properties of the recommendation object for the specified web site. + * Get a recommendation rule for an app. + * Get a recommendation rule for an app. * - * @param resourceGroupName Resource group name - * @param siteName Name of web app - * @param name Recommendation rule name + * @param resourceGroupName Name of the resource group to which the resource belongs. + * @param siteName Name of the app. + * @param name Name of the recommendation. * @return the observable to the RecommendationRuleInner object */ public Observable getRuleDetailsByWebAppAsync(String resourceGroupName, String siteName, String name) { @@ -600,12 +839,12 @@ public RecommendationRuleInner call(ServiceResponse res } /** - * Gets the detailed properties of the recommendation object for the specified web site. - * Gets the detailed properties of the recommendation object for the specified web site. + * Get a recommendation rule for an app. + * Get a recommendation rule for an app. * - * @param resourceGroupName Resource group name - * @param siteName Name of web app - * @param name Recommendation rule name + * @param resourceGroupName Name of the resource group to which the resource belongs. + * @param siteName Name of the app. + * @param name Name of the recommendation. * @return the observable to the RecommendationRuleInner object */ public Observable> getRuleDetailsByWebAppWithServiceResponseAsync(String resourceGroupName, String siteName, String name) { @@ -638,13 +877,13 @@ public Observable> call(Response getRuleDetailsByWebAppAsync(String r } /** - * Gets the detailed properties of the recommendation object for the specified web site. - * Gets the detailed properties of the recommendation object for the specified web site. + * Get a recommendation rule for an app. + * Get a recommendation rule for an app. * - * @param resourceGroupName Resource group name - * @param siteName Name of web app - * @param name Recommendation rule name - * @param updateSeen If true, the backend updates the last seen timestamp of the recommendation object. + * @param resourceGroupName Name of the resource group to which the resource belongs. + * @param siteName Name of the app. + * @param name Name of the recommendation. + * @param updateSeen Specify <code>true</code> to update the last-seen timestamp of the recommendation object. * @return the observable to the RecommendationRuleInner object */ public Observable getRuleDetailsByWebAppAsync(String resourceGroupName, String siteName, String name, Boolean updateSeen) { @@ -686,13 +925,13 @@ public RecommendationRuleInner call(ServiceResponse res } /** - * Gets the detailed properties of the recommendation object for the specified web site. - * Gets the detailed properties of the recommendation object for the specified web site. + * Get a recommendation rule for an app. + * Get a recommendation rule for an app. * - * @param resourceGroupName Resource group name - * @param siteName Name of web app - * @param name Recommendation rule name - * @param updateSeen If true, the backend updates the last seen timestamp of the recommendation object. + * @param resourceGroupName Name of the resource group to which the resource belongs. + * @param siteName Name of the app. + * @param name Name of the recommendation. + * @param updateSeen Specify <code>true</code> to update the last-seen timestamp of the recommendation object. * @return the observable to the RecommendationRuleInner object */ public Observable> getRuleDetailsByWebAppWithServiceResponseAsync(String resourceGroupName, String siteName, String name, Boolean updateSeen) { diff --git a/azure-mgmt-website/src/main/java/com/microsoft/azure/management/website/implementation/RecoverResponseInner.java b/azure-mgmt-website/src/main/java/com/microsoft/azure/management/website/implementation/RecoverResponseInner.java index 06fceaeeb8209..a3c9486233735 100644 --- a/azure-mgmt-website/src/main/java/com/microsoft/azure/management/website/implementation/RecoverResponseInner.java +++ b/azure-mgmt-website/src/main/java/com/microsoft/azure/management/website/implementation/RecoverResponseInner.java @@ -13,7 +13,7 @@ import com.microsoft.azure.Resource; /** - * Response for a recover site request. + * Response for an app recovery request. */ @JsonFlatten public class RecoverResponseInner extends Resource { @@ -21,7 +21,7 @@ public class RecoverResponseInner extends Resource { * ID of the recovery operation. Can be used to check the status of the * corresponding operation. */ - @JsonProperty(value = "properties.operationId") + @JsonProperty(value = "properties.operationId", access = JsonProperty.Access.WRITE_ONLY) private String operationId; /** @@ -33,15 +33,4 @@ public String operationId() { return this.operationId; } - /** - * Set the operationId value. - * - * @param operationId the operationId value to set - * @return the RecoverResponseInner object itself. - */ - public RecoverResponseInner withOperationId(String operationId) { - this.operationId = operationId; - return this; - } - } diff --git a/azure-mgmt-website/src/main/java/com/microsoft/azure/management/website/implementation/RelayServiceConnectionEntityInner.java b/azure-mgmt-website/src/main/java/com/microsoft/azure/management/website/implementation/RelayServiceConnectionEntityInner.java index 2e2e33cc650df..3096163cafa78 100644 --- a/azure-mgmt-website/src/main/java/com/microsoft/azure/management/website/implementation/RelayServiceConnectionEntityInner.java +++ b/azure-mgmt-website/src/main/java/com/microsoft/azure/management/website/implementation/RelayServiceConnectionEntityInner.java @@ -13,7 +13,7 @@ import com.microsoft.azure.Resource; /** - * Class that represents a Biztalk Hybrid Connection. + * Hybrid Connection for an App Service app. */ @JsonFlatten public class RelayServiceConnectionEntityInner extends Resource { diff --git a/azure-mgmt-website/src/main/java/com/microsoft/azure/management/website/implementation/ResourceMetricDefinitionInner.java b/azure-mgmt-website/src/main/java/com/microsoft/azure/management/website/implementation/ResourceMetricDefinitionInner.java new file mode 100644 index 0000000000000..ce3fdf81be583 --- /dev/null +++ b/azure-mgmt-website/src/main/java/com/microsoft/azure/management/website/implementation/ResourceMetricDefinitionInner.java @@ -0,0 +1,130 @@ +/** + * 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.website.implementation; + +import com.microsoft.azure.management.website.ResourceMetricName; +import java.util.List; +import com.microsoft.azure.management.website.ResourceMetricAvailability; +import java.util.Map; +import com.fasterxml.jackson.annotation.JsonProperty; +import com.microsoft.rest.serializer.JsonFlatten; +import com.microsoft.azure.Resource; + +/** + * Metadata for the metrics. + */ +@JsonFlatten +public class ResourceMetricDefinitionInner extends Resource { + /** + * Name of the metric. + */ + @JsonProperty(value = "properties.name", access = JsonProperty.Access.WRITE_ONLY) + private ResourceMetricName resourceMetricDefinitionName; + + /** + * Unit of the metric. + */ + @JsonProperty(value = "properties.unit", access = JsonProperty.Access.WRITE_ONLY) + private String unit; + + /** + * Primary aggregation type. + */ + @JsonProperty(value = "properties.primaryAggregationType", access = JsonProperty.Access.WRITE_ONLY) + private String primaryAggregationType; + + /** + * List of time grains supported for the metric together with retention + * period. + */ + @JsonProperty(value = "properties.metricAvailabilities", access = JsonProperty.Access.WRITE_ONLY) + private List metricAvailabilities; + + /** + * Resource URI. + */ + @JsonProperty(value = "properties.resourceUri", access = JsonProperty.Access.WRITE_ONLY) + private String resourceUri; + + /** + * Resource ID. + */ + @JsonProperty(value = "properties.id", access = JsonProperty.Access.WRITE_ONLY) + private String resourceMetricDefinitionId; + + /** + * Properties. + */ + @JsonProperty(value = "properties.properties", access = JsonProperty.Access.WRITE_ONLY) + private Map properties; + + /** + * Get the resourceMetricDefinitionName value. + * + * @return the resourceMetricDefinitionName value + */ + public ResourceMetricName resourceMetricDefinitionName() { + return this.resourceMetricDefinitionName; + } + + /** + * Get the unit value. + * + * @return the unit value + */ + public String unit() { + return this.unit; + } + + /** + * Get the primaryAggregationType value. + * + * @return the primaryAggregationType value + */ + public String primaryAggregationType() { + return this.primaryAggregationType; + } + + /** + * Get the metricAvailabilities value. + * + * @return the metricAvailabilities value + */ + public List metricAvailabilities() { + return this.metricAvailabilities; + } + + /** + * Get the resourceUri value. + * + * @return the resourceUri value + */ + public String resourceUri() { + return this.resourceUri; + } + + /** + * Get the resourceMetricDefinitionId value. + * + * @return the resourceMetricDefinitionId value + */ + public String resourceMetricDefinitionId() { + return this.resourceMetricDefinitionId; + } + + /** + * Get the properties value. + * + * @return the properties value + */ + public Map properties() { + return this.properties; + } + +} diff --git a/azure-mgmt-website/src/main/java/com/microsoft/azure/management/website/implementation/ResourceMetricInner.java b/azure-mgmt-website/src/main/java/com/microsoft/azure/management/website/implementation/ResourceMetricInner.java index 07afe1dbe108e..70db003edbf89 100644 --- a/azure-mgmt-website/src/main/java/com/microsoft/azure/management/website/implementation/ResourceMetricInner.java +++ b/azure-mgmt-website/src/main/java/com/microsoft/azure/management/website/implementation/ResourceMetricInner.java @@ -16,7 +16,7 @@ import com.fasterxml.jackson.annotation.JsonProperty; /** - * Object representing a metric for any resource. + * Object representing a metric for any resource . */ public class ResourceMetricInner { /** diff --git a/azure-mgmt-website/src/main/java/com/microsoft/azure/management/website/implementation/ResourceNameAvailabilityInner.java b/azure-mgmt-website/src/main/java/com/microsoft/azure/management/website/implementation/ResourceNameAvailabilityInner.java index 0af680efef4aa..53d726be2685c 100644 --- a/azure-mgmt-website/src/main/java/com/microsoft/azure/management/website/implementation/ResourceNameAvailabilityInner.java +++ b/azure-mgmt-website/src/main/java/com/microsoft/azure/management/website/implementation/ResourceNameAvailabilityInner.java @@ -8,27 +8,34 @@ package com.microsoft.azure.management.website.implementation; +import com.microsoft.azure.management.website.InAvailabilityReasonType; /** - * Describes if a resource name is available. + * Information regarding availbility of a resource name. */ public class ResourceNameAvailabilityInner { /** - * True indicates name is valid and available. False indicates the name - * is invalid, unavailable, or both. + * <code>true</code> indicates name is valid and available. + * <code>false</code> indicates the name is invalid, + * unavailable, or both. */ private Boolean nameAvailable; /** - * Required if nameAvailable is false. 'Invalid' indicates the name - * provided does not match Azure WebApp service’s naming requirements. - * 'AlreadyExists' indicates that the name is already in use and is - * therefore unavailable. + * <code>Invalid</code> indicates the name provided does not + * match Azure App Service naming requirements. + * <code>AlreadyExists</code> indicates that the name is + * already in use and is therefore unavailable. Possible values include: + * 'Invalid', 'AlreadyExists'. */ - private String reason; + private InAvailabilityReasonType reason; /** - * The message property. + * If reason == invalid, provide the user with the reason why the given + * name is invalid, and provide the resource naming requirements so that + * the user can select a valid name. If reason == AlreadyExists, explain + * that resource name is already in use, and direct them to select a + * different name. */ private String message; @@ -57,7 +64,7 @@ public ResourceNameAvailabilityInner withNameAvailable(Boolean nameAvailable) { * * @return the reason value */ - public String reason() { + public InAvailabilityReasonType reason() { return this.reason; } @@ -67,7 +74,7 @@ public String reason() { * @param reason the reason value to set * @return the ResourceNameAvailabilityInner object itself. */ - public ResourceNameAvailabilityInner withReason(String reason) { + public ResourceNameAvailabilityInner withReason(InAvailabilityReasonType reason) { this.reason = reason; return this; } diff --git a/azure-mgmt-website/src/main/java/com/microsoft/azure/management/website/implementation/RestoreRequestInner.java b/azure-mgmt-website/src/main/java/com/microsoft/azure/management/website/implementation/RestoreRequestInner.java index b2dc0d8813abc..f4203f5987723 100644 --- a/azure-mgmt-website/src/main/java/com/microsoft/azure/management/website/implementation/RestoreRequestInner.java +++ b/azure-mgmt-website/src/main/java/com/microsoft/azure/management/website/implementation/RestoreRequestInner.java @@ -33,31 +33,33 @@ public class RestoreRequestInner extends Resource { private String blobName; /** - * True if the restore operation can overwrite target site. "True" needed - * if trying to restore over an existing site. + * <code>true</code> if the restore operation can overwrite + * target app; otherwise, <code>false</code>. + * <code>true</code> is needed if trying to restore over an + * existing app. */ @JsonProperty(value = "properties.overwrite") private Boolean overwrite; /** - * Name of a site (Web App). + * Name of an app. */ @JsonProperty(value = "properties.siteName") private String siteName; /** - * Collection of databses which should be restored. This list has to match - * the list of databases included in the backup. + * Collection of databases which should be restored. This list has to + * match the list of databases included in the backup. */ @JsonProperty(value = "properties.databases") private List databases; /** - * Changes a logic when restoring a site with custom domains. If "true", - * custom domains are removed automatically. If "false", custom domains - * are added to - * the site object when it is being restored, but that might - * fail due to conflicts during the operation. + * Changes a logic when restoring an app with custom domains. + * <code>true</code> to remove custom domains automatically. + * If <code>false</code>, custom domains are added to + * the app's object when it is being restored, but that might fail due to + * conflicts during the operation. */ @JsonProperty(value = "properties.ignoreConflictingHostNames") private Boolean ignoreConflictingHostNames; @@ -70,14 +72,14 @@ public class RestoreRequestInner extends Resource { private BackupRestoreOperationType operationType; /** - * Gets or sets a flag showing if SiteConfig.ConnectionStrings should be - * set in new site. + * <code>true</code> if SiteConfig.ConnectionStrings should be + * set in new app; otherwise, <code>false</code>. */ @JsonProperty(value = "properties.adjustConnectionStrings") private Boolean adjustConnectionStrings; /** - * App Service Environment name, if needed (only when restoring a site to + * App Service Environment name, if needed (only when restoring an app to * an App Service Environment). */ @JsonProperty(value = "properties.hostingEnvironment") diff --git a/azure-mgmt-website/src/main/java/com/microsoft/azure/management/website/implementation/RestoreResponseInner.java b/azure-mgmt-website/src/main/java/com/microsoft/azure/management/website/implementation/RestoreResponseInner.java index d25047ec4c5f2..9351b1c2454ed 100644 --- a/azure-mgmt-website/src/main/java/com/microsoft/azure/management/website/implementation/RestoreResponseInner.java +++ b/azure-mgmt-website/src/main/java/com/microsoft/azure/management/website/implementation/RestoreResponseInner.java @@ -13,15 +13,15 @@ import com.microsoft.azure.Resource; /** - * Response for a restore site request. + * Response for an app restore request. */ @JsonFlatten public class RestoreResponseInner extends Resource { /** - * When server starts the restore process, it will return an OperationId + * When server starts the restore process, it will return an operation ID * identifying that particular restore operation. */ - @JsonProperty(value = "properties.operationId") + @JsonProperty(value = "properties.operationId", access = JsonProperty.Access.WRITE_ONLY) private String operationId; /** @@ -33,15 +33,4 @@ public String operationId() { return this.operationId; } - /** - * Set the operationId value. - * - * @param operationId the operationId value to set - * @return the RestoreResponseInner object itself. - */ - public RestoreResponseInner withOperationId(String operationId) { - this.operationId = operationId; - return this; - } - } diff --git a/azure-mgmt-website/src/main/java/com/microsoft/azure/management/website/implementation/SiteAuthSettingsInner.java b/azure-mgmt-website/src/main/java/com/microsoft/azure/management/website/implementation/SiteAuthSettingsInner.java index 77b977f67f767..ddb9489b8d01e 100644 --- a/azure-mgmt-website/src/main/java/com/microsoft/azure/management/website/implementation/SiteAuthSettingsInner.java +++ b/azure-mgmt-website/src/main/java/com/microsoft/azure/management/website/implementation/SiteAuthSettingsInner.java @@ -18,68 +18,66 @@ */ public class SiteAuthSettingsInner { /** - * Gets or sets a value indicating whether the Authentication / - * Authorization feature is enabled for the current app. + * <code>true</code> if the Authentication / Authorization + * feature is enabled for the current app; otherwise, + * <code>false</code>. */ private Boolean enabled; /** - * Gets or sets the relative path prefix used by platform HTTP APIs. - * Changing this value is not recommended except for - * compatibility reasons. + * The relative path prefix used by platform HTTP APIs. + * Changing this value is not recommended except for compatibility + * reasons. */ private String httpApiPrefixPath; /** - * Gets or sets the action to take when an unauthenticated client attempts - * to access the app. Possible values include: 'RedirectToLoginPage', + * The action to take when an unauthenticated client attempts to access + * the app. Possible values include: 'RedirectToLoginPage', * 'AllowAnonymous'. */ private UnauthenticatedClientAction unauthenticatedClientAction; /** - * Gets or sets a value indicating whether to durably store - * platform-specific security tokens - * obtained during login flows. This capability is disabled by - * default. + * <code>true</code> to durably store platform-specific + * security tokens that are obtained during login flows; otherwise, + * <code>false</code>. + * The default is <code>false</code>. */ private Boolean tokenStoreEnabled; /** - * Gets or sets a collection of external URLs that can be redirected to as - * part of logging in - * or logging out of the web app. Note that the query string - * part of the URL is ignored. - * This is an advanced setting typically only needed by - * Windows Store application backends. - * Note that URLs within the current domain are always - * implicitly allowed. + * External URLs that can be redirected to as part of logging in or + * logging out of the app. Note that the query string part of the URL is + * ignored. + * This is an advanced setting typically only needed by Windows Store + * application backends. + * Note that URLs within the current domain are always implicitly allowed. */ private List allowedExternalRedirectUrls; /** - * Gets or sets the default authentication provider to use when multiple - * providers are configured. - * This setting is only needed if multiple providers are - * configured and the unauthenticated client - * action is set to "RedirectToLoginPage". Possible values - * include: 'AzureActiveDirectory', 'Facebook', 'Google', - * 'MicrosoftAccount', 'Twitter'. + * The default authentication provider to use when multiple providers are + * configured. + * This setting is only needed if multiple providers are configured and + * the unauthenticated client + * action is set to "RedirectToLoginPage". Possible values include: + * 'AzureActiveDirectory', 'Facebook', 'Google', 'MicrosoftAccount', + * 'Twitter'. */ private BuiltInAuthenticationProvider defaultProvider; /** - * Gets or sets the number of hours after session token expiration that a - * session token can be used to + * The number of hours after session token expiration that a session token + * can be used to * call the token refresh API. The default is 72 hours. */ private Double tokenRefreshExtensionHours; /** - * Gets or sets the Client ID of this relying party application, known as - * the client_id. - * This setting is required for enabling OpenID Connection - * authentication with Azure Active Directory or + * The Client ID of this relying party application, known as the client_id. + * This setting is required for enabling OpenID Connection authentication + * with Azure Active Directory or * other 3rd party OpenID Connect providers. * More information on OpenID Connect: * http://openid.net/specs/openid-connect-core-1_0.html. @@ -87,45 +85,40 @@ public class SiteAuthSettingsInner { private String clientId; /** - * Gets or sets the Client Secret of this relying party application (in - * Azure Active Directory, this is also referred to as the Key). - * This setting is optional. If no client secret is - * configured, the OpenID Connect implicit auth flow is used to + * The Client Secret of this relying party application (in Azure Active + * Directory, this is also referred to as the Key). + * This setting is optional. If no client secret is configured, the + * OpenID Connect implicit auth flow is used to authenticate end users. + * Otherwise, the OpenID Connect Authorization Code Flow is used to * authenticate end users. - * Otherwise, the OpenID Connect Authorization Code Flow is - * used to authenticate end users. * More information on OpenID Connect: * http://openid.net/specs/openid-connect-core-1_0.html. */ private String clientSecret; /** - * Gets or sets the OpenID Connect Issuer URI that represents the entity - * which issues access tokens for this application. - * When using Azure Active Directory, this value is the URI of - * the directory tenant, e.g. https://sts.windows.net/{tenant-guid}/. - * This URI is a case-sensitive identifier for the token - * issuer. + * The OpenID Connect Issuer URI that represents the entity which issues + * access tokens for this application. + * When using Azure Active Directory, this value is the URI of the + * directory tenant, e.g. https://sts.windows.net/{tenant-guid}/. + * This URI is a case-sensitive identifier for the token issuer. * More information on OpenID Connect Discovery: * http://openid.net/specs/openid-connect-discovery-1_0.html. */ private String issuer; /** - * Gets or sets a list of allowed audience values to consider when - * validating JWTs issued by + * Allowed audience values to consider when validating JWTs issued by * Azure Active Directory. Note that the - * {Microsoft.Web.Hosting.Administration.SiteAuthSettings.ClientId} value - * is always considered an + * <code>ClientID</code> value is always considered an * allowed audience, regardless of this setting. */ private List allowedAudiences; /** - * Gets or sets a list of login parameters to send to the OpenID Connect - * authorization endpoint when - * a user logs in. Each parameter must be in the form - * "key=value". + * Login parameters to send to the OpenID Connect authorization endpoint + * when + * a user logs in. Each parameter must be in the form "key=value". */ private List additionalLoginParams; @@ -140,8 +133,7 @@ public class SiteAuthSettingsInner { private String openIdIssuer; /** - * Gets or sets the OpenID Connect Client ID for the Google web - * application. + * The OpenID Connect Client ID for the Google web application. * This setting is required for enabling Google Sign-In. * Google Sign-In documentation: * https://developers.google.com/identity/sign-in/web/. @@ -149,8 +141,7 @@ public class SiteAuthSettingsInner { private String googleClientId; /** - * Gets or sets the client secret associated with the Google web - * application. + * The client secret associated with the Google web application. * This setting is required for enabling Google Sign-In. * Google Sign-In documentation: * https://developers.google.com/identity/sign-in/web/. @@ -158,17 +149,17 @@ public class SiteAuthSettingsInner { private String googleClientSecret; /** - * Gets or sets the OAuth 2.0 scopes that will be requested as part of - * Google Sign-In authentication. - * This setting is optional. If not specified, "openid", - * "profile", and "email" are used as default scopes. + * The OAuth 2.0 scopes that will be requested as part of Google Sign-In + * authentication. + * This setting is optional. If not specified, "openid", "profile", and + * "email" are used as default scopes. * Google Sign-In documentation: * https://developers.google.com/identity/sign-in/web/. */ private List googleOAuthScopes; /** - * Gets or sets the App ID of the Facebook app used for login. + * The App ID of the Facebook app used for login. * This setting is required for enabling Facebook Login. * Facebook Login documentation: * https://developers.facebook.com/docs/facebook-login. @@ -176,8 +167,7 @@ public class SiteAuthSettingsInner { private String facebookAppId; /** - * Gets or sets the App Secret of the Facebook app used for Facebook - * Login. + * The App Secret of the Facebook app used for Facebook Login. * This setting is required for enabling Facebook Login. * Facebook Login documentation: * https://developers.facebook.com/docs/facebook-login. @@ -185,8 +175,8 @@ public class SiteAuthSettingsInner { private String facebookAppSecret; /** - * Gets or sets the OAuth 2.0 scopes that will be requested as part of - * Facebook Login authentication. + * The OAuth 2.0 scopes that will be requested as part of Facebook Login + * authentication. * This setting is optional. * Facebook Login documentation: * https://developers.facebook.com/docs/facebook-login. @@ -194,48 +184,43 @@ public class SiteAuthSettingsInner { private List facebookOAuthScopes; /** - * Gets or sets the OAuth 1.0a consumer key of the Twitter application - * used for sign-in. + * The OAuth 1.0a consumer key of the Twitter application used for sign-in. * This setting is required for enabling Twitter Sign-In. - * Twitter Sign-In documentation: - * https://dev.twitter.com/web/sign-in. + * Twitter Sign-In documentation: https://dev.twitter.com/web/sign-in. */ private String twitterConsumerKey; /** - * Gets or sets the OAuth 1.0a consumer secret of the Twitter application - * used for sign-in. + * The OAuth 1.0a consumer secret of the Twitter application used for + * sign-in. * This setting is required for enabling Twitter Sign-In. - * Twitter Sign-In documentation: - * https://dev.twitter.com/web/sign-in. + * Twitter Sign-In documentation: https://dev.twitter.com/web/sign-in. */ private String twitterConsumerSecret; /** - * Gets or sets the OAuth 2.0 client ID that was created for the app used - * for authentication. - * This setting is required for enabling Microsoft Account + * The OAuth 2.0 client ID that was created for the app used for * authentication. + * This setting is required for enabling Microsoft Account authentication. * Microsoft Account OAuth documentation: * https://dev.onedrive.com/auth/msa_oauth.htm. */ private String microsoftAccountClientId; /** - * Gets or sets the OAuth 2.0 client secret that was created for the app - * used for authentication. - * This setting is required for enabling Microsoft Account + * The OAuth 2.0 client secret that was created for the app used for * authentication. + * This setting is required for enabling Microsoft Account authentication. * Microsoft Account OAuth documentation: * https://dev.onedrive.com/auth/msa_oauth.htm. */ private String microsoftAccountClientSecret; /** - * Gets or sets the OAuth 2.0 scopes that will be requested as part of - * Microsoft Account authentication. - * This setting is optional. If not specified, "wl.basic" is - * used as the default scope. + * The OAuth 2.0 scopes that will be requested as part of Microsoft + * Account authentication. + * This setting is optional. If not specified, "wl.basic" is used as the + * default scope. * Microsoft Account Scopes and permissions documentation: * https://msdn.microsoft.com/en-us/library/dn631845.aspx. */ diff --git a/azure-mgmt-website/src/main/java/com/microsoft/azure/management/website/implementation/SiteCloneabilityInner.java b/azure-mgmt-website/src/main/java/com/microsoft/azure/management/website/implementation/SiteCloneabilityInner.java index 7b0888773a2e1..b7b39c6095571 100644 --- a/azure-mgmt-website/src/main/java/com/microsoft/azure/management/website/implementation/SiteCloneabilityInner.java +++ b/azure-mgmt-website/src/main/java/com/microsoft/azure/management/website/implementation/SiteCloneabilityInner.java @@ -11,29 +11,26 @@ import com.microsoft.azure.management.website.CloneAbilityResult; import java.util.List; import com.microsoft.azure.management.website.SiteCloneabilityCriterion; -import com.fasterxml.jackson.annotation.JsonProperty; /** - * Represents whether or not a web app is cloneable. + * Represents whether or not an app is cloneable. */ public class SiteCloneabilityInner { /** - * Name of web app. Possible values include: 'Cloneable', + * Name of app. Possible values include: 'Cloneable', * 'PartiallyCloneable', 'NotCloneable'. */ - @JsonProperty(required = true) private CloneAbilityResult result; /** - * List of features enabled on web app that prevent cloning. + * List of features enabled on app that prevent cloning. */ private List blockingFeatures; /** - * List of features enabled on web app that are non-blocking but cannot be - * cloned. The web app can still be cloned - * but the features in this list will not be set up on cloned - * web app. + * List of features enabled on app that are non-blocking but cannot be + * cloned. The app can still be cloned + * but the features in this list will not be set up on cloned app. */ private List unsupportedFeatures; diff --git a/azure-mgmt-website/src/main/java/com/microsoft/azure/management/website/implementation/SiteConfigInner.java b/azure-mgmt-website/src/main/java/com/microsoft/azure/management/website/implementation/SiteConfigInner.java index b084231ace04e..549e8bb1c7e74 100644 --- a/azure-mgmt-website/src/main/java/com/microsoft/azure/management/website/implementation/SiteConfigInner.java +++ b/azure-mgmt-website/src/main/java/com/microsoft/azure/management/website/implementation/SiteConfigInner.java @@ -26,7 +26,7 @@ import com.microsoft.azure.Resource; /** - * Configuration of Azure web site. + * Configuration of an App Service app. */ @JsonFlatten public class SiteConfigInner extends Resource { @@ -43,7 +43,7 @@ public class SiteConfigInner extends Resource { private List defaultDocuments; /** - * Net Framework Version. + * .NET Framework version. */ @JsonProperty(value = "properties.netFrameworkVersion") private String netFrameworkVersion; @@ -61,13 +61,14 @@ public class SiteConfigInner extends Resource { private String pythonVersion; /** - * Version of Node. + * Version of Node.js. */ @JsonProperty(value = "properties.nodeVersion") private String nodeVersion; /** - * Enable request tracing. + * <code>true</code> if request tracing is enabled; otherwise, + * <code>false</code>. */ @JsonProperty(value = "properties.requestTracingEnabled") private Boolean requestTracingEnabled; @@ -79,31 +80,34 @@ public class SiteConfigInner extends Resource { private DateTime requestTracingExpirationTime; /** - * Remote Debugging Enabled. + * <code>true</code> if remote debugging is enabled; + * otherwise, <code>false</code>. */ @JsonProperty(value = "properties.remoteDebuggingEnabled") private Boolean remoteDebuggingEnabled; /** - * Remote Debugging Version. + * Remote debugging version. */ @JsonProperty(value = "properties.remoteDebuggingVersion") private String remoteDebuggingVersion; /** - * HTTP logging Enabled. + * <code>true</code> if HTTP logging is enabled; otherwise, + * <code>false</code>. */ @JsonProperty(value = "properties.httpLoggingEnabled") private Boolean httpLoggingEnabled; /** - * HTTP Logs Directory size limit. + * HTTP logs directory size limit. */ @JsonProperty(value = "properties.logsDirectorySizeLimit") private Integer logsDirectorySizeLimit; /** - * Detailed error logging enabled. + * <code>true</code> if detailed error logging is enabled; + * otherwise, <code>false</code>. */ @JsonProperty(value = "properties.detailedErrorLoggingEnabled") private Boolean detailedErrorLoggingEnabled; @@ -117,7 +121,7 @@ public class SiteConfigInner extends Resource { /** * Site MachineKey. */ - @JsonProperty(value = "properties.machineKey") + @JsonProperty(value = "properties.machineKey", access = JsonProperty.Access.WRITE_ONLY) private SiteMachineKey machineKey; /** @@ -135,23 +139,26 @@ public class SiteConfigInner extends Resource { /** * SCM type. */ - @JsonProperty(value = "properties.scmType") + @JsonProperty(value = "properties.scmType", access = JsonProperty.Access.WRITE_ONLY) private String scmType; /** - * Use 32 bit worker process. + * <code>true</code> to use 32-bit worker process; otherwise, + * <code>false</code>. */ @JsonProperty(value = "properties.use32BitWorkerProcess") private Boolean use32BitWorkerProcess; /** - * Web socket enabled. + * <code>true</code> if WebSocket is enabled; otherwise, + * <code>false</code>. */ @JsonProperty(value = "properties.webSocketsEnabled") private Boolean webSocketsEnabled; /** - * Always On. + * <code>true</code> if Always On is enabled; otherwise, + * <code>false</code>. */ @JsonProperty(value = "properties.alwaysOn") private Boolean alwaysOn; @@ -175,7 +182,7 @@ public class SiteConfigInner extends Resource { private String javaContainerVersion; /** - * App Command Line to launch. + * App command line to launch. */ @JsonProperty(value = "properties.appCommandLine") private String appCommandLine; @@ -213,13 +220,14 @@ public class SiteConfigInner extends Resource { private SiteLimits limits; /** - * Auto heal enabled. + * <code>true</code> if Auto Heal is enabled; otherwise, + * <code>false</code>. */ @JsonProperty(value = "properties.autoHealEnabled") private Boolean autoHealEnabled; /** - * Auto heal rules. + * Auto Heal rules. */ @JsonProperty(value = "properties.autoHealRules") private AutoHealRules autoHealRules; @@ -231,7 +239,7 @@ public class SiteConfigInner extends Resource { private String tracingOptions; /** - * Vnet name. + * Virtual Network name. */ @JsonProperty(value = "properties.vnetName") private String vnetName; @@ -249,25 +257,26 @@ public class SiteConfigInner extends Resource { private PushSettingsInner push; /** - * Information about the formal API definition for the web app. + * Information about the formal API definition for the app. */ @JsonProperty(value = "properties.apiDefinition") private ApiDefinitionInfo apiDefinition; /** - * Auto swap slot name. + * Auto-swap slot name. */ @JsonProperty(value = "properties.autoSwapSlotName") private String autoSwapSlotName; /** - * Local mysql enabled. + * <code>true</code> to enable local MySQL; otherwise, + * <code>false</code>. */ @JsonProperty(value = "properties.localMySqlEnabled") private Boolean localMySqlEnabled; /** - * Ip Security restrictions. + * IP security restrictions. */ @JsonProperty(value = "properties.ipSecurityRestrictions") private List ipSecurityRestrictions; @@ -561,17 +570,6 @@ public SiteMachineKey machineKey() { return this.machineKey; } - /** - * Set the machineKey value. - * - * @param machineKey the machineKey value to set - * @return the SiteConfigInner object itself. - */ - public SiteConfigInner withMachineKey(SiteMachineKey machineKey) { - this.machineKey = machineKey; - return this; - } - /** * Get the handlerMappings value. * @@ -621,17 +619,6 @@ public String scmType() { return this.scmType; } - /** - * Set the scmType value. - * - * @param scmType the scmType value to set - * @return the SiteConfigInner object itself. - */ - public SiteConfigInner withScmType(String scmType) { - this.scmType = scmType; - return this; - } - /** * Get the use32BitWorkerProcess value. * diff --git a/azure-mgmt-website/src/main/java/com/microsoft/azure/management/website/implementation/SiteInner.java b/azure-mgmt-website/src/main/java/com/microsoft/azure/management/website/implementation/SiteInner.java index 91d7ae00e4100..fd28167cc0e7f 100644 --- a/azure-mgmt-website/src/main/java/com/microsoft/azure/management/website/implementation/SiteInner.java +++ b/azure-mgmt-website/src/main/java/com/microsoft/azure/management/website/implementation/SiteInner.java @@ -15,225 +15,232 @@ import org.joda.time.DateTime; import com.microsoft.azure.management.website.HostingEnvironmentProfile; import com.microsoft.azure.management.website.CloningInfo; +import com.microsoft.azure.management.website.SlotSwapStatus; import com.fasterxml.jackson.annotation.JsonProperty; import com.microsoft.rest.serializer.JsonFlatten; import com.microsoft.azure.Resource; /** - * Represents a web app. + * A web app, a mobile app backend, or an API app. */ @JsonFlatten public class SiteInner extends Resource { /** - * State of the web app. + * Current state of the app. */ - @JsonProperty(value = "properties.state") + @JsonProperty(value = "properties.state", access = JsonProperty.Access.WRITE_ONLY) private String state; /** - * Hostnames associated with web app. + * Hostnames associated with the app. */ - @JsonProperty(value = "properties.hostNames") + @JsonProperty(value = "properties.hostNames", access = JsonProperty.Access.WRITE_ONLY) private List hostNames; /** - * Name of repository site. + * Name of the repository site. */ - @JsonProperty(value = "properties.repositorySiteName") + @JsonProperty(value = "properties.repositorySiteName", access = JsonProperty.Access.WRITE_ONLY) private String repositorySiteName; /** - * State indicating whether web app has exceeded its quota usage. Possible - * values include: 'Normal', 'Exceeded'. + * State indicating whether the app has exceeded its quota usage. + * Read-only. Possible values include: 'Normal', 'Exceeded'. */ - @JsonProperty(value = "properties.usageState") + @JsonProperty(value = "properties.usageState", access = JsonProperty.Access.WRITE_ONLY) private UsageState usageState; /** - * True if the site is enabled; otherwise, false. Setting this value to - * false disables the site (takes the site off line). + * <code>true</code> if the app is enabled; otherwise, + * <code>false</code>. Setting this value to false disables + * the app (takes the app offline). */ @JsonProperty(value = "properties.enabled") private Boolean enabled; /** - * Hostnames for the web app that are enabled. Hostnames need to be - * assigned and enabled. If some hostnames are assigned but not enabled + * Enabled hostnames for the app.Hostnames need to be assigned (see + * HostNames) AND enabled. Otherwise, * the app is not served on those hostnames. */ - @JsonProperty(value = "properties.enabledHostNames") + @JsonProperty(value = "properties.enabledHostNames", access = JsonProperty.Access.WRITE_ONLY) private List enabledHostNames; /** - * Management information availability state for the web app. Possible - * values are Normal or Limited. - * Normal means that the site is running correctly and that - * management information for the site is available. - * Limited means that only partial management information for - * the site is available and that detailed site information is - * unavailable. Possible values include: 'Normal', 'Limited', - * 'DisasterRecoveryMode'. + * Management information availability state for the app. Possible values + * include: 'Normal', 'Limited', 'DisasterRecoveryMode'. */ - @JsonProperty(value = "properties.availabilityState") + @JsonProperty(value = "properties.availabilityState", access = JsonProperty.Access.WRITE_ONLY) private SiteAvailabilityState availabilityState; /** - * Hostname SSL states are used to manage the SSL bindings for site's + * Hostname SSL states are used to manage the SSL bindings for app's * hostnames. */ @JsonProperty(value = "properties.hostNameSslStates") private List hostNameSslStates; /** - * The serverFarmId property. + * Resource ID of the associated App Service plan, formatted as: + * "/subscriptions/{subscriptionID}/resourceGroups/{groupName}/providers/Microsoft.Web/serverfarms/{appServicePlanName}". */ @JsonProperty(value = "properties.serverFarmId") private String serverFarmId; /** - * Reserved. + * <code>true</code> if reserved; otherwise, + * <code>false</code>. */ @JsonProperty(value = "properties.reserved") private Boolean reserved; /** - * Last time web app was modified in UTC. + * Last time the app was modified, in UTC. Read-only. */ - @JsonProperty(value = "properties.lastModifiedTimeUtc") + @JsonProperty(value = "properties.lastModifiedTimeUtc", access = JsonProperty.Access.WRITE_ONLY) private DateTime lastModifiedTimeUtc; /** - * Configuration of web app. + * Configuration of the app. */ @JsonProperty(value = "properties.siteConfig") private SiteConfigInner siteConfig; /** - * Read-only list of Azure Traffic manager hostnames associated with web - * app. + * Azure Traffic Manager hostnames associated with the app. Read-only. */ - @JsonProperty(value = "properties.trafficManagerHostNames") + @JsonProperty(value = "properties.trafficManagerHostNames", access = JsonProperty.Access.WRITE_ONLY) private List trafficManagerHostNames; /** - * If set indicates whether web app is deployed as a premium app. + * Indicates whether app is deployed as a premium app. */ - @JsonProperty(value = "properties.premiumAppDeployed") + @JsonProperty(value = "properties.premiumAppDeployed", access = JsonProperty.Access.WRITE_ONLY) private Boolean premiumAppDeployed; /** - * If set indicates whether to stop SCM (KUDU) site when the web app is - * stopped. Default is false. + * <code>true</code> to stop SCM (KUDU) site when the app is + * stopped; otherwise, <code>false</code>. The default is + * <code>false</code>. */ @JsonProperty(value = "properties.scmSiteAlsoStopped") private Boolean scmSiteAlsoStopped; /** - * Read-only property that specifies which slot this app will swap into. + * Specifies which deployment slot this app will swap into. Read-only. */ - @JsonProperty(value = "properties.targetSwapSlot") + @JsonProperty(value = "properties.targetSwapSlot", access = JsonProperty.Access.WRITE_ONLY) private String targetSwapSlot; /** - * Specification for the hosting environment (App Service Environment) to - * use for the web app. + * App Service Environment to use for the app. */ @JsonProperty(value = "properties.hostingEnvironmentProfile") private HostingEnvironmentProfile hostingEnvironmentProfile; /** - * Micro services like WebSites, Logic Apps. + * Micro services like apps, logic apps. */ @JsonProperty(value = "properties.microService") private String microService; /** - * Name of gateway app associated with web app. + * Name of gateway app associated with the app. */ @JsonProperty(value = "properties.gatewaySiteName") private String gatewaySiteName; /** - * Specifies if the client affinity is enabled when load balancing http - * request for multiple instances of the web app. + * <code>true</code> to enable client affinity; + * <code>false</code> to stop sending session affinity + * cookies, which route client requests in the same session to the same + * instance. Default is <code>true</code>. */ @JsonProperty(value = "properties.clientAffinityEnabled") private Boolean clientAffinityEnabled; /** - * Specifies if the client certificate is enabled for the web app. + * <code>true</code> to enable client certificate + * authentication (TLS mutual authentication); otherwise, + * <code>false</code>. Default is + * <code>false</code>. */ @JsonProperty(value = "properties.clientCertEnabled") private Boolean clientCertEnabled; /** - * Specifies if the public hostnames are disabled the web app. - * If set to true the app is only accessible via API - * Management process. + * <code>true</code> to disable the public hostnames of the + * app; otherwise, <code>false</code>. + * If <code>true</code>, the app is only accessible via API + * management process. */ @JsonProperty(value = "properties.hostNamesDisabled") private Boolean hostNamesDisabled; /** - * List of comma separated IP addresses that this web app uses for - * outbound connections. Those can be used when configuring firewall - * rules for databases accessed by this web app. + * List of IP addresses that the app uses for outbound connections (e.g. + * database access). Read-only. */ - @JsonProperty(value = "properties.outboundIpAddresses") + @JsonProperty(value = "properties.outboundIpAddresses", access = JsonProperty.Access.WRITE_ONLY) private String outboundIpAddresses; /** - * Size of a function container. + * Size of the function container. */ @JsonProperty(value = "properties.containerSize") private Integer containerSize; /** - * Maximum allowed daily memory-time quota (applicable on dynamic sites + * Maximum allowed daily memory-time quota (applicable on dynamic apps * only). */ @JsonProperty(value = "properties.dailyMemoryTimeQuota") private Integer dailyMemoryTimeQuota; /** - * Site suspended till in case memory-time quota is exceeded. + * App suspended till in case memory-time quota is exceeded. */ - @JsonProperty(value = "properties.suspendedTill") + @JsonProperty(value = "properties.suspendedTill", access = JsonProperty.Access.WRITE_ONLY) private DateTime suspendedTill; /** - * Maximum number of workers - * This only applies to function container. + * Maximum number of workers. + * This only applies to Functions container. */ - @JsonProperty(value = "properties.maxNumberOfWorkers") + @JsonProperty(value = "properties.maxNumberOfWorkers", access = JsonProperty.Access.WRITE_ONLY) private Integer maxNumberOfWorkers; /** - * This is only valid for web app creation. If specified, web app is - * cloned from - * a source web app. + * If specified during app creation, the app is cloned from a source app. */ @JsonProperty(value = "properties.cloningInfo") private CloningInfo cloningInfo; /** - * Resource group web app belongs to. + * Name of the resource group the app belongs to. Read-only. */ - @JsonProperty(value = "properties.resourceGroup") + @JsonProperty(value = "properties.resourceGroup", access = JsonProperty.Access.WRITE_ONLY) private String resourceGroup; /** - * Site is a default container. + * <code>true</code> if the app is a default container; + * otherwise, <code>false</code>. */ - @JsonProperty(value = "properties.isDefaultContainer") + @JsonProperty(value = "properties.isDefaultContainer", access = JsonProperty.Access.WRITE_ONLY) private Boolean isDefaultContainer; /** - * Default hostname of the web app. + * Default hostname of the app. Read-only. */ - @JsonProperty(value = "properties.defaultHostName") + @JsonProperty(value = "properties.defaultHostName", access = JsonProperty.Access.WRITE_ONLY) private String defaultHostName; + /** + * Status of the last deployment slot swap operation. + */ + @JsonProperty(value = "properties.slotSwapStatus", access = JsonProperty.Access.WRITE_ONLY) + private SlotSwapStatus slotSwapStatus; + /** * Get the state value. * @@ -243,17 +250,6 @@ public String state() { return this.state; } - /** - * Set the state value. - * - * @param state the state value to set - * @return the SiteInner object itself. - */ - public SiteInner withState(String state) { - this.state = state; - return this; - } - /** * Get the hostNames value. * @@ -263,17 +259,6 @@ public List hostNames() { return this.hostNames; } - /** - * Set the hostNames value. - * - * @param hostNames the hostNames value to set - * @return the SiteInner object itself. - */ - public SiteInner withHostNames(List hostNames) { - this.hostNames = hostNames; - return this; - } - /** * Get the repositorySiteName value. * @@ -283,17 +268,6 @@ public String repositorySiteName() { return this.repositorySiteName; } - /** - * Set the repositorySiteName value. - * - * @param repositorySiteName the repositorySiteName value to set - * @return the SiteInner object itself. - */ - public SiteInner withRepositorySiteName(String repositorySiteName) { - this.repositorySiteName = repositorySiteName; - return this; - } - /** * Get the usageState value. * @@ -303,17 +277,6 @@ public UsageState usageState() { return this.usageState; } - /** - * Set the usageState value. - * - * @param usageState the usageState value to set - * @return the SiteInner object itself. - */ - public SiteInner withUsageState(UsageState usageState) { - this.usageState = usageState; - return this; - } - /** * Get the enabled value. * @@ -343,17 +306,6 @@ public List enabledHostNames() { return this.enabledHostNames; } - /** - * Set the enabledHostNames value. - * - * @param enabledHostNames the enabledHostNames value to set - * @return the SiteInner object itself. - */ - public SiteInner withEnabledHostNames(List enabledHostNames) { - this.enabledHostNames = enabledHostNames; - return this; - } - /** * Get the availabilityState value. * @@ -363,17 +315,6 @@ public SiteAvailabilityState availabilityState() { return this.availabilityState; } - /** - * Set the availabilityState value. - * - * @param availabilityState the availabilityState value to set - * @return the SiteInner object itself. - */ - public SiteInner withAvailabilityState(SiteAvailabilityState availabilityState) { - this.availabilityState = availabilityState; - return this; - } - /** * Get the hostNameSslStates value. * @@ -443,17 +384,6 @@ public DateTime lastModifiedTimeUtc() { return this.lastModifiedTimeUtc; } - /** - * Set the lastModifiedTimeUtc value. - * - * @param lastModifiedTimeUtc the lastModifiedTimeUtc value to set - * @return the SiteInner object itself. - */ - public SiteInner withLastModifiedTimeUtc(DateTime lastModifiedTimeUtc) { - this.lastModifiedTimeUtc = lastModifiedTimeUtc; - return this; - } - /** * Get the siteConfig value. * @@ -483,17 +413,6 @@ public List trafficManagerHostNames() { return this.trafficManagerHostNames; } - /** - * Set the trafficManagerHostNames value. - * - * @param trafficManagerHostNames the trafficManagerHostNames value to set - * @return the SiteInner object itself. - */ - public SiteInner withTrafficManagerHostNames(List trafficManagerHostNames) { - this.trafficManagerHostNames = trafficManagerHostNames; - return this; - } - /** * Get the premiumAppDeployed value. * @@ -503,17 +422,6 @@ public Boolean premiumAppDeployed() { return this.premiumAppDeployed; } - /** - * Set the premiumAppDeployed value. - * - * @param premiumAppDeployed the premiumAppDeployed value to set - * @return the SiteInner object itself. - */ - public SiteInner withPremiumAppDeployed(Boolean premiumAppDeployed) { - this.premiumAppDeployed = premiumAppDeployed; - return this; - } - /** * Get the scmSiteAlsoStopped value. * @@ -543,17 +451,6 @@ public String targetSwapSlot() { return this.targetSwapSlot; } - /** - * Set the targetSwapSlot value. - * - * @param targetSwapSlot the targetSwapSlot value to set - * @return the SiteInner object itself. - */ - public SiteInner withTargetSwapSlot(String targetSwapSlot) { - this.targetSwapSlot = targetSwapSlot; - return this; - } - /** * Get the hostingEnvironmentProfile value. * @@ -683,17 +580,6 @@ public String outboundIpAddresses() { return this.outboundIpAddresses; } - /** - * Set the outboundIpAddresses value. - * - * @param outboundIpAddresses the outboundIpAddresses value to set - * @return the SiteInner object itself. - */ - public SiteInner withOutboundIpAddresses(String outboundIpAddresses) { - this.outboundIpAddresses = outboundIpAddresses; - return this; - } - /** * Get the containerSize value. * @@ -743,17 +629,6 @@ public DateTime suspendedTill() { return this.suspendedTill; } - /** - * Set the suspendedTill value. - * - * @param suspendedTill the suspendedTill value to set - * @return the SiteInner object itself. - */ - public SiteInner withSuspendedTill(DateTime suspendedTill) { - this.suspendedTill = suspendedTill; - return this; - } - /** * Get the maxNumberOfWorkers value. * @@ -763,17 +638,6 @@ public Integer maxNumberOfWorkers() { return this.maxNumberOfWorkers; } - /** - * Set the maxNumberOfWorkers value. - * - * @param maxNumberOfWorkers the maxNumberOfWorkers value to set - * @return the SiteInner object itself. - */ - public SiteInner withMaxNumberOfWorkers(Integer maxNumberOfWorkers) { - this.maxNumberOfWorkers = maxNumberOfWorkers; - return this; - } - /** * Get the cloningInfo value. * @@ -803,17 +667,6 @@ public String resourceGroup() { return this.resourceGroup; } - /** - * Set the resourceGroup value. - * - * @param resourceGroup the resourceGroup value to set - * @return the SiteInner object itself. - */ - public SiteInner withResourceGroup(String resourceGroup) { - this.resourceGroup = resourceGroup; - return this; - } - /** * Get the isDefaultContainer value. * @@ -823,17 +676,6 @@ public Boolean isDefaultContainer() { return this.isDefaultContainer; } - /** - * Set the isDefaultContainer value. - * - * @param isDefaultContainer the isDefaultContainer value to set - * @return the SiteInner object itself. - */ - public SiteInner withIsDefaultContainer(Boolean isDefaultContainer) { - this.isDefaultContainer = isDefaultContainer; - return this; - } - /** * Get the defaultHostName value. * @@ -844,14 +686,12 @@ public String defaultHostName() { } /** - * Set the defaultHostName value. + * Get the slotSwapStatus value. * - * @param defaultHostName the defaultHostName value to set - * @return the SiteInner object itself. + * @return the slotSwapStatus value */ - public SiteInner withDefaultHostName(String defaultHostName) { - this.defaultHostName = defaultHostName; - return this; + public SlotSwapStatus slotSwapStatus() { + return this.slotSwapStatus; } } diff --git a/azure-mgmt-website/src/main/java/com/microsoft/azure/management/website/implementation/SiteInstanceInner.java b/azure-mgmt-website/src/main/java/com/microsoft/azure/management/website/implementation/SiteInstanceInner.java index 40ddc3a0bc259..fd8bfc019ad43 100644 --- a/azure-mgmt-website/src/main/java/com/microsoft/azure/management/website/implementation/SiteInstanceInner.java +++ b/azure-mgmt-website/src/main/java/com/microsoft/azure/management/website/implementation/SiteInstanceInner.java @@ -13,14 +13,14 @@ import com.microsoft.azure.Resource; /** - * Instance of a web app. + * Instance of an app. */ @JsonFlatten public class SiteInstanceInner extends Resource { /** * Name of instance. */ - @JsonProperty(value = "properties.name") + @JsonProperty(value = "properties.name", access = JsonProperty.Access.WRITE_ONLY) private String siteInstanceName; /** @@ -32,15 +32,4 @@ public String siteInstanceName() { return this.siteInstanceName; } - /** - * Set the siteInstanceName value. - * - * @param siteInstanceName the siteInstanceName value to set - * @return the SiteInstanceInner object itself. - */ - public SiteInstanceInner withSiteInstanceName(String siteInstanceName) { - this.siteInstanceName = siteInstanceName; - return this; - } - } diff --git a/azure-mgmt-website/src/main/java/com/microsoft/azure/management/website/implementation/SiteLogsConfigInner.java b/azure-mgmt-website/src/main/java/com/microsoft/azure/management/website/implementation/SiteLogsConfigInner.java index 57a872df148b6..c1d12393ff5f9 100644 --- a/azure-mgmt-website/src/main/java/com/microsoft/azure/management/website/implementation/SiteLogsConfigInner.java +++ b/azure-mgmt-website/src/main/java/com/microsoft/azure/management/website/implementation/SiteLogsConfigInner.java @@ -16,7 +16,7 @@ import com.microsoft.azure.Resource; /** - * Configuration of Azure web site. + * Configuration of App Service site logs. */ @JsonFlatten public class SiteLogsConfigInner extends Resource { @@ -27,7 +27,7 @@ public class SiteLogsConfigInner extends Resource { private ApplicationLogsConfig applicationLogs; /** - * Http logs configuration. + * HTTP logs configuration. */ @JsonProperty(value = "properties.httpLogs") private HttpLogsConfig httpLogs; diff --git a/azure-mgmt-website/src/main/java/com/microsoft/azure/management/website/implementation/SitePhpErrorLogFlagInner.java b/azure-mgmt-website/src/main/java/com/microsoft/azure/management/website/implementation/SitePhpErrorLogFlagInner.java new file mode 100644 index 0000000000000..aeb4c70be4273 --- /dev/null +++ b/azure-mgmt-website/src/main/java/com/microsoft/azure/management/website/implementation/SitePhpErrorLogFlagInner.java @@ -0,0 +1,124 @@ +/** + * 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.website.implementation; + +import com.fasterxml.jackson.annotation.JsonProperty; +import com.microsoft.rest.serializer.JsonFlatten; +import com.microsoft.azure.Resource; + +/** + * Used for getting PHP error logging flag. + */ +@JsonFlatten +public class SitePhpErrorLogFlagInner extends Resource { + /** + * Local log_errors setting. + */ + @JsonProperty(value = "properties.localLogErrors") + private String localLogErrors; + + /** + * Master log_errors setting. + */ + @JsonProperty(value = "properties.masterLogErrors") + private String masterLogErrors; + + /** + * Local log_errors_max_len setting. + */ + @JsonProperty(value = "properties.localLogErrorsMaxLength") + private String localLogErrorsMaxLength; + + /** + * Master log_errors_max_len setting. + */ + @JsonProperty(value = "properties.masterLogErrorsMaxLength") + private String masterLogErrorsMaxLength; + + /** + * Get the localLogErrors value. + * + * @return the localLogErrors value + */ + public String localLogErrors() { + return this.localLogErrors; + } + + /** + * Set the localLogErrors value. + * + * @param localLogErrors the localLogErrors value to set + * @return the SitePhpErrorLogFlagInner object itself. + */ + public SitePhpErrorLogFlagInner withLocalLogErrors(String localLogErrors) { + this.localLogErrors = localLogErrors; + return this; + } + + /** + * Get the masterLogErrors value. + * + * @return the masterLogErrors value + */ + public String masterLogErrors() { + return this.masterLogErrors; + } + + /** + * Set the masterLogErrors value. + * + * @param masterLogErrors the masterLogErrors value to set + * @return the SitePhpErrorLogFlagInner object itself. + */ + public SitePhpErrorLogFlagInner withMasterLogErrors(String masterLogErrors) { + this.masterLogErrors = masterLogErrors; + return this; + } + + /** + * Get the localLogErrorsMaxLength value. + * + * @return the localLogErrorsMaxLength value + */ + public String localLogErrorsMaxLength() { + return this.localLogErrorsMaxLength; + } + + /** + * Set the localLogErrorsMaxLength value. + * + * @param localLogErrorsMaxLength the localLogErrorsMaxLength value to set + * @return the SitePhpErrorLogFlagInner object itself. + */ + public SitePhpErrorLogFlagInner withLocalLogErrorsMaxLength(String localLogErrorsMaxLength) { + this.localLogErrorsMaxLength = localLogErrorsMaxLength; + return this; + } + + /** + * Get the masterLogErrorsMaxLength value. + * + * @return the masterLogErrorsMaxLength value + */ + public String masterLogErrorsMaxLength() { + return this.masterLogErrorsMaxLength; + } + + /** + * Set the masterLogErrorsMaxLength value. + * + * @param masterLogErrorsMaxLength the masterLogErrorsMaxLength value to set + * @return the SitePhpErrorLogFlagInner object itself. + */ + public SitePhpErrorLogFlagInner withMasterLogErrorsMaxLength(String masterLogErrorsMaxLength) { + this.masterLogErrorsMaxLength = masterLogErrorsMaxLength; + return this; + } + +} diff --git a/azure-mgmt-website/src/main/java/com/microsoft/azure/management/website/implementation/SiteSourceControlInner.java b/azure-mgmt-website/src/main/java/com/microsoft/azure/management/website/implementation/SiteSourceControlInner.java index 9ebf40b48a6c4..7abe1cca34ab0 100644 --- a/azure-mgmt-website/src/main/java/com/microsoft/azure/management/website/implementation/SiteSourceControlInner.java +++ b/azure-mgmt-website/src/main/java/com/microsoft/azure/management/website/implementation/SiteSourceControlInner.java @@ -13,12 +13,12 @@ import com.microsoft.azure.Resource; /** - * Describes the source control configuration for web app. + * Source control configuration for an app. */ @JsonFlatten public class SiteSourceControlInner extends Resource { /** - * Repository or source control url. + * Repository or source control URL. */ @JsonProperty(value = "properties.repoUrl") private String repoUrl; @@ -30,19 +30,23 @@ public class SiteSourceControlInner extends Resource { private String branch; /** - * Whether to manual or continuous integration. + * <code>true</code> to limit to manual integration; + * <code>false</code> to enable continuous integration (which + * configures webhooks into online repos like GitHub). */ @JsonProperty(value = "properties.isManualIntegration") private Boolean isManualIntegration; /** - * Whether to manual or continuous integration. + * <code>true</code> to enable deployment rollback; otherwise, + * <code>false</code>. */ @JsonProperty(value = "properties.deploymentRollbackEnabled") private Boolean deploymentRollbackEnabled; /** - * Mercurial or Git repository type. + * <code>true</code> for a Mercurial repository; + * <code>false</code> for a Git repository. */ @JsonProperty(value = "properties.isMercurial") private Boolean isMercurial; diff --git a/azure-mgmt-website/src/main/java/com/microsoft/azure/management/website/implementation/SkuInfoInner.java b/azure-mgmt-website/src/main/java/com/microsoft/azure/management/website/implementation/SkuInfoInner.java index 47438665b2eb0..c6994faa402ad 100644 --- a/azure-mgmt-website/src/main/java/com/microsoft/azure/management/website/implementation/SkuInfoInner.java +++ b/azure-mgmt-website/src/main/java/com/microsoft/azure/management/website/implementation/SkuInfoInner.java @@ -12,21 +12,21 @@ import com.microsoft.azure.management.website.SkuCapacity; /** - * Sku discovery information. + * SKU discovery information. */ public class SkuInfoInner { /** - * Resource type that this sku applies to. + * Resource type that this SKU applies to. */ private String resourceType; /** - * Name and tier of the sku. + * Name and tier of the SKU. */ private SkuDescription sku; /** - * Min, max, and default scale values of the sku. + * Min, max, and default scale values of the SKU. */ private SkuCapacity capacity; diff --git a/azure-mgmt-website/src/main/java/com/microsoft/azure/management/website/implementation/SkuInfosInner.java b/azure-mgmt-website/src/main/java/com/microsoft/azure/management/website/implementation/SkuInfosInner.java new file mode 100644 index 0000000000000..c0784f6e46ba0 --- /dev/null +++ b/azure-mgmt-website/src/main/java/com/microsoft/azure/management/website/implementation/SkuInfosInner.java @@ -0,0 +1,68 @@ +/** + * 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.website.implementation; + +import java.util.List; +import com.microsoft.azure.management.website.GlobalCsmSkuDescription; + +/** + * Collection of SKU information. + */ +public class SkuInfosInner { + /** + * Resource type that this SKU applies to. + */ + private String resourceType; + + /** + * List of SKUs the subscription is able to use. + */ + private List skus; + + /** + * Get the resourceType value. + * + * @return the resourceType value + */ + public String resourceType() { + return this.resourceType; + } + + /** + * Set the resourceType value. + * + * @param resourceType the resourceType value to set + * @return the SkuInfosInner object itself. + */ + public SkuInfosInner withResourceType(String resourceType) { + this.resourceType = resourceType; + return this; + } + + /** + * Get the skus value. + * + * @return the skus value + */ + public List skus() { + return this.skus; + } + + /** + * Set the skus value. + * + * @param skus the skus value to set + * @return the SkuInfosInner object itself. + */ + public SkuInfosInner withSkus(List skus) { + this.skus = skus; + return this; + } + +} diff --git a/azure-mgmt-website/src/main/java/com/microsoft/azure/management/website/implementation/SlotDifferenceInner.java b/azure-mgmt-website/src/main/java/com/microsoft/azure/management/website/implementation/SlotDifferenceInner.java index d1166dff970e4..055621c12e5cc 100644 --- a/azure-mgmt-website/src/main/java/com/microsoft/azure/management/website/implementation/SlotDifferenceInner.java +++ b/azure-mgmt-website/src/main/java/com/microsoft/azure/management/website/implementation/SlotDifferenceInner.java @@ -13,52 +13,51 @@ import com.microsoft.azure.Resource; /** - * An object describing the difference in setting values between two web app - * slots. + * A setting difference between two deployment slots of an app. */ @JsonFlatten public class SlotDifferenceInner extends Resource { /** - * Indicates the type of the difference: Information, Warning or Error. + * Type of the difference: Information, Warning or Error. */ - @JsonProperty(value = "properties.type") + @JsonProperty(value = "properties.type", access = JsonProperty.Access.WRITE_ONLY) private String slotDifferenceType; /** - * The type of the settings: General, AppSetting or ConnectionString. + * The type of the setting: General, AppSetting or ConnectionString. */ - @JsonProperty(value = "properties.settingType") + @JsonProperty(value = "properties.settingType", access = JsonProperty.Access.WRITE_ONLY) private String settingType; /** - * Rule that describes how to process the difference in settings during - * web app slot swap. + * Rule that describes how to process the setting difference during a slot + * swap. */ - @JsonProperty(value = "properties.diffRule") + @JsonProperty(value = "properties.diffRule", access = JsonProperty.Access.WRITE_ONLY) private String diffRule; /** * Name of the setting. */ - @JsonProperty(value = "properties.settingName") + @JsonProperty(value = "properties.settingName", access = JsonProperty.Access.WRITE_ONLY) private String settingName; /** - * Value of the setting in the current web app slot. + * Value of the setting in the current slot. */ - @JsonProperty(value = "properties.valueInCurrentSlot") + @JsonProperty(value = "properties.valueInCurrentSlot", access = JsonProperty.Access.WRITE_ONLY) private String valueInCurrentSlot; /** - * Value of the setting in the target web app slot. + * Value of the setting in the target slot. */ - @JsonProperty(value = "properties.valueInTargetSlot") + @JsonProperty(value = "properties.valueInTargetSlot", access = JsonProperty.Access.WRITE_ONLY) private String valueInTargetSlot; /** - * Description of the difference. + * Description of the setting difference. */ - @JsonProperty(value = "properties.description") + @JsonProperty(value = "properties.description", access = JsonProperty.Access.WRITE_ONLY) private String description; /** @@ -70,17 +69,6 @@ public String slotDifferenceType() { return this.slotDifferenceType; } - /** - * Set the slotDifferenceType value. - * - * @param slotDifferenceType the slotDifferenceType value to set - * @return the SlotDifferenceInner object itself. - */ - public SlotDifferenceInner withSlotDifferenceType(String slotDifferenceType) { - this.slotDifferenceType = slotDifferenceType; - return this; - } - /** * Get the settingType value. * @@ -90,17 +78,6 @@ public String settingType() { return this.settingType; } - /** - * Set the settingType value. - * - * @param settingType the settingType value to set - * @return the SlotDifferenceInner object itself. - */ - public SlotDifferenceInner withSettingType(String settingType) { - this.settingType = settingType; - return this; - } - /** * Get the diffRule value. * @@ -110,17 +87,6 @@ public String diffRule() { return this.diffRule; } - /** - * Set the diffRule value. - * - * @param diffRule the diffRule value to set - * @return the SlotDifferenceInner object itself. - */ - public SlotDifferenceInner withDiffRule(String diffRule) { - this.diffRule = diffRule; - return this; - } - /** * Get the settingName value. * @@ -130,17 +96,6 @@ public String settingName() { return this.settingName; } - /** - * Set the settingName value. - * - * @param settingName the settingName value to set - * @return the SlotDifferenceInner object itself. - */ - public SlotDifferenceInner withSettingName(String settingName) { - this.settingName = settingName; - return this; - } - /** * Get the valueInCurrentSlot value. * @@ -150,17 +105,6 @@ public String valueInCurrentSlot() { return this.valueInCurrentSlot; } - /** - * Set the valueInCurrentSlot value. - * - * @param valueInCurrentSlot the valueInCurrentSlot value to set - * @return the SlotDifferenceInner object itself. - */ - public SlotDifferenceInner withValueInCurrentSlot(String valueInCurrentSlot) { - this.valueInCurrentSlot = valueInCurrentSlot; - return this; - } - /** * Get the valueInTargetSlot value. * @@ -170,17 +114,6 @@ public String valueInTargetSlot() { return this.valueInTargetSlot; } - /** - * Set the valueInTargetSlot value. - * - * @param valueInTargetSlot the valueInTargetSlot value to set - * @return the SlotDifferenceInner object itself. - */ - public SlotDifferenceInner withValueInTargetSlot(String valueInTargetSlot) { - this.valueInTargetSlot = valueInTargetSlot; - return this; - } - /** * Get the description value. * @@ -190,15 +123,4 @@ public String description() { return this.description; } - /** - * Set the description value. - * - * @param description the description value to set - * @return the SlotDifferenceInner object itself. - */ - public SlotDifferenceInner withDescription(String description) { - this.description = description; - return this; - } - } diff --git a/azure-mgmt-website/src/main/java/com/microsoft/azure/management/website/implementation/SnapshotInner.java b/azure-mgmt-website/src/main/java/com/microsoft/azure/management/website/implementation/SnapshotInner.java index 5918c44a1707f..59710a8ffac81 100644 --- a/azure-mgmt-website/src/main/java/com/microsoft/azure/management/website/implementation/SnapshotInner.java +++ b/azure-mgmt-website/src/main/java/com/microsoft/azure/management/website/implementation/SnapshotInner.java @@ -14,14 +14,14 @@ import com.microsoft.azure.Resource; /** - * A snapshot of a web app. + * A snapshot of an app. */ @JsonFlatten public class SnapshotInner extends Resource { /** * The time the snapshot was taken. */ - @JsonProperty(value = "properties.time") + @JsonProperty(value = "properties.time", access = JsonProperty.Access.WRITE_ONLY) private DateTime time; /** @@ -33,15 +33,4 @@ public DateTime time() { return this.time; } - /** - * Set the time value. - * - * @param time the time value to set - * @return the SnapshotInner object itself. - */ - public SnapshotInner withTime(DateTime time) { - this.time = time; - return this; - } - } diff --git a/azure-mgmt-website/src/main/java/com/microsoft/azure/management/website/implementation/SourceControlInner.java b/azure-mgmt-website/src/main/java/com/microsoft/azure/management/website/implementation/SourceControlInner.java index 2e85d1145bb80..c64d4d0f7fd3b 100644 --- a/azure-mgmt-website/src/main/java/com/microsoft/azure/management/website/implementation/SourceControlInner.java +++ b/azure-mgmt-website/src/main/java/com/microsoft/azure/management/website/implementation/SourceControlInner.java @@ -14,36 +14,36 @@ import com.microsoft.azure.Resource; /** - * Describes the Source Control OAuth Token. + * The source control OAuth token. */ @JsonFlatten public class SourceControlInner extends Resource { /** - * Name or Source Control Type. + * Name or source control type. */ @JsonProperty(value = "properties.name") private String sourceControlName; /** - * OAuth Access Token. + * OAuth access token. */ @JsonProperty(value = "properties.token") private String token; /** - * OAuth Access Token Secret. + * OAuth access token secret. */ @JsonProperty(value = "properties.tokenSecret") private String tokenSecret; /** - * OAuth Refresh Token. + * OAuth refresh token. */ @JsonProperty(value = "properties.refreshToken") private String refreshToken; /** - * OAuth Token Expiration. + * OAuth token expiration. */ @JsonProperty(value = "properties.expirationTime") private DateTime expirationTime; diff --git a/azure-mgmt-website/src/main/java/com/microsoft/azure/management/website/implementation/StampCapacityInner.java b/azure-mgmt-website/src/main/java/com/microsoft/azure/management/website/implementation/StampCapacityInner.java index 73f7d8d66149b..d9fae491c5ff8 100644 --- a/azure-mgmt-website/src/main/java/com/microsoft/azure/management/website/implementation/StampCapacityInner.java +++ b/azure-mgmt-website/src/main/java/com/microsoft/azure/management/website/implementation/StampCapacityInner.java @@ -12,7 +12,7 @@ import com.microsoft.azure.management.website.WorkerSizeOptions; /** - * Class containing stamp capacity information. + * Stamp capacity information. */ public class StampCapacityInner { /** @@ -36,7 +36,7 @@ public class StampCapacityInner { private String unit; /** - * Shared/Dedicated workers. Possible values include: 'Shared', + * Shared/dedicated workers. Possible values include: 'Shared', * 'Dedicated', 'Dynamic'. */ private ComputeModeOptions computeMode; @@ -48,7 +48,7 @@ public class StampCapacityInner { private WorkerSizeOptions workerSize; /** - * Size Id of machines: + * Size ID of machines: * 0 - Small * 1 - Medium * 2 - Large. @@ -56,13 +56,14 @@ public class StampCapacityInner { private Integer workerSizeId; /** - * If true it includes basic sites - * Basic sites are not used for capacity allocation. + * If <code>true</code>, it includes basic apps. + * Basic apps are not used for capacity allocation. */ private Boolean excludeFromCapacityAllocation; /** - * Is capacity applicable for all sites?. + * <code>true</code> if capacity is applicable for all apps; + * otherwise, <code>false</code>. */ private Boolean isApplicableForAllComputeModes; diff --git a/azure-mgmt-website/src/main/java/com/microsoft/azure/management/website/implementation/StorageMigrationOptionsInner.java b/azure-mgmt-website/src/main/java/com/microsoft/azure/management/website/implementation/StorageMigrationOptionsInner.java index 2edf640cacaea..10c81927e8708 100644 --- a/azure-mgmt-website/src/main/java/com/microsoft/azure/management/website/implementation/StorageMigrationOptionsInner.java +++ b/azure-mgmt-website/src/main/java/com/microsoft/azure/management/website/implementation/StorageMigrationOptionsInner.java @@ -13,7 +13,7 @@ import com.microsoft.azure.Resource; /** - * Description of a backup which will be performed. + * Options for app content migration. */ @JsonFlatten public class StorageMigrationOptionsInner extends Resource { @@ -30,13 +30,15 @@ public class StorageMigrationOptionsInner extends Resource { private String azurefilesShare; /** - * Indicate if site should be switched over. + * <code>true</code>if the app should be switched over; + * otherwise, <code>false</code>. */ @JsonProperty(value = "properties.switchSiteAfterMigration") private Boolean switchSiteAfterMigration; /** - * Indicate if the site should be read only during copy operation. + * <code>true</code> if the app should be read only during + * copy operation; otherwise, <code>false</code>. */ @JsonProperty(value = "properties.blockWriteAccessToSite") private Boolean blockWriteAccessToSite; diff --git a/azure-mgmt-website/src/main/java/com/microsoft/azure/management/website/implementation/StorageMigrationResponseInner.java b/azure-mgmt-website/src/main/java/com/microsoft/azure/management/website/implementation/StorageMigrationResponseInner.java index 3a996affe4141..03aaeeea5cbb1 100644 --- a/azure-mgmt-website/src/main/java/com/microsoft/azure/management/website/implementation/StorageMigrationResponseInner.java +++ b/azure-mgmt-website/src/main/java/com/microsoft/azure/management/website/implementation/StorageMigrationResponseInner.java @@ -13,15 +13,15 @@ import com.microsoft.azure.Resource; /** - * Response for a migration of site content request. + * Response for a migration of app content request. */ @JsonFlatten public class StorageMigrationResponseInner extends Resource { /** - * When server starts the migration process, it will return an OperationId - * identifying that particular migration operation. + * When server starts the migration process, it will return an operation + * ID identifying that particular migration operation. */ - @JsonProperty(value = "properties.operationId") + @JsonProperty(value = "properties.operationId", access = JsonProperty.Access.WRITE_ONLY) private String operationId; /** @@ -33,15 +33,4 @@ public String operationId() { return this.operationId; } - /** - * Set the operationId value. - * - * @param operationId the operationId value to set - * @return the StorageMigrationResponseInner object itself. - */ - public StorageMigrationResponseInner withOperationId(String operationId) { - this.operationId = operationId; - return this; - } - } diff --git a/azure-mgmt-website/src/main/java/com/microsoft/azure/management/website/implementation/TldLegalAgreementInner.java b/azure-mgmt-website/src/main/java/com/microsoft/azure/management/website/implementation/TldLegalAgreementInner.java index 47ef3a8601b70..6f413e732ee1c 100644 --- a/azure-mgmt-website/src/main/java/com/microsoft/azure/management/website/implementation/TldLegalAgreementInner.java +++ b/azure-mgmt-website/src/main/java/com/microsoft/azure/management/website/implementation/TldLegalAgreementInner.java @@ -8,28 +8,32 @@ package com.microsoft.azure.management.website.implementation; +import com.fasterxml.jackson.annotation.JsonProperty; /** - * Represents a legal agreement for top level domain. + * Legal agreement for a top level domain. */ public class TldLegalAgreementInner { /** * Unique identifier for the agreement. */ + @JsonProperty(required = true) private String agreementKey; /** * Agreement title. */ + @JsonProperty(required = true) private String title; /** * Agreement details. */ + @JsonProperty(required = true) private String content; /** - * Url where a copy of the agreement details is hosted. + * URL where a copy of the agreement details is hosted. */ private String url; diff --git a/azure-mgmt-website/src/main/java/com/microsoft/azure/management/website/implementation/TopLevelDomainInner.java b/azure-mgmt-website/src/main/java/com/microsoft/azure/management/website/implementation/TopLevelDomainInner.java index 0a6bbd7762ca7..d472e2780b112 100644 --- a/azure-mgmt-website/src/main/java/com/microsoft/azure/management/website/implementation/TopLevelDomainInner.java +++ b/azure-mgmt-website/src/main/java/com/microsoft/azure/management/website/implementation/TopLevelDomainInner.java @@ -20,33 +20,23 @@ public class TopLevelDomainInner extends Resource { /** * Name of the top level domain. */ - @JsonProperty(value = "properties.name") - private String topLevelDomainName; + @JsonProperty(value = "properties.name", access = JsonProperty.Access.WRITE_ONLY) + private String domainName; /** - * If true then the top level domain supports domain privacy. + * If <code>true</code>, then the top level domain supports + * domain privacy; otherwise, <code>false</code>. */ @JsonProperty(value = "properties.privacy") private Boolean privacy; /** - * Get the topLevelDomainName value. + * Get the domainName value. * - * @return the topLevelDomainName value + * @return the domainName value */ - public String topLevelDomainName() { - return this.topLevelDomainName; - } - - /** - * Set the topLevelDomainName value. - * - * @param topLevelDomainName the topLevelDomainName value to set - * @return the TopLevelDomainInner object itself. - */ - public TopLevelDomainInner withTopLevelDomainName(String topLevelDomainName) { - this.topLevelDomainName = topLevelDomainName; - return this; + public String domainName() { + return this.domainName; } /** diff --git a/azure-mgmt-website/src/main/java/com/microsoft/azure/management/website/implementation/TopLevelDomainsInner.java b/azure-mgmt-website/src/main/java/com/microsoft/azure/management/website/implementation/TopLevelDomainsInner.java index 126c3e7d83dfc..300f267c8bd3b 100644 --- a/azure-mgmt-website/src/main/java/com/microsoft/azure/management/website/implementation/TopLevelDomainsInner.java +++ b/azure-mgmt-website/src/main/java/com/microsoft/azure/management/website/implementation/TopLevelDomainsInner.java @@ -8,32 +8,31 @@ package com.microsoft.azure.management.website.implementation; +import retrofit2.Retrofit; import com.google.common.reflect.TypeToken; import com.microsoft.azure.AzureServiceCall; import com.microsoft.azure.AzureServiceResponseBuilder; import com.microsoft.azure.CloudException; import com.microsoft.azure.ListOperationCallback; +import com.microsoft.azure.management.website.TopLevelDomainAgreementOption; import com.microsoft.azure.Page; import com.microsoft.azure.PagedList; -import com.microsoft.azure.management.website.TopLevelDomainAgreementOption; import com.microsoft.rest.ServiceCall; import com.microsoft.rest.ServiceCallback; import com.microsoft.rest.ServiceResponse; +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.Header; import retrofit2.http.Headers; -import retrofit2.http.POST; import retrofit2.http.Path; +import retrofit2.http.POST; 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 @@ -84,8 +83,8 @@ interface TopLevelDomainsService { } /** - * Lists all top level domains supported for registration. - * Lists all top level domains supported for registration. + * Get all top-level domains supported for registration. + * Get all top-level domains supported for registration. * * @return the PagedList<TopLevelDomainInner> object if successful. */ @@ -100,8 +99,8 @@ public Page nextPage(String nextPageLink) { } /** - * Lists all top level domains supported for registration. - * Lists all top level domains supported for registration. + * Get all top-level domains supported for registration. + * Get all top-level domains supported for registration. * * @param serviceCallback the async ServiceCallback to handle successful and failed responses. * @return the {@link ServiceCall} object @@ -119,8 +118,8 @@ public Observable>> call(String nextPa } /** - * Lists all top level domains supported for registration. - * Lists all top level domains supported for registration. + * Get all top-level domains supported for registration. + * Get all top-level domains supported for registration. * * @return the observable to the PagedList<TopLevelDomainInner> object */ @@ -135,8 +134,8 @@ public Page call(ServiceResponse> } /** - * Lists all top level domains supported for registration. - * Lists all top level domains supported for registration. + * Get all top-level domains supported for registration. + * Get all top-level domains supported for registration. * * @return the observable to the PagedList<TopLevelDomainInner> object */ @@ -155,8 +154,8 @@ public Observable>> call(ServiceRespon } /** - * Lists all top level domains supported for registration. - * Lists all top level domains supported for registration. + * Get all top-level domains supported for registration. + * Get all top-level domains supported for registration. * * @return the PagedList<TopLevelDomainInner> object wrapped in {@link ServiceResponse} if successful. */ @@ -187,10 +186,10 @@ private ServiceResponse> listDelegate(Response getAsync(String name, final ServiceCallb } /** - * Gets details of a top level domain. - * Gets details of a top level domain. + * Get details of a top-level domain. + * Get details of a top-level domain. * - * @param name Name of the top level domain + * @param name Name of the top-level domain. * @return the observable to the TopLevelDomainInner object */ public Observable getAsync(String name) { @@ -226,10 +225,10 @@ public TopLevelDomainInner call(ServiceResponse response) { } /** - * Gets details of a top level domain. - * Gets details of a top level domain. + * Get details of a top-level domain. + * Get details of a top-level domain. * - * @param name Name of the top level domain + * @param name Name of the top-level domain. * @return the observable to the TopLevelDomainInner object */ public Observable> getWithServiceResponseAsync(String name) { @@ -239,7 +238,7 @@ public Observable> getWithServiceResponseAs if (this.client.subscriptionId() == null) { throw new IllegalArgumentException("Parameter this.client.subscriptionId() is required and cannot be null."); } - final String apiVersion = "2016-03-01"; + final String apiVersion = "2015-04-01"; return service.get(name, this.client.subscriptionId(), apiVersion, this.client.acceptLanguage(), this.client.userAgent()) .flatMap(new Func1, Observable>>() { @Override @@ -262,10 +261,10 @@ private ServiceResponse getDelegate(Response } /** - * Lists legal agreements that user needs to accept before purchasing domain. - * Lists legal agreements that user needs to accept before purchasing domain. + * Gets all legal agreements that user needs to accept before purchasing a domain. + * Gets all legal agreements that user needs to accept before purchasing a domain. * - * @param name Name of the top level domain + * @param name Name of the top-level domain. * @return the PagedList<TldLegalAgreementInner> object if successful. */ public PagedList listAgreements(final String name) { @@ -279,10 +278,10 @@ public Page nextPage(String nextPageLink) { } /** - * Lists legal agreements that user needs to accept before purchasing domain. - * Lists legal agreements that user needs to accept before purchasing domain. + * Gets all legal agreements that user needs to accept before purchasing a domain. + * Gets all legal agreements that user needs to accept before purchasing a domain. * - * @param name Name of the top level domain + * @param name Name of the top-level domain. * @param serviceCallback the async ServiceCallback to handle successful and failed responses. * @return the {@link ServiceCall} object */ @@ -299,10 +298,10 @@ public Observable>> call(String nex } /** - * Lists legal agreements that user needs to accept before purchasing domain. - * Lists legal agreements that user needs to accept before purchasing domain. + * Gets all legal agreements that user needs to accept before purchasing a domain. + * Gets all legal agreements that user needs to accept before purchasing a domain. * - * @param name Name of the top level domain + * @param name Name of the top-level domain. * @return the observable to the PagedList<TldLegalAgreementInner> object */ public Observable> listAgreementsAsync(final String name) { @@ -316,10 +315,10 @@ public Page call(ServiceResponse>> listAgreementsWithServiceResponseAsync(final String name) { @@ -337,10 +336,10 @@ public Observable>> call(ServiceRes } /** - * Lists legal agreements that user needs to accept before purchasing domain. - * Lists legal agreements that user needs to accept before purchasing domain. + * Gets all legal agreements that user needs to accept before purchasing a domain. + * Gets all legal agreements that user needs to accept before purchasing a domain. * - * @param name Name of the top level domain + * @param name Name of the top-level domain. * @return the PagedList<TldLegalAgreementInner> object wrapped in {@link ServiceResponse} if successful. */ public Observable>> listAgreementsSinglePageAsync(final String name) { @@ -369,11 +368,11 @@ public Observable>> call(Response listAgreements(final String name, final Boolean includePrivacy) { @@ -387,11 +386,11 @@ public Page nextPage(String nextPageLink) { } /** - * Lists legal agreements that user needs to accept before purchasing domain. - * Lists legal agreements that user needs to accept before purchasing domain. + * Gets all legal agreements that user needs to accept before purchasing a domain. + * Gets all legal agreements that user needs to accept before purchasing a domain. * - * @param name Name of the top level domain - * @param includePrivacy If true then the list of agreements will inclue agreements for domain privacy as well. + * @param name Name of the top-level domain. + * @param includePrivacy If <code>true</code>, then the list of agreements will include agreements for domain privacy as well; otherwise, <code>false</code>. * @param serviceCallback the async ServiceCallback to handle successful and failed responses. * @return the {@link ServiceCall} object */ @@ -408,11 +407,11 @@ public Observable>> call(String nex } /** - * Lists legal agreements that user needs to accept before purchasing domain. - * Lists legal agreements that user needs to accept before purchasing domain. + * Gets all legal agreements that user needs to accept before purchasing a domain. + * Gets all legal agreements that user needs to accept before purchasing a domain. * - * @param name Name of the top level domain - * @param includePrivacy If true then the list of agreements will inclue agreements for domain privacy as well. + * @param name Name of the top-level domain. + * @param includePrivacy If <code>true</code>, then the list of agreements will include agreements for domain privacy as well; otherwise, <code>false</code>. * @return the observable to the PagedList<TldLegalAgreementInner> object */ public Observable> listAgreementsAsync(final String name, final Boolean includePrivacy) { @@ -426,11 +425,11 @@ public Page call(ServiceResponse>> listAgreementsWithServiceResponseAsync(final String name, final Boolean includePrivacy) { @@ -448,11 +447,11 @@ public Observable>> call(ServiceRes } /** - * Lists legal agreements that user needs to accept before purchasing domain. - * Lists legal agreements that user needs to accept before purchasing domain. + * Gets all legal agreements that user needs to accept before purchasing a domain. + * Gets all legal agreements that user needs to accept before purchasing a domain. * - ServiceResponse> * @param name Name of the top level domain - ServiceResponse> * @param includePrivacy If true then the list of agreements will inclue agreements for domain privacy as well. + ServiceResponse> * @param name Name of the top-level domain. + ServiceResponse> * @param includePrivacy If <code>true</code>, then the list of agreements will include agreements for domain privacy as well; otherwise, <code>false</code>. * @return the PagedList<TldLegalAgreementInner> object wrapped in {@link ServiceResponse} if successful. */ public Observable>> listAgreementsSinglePageAsync(final String name, final Boolean includePrivacy) { @@ -462,7 +461,7 @@ public Observable>> listAgreementsS if (this.client.subscriptionId() == null) { throw new IllegalArgumentException("Parameter this.client.subscriptionId() is required and cannot be null."); } - final String apiVersion = "2016-03-01"; + final String apiVersion = "2015-04-01"; TopLevelDomainAgreementOption agreementOption = new TopLevelDomainAgreementOption(); agreementOption.withIncludePrivacy(includePrivacy); return service.listAgreements(name, this.client.subscriptionId(), apiVersion, this.client.acceptLanguage(), agreementOption, this.client.userAgent()) @@ -487,8 +486,8 @@ private ServiceResponse> listAgreementsDelegate } /** - * Lists all top level domains supported for registration. - * Lists all top level domains supported for registration. + * Get all top-level domains supported for registration. + * Get all top-level domains supported for registration. * * @param nextPageLink The NextLink from the previous successful call to List operation. * @return the PagedList<TopLevelDomainInner> object if successful. @@ -504,8 +503,8 @@ public Page nextPage(String nextPageLink) { } /** - * Lists all top level domains supported for registration. - * Lists all top level domains supported for registration. + * Get all top-level domains supported for registration. + * Get all top-level domains supported for registration. * * @param nextPageLink The NextLink from the previous successful call to List operation. * @param serviceCall the ServiceCall object tracking the Retrofit calls @@ -525,8 +524,8 @@ public Observable>> call(String nextPa } /** - * Lists all top level domains supported for registration. - * Lists all top level domains supported for registration. + * Get all top-level domains supported for registration. + * Get all top-level domains supported for registration. * * @param nextPageLink The NextLink from the previous successful call to List operation. * @return the observable to the PagedList<TopLevelDomainInner> object @@ -542,8 +541,8 @@ public Page call(ServiceResponse> } /** - * Lists all top level domains supported for registration. - * Lists all top level domains supported for registration. + * Get all top-level domains supported for registration. + * Get all top-level domains supported for registration. * * @param nextPageLink The NextLink from the previous successful call to List operation. * @return the observable to the PagedList<TopLevelDomainInner> object @@ -563,8 +562,8 @@ public Observable>> call(ServiceRespon } /** - * Lists all top level domains supported for registration. - * Lists all top level domains supported for registration. + * Get all top-level domains supported for registration. + * Get all top-level domains supported for registration. * ServiceResponse> * @param nextPageLink The NextLink from the previous successful call to List operation. * @return the PagedList<TopLevelDomainInner> object wrapped in {@link ServiceResponse} if successful. @@ -595,8 +594,8 @@ private ServiceResponse> listNextDelegate(Response } /** - * Lists legal agreements that user needs to accept before purchasing domain. - * Lists legal agreements that user needs to accept before purchasing domain. + * Gets all legal agreements that user needs to accept before purchasing a domain. + * Gets all legal agreements that user needs to accept before purchasing a domain. * * @param nextPageLink The NextLink from the previous successful call to List operation. * @return the PagedList<TldLegalAgreementInner> object if successful. @@ -612,8 +611,8 @@ public Page nextPage(String nextPageLink) { } /** - * Lists legal agreements that user needs to accept before purchasing domain. - * Lists legal agreements that user needs to accept before purchasing domain. + * Gets all legal agreements that user needs to accept before purchasing a domain. + * Gets all legal agreements that user needs to accept before purchasing a domain. * * @param nextPageLink The NextLink from the previous successful call to List operation. * @param serviceCall the ServiceCall object tracking the Retrofit calls @@ -633,8 +632,8 @@ public Observable>> call(String nex } /** - * Lists legal agreements that user needs to accept before purchasing domain. - * Lists legal agreements that user needs to accept before purchasing domain. + * Gets all legal agreements that user needs to accept before purchasing a domain. + * Gets all legal agreements that user needs to accept before purchasing a domain. * * @param nextPageLink The NextLink from the previous successful call to List operation. * @return the observable to the PagedList<TldLegalAgreementInner> object @@ -650,8 +649,8 @@ public Page call(ServiceResponse>> call(ServiceRes } /** - * Lists legal agreements that user needs to accept before purchasing domain. - * Lists legal agreements that user needs to accept before purchasing domain. + * Gets all legal agreements that user needs to accept before purchasing a domain. + * Gets all legal agreements that user needs to accept before purchasing a domain. * ServiceResponse> * @param nextPageLink The NextLink from the previous successful call to List operation. * @return the PagedList<TldLegalAgreementInner> object wrapped in {@link ServiceResponse} if successful. diff --git a/azure-mgmt-website/src/main/java/com/microsoft/azure/management/website/implementation/UsageInner.java b/azure-mgmt-website/src/main/java/com/microsoft/azure/management/website/implementation/UsageInner.java index 180d7878a2af5..3a906c1512070 100644 --- a/azure-mgmt-website/src/main/java/com/microsoft/azure/management/website/implementation/UsageInner.java +++ b/azure-mgmt-website/src/main/java/com/microsoft/azure/management/website/implementation/UsageInner.java @@ -15,63 +15,63 @@ import com.microsoft.azure.Resource; /** - * Class that represents usage of the quota resource. + * Usage of the quota resource. */ @JsonFlatten public class UsageInner extends Resource { /** * Friendly name shown in the UI. */ - @JsonProperty(value = "properties.displayName") + @JsonProperty(value = "properties.displayName", access = JsonProperty.Access.WRITE_ONLY) private String displayName; /** * Name of the quota. */ - @JsonProperty(value = "properties.name") + @JsonProperty(value = "properties.name", access = JsonProperty.Access.WRITE_ONLY) private String usageName; /** * Name of the quota resource. */ - @JsonProperty(value = "properties.resourceName") + @JsonProperty(value = "properties.resourceName", access = JsonProperty.Access.WRITE_ONLY) private String resourceName; /** * Units of measurement for the quota resource. */ - @JsonProperty(value = "properties.unit") + @JsonProperty(value = "properties.unit", access = JsonProperty.Access.WRITE_ONLY) private String unit; /** * The current value of the resource counter. */ - @JsonProperty(value = "properties.currentValue") + @JsonProperty(value = "properties.currentValue", access = JsonProperty.Access.WRITE_ONLY) private Long currentValue; /** * The resource limit. */ - @JsonProperty(value = "properties.limit") + @JsonProperty(value = "properties.limit", access = JsonProperty.Access.WRITE_ONLY) private Long limit; /** * Next reset time for the resource counter. */ - @JsonProperty(value = "properties.nextResetTime") + @JsonProperty(value = "properties.nextResetTime", access = JsonProperty.Access.WRITE_ONLY) private DateTime nextResetTime; /** - * ComputeMode used for this usage. Possible values include: 'Shared', + * Compute mode used for this usage. Possible values include: 'Shared', * 'Dedicated', 'Dynamic'. */ - @JsonProperty(value = "properties.computeMode") + @JsonProperty(value = "properties.computeMode", access = JsonProperty.Access.WRITE_ONLY) private ComputeModeOptions computeMode; /** - * SiteMode used for this usage. + * Site mode used for this usage. */ - @JsonProperty(value = "properties.siteMode") + @JsonProperty(value = "properties.siteMode", access = JsonProperty.Access.WRITE_ONLY) private String siteMode; /** @@ -83,17 +83,6 @@ public String displayName() { return this.displayName; } - /** - * Set the displayName value. - * - * @param displayName the displayName value to set - * @return the UsageInner object itself. - */ - public UsageInner withDisplayName(String displayName) { - this.displayName = displayName; - return this; - } - /** * Get the usageName value. * @@ -103,17 +92,6 @@ public String usageName() { return this.usageName; } - /** - * Set the usageName value. - * - * @param usageName the usageName value to set - * @return the UsageInner object itself. - */ - public UsageInner withUsageName(String usageName) { - this.usageName = usageName; - return this; - } - /** * Get the resourceName value. * @@ -123,17 +101,6 @@ public String resourceName() { return this.resourceName; } - /** - * Set the resourceName value. - * - * @param resourceName the resourceName value to set - * @return the UsageInner object itself. - */ - public UsageInner withResourceName(String resourceName) { - this.resourceName = resourceName; - return this; - } - /** * Get the unit value. * @@ -143,17 +110,6 @@ public String unit() { return this.unit; } - /** - * Set the unit value. - * - * @param unit the unit value to set - * @return the UsageInner object itself. - */ - public UsageInner withUnit(String unit) { - this.unit = unit; - return this; - } - /** * Get the currentValue value. * @@ -163,17 +119,6 @@ public Long currentValue() { return this.currentValue; } - /** - * Set the currentValue value. - * - * @param currentValue the currentValue value to set - * @return the UsageInner object itself. - */ - public UsageInner withCurrentValue(Long currentValue) { - this.currentValue = currentValue; - return this; - } - /** * Get the limit value. * @@ -183,17 +128,6 @@ public Long limit() { return this.limit; } - /** - * Set the limit value. - * - * @param limit the limit value to set - * @return the UsageInner object itself. - */ - public UsageInner withLimit(Long limit) { - this.limit = limit; - return this; - } - /** * Get the nextResetTime value. * @@ -203,17 +137,6 @@ public DateTime nextResetTime() { return this.nextResetTime; } - /** - * Set the nextResetTime value. - * - * @param nextResetTime the nextResetTime value to set - * @return the UsageInner object itself. - */ - public UsageInner withNextResetTime(DateTime nextResetTime) { - this.nextResetTime = nextResetTime; - return this; - } - /** * Get the computeMode value. * @@ -223,17 +146,6 @@ public ComputeModeOptions computeMode() { return this.computeMode; } - /** - * Set the computeMode value. - * - * @param computeMode the computeMode value to set - * @return the UsageInner object itself. - */ - public UsageInner withComputeMode(ComputeModeOptions computeMode) { - this.computeMode = computeMode; - return this; - } - /** * Get the siteMode value. * @@ -243,15 +155,4 @@ public String siteMode() { return this.siteMode; } - /** - * Set the siteMode value. - * - * @param siteMode the siteMode value to set - * @return the UsageInner object itself. - */ - public UsageInner withSiteMode(String siteMode) { - this.siteMode = siteMode; - return this; - } - } diff --git a/azure-mgmt-website/src/main/java/com/microsoft/azure/management/website/implementation/UserInner.java b/azure-mgmt-website/src/main/java/com/microsoft/azure/management/website/implementation/UserInner.java index 6c5387fed233e..a91ffc2ae8f2e 100644 --- a/azure-mgmt-website/src/main/java/com/microsoft/azure/management/website/implementation/UserInner.java +++ b/azure-mgmt-website/src/main/java/com/microsoft/azure/management/website/implementation/UserInner.java @@ -13,12 +13,12 @@ import com.microsoft.azure.Resource; /** - * Represents user crendentials used for publishing activity. + * User crendentials used for publishing activity. */ @JsonFlatten public class UserInner extends Resource { /** - * Username (internal). + * Username. */ @JsonProperty(value = "properties.name") private String userName; @@ -36,13 +36,13 @@ public class UserInner extends Resource { private String publishingPassword; /** - * PasswordHash used for publishing. + * Password hash used for publishing. */ @JsonProperty(value = "properties.publishingPasswordHash") private String publishingPasswordHash; /** - * PasswordHashSalt used for publishing. + * Password hash salt used for publishing. */ @JsonProperty(value = "properties.publishingPasswordHashSalt") private String publishingPasswordHashSalt; diff --git a/azure-mgmt-website/src/main/java/com/microsoft/azure/management/website/implementation/ValidateRequestInner.java b/azure-mgmt-website/src/main/java/com/microsoft/azure/management/website/implementation/ValidateRequestInner.java index 48c447be2434b..97336869c9d41 100644 --- a/azure-mgmt-website/src/main/java/com/microsoft/azure/management/website/implementation/ValidateRequestInner.java +++ b/azure-mgmt-website/src/main/java/com/microsoft/azure/management/website/implementation/ValidateRequestInner.java @@ -9,32 +9,64 @@ package com.microsoft.azure.management.website.implementation; import com.microsoft.azure.management.website.ValidateResourceTypes; -import com.microsoft.azure.management.website.ValidateProperties; +import com.fasterxml.jackson.annotation.JsonProperty; +import com.microsoft.rest.serializer.JsonFlatten; /** * Resource validation request content. */ +@JsonFlatten public class ValidateRequestInner { /** * Resource name to verify. */ + @JsonProperty(required = true) private String name; /** * Resource type used for verification. Possible values include: * 'ServerFarm', 'Site'. */ + @JsonProperty(required = true) private ValidateResourceTypes type; /** * Expected location of the resource. */ + @JsonProperty(required = true) private String location; /** - * Properties of the resource to validate. + * ARM resource ID of an App Service plan that would host the app. */ - private ValidateProperties properties; + @JsonProperty(value = "properties.serverFarmId") + private String serverFarmId; + + /** + * Name of the target SKU for the App Service plan. + */ + @JsonProperty(value = "properties.skuName") + private String skuName; + + /** + * <code>true</code> if App Service plan is for Linux workers; + * otherwise, <code>false</code>. + */ + @JsonProperty(value = "properties.needLinuxWorkers") + private Boolean needLinuxWorkers; + + /** + * Target capacity of the App Service plan (number of VM's). + */ + @JsonProperty(value = "properties.capacity") + private Integer capacity; + + /** + * Name of App Service Environment where app or App Service plan should be + * created. + */ + @JsonProperty(value = "properties.hostingEnvironment") + private String hostingEnvironment; /** * Get the name value. @@ -97,22 +129,102 @@ public ValidateRequestInner withLocation(String location) { } /** - * Get the properties value. + * Get the serverFarmId value. + * + * @return the serverFarmId value + */ + public String serverFarmId() { + return this.serverFarmId; + } + + /** + * Set the serverFarmId value. + * + * @param serverFarmId the serverFarmId value to set + * @return the ValidateRequestInner object itself. + */ + public ValidateRequestInner withServerFarmId(String serverFarmId) { + this.serverFarmId = serverFarmId; + return this; + } + + /** + * Get the skuName value. + * + * @return the skuName value + */ + public String skuName() { + return this.skuName; + } + + /** + * Set the skuName value. + * + * @param skuName the skuName value to set + * @return the ValidateRequestInner object itself. + */ + public ValidateRequestInner withSkuName(String skuName) { + this.skuName = skuName; + return this; + } + + /** + * Get the needLinuxWorkers value. + * + * @return the needLinuxWorkers value + */ + public Boolean needLinuxWorkers() { + return this.needLinuxWorkers; + } + + /** + * Set the needLinuxWorkers value. + * + * @param needLinuxWorkers the needLinuxWorkers value to set + * @return the ValidateRequestInner object itself. + */ + public ValidateRequestInner withNeedLinuxWorkers(Boolean needLinuxWorkers) { + this.needLinuxWorkers = needLinuxWorkers; + return this; + } + + /** + * Get the capacity value. + * + * @return the capacity value + */ + public Integer capacity() { + return this.capacity; + } + + /** + * Set the capacity value. + * + * @param capacity the capacity value to set + * @return the ValidateRequestInner object itself. + */ + public ValidateRequestInner withCapacity(Integer capacity) { + this.capacity = capacity; + return this; + } + + /** + * Get the hostingEnvironment value. * - * @return the properties value + * @return the hostingEnvironment value */ - public ValidateProperties properties() { - return this.properties; + public String hostingEnvironment() { + return this.hostingEnvironment; } /** - * Set the properties value. + * Set the hostingEnvironment value. * - * @param properties the properties value to set + * @param hostingEnvironment the hostingEnvironment value to set * @return the ValidateRequestInner object itself. */ - public ValidateRequestInner withProperties(ValidateProperties properties) { - this.properties = properties; + public ValidateRequestInner withHostingEnvironment(String hostingEnvironment) { + this.hostingEnvironment = hostingEnvironment; return this; } diff --git a/azure-mgmt-website/src/main/java/com/microsoft/azure/management/website/implementation/ValidateResponseInner.java b/azure-mgmt-website/src/main/java/com/microsoft/azure/management/website/implementation/ValidateResponseInner.java index 18f5af969e99c..49da5be38f424 100644 --- a/azure-mgmt-website/src/main/java/com/microsoft/azure/management/website/implementation/ValidateResponseInner.java +++ b/azure-mgmt-website/src/main/java/com/microsoft/azure/management/website/implementation/ValidateResponseInner.java @@ -15,7 +15,7 @@ */ public class ValidateResponseInner { /** - * Indicates the result of validation. + * Result of validation. */ private String status; diff --git a/azure-mgmt-website/src/main/java/com/microsoft/azure/management/website/implementation/VnetGatewayInner.java b/azure-mgmt-website/src/main/java/com/microsoft/azure/management/website/implementation/VnetGatewayInner.java index 9f36769b410ef..ef0b4ca16d875 100644 --- a/azure-mgmt-website/src/main/java/com/microsoft/azure/management/website/implementation/VnetGatewayInner.java +++ b/azure-mgmt-website/src/main/java/com/microsoft/azure/management/website/implementation/VnetGatewayInner.java @@ -13,19 +13,19 @@ import com.microsoft.azure.Resource; /** - * The VnetGateway contract. This is used to give the vnet gateway access to - * the VPN package. + * The Virtual Network gateway contract. This is used to give the Virtual + * Network gateway access to the VPN package. */ @JsonFlatten public class VnetGatewayInner extends Resource { /** - * The VNET name. + * The Virtual Network name. */ @JsonProperty(value = "properties.vnetName") private String vnetName; /** - * The URI where the Vpn package can be downloaded. + * The URI where the VPN package can be downloaded. */ @JsonProperty(value = "properties.vpnPackageUri") private String vpnPackageUri; diff --git a/azure-mgmt-website/src/main/java/com/microsoft/azure/management/website/implementation/VnetInfoInner.java b/azure-mgmt-website/src/main/java/com/microsoft/azure/management/website/implementation/VnetInfoInner.java index 8c12a39cf94c4..ed948dc08e163 100644 --- a/azure-mgmt-website/src/main/java/com/microsoft/azure/management/website/implementation/VnetInfoInner.java +++ b/azure-mgmt-website/src/main/java/com/microsoft/azure/management/website/implementation/VnetInfoInner.java @@ -14,13 +14,12 @@ import com.microsoft.azure.Resource; /** - * VNETInfo contract. This contract is public and is a stripped down version - * of VNETInfoInternal. + * Virtual Network information contract. */ @JsonFlatten public class VnetInfoInner extends Resource { /** - * The vnet resource id. + * The Virtual Network's resource ID. */ @JsonProperty(value = "properties.vnetResourceId") private String vnetResourceId; @@ -28,7 +27,7 @@ public class VnetInfoInner extends Resource { /** * The client certificate thumbprint. */ - @JsonProperty(value = "properties.certThumbprint") + @JsonProperty(value = "properties.certThumbprint", access = JsonProperty.Access.WRITE_ONLY) private String certThumbprint; /** @@ -40,20 +39,21 @@ public class VnetInfoInner extends Resource { private String certBlob; /** - * The routes that this virtual network connection uses. + * The routes that this Virtual Network connection uses. */ - @JsonProperty(value = "properties.routes") + @JsonProperty(value = "properties.routes", access = JsonProperty.Access.WRITE_ONLY) private List routes; /** - * Flag to determine if a resync is required. + * <code>true</code> if a resync is required; otherwise, + * <code>false</code>. */ - @JsonProperty(value = "properties.resyncRequired") + @JsonProperty(value = "properties.resyncRequired", access = JsonProperty.Access.WRITE_ONLY) private Boolean resyncRequired; /** - * Dns servers to be used by this VNET. This should be a comma-separated - * list of IP addresses. + * DNS servers to be used by this Virtual Network. This should be a + * comma-separated list of IP addresses. */ @JsonProperty(value = "properties.dnsServers") private String dnsServers; @@ -87,17 +87,6 @@ public String certThumbprint() { return this.certThumbprint; } - /** - * Set the certThumbprint value. - * - * @param certThumbprint the certThumbprint value to set - * @return the VnetInfoInner object itself. - */ - public VnetInfoInner withCertThumbprint(String certThumbprint) { - this.certThumbprint = certThumbprint; - return this; - } - /** * Get the certBlob value. * @@ -127,17 +116,6 @@ public List routes() { return this.routes; } - /** - * Set the routes value. - * - * @param routes the routes value to set - * @return the VnetInfoInner object itself. - */ - public VnetInfoInner withRoutes(List routes) { - this.routes = routes; - return this; - } - /** * Get the resyncRequired value. * @@ -147,17 +125,6 @@ public Boolean resyncRequired() { return this.resyncRequired; } - /** - * Set the resyncRequired value. - * - * @param resyncRequired the resyncRequired value to set - * @return the VnetInfoInner object itself. - */ - public VnetInfoInner withResyncRequired(Boolean resyncRequired) { - this.resyncRequired = resyncRequired; - return this; - } - /** * Get the dnsServers value. * diff --git a/azure-mgmt-website/src/main/java/com/microsoft/azure/management/website/implementation/VnetRouteInner.java b/azure-mgmt-website/src/main/java/com/microsoft/azure/management/website/implementation/VnetRouteInner.java index b3d2b7fbce404..72b1bf5837574 100644 --- a/azure-mgmt-website/src/main/java/com/microsoft/azure/management/website/implementation/VnetRouteInner.java +++ b/azure-mgmt-website/src/main/java/com/microsoft/azure/management/website/implementation/VnetRouteInner.java @@ -8,12 +8,14 @@ package com.microsoft.azure.management.website.implementation; +import com.microsoft.azure.management.website.RouteType; import com.fasterxml.jackson.annotation.JsonProperty; import com.microsoft.rest.serializer.JsonFlatten; import com.microsoft.azure.Resource; /** - * VnetRoute contract used to pass routing information for a vnet. + * Virtual Network route contract used to pass routing information for a + * Virtual Network. */ @JsonFlatten public class VnetRouteInner extends Resource { @@ -40,19 +42,17 @@ public class VnetRouteInner extends Resource { /** * The type of route this is: - * DEFAULT - By default, every web app has routes to the local - * address ranges specified by RFC1918 - * INHERITED - Routes inherited from the real Virtual Network - * routes - * STATIC - Static route set on the web app only + * DEFAULT - By default, every app has routes to the local address ranges + * specified by RFC1918 + * INHERITED - Routes inherited from the real Virtual Network routes + * STATIC - Static route set on the app only * - * These values will be used for syncing a Web App's routes - * with those from a Virtual Network. This operation will clear all - * DEFAULT and INHERITED routes and replace them - * with new INHERITED routes. + * These values will be used for syncing an app's routes with those from + * a Virtual Network. Possible values include: 'DEFAULT', 'INHERITED', + * 'STATIC'. */ @JsonProperty(value = "properties.routeType") - private String routeType; + private RouteType routeType; /** * Get the vnetRouteName value. @@ -119,7 +119,7 @@ public VnetRouteInner withEndAddress(String endAddress) { * * @return the routeType value */ - public String routeType() { + public RouteType routeType() { return this.routeType; } @@ -129,7 +129,7 @@ public String routeType() { * @param routeType the routeType value to set * @return the VnetRouteInner object itself. */ - public VnetRouteInner withRouteType(String routeType) { + public VnetRouteInner withRouteType(RouteType routeType) { this.routeType = routeType; return this; } diff --git a/azure-mgmt-website/src/main/java/com/microsoft/azure/management/website/implementation/WebAppBaseImpl.java b/azure-mgmt-website/src/main/java/com/microsoft/azure/management/website/implementation/WebAppBaseImpl.java index ef3f0955b795d..f5b2cb704a2ca 100644 --- a/azure-mgmt-website/src/main/java/com/microsoft/azure/management/website/implementation/WebAppBaseImpl.java +++ b/azure-mgmt-website/src/main/java/com/microsoft/azure/management/website/implementation/WebAppBaseImpl.java @@ -402,7 +402,7 @@ public ConnectionString apply(String input) { abstract Observable createOrUpdateSiteConfig(SiteConfigInner siteConfig); - abstract Observable deleteHostNameBinding(String hostname); + abstract Observable deleteHostNameBinding(String hostname); abstract Observable listAppSettings(); diff --git a/azure-mgmt-website/src/main/java/com/microsoft/azure/management/website/implementation/WebAppImpl.java b/azure-mgmt-website/src/main/java/com/microsoft/azure/management/website/implementation/WebAppImpl.java index e44eaaac9e16c..f78afb9af1733 100644 --- a/azure-mgmt-website/src/main/java/com/microsoft/azure/management/website/implementation/WebAppImpl.java +++ b/azure-mgmt-website/src/main/java/com/microsoft/azure/management/website/implementation/WebAppImpl.java @@ -58,7 +58,7 @@ Observable createOrUpdateSiteConfig(SiteConfigInner siteConfig) } @Override - Observable deleteHostNameBinding(String hostname) { + Observable deleteHostNameBinding(String hostname) { return client.deleteHostNameBindingAsync(resourceGroupName(), name(), hostname); } diff --git a/azure-mgmt-website/src/main/java/com/microsoft/azure/management/website/implementation/WebAppsInner.java b/azure-mgmt-website/src/main/java/com/microsoft/azure/management/website/implementation/WebAppsInner.java index 7dae24f7e0dcd..50d8e30d1d2b9 100644 --- a/azure-mgmt-website/src/main/java/com/microsoft/azure/management/website/implementation/WebAppsInner.java +++ b/azure-mgmt-website/src/main/java/com/microsoft/azure/management/website/implementation/WebAppsInner.java @@ -8,38 +8,38 @@ package com.microsoft.azure.management.website.implementation; +import retrofit2.Retrofit; import com.google.common.reflect.TypeToken; import com.microsoft.azure.AzureServiceCall; import com.microsoft.azure.AzureServiceResponseBuilder; import com.microsoft.azure.CloudException; import com.microsoft.azure.ListOperationCallback; +import com.microsoft.azure.management.website.CsmPublishingProfileOptions; +import com.microsoft.azure.management.website.PublishingProfileFormat; import com.microsoft.azure.Page; import com.microsoft.azure.PagedList; -import com.microsoft.azure.management.website.CsmPublishingProfileOptions; import com.microsoft.rest.ServiceCall; import com.microsoft.rest.ServiceCallback; import com.microsoft.rest.ServiceResponse; import com.microsoft.rest.Validator; +import java.io.InputStream; +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.PATCH; +import retrofit2.http.Path; import retrofit2.http.POST; import retrofit2.http.PUT; -import retrofit2.http.Path; import retrofit2.http.Query; import retrofit2.http.Streaming; -import rx.Observable; +import retrofit2.Response; import rx.functions.Func1; - -import java.io.IOException; -import java.io.InputStream; -import java.util.List; +import rx.Observable; /** * An instance of this class provides access to all the operations defined @@ -71,17 +71,13 @@ interface WebAppsService { @GET("subscriptions/{subscriptionId}/providers/Microsoft.Web/sites") Observable> list(@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") - @GET("subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.Web/deletedSites") - Observable> listDeleted(@Path("resourceGroupName") String resourceGroupName, @Path("subscriptionId") String subscriptionId, @Query("propertiesToInclude") String propertiesToInclude, @Query("api-version") String apiVersion, @Header("accept-language") String acceptLanguage, @Header("User-Agent") String userAgent); - @Headers("Content-Type: application/json; charset=utf-8") @GET("subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.Web/sites") - Observable> listByResourceGroup(@Path("resourceGroupName") String resourceGroupName, @Path("subscriptionId") String subscriptionId, @Query("propertiesToInclude") String propertiesToInclude, @Query("includeSlots") Boolean includeSlots, @Query("api-version") String apiVersion, @Header("accept-language") String acceptLanguage, @Header("User-Agent") String userAgent); + Observable> listByResourceGroup(@Path("resourceGroupName") String resourceGroupName, @Path("subscriptionId") String subscriptionId, @Query("includeSlots") Boolean includeSlots, @Query("api-version") String apiVersion, @Header("accept-language") String acceptLanguage, @Header("User-Agent") String userAgent); @Headers("Content-Type: application/json; charset=utf-8") @GET("subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.Web/sites/{name}") - Observable> get(@Path("resourceGroupName") String resourceGroupName, @Path("name") String name, @Path("subscriptionId") String subscriptionId, @Query("propertiesToInclude") String propertiesToInclude, @Query("api-version") String apiVersion, @Header("accept-language") String acceptLanguage, @Header("User-Agent") String userAgent); + Observable> get(@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") @PUT("subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.Web/sites/{name}") @@ -149,7 +145,7 @@ interface WebAppsService { @Headers("Content-Type: application/json; charset=utf-8") @POST("subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.Web/sites/{name}/config/authsettings/list") - Observable> listAuthSettings(@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> getAuthSettings(@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") @PUT("subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.Web/sites/{name}/config/backup") @@ -239,6 +235,26 @@ interface WebAppsService { @HTTP(path = "subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.Web/sites/{name}/deployments/{id}", method = "DELETE", hasBody = true) Observable> deleteDeployment(@Path("resourceGroupName") String resourceGroupName, @Path("name") String name, @Path("id") String id, @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") + @GET("subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.Web/sites/{name}/domainOwnershipIdentifiers") + Observable> listDomainOwnershipIdentifiers(@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") + @GET("subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.Web/sites/{name}/domainOwnershipIdentifiers/{domainOwnershipIdentifierName}") + Observable> getDomainOwnershipIdentifier(@Path("resourceGroupName") String resourceGroupName, @Path("name") String name, @Path("domainOwnershipIdentifierName") String domainOwnershipIdentifierName, @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") + @PUT("subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.Web/sites/{name}/domainOwnershipIdentifiers/{domainOwnershipIdentifierName}") + Observable> createOrUpdateDomainOwnershipIdentifier(@Path("resourceGroupName") String resourceGroupName, @Path("name") String name, @Path("domainOwnershipIdentifierName") String domainOwnershipIdentifierName, @Path("subscriptionId") String subscriptionId, @Body IdentifierInner domainOwnershipIdentifier, @Query("api-version") String apiVersion, @Header("accept-language") String acceptLanguage, @Header("User-Agent") String userAgent); + + @Headers("Content-Type: application/json; charset=utf-8") + @HTTP(path = "subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.Web/sites/{name}/domainOwnershipIdentifiers/{domainOwnershipIdentifierName}", method = "DELETE", hasBody = true) + Observable> deleteDomainOwnershipIdentifier(@Path("resourceGroupName") String resourceGroupName, @Path("name") String name, @Path("domainOwnershipIdentifierName") String domainOwnershipIdentifierName, @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") + @PATCH("subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.Web/sites/{name}/domainOwnershipIdentifiers/{domainOwnershipIdentifierName}") + Observable> updateDomainOwnershipIdentifier(@Path("resourceGroupName") String resourceGroupName, @Path("name") String name, @Path("domainOwnershipIdentifierName") String domainOwnershipIdentifierName, @Path("subscriptionId") String subscriptionId, @Body IdentifierInner domainOwnershipIdentifier, @Query("api-version") String apiVersion, @Header("accept-language") String acceptLanguage, @Header("User-Agent") String userAgent); + @Headers("Content-Type: application/json; charset=utf-8") @GET("subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.Web/sites/{name}/hostNameBindings") Observable> listHostNameBindings(@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); @@ -329,7 +345,7 @@ interface WebAppsService { @Headers("Content-Type: application/json; charset=utf-8") @GET("subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.Web/sites/{name}/metrics") - Observable> listMetrics(@Path("resourceGroupName") String resourceGroupName, @Path("name") String name, @Path("subscriptionId") String subscriptionId, @Query("details") Boolean details, @Query("$filter") String filter, @Query("api-version") String apiVersion, @Header("accept-language") String acceptLanguage, @Header("User-Agent") String userAgent); + Observable> listMetrics(@Path("resourceGroupName") String resourceGroupName, @Path("name") String name, @Path("subscriptionId") String subscriptionId, @Query("details") Boolean details, @Query(value = "$filter", encoded = true) String filter, @Query("api-version") String apiVersion, @Header("accept-language") String acceptLanguage, @Header("User-Agent") String userAgent); @Headers("Content-Type: application/json; charset=utf-8") @PUT("subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.Web/sites/{name}/migrate") @@ -363,13 +379,9 @@ interface WebAppsService { @POST("subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.Web/sites/{name}/newpassword") Observable> generateNewSitePublishingPassword(@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") - @GET("subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.Web/sites/{name}/operationresults/{operationId}") - Observable> getOperation(@Path("resourceGroupName") String resourceGroupName, @Path("name") String name, @Path("operationId") String operationId, @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") @GET("subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.Web/sites/{name}/perfcounters") - Observable> listPerfMonCounters(@Path("resourceGroupName") String resourceGroupName, @Path("name") String name, @Path("subscriptionId") String subscriptionId, @Query("$filter") String filter, @Query("api-version") String apiVersion, @Header("accept-language") String acceptLanguage, @Header("User-Agent") String userAgent); + Observable> listPerfMonCounters(@Path("resourceGroupName") String resourceGroupName, @Path("name") String name, @Path("subscriptionId") String subscriptionId, @Query(value = "$filter", encoded = true) String filter, @Query("api-version") String apiVersion, @Header("accept-language") String acceptLanguage, @Header("User-Agent") String userAgent); @Headers("Content-Type: application/json; charset=utf-8") @GET("subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.Web/sites/{name}/phplogging") @@ -385,7 +397,7 @@ interface WebAppsService { @Headers("Content-Type: application/json; charset=utf-8") @PUT("subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.Web/sites/{name}/premieraddons/{premierAddOnName}") - Observable> addPremierAddOn(@Path("resourceGroupName") String resourceGroupName, @Path("name") String name, @Path("premierAddOnName") String premierAddOnName, @Path("subscriptionId") String subscriptionId, @Body PremierAddOnRequestInner premierAddOn, @Query("api-version") String apiVersion, @Header("accept-language") String acceptLanguage, @Header("User-Agent") String userAgent); + Observable> addPremierAddOn(@Path("resourceGroupName") String resourceGroupName, @Path("name") String name, @Path("premierAddOnName") String premierAddOnName, @Path("subscriptionId") String subscriptionId, @Body PremierAddOnInner premierAddOn, @Query("api-version") String apiVersion, @Header("accept-language") String acceptLanguage, @Header("User-Agent") String userAgent); @Headers("Content-Type: application/json; charset=utf-8") @HTTP(path = "subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.Web/sites/{name}/premieraddons/{premierAddOnName}", method = "DELETE", hasBody = true) @@ -414,11 +426,11 @@ interface WebAppsService { @Headers("Content-Type: application/json; charset=utf-8") @GET("subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.Web/sites/{name}/slots") - Observable> listSlots(@Path("resourceGroupName") String resourceGroupName, @Path("name") String name, @Path("subscriptionId") String subscriptionId, @Query("propertiesToInclude") String propertiesToInclude, @Query("api-version") String apiVersion, @Header("accept-language") String acceptLanguage, @Header("User-Agent") String userAgent); + Observable> listSlots(@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") @GET("subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.Web/sites/{name}/slots/{slot}") - Observable> getSlot(@Path("resourceGroupName") String resourceGroupName, @Path("name") String name, @Path("slot") String slot, @Path("subscriptionId") String subscriptionId, @Query("propertiesToInclude") String propertiesToInclude, @Query("api-version") String apiVersion, @Header("accept-language") String acceptLanguage, @Header("User-Agent") String userAgent); + Observable> getSlot(@Path("resourceGroupName") String resourceGroupName, @Path("name") String name, @Path("slot") String slot, @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") @PUT("subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.Web/sites/{name}/slots/{slot}") @@ -486,7 +498,7 @@ interface WebAppsService { @Headers("Content-Type: application/json; charset=utf-8") @POST("subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.Web/sites/{name}/slots/{slot}/config/authsettings/list") - Observable> listAuthSettingsSlot(@Path("resourceGroupName") String resourceGroupName, @Path("name") String name, @Path("slot") String slot, @Path("subscriptionId") String subscriptionId, @Query("api-version") String apiVersion, @Header("accept-language") String acceptLanguage, @Header("User-Agent") String userAgent); + Observable> getAuthSettingsSlot(@Path("resourceGroupName") String resourceGroupName, @Path("name") String name, @Path("slot") String slot, @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") @PUT("subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.Web/sites/{name}/slots/{slot}/config/backup") @@ -568,6 +580,26 @@ interface WebAppsService { @HTTP(path = "subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.Web/sites/{name}/slots/{slot}/deployments/{id}", method = "DELETE", hasBody = true) Observable> deleteDeploymentSlot(@Path("resourceGroupName") String resourceGroupName, @Path("name") String name, @Path("id") String id, @Path("slot") String slot, @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") + @GET("subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.Web/sites/{name}/slots/{slot}/domainOwnershipIdentifiers") + Observable> listDomainOwnershipIdentifiersSlot(@Path("resourceGroupName") String resourceGroupName, @Path("name") String name, @Path("slot") String slot, @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") + @GET("subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.Web/sites/{name}/slots/{slot}/domainOwnershipIdentifiers/{domainOwnershipIdentifierName}") + Observable> getDomainOwnershipIdentifierSlot(@Path("resourceGroupName") String resourceGroupName, @Path("name") String name, @Path("domainOwnershipIdentifierName") String domainOwnershipIdentifierName, @Path("slot") String slot, @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") + @PUT("subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.Web/sites/{name}/slots/{slot}/domainOwnershipIdentifiers/{domainOwnershipIdentifierName}") + Observable> createOrUpdateDomainOwnershipIdentifierSlot(@Path("resourceGroupName") String resourceGroupName, @Path("name") String name, @Path("domainOwnershipIdentifierName") String domainOwnershipIdentifierName, @Path("slot") String slot, @Path("subscriptionId") String subscriptionId, @Body IdentifierInner domainOwnershipIdentifier, @Query("api-version") String apiVersion, @Header("accept-language") String acceptLanguage, @Header("User-Agent") String userAgent); + + @Headers("Content-Type: application/json; charset=utf-8") + @HTTP(path = "subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.Web/sites/{name}/slots/{slot}/domainOwnershipIdentifiers/{domainOwnershipIdentifierName}", method = "DELETE", hasBody = true) + Observable> deleteDomainOwnershipIdentifierSlot(@Path("resourceGroupName") String resourceGroupName, @Path("name") String name, @Path("domainOwnershipIdentifierName") String domainOwnershipIdentifierName, @Path("slot") String slot, @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") + @PATCH("subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.Web/sites/{name}/slots/{slot}/domainOwnershipIdentifiers/{domainOwnershipIdentifierName}") + Observable> updateDomainOwnershipIdentifierSlot(@Path("resourceGroupName") String resourceGroupName, @Path("name") String name, @Path("domainOwnershipIdentifierName") String domainOwnershipIdentifierName, @Path("slot") String slot, @Path("subscriptionId") String subscriptionId, @Body IdentifierInner domainOwnershipIdentifier, @Query("api-version") String apiVersion, @Header("accept-language") String acceptLanguage, @Header("User-Agent") String userAgent); + @Headers("Content-Type: application/json; charset=utf-8") @GET("subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.Web/sites/{name}/slots/{slot}/hostNameBindings") Observable> listHostNameBindingsSlot(@Path("resourceGroupName") String resourceGroupName, @Path("name") String name, @Path("slot") String slot, @Path("subscriptionId") String subscriptionId, @Query("api-version") String apiVersion, @Header("accept-language") String acceptLanguage, @Header("User-Agent") String userAgent); @@ -658,7 +690,7 @@ interface WebAppsService { @Headers("Content-Type: application/json; charset=utf-8") @GET("subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.Web/sites/{name}/slots/{slot}/metrics") - Observable> listMetricsSlot(@Path("resourceGroupName") String resourceGroupName, @Path("name") String name, @Path("slot") String slot, @Path("subscriptionId") String subscriptionId, @Query("details") Boolean details, @Query("$filter") String filter, @Query("api-version") String apiVersion, @Header("accept-language") String acceptLanguage, @Header("User-Agent") String userAgent); + Observable> listMetricsSlot(@Path("resourceGroupName") String resourceGroupName, @Path("name") String name, @Path("slot") String slot, @Path("subscriptionId") String subscriptionId, @Query("details") Boolean details, @Query(value = "$filter", encoded = true) String filter, @Query("api-version") String apiVersion, @Header("accept-language") String acceptLanguage, @Header("User-Agent") String userAgent); @Headers("Content-Type: application/json; charset=utf-8") @GET("subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.Web/sites/{name}/slots/{slot}/networkFeatures/{view}") @@ -676,13 +708,9 @@ interface WebAppsService { @POST("subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.Web/sites/{name}/slots/{slot}/newpassword") Observable> generateNewSitePublishingPasswordSlot(@Path("resourceGroupName") String resourceGroupName, @Path("name") String name, @Path("slot") String slot, @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") - @GET("subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.Web/sites/{name}/slots/{slot}/operationresults/{operationId}") - Observable> getOperationSlot(@Path("resourceGroupName") String resourceGroupName, @Path("name") String name, @Path("operationId") String operationId, @Path("slot") String slot, @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") @GET("subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.Web/sites/{name}/slots/{slot}/perfcounters") - Observable> listPerfMonCountersSlot(@Path("resourceGroupName") String resourceGroupName, @Path("name") String name, @Path("slot") String slot, @Path("subscriptionId") String subscriptionId, @Query("$filter") String filter, @Query("api-version") String apiVersion, @Header("accept-language") String acceptLanguage, @Header("User-Agent") String userAgent); + Observable> listPerfMonCountersSlot(@Path("resourceGroupName") String resourceGroupName, @Path("name") String name, @Path("slot") String slot, @Path("subscriptionId") String subscriptionId, @Query(value = "$filter", encoded = true) String filter, @Query("api-version") String apiVersion, @Header("accept-language") String acceptLanguage, @Header("User-Agent") String userAgent); @Headers("Content-Type: application/json; charset=utf-8") @GET("subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.Web/sites/{name}/slots/{slot}/phplogging") @@ -698,7 +726,7 @@ interface WebAppsService { @Headers("Content-Type: application/json; charset=utf-8") @PUT("subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.Web/sites/{name}/slots/{slot}/premieraddons/{premierAddOnName}") - Observable> addPremierAddOnSlot(@Path("resourceGroupName") String resourceGroupName, @Path("name") String name, @Path("premierAddOnName") String premierAddOnName, @Path("slot") String slot, @Path("subscriptionId") String subscriptionId, @Body PremierAddOnRequestInner premierAddOn, @Query("api-version") String apiVersion, @Header("accept-language") String acceptLanguage, @Header("User-Agent") String userAgent); + Observable> addPremierAddOnSlot(@Path("resourceGroupName") String resourceGroupName, @Path("name") String name, @Path("premierAddOnName") String premierAddOnName, @Path("slot") String slot, @Path("subscriptionId") String subscriptionId, @Body PremierAddOnInner premierAddOn, @Query("api-version") String apiVersion, @Header("accept-language") String acceptLanguage, @Header("User-Agent") String userAgent); @Headers("Content-Type: application/json; charset=utf-8") @HTTP(path = "subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.Web/sites/{name}/slots/{slot}/premieraddons/{premierAddOnName}", method = "DELETE", hasBody = true) @@ -731,11 +759,11 @@ interface WebAppsService { @Headers("Content-Type: application/json; charset=utf-8") @POST("subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.Web/sites/{name}/slots/{slot}/slotsswap") - Observable> swapSlotsSlot(@Path("resourceGroupName") String resourceGroupName, @Path("name") String name, @Path("slot") String slot, @Path("subscriptionId") String subscriptionId, @Body CsmSlotEntityInner slotSwapEntity, @Query("api-version") String apiVersion, @Header("accept-language") String acceptLanguage, @Header("User-Agent") String userAgent); + Observable> swapSlotSlot(@Path("resourceGroupName") String resourceGroupName, @Path("name") String name, @Path("slot") String slot, @Path("subscriptionId") String subscriptionId, @Body CsmSlotEntityInner slotSwapEntity, @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.Web/sites/{name}/slots/{slot}/slotsswap") - Observable> beginSwapSlotsSlot(@Path("resourceGroupName") String resourceGroupName, @Path("name") String name, @Path("slot") String slot, @Path("subscriptionId") String subscriptionId, @Body CsmSlotEntityInner slotSwapEntity, @Query("api-version") String apiVersion, @Header("accept-language") String acceptLanguage, @Header("User-Agent") String userAgent); + Observable> beginSwapSlotSlot(@Path("resourceGroupName") String resourceGroupName, @Path("name") String name, @Path("slot") String slot, @Path("subscriptionId") String subscriptionId, @Body CsmSlotEntityInner slotSwapEntity, @Query("api-version") String apiVersion, @Header("accept-language") String acceptLanguage, @Header("User-Agent") String userAgent); @Headers("Content-Type: application/json; charset=utf-8") @GET("subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.Web/sites/{name}/slots/{slot}/snapshots") @@ -750,12 +778,12 @@ interface WebAppsService { Observable> createOrUpdateSourceControlSlot(@Path("resourceGroupName") String resourceGroupName, @Path("name") String name, @Path("slot") String slot, @Path("subscriptionId") String subscriptionId, @Body SiteSourceControlInner siteSourceControl, @Query("api-version") String apiVersion, @Header("accept-language") String acceptLanguage, @Header("User-Agent") String userAgent); @Headers("Content-Type: application/json; charset=utf-8") - @HTTP(path = "subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.Web/sites/{name}/slots/{slot}/sourcecontrols/web", method = "DELETE", hasBody = true) - Observable> deleteSourceControlSlot(@Path("resourceGroupName") String resourceGroupName, @Path("name") String name, @Path("slot") String slot, @Path("subscriptionId") String subscriptionId, @Query("api-version") String apiVersion, @Header("accept-language") String acceptLanguage, @Header("User-Agent") String userAgent); + @PUT("subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.Web/sites/{name}/slots/{slot}/sourcecontrols/web") + Observable> beginCreateOrUpdateSourceControlSlot(@Path("resourceGroupName") String resourceGroupName, @Path("name") String name, @Path("slot") String slot, @Path("subscriptionId") String subscriptionId, @Body SiteSourceControlInner siteSourceControl, @Query("api-version") String apiVersion, @Header("accept-language") String acceptLanguage, @Header("User-Agent") String userAgent); @Headers("Content-Type: application/json; charset=utf-8") - @PATCH("subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.Web/sites/{name}/slots/{slot}/sourcecontrols/web") - Observable> updateSourceControlSlot(@Path("resourceGroupName") String resourceGroupName, @Path("name") String name, @Path("slot") String slot, @Path("subscriptionId") String subscriptionId, @Body SiteSourceControlInner siteSourceControl, @Query("api-version") String apiVersion, @Header("accept-language") String acceptLanguage, @Header("User-Agent") String userAgent); + @HTTP(path = "subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.Web/sites/{name}/slots/{slot}/sourcecontrols/web", method = "DELETE", hasBody = true) + Observable> deleteSourceControlSlot(@Path("resourceGroupName") String resourceGroupName, @Path("name") String name, @Path("slot") String slot, @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.Web/sites/{name}/slots/{slot}/start") @@ -771,7 +799,7 @@ interface WebAppsService { @Headers("Content-Type: application/json; charset=utf-8") @GET("subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.Web/sites/{name}/slots/{slot}/usages") - Observable> listUsagesSlot(@Path("resourceGroupName") String resourceGroupName, @Path("name") String name, @Path("slot") String slot, @Path("subscriptionId") String subscriptionId, @Query("$filter") String filter, @Query("api-version") String apiVersion, @Header("accept-language") String acceptLanguage, @Header("User-Agent") String userAgent); + Observable> listUsagesSlot(@Path("resourceGroupName") String resourceGroupName, @Path("name") String name, @Path("slot") String slot, @Path("subscriptionId") String subscriptionId, @Query(value = "$filter", encoded = true) String filter, @Query("api-version") String apiVersion, @Header("accept-language") String acceptLanguage, @Header("User-Agent") String userAgent); @Headers("Content-Type: application/json; charset=utf-8") @GET("subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.Web/sites/{name}/slots/{slot}/virtualNetworkConnections") @@ -830,12 +858,12 @@ interface WebAppsService { Observable> createOrUpdateSourceControl(@Path("resourceGroupName") String resourceGroupName, @Path("name") String name, @Path("subscriptionId") String subscriptionId, @Body SiteSourceControlInner siteSourceControl, @Query("api-version") String apiVersion, @Header("accept-language") String acceptLanguage, @Header("User-Agent") String userAgent); @Headers("Content-Type: application/json; charset=utf-8") - @HTTP(path = "subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.Web/sites/{name}/sourcecontrols/web", method = "DELETE", hasBody = true) - Observable> deleteSourceControl(@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); + @PUT("subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.Web/sites/{name}/sourcecontrols/web") + Observable> beginCreateOrUpdateSourceControl(@Path("resourceGroupName") String resourceGroupName, @Path("name") String name, @Path("subscriptionId") String subscriptionId, @Body SiteSourceControlInner siteSourceControl, @Query("api-version") String apiVersion, @Header("accept-language") String acceptLanguage, @Header("User-Agent") String userAgent); @Headers("Content-Type: application/json; charset=utf-8") - @PATCH("subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.Web/sites/{name}/sourcecontrols/web") - Observable> updateSourceControl(@Path("resourceGroupName") String resourceGroupName, @Path("name") String name, @Path("subscriptionId") String subscriptionId, @Body SiteSourceControlInner siteSourceControl, @Query("api-version") String apiVersion, @Header("accept-language") String acceptLanguage, @Header("User-Agent") String userAgent); + @HTTP(path = "subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.Web/sites/{name}/sourcecontrols/web", method = "DELETE", hasBody = true) + Observable> deleteSourceControl(@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.Web/sites/{name}/start") @@ -851,7 +879,7 @@ interface WebAppsService { @Headers("Content-Type: application/json; charset=utf-8") @GET("subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.Web/sites/{name}/usages") - Observable> listUsages(@Path("resourceGroupName") String resourceGroupName, @Path("name") String name, @Path("subscriptionId") String subscriptionId, @Query("$filter") String filter, @Query("api-version") String apiVersion, @Header("accept-language") String acceptLanguage, @Header("User-Agent") String userAgent); + Observable> listUsages(@Path("resourceGroupName") String resourceGroupName, @Path("name") String name, @Path("subscriptionId") String subscriptionId, @Query(value = "$filter", encoded = true) String filter, @Query("api-version") String apiVersion, @Header("accept-language") String acceptLanguage, @Header("User-Agent") String userAgent); @Headers("Content-Type: application/json; charset=utf-8") @GET("subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.Web/sites/{name}/virtualNetworkConnections") @@ -889,10 +917,6 @@ interface WebAppsService { @GET("{nextLink}") Observable> listNext(@Path(value = "nextLink", encoded = true) String nextPageLink, @Header("accept-language") String acceptLanguage, @Header("User-Agent") String userAgent); - @Headers("Content-Type: application/json; charset=utf-8") - @GET("{nextLink}") - Observable> listDeletedNext(@Path(value = "nextLink", encoded = true) String nextPageLink, @Header("accept-language") String acceptLanguage, @Header("User-Agent") String userAgent); - @Headers("Content-Type: application/json; charset=utf-8") @GET("{nextLink}") Observable> listByResourceGroupNext(@Path(value = "nextLink", encoded = true) String nextPageLink, @Header("accept-language") String acceptLanguage, @Header("User-Agent") String userAgent); @@ -905,6 +929,10 @@ interface WebAppsService { @GET("{nextLink}") Observable> listDeploymentsNext(@Path(value = "nextLink", encoded = true) String nextPageLink, @Header("accept-language") String acceptLanguage, @Header("User-Agent") String userAgent); + @Headers("Content-Type: application/json; charset=utf-8") + @GET("{nextLink}") + Observable> listDomainOwnershipIdentifiersNext(@Path(value = "nextLink", encoded = true) String nextPageLink, @Header("accept-language") String acceptLanguage, @Header("User-Agent") String userAgent); + @Headers("Content-Type: application/json; charset=utf-8") @GET("{nextLink}") Observable> listHostNameBindingsNext(@Path(value = "nextLink", encoded = true) String nextPageLink, @Header("accept-language") String acceptLanguage, @Header("User-Agent") String userAgent); @@ -941,6 +969,10 @@ interface WebAppsService { @GET("{nextLink}") Observable> listDeploymentsSlotNext(@Path(value = "nextLink", encoded = true) String nextPageLink, @Header("accept-language") String acceptLanguage, @Header("User-Agent") String userAgent); + @Headers("Content-Type: application/json; charset=utf-8") + @GET("{nextLink}") + Observable> listDomainOwnershipIdentifiersSlotNext(@Path(value = "nextLink", encoded = true) String nextPageLink, @Header("accept-language") String acceptLanguage, @Header("User-Agent") String userAgent); + @Headers("Content-Type: application/json; charset=utf-8") @GET("{nextLink}") Observable> listHostNameBindingsSlotNext(@Path(value = "nextLink", encoded = true) String nextPageLink, @Header("accept-language") String acceptLanguage, @Header("User-Agent") String userAgent); @@ -992,8 +1024,8 @@ interface WebAppsService { } /** - * Gets all Web Apps for a subscription. - * Gets all Web Apps for a subscription. + * Get all apps for a subscription. + * Get all apps for a subscription. * * @return the PagedList<SiteInner> object if successful. */ @@ -1008,8 +1040,8 @@ public Page nextPage(String nextPageLink) { } /** - * Gets all Web Apps for a subscription. - * Gets all Web Apps for a subscription. + * Get all apps for a subscription. + * Get all apps for a subscription. * * @param serviceCallback the async ServiceCallback to handle successful and failed responses. * @return the {@link ServiceCall} object @@ -1027,8 +1059,8 @@ public Observable>> call(String nextPageLink) { } /** - * Gets all Web Apps for a subscription. - * Gets all Web Apps for a subscription. + * Get all apps for a subscription. + * Get all apps for a subscription. * * @return the observable to the PagedList<SiteInner> object */ @@ -1043,8 +1075,8 @@ public Page call(ServiceResponse> response) { } /** - * Gets all Web Apps for a subscription. - * Gets all Web Apps for a subscription. + * Get all apps for a subscription. + * Get all apps for a subscription. * * @return the observable to the PagedList<SiteInner> object */ @@ -1063,8 +1095,8 @@ public Observable>> call(ServiceResponse> listDelegate(Response } /** - * Gets deleted web apps in subscription. - * Gets deleted web apps in subscription. - * - * @param resourceGroupName Name of resource group - * @return the PagedList<DeletedSiteInner> object if successful. - */ - public PagedList listDeleted(final String resourceGroupName) { - ServiceResponse> response = listDeletedSinglePageAsync(resourceGroupName).toBlocking().single(); - return new PagedList(response.getBody()) { - @Override - public Page nextPage(String nextPageLink) { - return listDeletedNextSinglePageAsync(nextPageLink).toBlocking().single().getBody(); - } - }; - } - - /** - * Gets deleted web apps in subscription. - * Gets deleted web apps in subscription. - * - * @param resourceGroupName Name of resource group - * @param serviceCallback the async ServiceCallback to handle successful and failed responses. - * @return the {@link ServiceCall} object - */ - public ServiceCall> listDeletedAsync(final String resourceGroupName, final ListOperationCallback serviceCallback) { - return AzureServiceCall.create( - listDeletedSinglePageAsync(resourceGroupName), - new Func1>>>() { - @Override - public Observable>> call(String nextPageLink) { - return listDeletedNextSinglePageAsync(nextPageLink); - } - }, - serviceCallback); - } - - /** - * Gets deleted web apps in subscription. - * Gets deleted web apps in subscription. - * - * @param resourceGroupName Name of resource group - * @return the observable to the PagedList<DeletedSiteInner> object - */ - public Observable> listDeletedAsync(final String resourceGroupName) { - return listDeletedWithServiceResponseAsync(resourceGroupName) - .map(new Func1>, Page>() { - @Override - public Page call(ServiceResponse> response) { - return response.getBody(); - } - }); - } - - /** - * Gets deleted web apps in subscription. - * Gets deleted web apps in subscription. - * - * @param resourceGroupName Name of resource group - * @return the observable to the PagedList<DeletedSiteInner> object - */ - public Observable>> listDeletedWithServiceResponseAsync(final String resourceGroupName) { - return listDeletedSinglePageAsync(resourceGroupName) - .concatMap(new Func1>, Observable>>>() { - @Override - public Observable>> call(ServiceResponse> page) { - String nextPageLink = page.getBody().getNextPageLink(); - if (nextPageLink == null) { - return Observable.just(page); - } - return Observable.just(page).concatWith(listDeletedNextWithServiceResponseAsync(nextPageLink)); - } - }); - } - - /** - * Gets deleted web apps in subscription. - * Gets deleted web apps in subscription. - * - * @param resourceGroupName Name of resource group - * @return the PagedList<DeletedSiteInner> object wrapped in {@link ServiceResponse} if successful. - */ - public Observable>> listDeletedSinglePageAsync(final String resourceGroupName) { - if (resourceGroupName == null) { - throw new IllegalArgumentException("Parameter resourceGroupName is required and cannot be null."); - } - if (this.client.subscriptionId() == null) { - throw new IllegalArgumentException("Parameter this.client.subscriptionId() is required and cannot be null."); - } - final String apiVersion = "2016-08-01"; - final String propertiesToInclude = null; - return service.listDeleted(resourceGroupName, this.client.subscriptionId(), propertiesToInclude, apiVersion, this.client.acceptLanguage(), this.client.userAgent()) - .flatMap(new Func1, Observable>>>() { - @Override - public Observable>> call(Response response) { - try { - ServiceResponse> result = listDeletedDelegate(response); - return Observable.just(new ServiceResponse>(result.getBody(), result.getResponse())); - } catch (Throwable t) { - return Observable.error(t); - } - } - }); - } - - /** - * Gets deleted web apps in subscription. - * Gets deleted web apps in subscription. - * - * @param resourceGroupName Name of resource group - * @param propertiesToInclude Additional web app properties included in the response - * @return the PagedList<DeletedSiteInner> object if successful. - */ - public PagedList listDeleted(final String resourceGroupName, final String propertiesToInclude) { - ServiceResponse> response = listDeletedSinglePageAsync(resourceGroupName, propertiesToInclude).toBlocking().single(); - return new PagedList(response.getBody()) { - @Override - public Page nextPage(String nextPageLink) { - return listDeletedNextSinglePageAsync(nextPageLink).toBlocking().single().getBody(); - } - }; - } - - /** - * Gets deleted web apps in subscription. - * Gets deleted web apps in subscription. - * - * @param resourceGroupName Name of resource group - * @param propertiesToInclude Additional web app properties included in the response - * @param serviceCallback the async ServiceCallback to handle successful and failed responses. - * @return the {@link ServiceCall} object - */ - public ServiceCall> listDeletedAsync(final String resourceGroupName, final String propertiesToInclude, final ListOperationCallback serviceCallback) { - return AzureServiceCall.create( - listDeletedSinglePageAsync(resourceGroupName, propertiesToInclude), - new Func1>>>() { - @Override - public Observable>> call(String nextPageLink) { - return listDeletedNextSinglePageAsync(nextPageLink); - } - }, - serviceCallback); - } - - /** - * Gets deleted web apps in subscription. - * Gets deleted web apps in subscription. - * - * @param resourceGroupName Name of resource group - * @param propertiesToInclude Additional web app properties included in the response - * @return the observable to the PagedList<DeletedSiteInner> object - */ - public Observable> listDeletedAsync(final String resourceGroupName, final String propertiesToInclude) { - return listDeletedWithServiceResponseAsync(resourceGroupName, propertiesToInclude) - .map(new Func1>, Page>() { - @Override - public Page call(ServiceResponse> response) { - return response.getBody(); - } - }); - } - - /** - * Gets deleted web apps in subscription. - * Gets deleted web apps in subscription. - * - * @param resourceGroupName Name of resource group - * @param propertiesToInclude Additional web app properties included in the response - * @return the observable to the PagedList<DeletedSiteInner> object - */ - public Observable>> listDeletedWithServiceResponseAsync(final String resourceGroupName, final String propertiesToInclude) { - return listDeletedSinglePageAsync(resourceGroupName, propertiesToInclude) - .concatMap(new Func1>, Observable>>>() { - @Override - public Observable>> call(ServiceResponse> page) { - String nextPageLink = page.getBody().getNextPageLink(); - if (nextPageLink == null) { - return Observable.just(page); - } - return Observable.just(page).concatWith(listDeletedNextWithServiceResponseAsync(nextPageLink)); - } - }); - } - - /** - * Gets deleted web apps in subscription. - * Gets deleted web apps in subscription. - * - ServiceResponse> * @param resourceGroupName Name of resource group - ServiceResponse> * @param propertiesToInclude Additional web app properties included in the response - * @return the PagedList<DeletedSiteInner> object wrapped in {@link ServiceResponse} if successful. - */ - public Observable>> listDeletedSinglePageAsync(final String resourceGroupName, final String propertiesToInclude) { - if (resourceGroupName == null) { - throw new IllegalArgumentException("Parameter resourceGroupName is required and cannot be null."); - } - if (this.client.subscriptionId() == null) { - throw new IllegalArgumentException("Parameter this.client.subscriptionId() is required and cannot be null."); - } - final String apiVersion = "2016-08-01"; - return service.listDeleted(resourceGroupName, this.client.subscriptionId(), propertiesToInclude, apiVersion, this.client.acceptLanguage(), this.client.userAgent()) - .flatMap(new Func1, Observable>>>() { - @Override - public Observable>> call(Response response) { - try { - ServiceResponse> result = listDeletedDelegate(response); - return Observable.just(new ServiceResponse>(result.getBody(), result.getResponse())); - } catch (Throwable t) { - return Observable.error(t); - } - } - }); - } - - private ServiceResponse> listDeletedDelegate(Response response) throws CloudException, IOException, IllegalArgumentException { - return new AzureServiceResponseBuilder, CloudException>(this.client.mapperAdapter()) - .register(200, new TypeToken>() { }.getType()) - .registerError(CloudException.class) - .build(response); - } - - /** - * Gets the web apps for a subscription in the specified resource group. - * Gets the web apps for a subscription in the specified resource group. + * Gets all web, mobile, and API apps in the specified resource group. + * Gets all web, mobile, and API apps in the specified resource group. * - * @param resourceGroupName Name of resource group + * @param resourceGroupName Name of the resource group to which the resource belongs. * @return the PagedList<SiteInner> object if successful. */ public PagedList listByResourceGroup(final String resourceGroupName) { @@ -1333,10 +1144,10 @@ public Page nextPage(String nextPageLink) { } /** - * Gets the web apps for a subscription in the specified resource group. - * Gets the web apps for a subscription in the specified resource group. + * Gets all web, mobile, and API apps in the specified resource group. + * Gets all web, mobile, and API apps in the specified resource group. * - * @param resourceGroupName Name of resource group + * @param resourceGroupName Name of the resource group to which the resource belongs. * @param serviceCallback the async ServiceCallback to handle successful and failed responses. * @return the {@link ServiceCall} object */ @@ -1353,10 +1164,10 @@ public Observable>> call(String nextPageLink) { } /** - * Gets the web apps for a subscription in the specified resource group. - * Gets the web apps for a subscription in the specified resource group. + * Gets all web, mobile, and API apps in the specified resource group. + * Gets all web, mobile, and API apps in the specified resource group. * - * @param resourceGroupName Name of resource group + * @param resourceGroupName Name of the resource group to which the resource belongs. * @return the observable to the PagedList<SiteInner> object */ public Observable> listByResourceGroupAsync(final String resourceGroupName) { @@ -1370,10 +1181,10 @@ public Page call(ServiceResponse> response) { } /** - * Gets the web apps for a subscription in the specified resource group. - * Gets the web apps for a subscription in the specified resource group. + * Gets all web, mobile, and API apps in the specified resource group. + * Gets all web, mobile, and API apps in the specified resource group. * - * @param resourceGroupName Name of resource group + * @param resourceGroupName Name of the resource group to which the resource belongs. * @return the observable to the PagedList<SiteInner> object */ public Observable>> listByResourceGroupWithServiceResponseAsync(final String resourceGroupName) { @@ -1391,10 +1202,10 @@ public Observable>> call(ServiceResponse>> listByResourceGroupSinglePageAsync(final String resourceGroupName) { @@ -1405,9 +1216,8 @@ public Observable>> listByResourceGroupSinglePag throw new IllegalArgumentException("Parameter this.client.subscriptionId() is required and cannot be null."); } final String apiVersion = "2016-08-01"; - final String propertiesToInclude = null; final Boolean includeSlots = null; - return service.listByResourceGroup(resourceGroupName, this.client.subscriptionId(), propertiesToInclude, includeSlots, apiVersion, this.client.acceptLanguage(), this.client.userAgent()) + return service.listByResourceGroup(resourceGroupName, this.client.subscriptionId(), includeSlots, apiVersion, this.client.acceptLanguage(), this.client.userAgent()) .flatMap(new Func1, Observable>>>() { @Override public Observable>> call(Response response) { @@ -1422,16 +1232,15 @@ public Observable>> call(Response } /** - * Gets the web apps for a subscription in the specified resource group. - * Gets the web apps for a subscription in the specified resource group. + * Gets all web, mobile, and API apps in the specified resource group. + * Gets all web, mobile, and API apps in the specified resource group. * - * @param resourceGroupName Name of resource group - * @param propertiesToInclude Additional web app properties included in the response - * @param includeSlots Whether or not to include deployments slots in results + * @param resourceGroupName Name of the resource group to which the resource belongs. + * @param includeSlots Specify <strong>true</strong> to include deployment slots in results. The default is false, which only gives you the production slot of all apps. * @return the PagedList<SiteInner> object if successful. */ - public PagedList listByResourceGroup(final String resourceGroupName, final String propertiesToInclude, final Boolean includeSlots) { - ServiceResponse> response = listByResourceGroupSinglePageAsync(resourceGroupName, propertiesToInclude, includeSlots).toBlocking().single(); + public PagedList listByResourceGroup(final String resourceGroupName, final Boolean includeSlots) { + ServiceResponse> response = listByResourceGroupSinglePageAsync(resourceGroupName, includeSlots).toBlocking().single(); return new PagedList(response.getBody()) { @Override public Page nextPage(String nextPageLink) { @@ -1441,18 +1250,17 @@ public Page nextPage(String nextPageLink) { } /** - * Gets the web apps for a subscription in the specified resource group. - * Gets the web apps for a subscription in the specified resource group. + * Gets all web, mobile, and API apps in the specified resource group. + * Gets all web, mobile, and API apps in the specified resource group. * - * @param resourceGroupName Name of resource group - * @param propertiesToInclude Additional web app properties included in the response - * @param includeSlots Whether or not to include deployments slots in results + * @param resourceGroupName Name of the resource group to which the resource belongs. + * @param includeSlots Specify <strong>true</strong> to include deployment slots in results. The default is false, which only gives you the production slot of all apps. * @param serviceCallback the async ServiceCallback to handle successful and failed responses. * @return the {@link ServiceCall} object */ - public ServiceCall> listByResourceGroupAsync(final String resourceGroupName, final String propertiesToInclude, final Boolean includeSlots, final ListOperationCallback serviceCallback) { + public ServiceCall> listByResourceGroupAsync(final String resourceGroupName, final Boolean includeSlots, final ListOperationCallback serviceCallback) { return AzureServiceCall.create( - listByResourceGroupSinglePageAsync(resourceGroupName, propertiesToInclude, includeSlots), + listByResourceGroupSinglePageAsync(resourceGroupName, includeSlots), new Func1>>>() { @Override public Observable>> call(String nextPageLink) { @@ -1463,16 +1271,15 @@ public Observable>> call(String nextPageLink) { } /** - * Gets the web apps for a subscription in the specified resource group. - * Gets the web apps for a subscription in the specified resource group. + * Gets all web, mobile, and API apps in the specified resource group. + * Gets all web, mobile, and API apps in the specified resource group. * - * @param resourceGroupName Name of resource group - * @param propertiesToInclude Additional web app properties included in the response - * @param includeSlots Whether or not to include deployments slots in results + * @param resourceGroupName Name of the resource group to which the resource belongs. + * @param includeSlots Specify <strong>true</strong> to include deployment slots in results. The default is false, which only gives you the production slot of all apps. * @return the observable to the PagedList<SiteInner> object */ - public Observable> listByResourceGroupAsync(final String resourceGroupName, final String propertiesToInclude, final Boolean includeSlots) { - return listByResourceGroupWithServiceResponseAsync(resourceGroupName, propertiesToInclude, includeSlots) + public Observable> listByResourceGroupAsync(final String resourceGroupName, final Boolean includeSlots) { + return listByResourceGroupWithServiceResponseAsync(resourceGroupName, includeSlots) .map(new Func1>, Page>() { @Override public Page call(ServiceResponse> response) { @@ -1482,16 +1289,15 @@ public Page call(ServiceResponse> response) { } /** - * Gets the web apps for a subscription in the specified resource group. - * Gets the web apps for a subscription in the specified resource group. + * Gets all web, mobile, and API apps in the specified resource group. + * Gets all web, mobile, and API apps in the specified resource group. * - * @param resourceGroupName Name of resource group - * @param propertiesToInclude Additional web app properties included in the response - * @param includeSlots Whether or not to include deployments slots in results + * @param resourceGroupName Name of the resource group to which the resource belongs. + * @param includeSlots Specify <strong>true</strong> to include deployment slots in results. The default is false, which only gives you the production slot of all apps. * @return the observable to the PagedList<SiteInner> object */ - public Observable>> listByResourceGroupWithServiceResponseAsync(final String resourceGroupName, final String propertiesToInclude, final Boolean includeSlots) { - return listByResourceGroupSinglePageAsync(resourceGroupName, propertiesToInclude, includeSlots) + public Observable>> listByResourceGroupWithServiceResponseAsync(final String resourceGroupName, final Boolean includeSlots) { + return listByResourceGroupSinglePageAsync(resourceGroupName, includeSlots) .concatMap(new Func1>, Observable>>>() { @Override public Observable>> call(ServiceResponse> page) { @@ -1505,15 +1311,14 @@ public Observable>> call(ServiceResponse> * @param resourceGroupName Name of resource group - ServiceResponse> * @param propertiesToInclude Additional web app properties included in the response - ServiceResponse> * @param includeSlots Whether or not to include deployments slots in results + ServiceResponse> * @param resourceGroupName Name of the resource group to which the resource belongs. + ServiceResponse> * @param includeSlots Specify <strong>true</strong> to include deployment slots in results. The default is false, which only gives you the production slot of all apps. * @return the PagedList<SiteInner> object wrapped in {@link ServiceResponse} if successful. */ - public Observable>> listByResourceGroupSinglePageAsync(final String resourceGroupName, final String propertiesToInclude, final Boolean includeSlots) { + public Observable>> listByResourceGroupSinglePageAsync(final String resourceGroupName, final Boolean includeSlots) { if (resourceGroupName == null) { throw new IllegalArgumentException("Parameter resourceGroupName is required and cannot be null."); } @@ -1521,7 +1326,7 @@ public Observable>> listByResourceGroupSinglePag throw new IllegalArgumentException("Parameter this.client.subscriptionId() is required and cannot be null."); } final String apiVersion = "2016-08-01"; - return service.listByResourceGroup(resourceGroupName, this.client.subscriptionId(), propertiesToInclude, includeSlots, apiVersion, this.client.acceptLanguage(), this.client.userAgent()) + return service.listByResourceGroup(resourceGroupName, this.client.subscriptionId(), includeSlots, apiVersion, this.client.acceptLanguage(), this.client.userAgent()) .flatMap(new Func1, Observable>>>() { @Override public Observable>> call(Response response) { @@ -1543,11 +1348,11 @@ private ServiceResponse> listByResourceGroupDelegate(Respons } /** - * Get details of a web app. - * Get details of a web app. + * Gets the details of a web, mobile, or API app. + * Gets the details of a web, mobile, or API app. * - * @param resourceGroupName Name of resource group - * @param name Name of web app + * @param resourceGroupName Name of the resource group to which the resource belongs. + * @param name Name of the app. * @return the SiteInner object if successful. */ public SiteInner get(String resourceGroupName, String name) { @@ -1555,11 +1360,11 @@ public SiteInner get(String resourceGroupName, String name) { } /** - * Get details of a web app. - * Get details of a web app. + * Gets the details of a web, mobile, or API app. + * Gets the details of a web, mobile, or API app. * - * @param resourceGroupName Name of resource group - * @param name Name of web app + * @param resourceGroupName Name of the resource group to which the resource belongs. + * @param name Name of the app. * @param serviceCallback the async ServiceCallback to handle successful and failed responses. * @return the {@link ServiceCall} object */ @@ -1568,11 +1373,11 @@ public ServiceCall getAsync(String resourceGroupName, String name, fi } /** - * Get details of a web app. - * Get details of a web app. + * Gets the details of a web, mobile, or API app. + * Gets the details of a web, mobile, or API app. * - * @param resourceGroupName Name of resource group - * @param name Name of web app + * @param resourceGroupName Name of the resource group to which the resource belongs. + * @param name Name of the app. * @return the observable to the SiteInner object */ public Observable getAsync(String resourceGroupName, String name) { @@ -1585,11 +1390,11 @@ public SiteInner call(ServiceResponse response) { } /** - * Get details of a web app. - * Get details of a web app. + * Gets the details of a web, mobile, or API app. + * Gets the details of a web, mobile, or API app. * - * @param resourceGroupName Name of resource group - * @param name Name of web app + * @param resourceGroupName Name of the resource group to which the resource belongs. + * @param name Name of the app. * @return the observable to the SiteInner object */ public Observable> getWithServiceResponseAsync(String resourceGroupName, String name) { @@ -1603,87 +1408,7 @@ public Observable> getWithServiceResponseAsync(String throw new IllegalArgumentException("Parameter this.client.subscriptionId() is required and cannot be null."); } final String apiVersion = "2016-08-01"; - final String propertiesToInclude = null; - return service.get(resourceGroupName, name, this.client.subscriptionId(), propertiesToInclude, apiVersion, this.client.acceptLanguage(), this.client.userAgent()) - .flatMap(new Func1, Observable>>() { - @Override - public Observable> call(Response response) { - try { - ServiceResponse clientResponse = getDelegate(response); - return Observable.just(clientResponse); - } catch (Throwable t) { - return Observable.error(t); - } - } - }); - } - - /** - * Get details of a web app. - * Get details of a web app. - * - * @param resourceGroupName Name of resource group - * @param name Name of web app - * @param propertiesToInclude Additional web app properties included in the response - * @return the SiteInner object if successful. - */ - public SiteInner get(String resourceGroupName, String name, String propertiesToInclude) { - return getWithServiceResponseAsync(resourceGroupName, name, propertiesToInclude).toBlocking().single().getBody(); - } - - /** - * Get details of a web app. - * Get details of a web app. - * - * @param resourceGroupName Name of resource group - * @param name Name of web app - * @param propertiesToInclude Additional web app properties included in the response - * @param serviceCallback the async ServiceCallback to handle successful and failed responses. - * @return the {@link ServiceCall} object - */ - public ServiceCall getAsync(String resourceGroupName, String name, String propertiesToInclude, final ServiceCallback serviceCallback) { - return ServiceCall.create(getWithServiceResponseAsync(resourceGroupName, name, propertiesToInclude), serviceCallback); - } - - /** - * Get details of a web app. - * Get details of a web app. - * - * @param resourceGroupName Name of resource group - * @param name Name of web app - * @param propertiesToInclude Additional web app properties included in the response - * @return the observable to the SiteInner object - */ - public Observable getAsync(String resourceGroupName, String name, String propertiesToInclude) { - return getWithServiceResponseAsync(resourceGroupName, name, propertiesToInclude).map(new Func1, SiteInner>() { - @Override - public SiteInner call(ServiceResponse response) { - return response.getBody(); - } - }); - } - - /** - * Get details of a web app. - * Get details of a web app. - * - * @param resourceGroupName Name of resource group - * @param name Name of web app - * @param propertiesToInclude Additional web app properties included in the response - * @return the observable to the SiteInner object - */ - public Observable> getWithServiceResponseAsync(String resourceGroupName, String name, String propertiesToInclude) { - if (resourceGroupName == null) { - throw new IllegalArgumentException("Parameter resourceGroupName is required and cannot be null."); - } - if (name == null) { - throw new IllegalArgumentException("Parameter name is required and cannot be null."); - } - if (this.client.subscriptionId() == null) { - throw new IllegalArgumentException("Parameter this.client.subscriptionId() is required and cannot be null."); - } - final String apiVersion = "2016-08-01"; - return service.get(resourceGroupName, name, this.client.subscriptionId(), propertiesToInclude, apiVersion, this.client.acceptLanguage(), this.client.userAgent()) + return service.get(resourceGroupName, name, this.client.subscriptionId(), apiVersion, this.client.acceptLanguage(), this.client.userAgent()) .flatMap(new Func1, Observable>>() { @Override public Observable> call(Response response) { @@ -1705,12 +1430,12 @@ private ServiceResponse getDelegate(Response response) } /** - * Creates a new web app or modifies an existing web app. - * Creates a new web app or modifies an existing web app. + * Creates a new web, mobile, or API app in an existing resource group, or updates an existing app. + * Creates a new web, mobile, or API app in an existing resource group, or updates an existing app. * - * @param resourceGroupName Name of the resource group - * @param name Name of the web app - * @param siteEnvelope Details of web app if it exists already + * @param resourceGroupName Name of the resource group to which the resource belongs. + * @param name Unique name of the app to create or update. To create or update a deployment slot, use the {slot} parameter. + * @param siteEnvelope A JSON representation of the app properties. See example. * @return the SiteInner object if successful. */ public SiteInner createOrUpdate(String resourceGroupName, String name, SiteInner siteEnvelope) { @@ -1718,12 +1443,12 @@ public SiteInner createOrUpdate(String resourceGroupName, String name, SiteInner } /** - * Creates a new web app or modifies an existing web app. - * Creates a new web app or modifies an existing web app. + * Creates a new web, mobile, or API app in an existing resource group, or updates an existing app. + * Creates a new web, mobile, or API app in an existing resource group, or updates an existing app. * - * @param resourceGroupName Name of the resource group - * @param name Name of the web app - * @param siteEnvelope Details of web app if it exists already + * @param resourceGroupName Name of the resource group to which the resource belongs. + * @param name Unique name of the app to create or update. To create or update a deployment slot, use the {slot} parameter. + * @param siteEnvelope A JSON representation of the app properties. See example. * @param serviceCallback the async ServiceCallback to handle successful and failed responses. * @return the {@link ServiceCall} object */ @@ -1732,12 +1457,12 @@ public ServiceCall createOrUpdateAsync(String resourceGroupName, Stri } /** - * Creates a new web app or modifies an existing web app. - * Creates a new web app or modifies an existing web app. + * Creates a new web, mobile, or API app in an existing resource group, or updates an existing app. + * Creates a new web, mobile, or API app in an existing resource group, or updates an existing app. * - * @param resourceGroupName Name of the resource group - * @param name Name of the web app - * @param siteEnvelope Details of web app if it exists already + * @param resourceGroupName Name of the resource group to which the resource belongs. + * @param name Unique name of the app to create or update. To create or update a deployment slot, use the {slot} parameter. + * @param siteEnvelope A JSON representation of the app properties. See example. * @return the observable for the request */ public Observable createOrUpdateAsync(String resourceGroupName, String name, SiteInner siteEnvelope) { @@ -1750,12 +1475,12 @@ public SiteInner call(ServiceResponse response) { } /** - * Creates a new web app or modifies an existing web app. - * Creates a new web app or modifies an existing web app. + * Creates a new web, mobile, or API app in an existing resource group, or updates an existing app. + * Creates a new web, mobile, or API app in an existing resource group, or updates an existing app. * - * @param resourceGroupName Name of the resource group - * @param name Name of the web app - * @param siteEnvelope Details of web app if it exists already + * @param resourceGroupName Name of the resource group to which the resource belongs. + * @param name Unique name of the app to create or update. To create or update a deployment slot, use the {slot} parameter. + * @param siteEnvelope A JSON representation of the app properties. See example. * @return the observable for the request */ public Observable> createOrUpdateWithServiceResponseAsync(String resourceGroupName, String name, SiteInner siteEnvelope) { @@ -1781,14 +1506,14 @@ public Observable> createOrUpdateWithServiceResponseA return client.getAzureClient().getPutOrPatchResultAsync(observable, new TypeToken() { }.getType()); } /** - * Creates a new web app or modifies an existing web app. - * Creates a new web app or modifies an existing web app. + * Creates a new web, mobile, or API app in an existing resource group, or updates an existing app. + * Creates a new web, mobile, or API app in an existing resource group, or updates an existing app. * - * @param resourceGroupName Name of the resource group - * @param name Name of the web app - * @param siteEnvelope Details of web app if it exists already + * @param resourceGroupName Name of the resource group to which the resource belongs. + * @param name Unique name of the app to create or update. To create or update a deployment slot, use the {slot} parameter. + * @param siteEnvelope A JSON representation of the app properties. See example. * @param skipDnsRegistration If true web app hostname is not registered with DNS on creation. This parameter is - only used for app creation + only used for app creation * @param skipCustomDomainVerification If true, custom (non *.azurewebsites.net) domains associated with web app are not verified. * @param forceDnsRegistration If true, web app hostname is force registered with DNS * @param ttlInSeconds Time to live in seconds for web app's default domain name @@ -1799,14 +1524,14 @@ public SiteInner createOrUpdate(String resourceGroupName, String name, SiteInner } /** - * Creates a new web app or modifies an existing web app. - * Creates a new web app or modifies an existing web app. + * Creates a new web, mobile, or API app in an existing resource group, or updates an existing app. + * Creates a new web, mobile, or API app in an existing resource group, or updates an existing app. * - * @param resourceGroupName Name of the resource group - * @param name Name of the web app - * @param siteEnvelope Details of web app if it exists already + * @param resourceGroupName Name of the resource group to which the resource belongs. + * @param name Unique name of the app to create or update. To create or update a deployment slot, use the {slot} parameter. + * @param siteEnvelope A JSON representation of the app properties. See example. * @param skipDnsRegistration If true web app hostname is not registered with DNS on creation. This parameter is - only used for app creation + only used for app creation * @param skipCustomDomainVerification If true, custom (non *.azurewebsites.net) domains associated with web app are not verified. * @param forceDnsRegistration If true, web app hostname is force registered with DNS * @param ttlInSeconds Time to live in seconds for web app's default domain name @@ -1818,14 +1543,14 @@ public ServiceCall createOrUpdateAsync(String resourceGroupName, Stri } /** - * Creates a new web app or modifies an existing web app. - * Creates a new web app or modifies an existing web app. + * Creates a new web, mobile, or API app in an existing resource group, or updates an existing app. + * Creates a new web, mobile, or API app in an existing resource group, or updates an existing app. * - * @param resourceGroupName Name of the resource group - * @param name Name of the web app - * @param siteEnvelope Details of web app if it exists already + * @param resourceGroupName Name of the resource group to which the resource belongs. + * @param name Unique name of the app to create or update. To create or update a deployment slot, use the {slot} parameter. + * @param siteEnvelope A JSON representation of the app properties. See example. * @param skipDnsRegistration If true web app hostname is not registered with DNS on creation. This parameter is - only used for app creation + only used for app creation * @param skipCustomDomainVerification If true, custom (non *.azurewebsites.net) domains associated with web app are not verified. * @param forceDnsRegistration If true, web app hostname is force registered with DNS * @param ttlInSeconds Time to live in seconds for web app's default domain name @@ -1841,14 +1566,14 @@ public SiteInner call(ServiceResponse response) { } /** - * Creates a new web app or modifies an existing web app. - * Creates a new web app or modifies an existing web app. + * Creates a new web, mobile, or API app in an existing resource group, or updates an existing app. + * Creates a new web, mobile, or API app in an existing resource group, or updates an existing app. * - * @param resourceGroupName Name of the resource group - * @param name Name of the web app - * @param siteEnvelope Details of web app if it exists already + * @param resourceGroupName Name of the resource group to which the resource belongs. + * @param name Unique name of the app to create or update. To create or update a deployment slot, use the {slot} parameter. + * @param siteEnvelope A JSON representation of the app properties. See example. * @param skipDnsRegistration If true web app hostname is not registered with DNS on creation. This parameter is - only used for app creation + only used for app creation * @param skipCustomDomainVerification If true, custom (non *.azurewebsites.net) domains associated with web app are not verified. * @param forceDnsRegistration If true, web app hostname is force registered with DNS * @param ttlInSeconds Time to live in seconds for web app's default domain name @@ -1874,12 +1599,12 @@ public Observable> createOrUpdateWithServiceResponseA } /** - * Creates a new web app or modifies an existing web app. - * Creates a new web app or modifies an existing web app. + * Creates a new web, mobile, or API app in an existing resource group, or updates an existing app. + * Creates a new web, mobile, or API app in an existing resource group, or updates an existing app. * - * @param resourceGroupName Name of the resource group - * @param name Name of the web app - * @param siteEnvelope Details of web app if it exists already + * @param resourceGroupName Name of the resource group to which the resource belongs. + * @param name Unique name of the app to create or update. To create or update a deployment slot, use the {slot} parameter. + * @param siteEnvelope A JSON representation of the app properties. See example. * @return the SiteInner object if successful. */ public SiteInner beginCreateOrUpdate(String resourceGroupName, String name, SiteInner siteEnvelope) { @@ -1887,12 +1612,12 @@ public SiteInner beginCreateOrUpdate(String resourceGroupName, String name, Site } /** - * Creates a new web app or modifies an existing web app. - * Creates a new web app or modifies an existing web app. + * Creates a new web, mobile, or API app in an existing resource group, or updates an existing app. + * Creates a new web, mobile, or API app in an existing resource group, or updates an existing app. * - * @param resourceGroupName Name of the resource group - * @param name Name of the web app - * @param siteEnvelope Details of web app if it exists already + * @param resourceGroupName Name of the resource group to which the resource belongs. + * @param name Unique name of the app to create or update. To create or update a deployment slot, use the {slot} parameter. + * @param siteEnvelope A JSON representation of the app properties. See example. * @param serviceCallback the async ServiceCallback to handle successful and failed responses. * @return the {@link ServiceCall} object */ @@ -1901,12 +1626,12 @@ public ServiceCall beginCreateOrUpdateAsync(String resourceGroupName, } /** - * Creates a new web app or modifies an existing web app. - * Creates a new web app or modifies an existing web app. + * Creates a new web, mobile, or API app in an existing resource group, or updates an existing app. + * Creates a new web, mobile, or API app in an existing resource group, or updates an existing app. * - * @param resourceGroupName Name of the resource group - * @param name Name of the web app - * @param siteEnvelope Details of web app if it exists already + * @param resourceGroupName Name of the resource group to which the resource belongs. + * @param name Unique name of the app to create or update. To create or update a deployment slot, use the {slot} parameter. + * @param siteEnvelope A JSON representation of the app properties. See example. * @return the observable to the SiteInner object */ public Observable beginCreateOrUpdateAsync(String resourceGroupName, String name, SiteInner siteEnvelope) { @@ -1919,12 +1644,12 @@ public SiteInner call(ServiceResponse response) { } /** - * Creates a new web app or modifies an existing web app. - * Creates a new web app or modifies an existing web app. + * Creates a new web, mobile, or API app in an existing resource group, or updates an existing app. + * Creates a new web, mobile, or API app in an existing resource group, or updates an existing app. * - * @param resourceGroupName Name of the resource group - * @param name Name of the web app - * @param siteEnvelope Details of web app if it exists already + * @param resourceGroupName Name of the resource group to which the resource belongs. + * @param name Unique name of the app to create or update. To create or update a deployment slot, use the {slot} parameter. + * @param siteEnvelope A JSON representation of the app properties. See example. * @return the observable to the SiteInner object */ public Observable> beginCreateOrUpdateWithServiceResponseAsync(String resourceGroupName, String name, SiteInner siteEnvelope) { @@ -1961,14 +1686,14 @@ public Observable> call(Response respon } /** - * Creates a new web app or modifies an existing web app. - * Creates a new web app or modifies an existing web app. + * Creates a new web, mobile, or API app in an existing resource group, or updates an existing app. + * Creates a new web, mobile, or API app in an existing resource group, or updates an existing app. * - * @param resourceGroupName Name of the resource group - * @param name Name of the web app - * @param siteEnvelope Details of web app if it exists already + * @param resourceGroupName Name of the resource group to which the resource belongs. + * @param name Unique name of the app to create or update. To create or update a deployment slot, use the {slot} parameter. + * @param siteEnvelope A JSON representation of the app properties. See example. * @param skipDnsRegistration If true web app hostname is not registered with DNS on creation. This parameter is - only used for app creation + only used for app creation * @param skipCustomDomainVerification If true, custom (non *.azurewebsites.net) domains associated with web app are not verified. * @param forceDnsRegistration If true, web app hostname is force registered with DNS * @param ttlInSeconds Time to live in seconds for web app's default domain name @@ -1979,14 +1704,14 @@ public SiteInner beginCreateOrUpdate(String resourceGroupName, String name, Site } /** - * Creates a new web app or modifies an existing web app. - * Creates a new web app or modifies an existing web app. + * Creates a new web, mobile, or API app in an existing resource group, or updates an existing app. + * Creates a new web, mobile, or API app in an existing resource group, or updates an existing app. * - * @param resourceGroupName Name of the resource group - * @param name Name of the web app - * @param siteEnvelope Details of web app if it exists already + * @param resourceGroupName Name of the resource group to which the resource belongs. + * @param name Unique name of the app to create or update. To create or update a deployment slot, use the {slot} parameter. + * @param siteEnvelope A JSON representation of the app properties. See example. * @param skipDnsRegistration If true web app hostname is not registered with DNS on creation. This parameter is - only used for app creation + only used for app creation * @param skipCustomDomainVerification If true, custom (non *.azurewebsites.net) domains associated with web app are not verified. * @param forceDnsRegistration If true, web app hostname is force registered with DNS * @param ttlInSeconds Time to live in seconds for web app's default domain name @@ -1998,14 +1723,14 @@ public ServiceCall beginCreateOrUpdateAsync(String resourceGroupName, } /** - * Creates a new web app or modifies an existing web app. - * Creates a new web app or modifies an existing web app. + * Creates a new web, mobile, or API app in an existing resource group, or updates an existing app. + * Creates a new web, mobile, or API app in an existing resource group, or updates an existing app. * - * @param resourceGroupName Name of the resource group - * @param name Name of the web app - * @param siteEnvelope Details of web app if it exists already + * @param resourceGroupName Name of the resource group to which the resource belongs. + * @param name Unique name of the app to create or update. To create or update a deployment slot, use the {slot} parameter. + * @param siteEnvelope A JSON representation of the app properties. See example. * @param skipDnsRegistration If true web app hostname is not registered with DNS on creation. This parameter is - only used for app creation + only used for app creation * @param skipCustomDomainVerification If true, custom (non *.azurewebsites.net) domains associated with web app are not verified. * @param forceDnsRegistration If true, web app hostname is force registered with DNS * @param ttlInSeconds Time to live in seconds for web app's default domain name @@ -2021,14 +1746,14 @@ public SiteInner call(ServiceResponse response) { } /** - * Creates a new web app or modifies an existing web app. - * Creates a new web app or modifies an existing web app. + * Creates a new web, mobile, or API app in an existing resource group, or updates an existing app. + * Creates a new web, mobile, or API app in an existing resource group, or updates an existing app. * - * @param resourceGroupName Name of the resource group - * @param name Name of the web app - * @param siteEnvelope Details of web app if it exists already + * @param resourceGroupName Name of the resource group to which the resource belongs. + * @param name Unique name of the app to create or update. To create or update a deployment slot, use the {slot} parameter. + * @param siteEnvelope A JSON representation of the app properties. See example. * @param skipDnsRegistration If true web app hostname is not registered with DNS on creation. This parameter is - only used for app creation + only used for app creation * @param skipCustomDomainVerification If true, custom (non *.azurewebsites.net) domains associated with web app are not verified. * @param forceDnsRegistration If true, web app hostname is force registered with DNS * @param ttlInSeconds Time to live in seconds for web app's default domain name @@ -2072,56 +1797,55 @@ private ServiceResponse beginCreateOrUpdateDelegate(Response deleteAsync(String resourceGroupName, String name, final ServiceCallback serviceCallback) { + public ServiceCall deleteAsync(String resourceGroupName, String name, final ServiceCallback serviceCallback) { return ServiceCall.create(deleteWithServiceResponseAsync(resourceGroupName, name), serviceCallback); } /** - * Deletes a web app. - * Deletes a web app. + * Deletes a web, mobile, or API app, or one of the deployment slots. + * Deletes a web, mobile, or API app, or one of the deployment slots. * - * @param resourceGroupName Name of resource group - * @param name Name of web app - * @return the observable to the Object object + * @param resourceGroupName Name of the resource group to which the resource belongs. + * @param name Name of the app to delete. + * @return the {@link ServiceResponse} object if successful. */ - public Observable deleteAsync(String resourceGroupName, String name) { - return deleteWithServiceResponseAsync(resourceGroupName, name).map(new Func1, Object>() { + public Observable deleteAsync(String resourceGroupName, String name) { + return deleteWithServiceResponseAsync(resourceGroupName, name).map(new Func1, Void>() { @Override - public Object call(ServiceResponse response) { + public Void call(ServiceResponse response) { return response.getBody(); } }); } /** - * Deletes a web app. - * Deletes a web app. + * Deletes a web, mobile, or API app, or one of the deployment slots. + * Deletes a web, mobile, or API app, or one of the deployment slots. * - * @param resourceGroupName Name of resource group - * @param name Name of web app - * @return the observable to the Object object + * @param resourceGroupName Name of the resource group to which the resource belongs. + * @param name Name of the app to delete. + * @return the {@link ServiceResponse} object if successful. */ - public Observable> deleteWithServiceResponseAsync(String resourceGroupName, String name) { + public Observable> deleteWithServiceResponseAsync(String resourceGroupName, String name) { if (resourceGroupName == null) { throw new IllegalArgumentException("Parameter resourceGroupName is required and cannot be null."); } @@ -2136,11 +1860,11 @@ public Observable> deleteWithServiceResponseAsync(String final Boolean deleteEmptyServerFarm = null; final Boolean skipDnsRegistration = null; return service.delete(resourceGroupName, name, this.client.subscriptionId(), deleteMetrics, deleteEmptyServerFarm, skipDnsRegistration, apiVersion, this.client.acceptLanguage(), this.client.userAgent()) - .flatMap(new Func1, Observable>>() { + .flatMap(new Func1, Observable>>() { @Override - public Observable> call(Response response) { + public Observable> call(Response response) { try { - ServiceResponse clientResponse = deleteDelegate(response); + ServiceResponse clientResponse = deleteDelegate(response); return Observable.just(clientResponse); } catch (Throwable t) { return Observable.error(t); @@ -2150,68 +1874,67 @@ public Observable> call(Response response) } /** - * Deletes a web app. - * Deletes a web app. + * Deletes a web, mobile, or API app, or one of the deployment slots. + * Deletes a web, mobile, or API app, or one of the deployment slots. * - * @param resourceGroupName Name of resource group - * @param name Name of web app + * @param resourceGroupName Name of the resource group to which the resource belongs. + * @param name Name of the app to delete. * @param deleteMetrics If true, web app metrics are also deleted - * @param deleteEmptyServerFarm If true and App Service Plan is empty after web app deletion, App Service Plan is also deleted + * @param deleteEmptyServerFarm Specify true if the App Service plan will be empty after app deletion and you want to delete the empty App Service plan. By default, the empty App Service plan is not deleted. * @param skipDnsRegistration If true, DNS registration is skipped - * @return the Object object if successful. */ - public Object delete(String resourceGroupName, String name, Boolean deleteMetrics, Boolean deleteEmptyServerFarm, Boolean skipDnsRegistration) { - return deleteWithServiceResponseAsync(resourceGroupName, name, deleteMetrics, deleteEmptyServerFarm, skipDnsRegistration).toBlocking().single().getBody(); + public void delete(String resourceGroupName, String name, Boolean deleteMetrics, Boolean deleteEmptyServerFarm, Boolean skipDnsRegistration) { + deleteWithServiceResponseAsync(resourceGroupName, name, deleteMetrics, deleteEmptyServerFarm, skipDnsRegistration).toBlocking().single().getBody(); } /** - * Deletes a web app. - * Deletes a web app. + * Deletes a web, mobile, or API app, or one of the deployment slots. + * Deletes a web, mobile, or API app, or one of the deployment slots. * - * @param resourceGroupName Name of resource group - * @param name Name of web app + * @param resourceGroupName Name of the resource group to which the resource belongs. + * @param name Name of the app to delete. * @param deleteMetrics If true, web app metrics are also deleted - * @param deleteEmptyServerFarm If true and App Service Plan is empty after web app deletion, App Service Plan is also deleted + * @param deleteEmptyServerFarm Specify true if the App Service plan will be empty after app deletion and you want to delete the empty App Service plan. By default, the empty App Service plan is not deleted. * @param skipDnsRegistration If true, DNS registration is skipped * @param serviceCallback the async ServiceCallback to handle successful and failed responses. * @return the {@link ServiceCall} object */ - public ServiceCall deleteAsync(String resourceGroupName, String name, Boolean deleteMetrics, Boolean deleteEmptyServerFarm, Boolean skipDnsRegistration, final ServiceCallback serviceCallback) { + public ServiceCall deleteAsync(String resourceGroupName, String name, Boolean deleteMetrics, Boolean deleteEmptyServerFarm, Boolean skipDnsRegistration, final ServiceCallback serviceCallback) { return ServiceCall.create(deleteWithServiceResponseAsync(resourceGroupName, name, deleteMetrics, deleteEmptyServerFarm, skipDnsRegistration), serviceCallback); } /** - * Deletes a web app. - * Deletes a web app. + * Deletes a web, mobile, or API app, or one of the deployment slots. + * Deletes a web, mobile, or API app, or one of the deployment slots. * - * @param resourceGroupName Name of resource group - * @param name Name of web app + * @param resourceGroupName Name of the resource group to which the resource belongs. + * @param name Name of the app to delete. * @param deleteMetrics If true, web app metrics are also deleted - * @param deleteEmptyServerFarm If true and App Service Plan is empty after web app deletion, App Service Plan is also deleted + * @param deleteEmptyServerFarm Specify true if the App Service plan will be empty after app deletion and you want to delete the empty App Service plan. By default, the empty App Service plan is not deleted. * @param skipDnsRegistration If true, DNS registration is skipped - * @return the observable to the Object object + * @return the {@link ServiceResponse} object if successful. */ - public Observable deleteAsync(String resourceGroupName, String name, Boolean deleteMetrics, Boolean deleteEmptyServerFarm, Boolean skipDnsRegistration) { - return deleteWithServiceResponseAsync(resourceGroupName, name, deleteMetrics, deleteEmptyServerFarm, skipDnsRegistration).map(new Func1, Object>() { + public Observable deleteAsync(String resourceGroupName, String name, Boolean deleteMetrics, Boolean deleteEmptyServerFarm, Boolean skipDnsRegistration) { + return deleteWithServiceResponseAsync(resourceGroupName, name, deleteMetrics, deleteEmptyServerFarm, skipDnsRegistration).map(new Func1, Void>() { @Override - public Object call(ServiceResponse response) { + public Void call(ServiceResponse response) { return response.getBody(); } }); } /** - * Deletes a web app. - * Deletes a web app. + * Deletes a web, mobile, or API app, or one of the deployment slots. + * Deletes a web, mobile, or API app, or one of the deployment slots. * - * @param resourceGroupName Name of resource group - * @param name Name of web app + * @param resourceGroupName Name of the resource group to which the resource belongs. + * @param name Name of the app to delete. * @param deleteMetrics If true, web app metrics are also deleted - * @param deleteEmptyServerFarm If true and App Service Plan is empty after web app deletion, App Service Plan is also deleted + * @param deleteEmptyServerFarm Specify true if the App Service plan will be empty after app deletion and you want to delete the empty App Service plan. By default, the empty App Service plan is not deleted. * @param skipDnsRegistration If true, DNS registration is skipped - * @return the observable to the Object object + * @return the {@link ServiceResponse} object if successful. */ - public Observable> deleteWithServiceResponseAsync(String resourceGroupName, String name, Boolean deleteMetrics, Boolean deleteEmptyServerFarm, Boolean skipDnsRegistration) { + public Observable> deleteWithServiceResponseAsync(String resourceGroupName, String name, Boolean deleteMetrics, Boolean deleteEmptyServerFarm, Boolean skipDnsRegistration) { if (resourceGroupName == null) { throw new IllegalArgumentException("Parameter resourceGroupName is required and cannot be null."); } @@ -2223,11 +1946,11 @@ public Observable> deleteWithServiceResponseAsync(String } final String apiVersion = "2016-08-01"; return service.delete(resourceGroupName, name, this.client.subscriptionId(), deleteMetrics, deleteEmptyServerFarm, skipDnsRegistration, apiVersion, this.client.acceptLanguage(), this.client.userAgent()) - .flatMap(new Func1, Observable>>() { + .flatMap(new Func1, Observable>>() { @Override - public Observable> call(Response response) { + public Observable> call(Response response) { try { - ServiceResponse clientResponse = deleteDelegate(response); + ServiceResponse clientResponse = deleteDelegate(response); return Observable.just(clientResponse); } catch (Throwable t) { return Observable.error(t); @@ -2236,10 +1959,10 @@ public Observable> call(Response response) }); } - private ServiceResponse deleteDelegate(Response response) throws CloudException, IOException, IllegalArgumentException { - return new AzureServiceResponseBuilder(this.client.mapperAdapter()) - .register(200, new TypeToken() { }.getType()) - .registerError(CloudException.class) + private ServiceResponse deleteDelegate(Response response) throws CloudException, IOException, IllegalArgumentException { + return new AzureServiceResponseBuilder(this.client.mapperAdapter()) + .register(200, new TypeToken() { }.getType()) + .register(404, new TypeToken() { }.getType()) .build(response); } @@ -2247,7 +1970,7 @@ private ServiceResponse deleteDelegate(Response response) * Analyze a custom hostname. * Analyze a custom hostname. * - * @param resourceGroupName Name of resource group + * @param resourceGroupName Name of the resource group to which the resource belongs. * @param name Name of web app * @return the CustomHostnameAnalysisResultInner object if successful. */ @@ -2259,7 +1982,7 @@ public CustomHostnameAnalysisResultInner analyzeCustomHostname(String resourceGr * Analyze a custom hostname. * Analyze a custom hostname. * - * @param resourceGroupName Name of resource group + * @param resourceGroupName Name of the resource group to which the resource belongs. * @param name Name of web app * @param serviceCallback the async ServiceCallback to handle successful and failed responses. * @return the {@link ServiceCall} object @@ -2272,7 +1995,7 @@ public ServiceCall analyzeCustomHostnameAsync * Analyze a custom hostname. * Analyze a custom hostname. * - * @param resourceGroupName Name of resource group + * @param resourceGroupName Name of the resource group to which the resource belongs. * @param name Name of web app * @return the observable to the CustomHostnameAnalysisResultInner object */ @@ -2289,7 +2012,7 @@ public CustomHostnameAnalysisResultInner call(ServiceResponse> call(Respo * Analyze a custom hostname. * Analyze a custom hostname. * - * @param resourceGroupName Name of resource group + * @param resourceGroupName Name of the resource group to which the resource belongs. * @param name Name of web app * @param hostName Custom hostname * @return the CustomHostnameAnalysisResultInner object if successful. @@ -2336,7 +2059,7 @@ public CustomHostnameAnalysisResultInner analyzeCustomHostname(String resourceGr * Analyze a custom hostname. * Analyze a custom hostname. * - * @param resourceGroupName Name of resource group + * @param resourceGroupName Name of the resource group to which the resource belongs. * @param name Name of web app * @param hostName Custom hostname * @param serviceCallback the async ServiceCallback to handle successful and failed responses. @@ -2350,7 +2073,7 @@ public ServiceCall analyzeCustomHostnameAsync * Analyze a custom hostname. * Analyze a custom hostname. * - * @param resourceGroupName Name of resource group + * @param resourceGroupName Name of the resource group to which the resource belongs. * @param name Name of web app * @param hostName Custom hostname * @return the observable to the CustomHostnameAnalysisResultInner object @@ -2368,7 +2091,7 @@ public CustomHostnameAnalysisResultInner call(ServiceResponse analyzeCustomHostname * Applies the configuration settings from the target slot onto the current slot. * Applies the configuration settings from the target slot onto the current slot. * - * @param resourceGroupName Name of resource group - * @param name Name of web app - * @param slotSwapEntity Request body that contains the target slot name. Settings from that slot will be applied on the source slot - * @return the Object object if successful. + * @param resourceGroupName Name of the resource group to which the resource belongs. + * @param name Name of the app. + * @param slotSwapEntity JSON object that contains the target slot name. See example. */ - public Object applySlotConfigToProduction(String resourceGroupName, String name, CsmSlotEntityInner slotSwapEntity) { - return applySlotConfigToProductionWithServiceResponseAsync(resourceGroupName, name, slotSwapEntity).toBlocking().single().getBody(); + public void applySlotConfigToProduction(String resourceGroupName, String name, CsmSlotEntityInner slotSwapEntity) { + applySlotConfigToProductionWithServiceResponseAsync(resourceGroupName, name, slotSwapEntity).toBlocking().single().getBody(); } /** * Applies the configuration settings from the target slot onto the current slot. * Applies the configuration settings from the target slot onto the current slot. * - * @param resourceGroupName Name of resource group - * @param name Name of web app - * @param slotSwapEntity Request body that contains the target slot name. Settings from that slot will be applied on the source slot + * @param resourceGroupName Name of the resource group to which the resource belongs. + * @param name Name of the app. + * @param slotSwapEntity JSON object that contains the target slot name. See example. * @param serviceCallback the async ServiceCallback to handle successful and failed responses. * @return the {@link ServiceCall} object */ - public ServiceCall applySlotConfigToProductionAsync(String resourceGroupName, String name, CsmSlotEntityInner slotSwapEntity, final ServiceCallback serviceCallback) { + public ServiceCall applySlotConfigToProductionAsync(String resourceGroupName, String name, CsmSlotEntityInner slotSwapEntity, final ServiceCallback serviceCallback) { return ServiceCall.create(applySlotConfigToProductionWithServiceResponseAsync(resourceGroupName, name, slotSwapEntity), serviceCallback); } @@ -2436,15 +2158,15 @@ public ServiceCall applySlotConfigToProductionAsync(String resourceGroup * Applies the configuration settings from the target slot onto the current slot. * Applies the configuration settings from the target slot onto the current slot. * - * @param resourceGroupName Name of resource group - * @param name Name of web app - * @param slotSwapEntity Request body that contains the target slot name. Settings from that slot will be applied on the source slot - * @return the observable to the Object object + * @param resourceGroupName Name of the resource group to which the resource belongs. + * @param name Name of the app. + * @param slotSwapEntity JSON object that contains the target slot name. See example. + * @return the {@link ServiceResponse} object if successful. */ - public Observable applySlotConfigToProductionAsync(String resourceGroupName, String name, CsmSlotEntityInner slotSwapEntity) { - return applySlotConfigToProductionWithServiceResponseAsync(resourceGroupName, name, slotSwapEntity).map(new Func1, Object>() { + public Observable applySlotConfigToProductionAsync(String resourceGroupName, String name, CsmSlotEntityInner slotSwapEntity) { + return applySlotConfigToProductionWithServiceResponseAsync(resourceGroupName, name, slotSwapEntity).map(new Func1, Void>() { @Override - public Object call(ServiceResponse response) { + public Void call(ServiceResponse response) { return response.getBody(); } }); @@ -2454,12 +2176,12 @@ public Object call(ServiceResponse response) { * Applies the configuration settings from the target slot onto the current slot. * Applies the configuration settings from the target slot onto the current slot. * - * @param resourceGroupName Name of resource group - * @param name Name of web app - * @param slotSwapEntity Request body that contains the target slot name. Settings from that slot will be applied on the source slot - * @return the observable to the Object object + * @param resourceGroupName Name of the resource group to which the resource belongs. + * @param name Name of the app. + * @param slotSwapEntity JSON object that contains the target slot name. See example. + * @return the {@link ServiceResponse} object if successful. */ - public Observable> applySlotConfigToProductionWithServiceResponseAsync(String resourceGroupName, String name, CsmSlotEntityInner slotSwapEntity) { + public Observable> applySlotConfigToProductionWithServiceResponseAsync(String resourceGroupName, String name, CsmSlotEntityInner slotSwapEntity) { if (resourceGroupName == null) { throw new IllegalArgumentException("Parameter resourceGroupName is required and cannot be null."); } @@ -2475,11 +2197,11 @@ public Observable> applySlotConfigToProductionWithServic Validator.validate(slotSwapEntity); final String apiVersion = "2016-08-01"; return service.applySlotConfigToProduction(resourceGroupName, name, this.client.subscriptionId(), slotSwapEntity, apiVersion, this.client.acceptLanguage(), this.client.userAgent()) - .flatMap(new Func1, Observable>>() { + .flatMap(new Func1, Observable>>() { @Override - public Observable> call(Response response) { + public Observable> call(Response response) { try { - ServiceResponse clientResponse = applySlotConfigToProductionDelegate(response); + ServiceResponse clientResponse = applySlotConfigToProductionDelegate(response); return Observable.just(clientResponse); } catch (Throwable t) { return Observable.error(t); @@ -2488,20 +2210,19 @@ public Observable> call(Response response) }); } - private ServiceResponse applySlotConfigToProductionDelegate(Response response) throws CloudException, IOException, IllegalArgumentException { - return new AzureServiceResponseBuilder(this.client.mapperAdapter()) - .register(200, new TypeToken() { }.getType()) - .registerError(CloudException.class) + private ServiceResponse applySlotConfigToProductionDelegate(Response response) throws CloudException, IOException, IllegalArgumentException { + return new AzureServiceResponseBuilder(this.client.mapperAdapter()) + .register(204, new TypeToken() { }.getType()) .build(response); } /** - * Creates web app backup. - * Creates web app backup. + * Creates a backup of an app. + * Creates a backup of an app. * - * @param resourceGroupName Name of resource group - * @param name Name of web app - * @param request Information on backup request + * @param resourceGroupName Name of the resource group to which the resource belongs. + * @param name Name of the app. + * @param request Backup configuration. You can use the JSON response from the POST action as input here. * @return the BackupItemInner object if successful. */ public BackupItemInner backup(String resourceGroupName, String name, BackupRequestInner request) { @@ -2509,12 +2230,12 @@ public BackupItemInner backup(String resourceGroupName, String name, BackupReque } /** - * Creates web app backup. - * Creates web app backup. + * Creates a backup of an app. + * Creates a backup of an app. * - * @param resourceGroupName Name of resource group - * @param name Name of web app - * @param request Information on backup request + * @param resourceGroupName Name of the resource group to which the resource belongs. + * @param name Name of the app. + * @param request Backup configuration. You can use the JSON response from the POST action as input here. * @param serviceCallback the async ServiceCallback to handle successful and failed responses. * @return the {@link ServiceCall} object */ @@ -2523,12 +2244,12 @@ public ServiceCall backupAsync(String resourceGroupName, String } /** - * Creates web app backup. - * Creates web app backup. + * Creates a backup of an app. + * Creates a backup of an app. * - * @param resourceGroupName Name of resource group - * @param name Name of web app - * @param request Information on backup request + * @param resourceGroupName Name of the resource group to which the resource belongs. + * @param name Name of the app. + * @param request Backup configuration. You can use the JSON response from the POST action as input here. * @return the observable to the BackupItemInner object */ public Observable backupAsync(String resourceGroupName, String name, BackupRequestInner request) { @@ -2541,12 +2262,12 @@ public BackupItemInner call(ServiceResponse response) { } /** - * Creates web app backup. - * Creates web app backup. + * Creates a backup of an app. + * Creates a backup of an app. * - * @param resourceGroupName Name of resource group - * @param name Name of web app - * @param request Information on backup request + * @param resourceGroupName Name of the resource group to which the resource belongs. + * @param name Name of the app. + * @param request Backup configuration. You can use the JSON response from the POST action as input here. * @return the observable to the BackupItemInner object */ public Observable> backupWithServiceResponseAsync(String resourceGroupName, String name, BackupRequestInner request) { @@ -2586,11 +2307,11 @@ private ServiceResponse backupDelegate(Response r } /** - * Lists all available backups for web app. - * Lists all available backups for web app. + * Gets existing backups of an app. + * Gets existing backups of an app. * - * @param resourceGroupName Name of resource group - * @param name Name of web app + * @param resourceGroupName Name of the resource group to which the resource belongs. + * @param name Name of the app. * @return the PagedList<BackupItemInner> object if successful. */ public PagedList listBackups(final String resourceGroupName, final String name) { @@ -2604,11 +2325,11 @@ public Page nextPage(String nextPageLink) { } /** - * Lists all available backups for web app. - * Lists all available backups for web app. + * Gets existing backups of an app. + * Gets existing backups of an app. * - * @param resourceGroupName Name of resource group - * @param name Name of web app + * @param resourceGroupName Name of the resource group to which the resource belongs. + * @param name Name of the app. * @param serviceCallback the async ServiceCallback to handle successful and failed responses. * @return the {@link ServiceCall} object */ @@ -2625,11 +2346,11 @@ public Observable>> call(String nextPageLi } /** - * Lists all available backups for web app. - * Lists all available backups for web app. + * Gets existing backups of an app. + * Gets existing backups of an app. * - * @param resourceGroupName Name of resource group - * @param name Name of web app + * @param resourceGroupName Name of the resource group to which the resource belongs. + * @param name Name of the app. * @return the observable to the PagedList<BackupItemInner> object */ public Observable> listBackupsAsync(final String resourceGroupName, final String name) { @@ -2643,11 +2364,11 @@ public Page call(ServiceResponse> respons } /** - * Lists all available backups for web app. - * Lists all available backups for web app. + * Gets existing backups of an app. + * Gets existing backups of an app. * - * @param resourceGroupName Name of resource group - * @param name Name of web app + * @param resourceGroupName Name of the resource group to which the resource belongs. + * @param name Name of the app. * @return the observable to the PagedList<BackupItemInner> object */ public Observable>> listBackupsWithServiceResponseAsync(final String resourceGroupName, final String name) { @@ -2665,11 +2386,11 @@ public Observable>> call(ServiceResponse

> * @param resourceGroupName Name of resource group - ServiceResponse> * @param name Name of web app + ServiceResponse> * @param resourceGroupName Name of the resource group to which the resource belongs. + ServiceResponse> * @param name Name of the app. * @return the PagedList<BackupItemInner> object wrapped in {@link ServiceResponse} if successful. */ public Observable>> listBackupsSinglePageAsync(final String resourceGroupName, final String name) { @@ -2705,12 +2426,12 @@ private ServiceResponse> listBackupsDelegate(Response< } /** - * Discovers existing web app backups that can be restored. - * Discovers existing web app backups that can be restored. + * Discovers an existing app backup that can be restored from a blob in Azure storage. + * Discovers an existing app backup that can be restored from a blob in Azure storage. * - * @param resourceGroupName Name of resource group - * @param name Name of web app - * @param request Information on restore request + * @param resourceGroupName Name of the resource group to which the resource belongs. + * @param name Name of the app. + * @param request A RestoreRequest object that includes Azure storage URL and blog name for discovery of backup. * @return the RestoreRequestInner object if successful. */ public RestoreRequestInner discoverRestore(String resourceGroupName, String name, RestoreRequestInner request) { @@ -2718,12 +2439,12 @@ public RestoreRequestInner discoverRestore(String resourceGroupName, String name } /** - * Discovers existing web app backups that can be restored. - * Discovers existing web app backups that can be restored. + * Discovers an existing app backup that can be restored from a blob in Azure storage. + * Discovers an existing app backup that can be restored from a blob in Azure storage. * - * @param resourceGroupName Name of resource group - * @param name Name of web app - * @param request Information on restore request + * @param resourceGroupName Name of the resource group to which the resource belongs. + * @param name Name of the app. + * @param request A RestoreRequest object that includes Azure storage URL and blog name for discovery of backup. * @param serviceCallback the async ServiceCallback to handle successful and failed responses. * @return the {@link ServiceCall} object */ @@ -2732,12 +2453,12 @@ public ServiceCall discoverRestoreAsync(String resourceGrou } /** - * Discovers existing web app backups that can be restored. - * Discovers existing web app backups that can be restored. + * Discovers an existing app backup that can be restored from a blob in Azure storage. + * Discovers an existing app backup that can be restored from a blob in Azure storage. * - * @param resourceGroupName Name of resource group - * @param name Name of web app - * @param request Information on restore request + * @param resourceGroupName Name of the resource group to which the resource belongs. + * @param name Name of the app. + * @param request A RestoreRequest object that includes Azure storage URL and blog name for discovery of backup. * @return the observable to the RestoreRequestInner object */ public Observable discoverRestoreAsync(String resourceGroupName, String name, RestoreRequestInner request) { @@ -2750,12 +2471,12 @@ public RestoreRequestInner call(ServiceResponse response) { } /** - * Discovers existing web app backups that can be restored. - * Discovers existing web app backups that can be restored. + * Discovers an existing app backup that can be restored from a blob in Azure storage. + * Discovers an existing app backup that can be restored from a blob in Azure storage. * - * @param resourceGroupName Name of resource group - * @param name Name of web app - * @param request Information on restore request + * @param resourceGroupName Name of the resource group to which the resource belongs. + * @param name Name of the app. + * @param request A RestoreRequest object that includes Azure storage URL and blog name for discovery of backup. * @return the observable to the RestoreRequestInner object */ public Observable> discoverRestoreWithServiceResponseAsync(String resourceGroupName, String name, RestoreRequestInner request) { @@ -2795,12 +2516,12 @@ private ServiceResponse discoverRestoreDelegate(Response getBackupStatusAsync(String resourceGroupNam } /** - * Gets status of a web app backup that may be in progress. - * Gets status of a web app backup that may be in progress. + * Gets a backup of an app by its ID. + * Gets a backup of an app by its ID. * - * @param resourceGroupName Name of resource group - * @param name Name of web app - * @param backupId Id of backup + * @param resourceGroupName Name of the resource group to which the resource belongs. + * @param name Name of the app. + * @param backupId ID of the backup. * @return the observable to the BackupItemInner object */ public Observable getBackupStatusAsync(String resourceGroupName, String name, String backupId) { @@ -2840,12 +2561,12 @@ public BackupItemInner call(ServiceResponse response) { } /** - * Gets status of a web app backup that may be in progress. - * Gets status of a web app backup that may be in progress. + * Gets a backup of an app by its ID. + * Gets a backup of an app by its ID. * - * @param resourceGroupName Name of resource group - * @param name Name of web app - * @param backupId Id of backup + * @param resourceGroupName Name of the resource group to which the resource belongs. + * @param name Name of the app. + * @param backupId ID of the backup. * @return the observable to the BackupItemInner object */ public Observable> getBackupStatusWithServiceResponseAsync(String resourceGroupName, String name, String backupId) { @@ -2884,60 +2605,59 @@ private ServiceResponse getBackupStatusDelegate(Response deleteBackupAsync(String resourceGroupName, String name, String backupId, final ServiceCallback serviceCallback) { + public ServiceCall deleteBackupAsync(String resourceGroupName, String name, String backupId, final ServiceCallback serviceCallback) { return ServiceCall.create(deleteBackupWithServiceResponseAsync(resourceGroupName, name, backupId), serviceCallback); } /** - * Deletes a backup from Azure Storage. - * Deletes a backup from Azure Storage. + * Deletes a backup of an app by its ID. + * Deletes a backup of an app by its ID. * - * @param resourceGroupName Name of resource group - * @param name Name of web app - * @param backupId Id of backup - * @return the observable to the BackupItemInner object + * @param resourceGroupName Name of the resource group to which the resource belongs. + * @param name Name of the app. + * @param backupId ID of the backup. + * @return the {@link ServiceResponse} object if successful. */ - public Observable deleteBackupAsync(String resourceGroupName, String name, String backupId) { - return deleteBackupWithServiceResponseAsync(resourceGroupName, name, backupId).map(new Func1, BackupItemInner>() { + public Observable deleteBackupAsync(String resourceGroupName, String name, String backupId) { + return deleteBackupWithServiceResponseAsync(resourceGroupName, name, backupId).map(new Func1, Void>() { @Override - public BackupItemInner call(ServiceResponse response) { + public Void call(ServiceResponse response) { return response.getBody(); } }); } /** - * Deletes a backup from Azure Storage. - * Deletes a backup from Azure Storage. + * Deletes a backup of an app by its ID. + * Deletes a backup of an app by its ID. * - * @param resourceGroupName Name of resource group - * @param name Name of web app - * @param backupId Id of backup - * @return the observable to the BackupItemInner object + * @param resourceGroupName Name of the resource group to which the resource belongs. + * @param name Name of the app. + * @param backupId ID of the backup. + * @return the {@link ServiceResponse} object if successful. */ - public Observable> deleteBackupWithServiceResponseAsync(String resourceGroupName, String name, String backupId) { + public Observable> deleteBackupWithServiceResponseAsync(String resourceGroupName, String name, String backupId) { if (resourceGroupName == null) { throw new IllegalArgumentException("Parameter resourceGroupName is required and cannot be null."); } @@ -2952,11 +2672,11 @@ public Observable> deleteBackupWithServiceRespo } final String apiVersion = "2016-08-01"; return service.deleteBackup(resourceGroupName, name, backupId, this.client.subscriptionId(), apiVersion, this.client.acceptLanguage(), this.client.userAgent()) - .flatMap(new Func1, Observable>>() { + .flatMap(new Func1, Observable>>() { @Override - public Observable> call(Response response) { + public Observable> call(Response response) { try { - ServiceResponse clientResponse = deleteBackupDelegate(response); + ServiceResponse clientResponse = deleteBackupDelegate(response); return Observable.just(clientResponse); } catch (Throwable t) { return Observable.error(t); @@ -2965,10 +2685,10 @@ public Observable> call(Response }); } - private ServiceResponse deleteBackupDelegate(Response response) throws CloudException, IOException, IllegalArgumentException { - return new AzureServiceResponseBuilder(this.client.mapperAdapter()) - .register(200, new TypeToken() { }.getType()) - .registerError(CloudException.class) + private ServiceResponse deleteBackupDelegate(Response response) throws CloudException, IOException, IllegalArgumentException { + return new AzureServiceResponseBuilder(this.client.mapperAdapter()) + .register(200, new TypeToken() { }.getType()) + .register(404, new TypeToken() { }.getType()) .build(response); } @@ -2976,7 +2696,7 @@ private ServiceResponse deleteBackupDelegate(Response listBackupStatusSecretsAsync(String resource * Gets status of a web app backup that may be in progress, including secrets associated with the backup, such as the Azure Storage SAS URL. Also can be used to update the SAS URL for the backup if a new URL is passed in the request body. * Gets status of a web app backup that may be in progress, including secrets associated with the backup, such as the Azure Storage SAS URL. Also can be used to update the SAS URL for the backup if a new URL is passed in the request body. * - * @param resourceGroupName Name of resource group + * @param resourceGroupName Name of the resource group to which the resource belongs. * @param name Name of web app * @param backupId Id of backup * @param request Information on backup request @@ -3024,7 +2744,7 @@ public BackupItemInner call(ServiceResponse response) { * Gets status of a web app backup that may be in progress, including secrets associated with the backup, such as the Azure Storage SAS URL. Also can be used to update the SAS URL for the backup if a new URL is passed in the request body. * Gets status of a web app backup that may be in progress, including secrets associated with the backup, such as the Azure Storage SAS URL. Also can be used to update the SAS URL for the backup if a new URL is passed in the request body. * - * @param resourceGroupName Name of resource group + * @param resourceGroupName Name of the resource group to which the resource belongs. * @param name Name of web app * @param backupId Id of backup * @param request Information on backup request @@ -3070,12 +2790,12 @@ private ServiceResponse listBackupStatusSecretsDelegate(Respons } /** - * Restores a web app. - * Restores a web app. + * Restores a specific backup to another app (or deployment slot, if specified). + * Restores a specific backup to another app (or deployment slot, if specified). * - * @param resourceGroupName Name of resource group - * @param name Name of web app - * @param backupId Id of backup to restore + * @param resourceGroupName Name of the resource group to which the resource belongs. + * @param name Name of the app. + * @param backupId ID of the backup. * @param request Information on restore request * @return the RestoreResponseInner object if successful. */ @@ -3084,12 +2804,12 @@ public RestoreResponseInner restore(String resourceGroupName, String name, Strin } /** - * Restores a web app. - * Restores a web app. + * Restores a specific backup to another app (or deployment slot, if specified). + * Restores a specific backup to another app (or deployment slot, if specified). * - * @param resourceGroupName Name of resource group - * @param name Name of web app - * @param backupId Id of backup to restore + * @param resourceGroupName Name of the resource group to which the resource belongs. + * @param name Name of the app. + * @param backupId ID of the backup. * @param request Information on restore request * @param serviceCallback the async ServiceCallback to handle successful and failed responses. * @return the {@link ServiceCall} object @@ -3099,12 +2819,12 @@ public ServiceCall restoreAsync(String resourceGroupName, } /** - * Restores a web app. - * Restores a web app. + * Restores a specific backup to another app (or deployment slot, if specified). + * Restores a specific backup to another app (or deployment slot, if specified). * - * @param resourceGroupName Name of resource group - * @param name Name of web app - * @param backupId Id of backup to restore + * @param resourceGroupName Name of the resource group to which the resource belongs. + * @param name Name of the app. + * @param backupId ID of the backup. * @param request Information on restore request * @return the observable for the request */ @@ -3118,12 +2838,12 @@ public RestoreResponseInner call(ServiceResponse response) } /** - * Restores a web app. - * Restores a web app. + * Restores a specific backup to another app (or deployment slot, if specified). + * Restores a specific backup to another app (or deployment slot, if specified). * - * @param resourceGroupName Name of resource group - * @param name Name of web app - * @param backupId Id of backup to restore + * @param resourceGroupName Name of the resource group to which the resource belongs. + * @param name Name of the app. + * @param backupId ID of the backup. * @param request Information on restore request * @return the observable for the request */ @@ -3150,12 +2870,12 @@ public Observable> restoreWithServiceRespo } /** - * Restores a web app. - * Restores a web app. + * Restores a specific backup to another app (or deployment slot, if specified). + * Restores a specific backup to another app (or deployment slot, if specified). * - * @param resourceGroupName Name of resource group - * @param name Name of web app - * @param backupId Id of backup to restore + * @param resourceGroupName Name of the resource group to which the resource belongs. + * @param name Name of the app. + * @param backupId ID of the backup. * @param request Information on restore request * @return the RestoreResponseInner object if successful. */ @@ -3164,12 +2884,12 @@ public RestoreResponseInner beginRestore(String resourceGroupName, String name, } /** - * Restores a web app. - * Restores a web app. + * Restores a specific backup to another app (or deployment slot, if specified). + * Restores a specific backup to another app (or deployment slot, if specified). * - * @param resourceGroupName Name of resource group - * @param name Name of web app - * @param backupId Id of backup to restore + * @param resourceGroupName Name of the resource group to which the resource belongs. + * @param name Name of the app. + * @param backupId ID of the backup. * @param request Information on restore request * @param serviceCallback the async ServiceCallback to handle successful and failed responses. * @return the {@link ServiceCall} object @@ -3179,12 +2899,12 @@ public ServiceCall beginRestoreAsync(String resourceGroupN } /** - * Restores a web app. - * Restores a web app. + * Restores a specific backup to another app (or deployment slot, if specified). + * Restores a specific backup to another app (or deployment slot, if specified). * - * @param resourceGroupName Name of resource group - * @param name Name of web app - * @param backupId Id of backup to restore + * @param resourceGroupName Name of the resource group to which the resource belongs. + * @param name Name of the app. + * @param backupId ID of the backup. * @param request Information on restore request * @return the observable to the RestoreResponseInner object */ @@ -3198,12 +2918,12 @@ public RestoreResponseInner call(ServiceResponse response) } /** - * Restores a web app. - * Restores a web app. + * Restores a specific backup to another app (or deployment slot, if specified). + * Restores a specific backup to another app (or deployment slot, if specified). * - * @param resourceGroupName Name of resource group - * @param name Name of web app - * @param backupId Id of backup to restore + * @param resourceGroupName Name of the resource group to which the resource belongs. + * @param name Name of the app. + * @param backupId ID of the backup. * @param request Information on restore request * @return the observable to the RestoreResponseInner object */ @@ -3247,12 +2967,12 @@ private ServiceResponse beginRestoreDelegate(Response updateApplicationSettingsAsync(String } /** - * Updates the application settings of web app. - * Updates the application settings of web app. + * Replaces the application settings of an app. + * Replaces the application settings of an app. * - * @param resourceGroupName Name of resource group - * @param name Name of web app - * @param appSettings Application settings of web app + * @param resourceGroupName Name of the resource group to which the resource belongs. + * @param name Name of the app. + * @param appSettings Application settings of the app. * @return the observable to the StringDictionaryInner object */ public Observable updateApplicationSettingsAsync(String resourceGroupName, String name, StringDictionaryInner appSettings) { @@ -3292,12 +3012,12 @@ public StringDictionaryInner call(ServiceResponse respons } /** - * Updates the application settings of web app. - * Updates the application settings of web app. + * Replaces the application settings of an app. + * Replaces the application settings of an app. * - * @param resourceGroupName Name of resource group - * @param name Name of web app - * @param appSettings Application settings of web app + * @param resourceGroupName Name of the resource group to which the resource belongs. + * @param name Name of the app. + * @param appSettings Application settings of the app. * @return the observable to the StringDictionaryInner object */ public Observable> updateApplicationSettingsWithServiceResponseAsync(String resourceGroupName, String name, StringDictionaryInner appSettings) { @@ -3337,11 +3057,11 @@ private ServiceResponse updateApplicationSettingsDelegate } /** - * Gets the application settings of web app. - * Gets the application settings of web app. + * Gets the application settings of an app. + * Gets the application settings of an app. * - * @param resourceGroupName Name of resource group - * @param name Name of web app + * @param resourceGroupName Name of the resource group to which the resource belongs. + * @param name Name of the app. * @return the StringDictionaryInner object if successful. */ public StringDictionaryInner listApplicationSettings(String resourceGroupName, String name) { @@ -3349,11 +3069,11 @@ public StringDictionaryInner listApplicationSettings(String resourceGroupName, S } /** - * Gets the application settings of web app. - * Gets the application settings of web app. + * Gets the application settings of an app. + * Gets the application settings of an app. * - * @param resourceGroupName Name of resource group - * @param name Name of web app + * @param resourceGroupName Name of the resource group to which the resource belongs. + * @param name Name of the app. * @param serviceCallback the async ServiceCallback to handle successful and failed responses. * @return the {@link ServiceCall} object */ @@ -3362,11 +3082,11 @@ public ServiceCall listApplicationSettingsAsync(String re } /** - * Gets the application settings of web app. - * Gets the application settings of web app. + * Gets the application settings of an app. + * Gets the application settings of an app. * - * @param resourceGroupName Name of resource group - * @param name Name of web app + * @param resourceGroupName Name of the resource group to which the resource belongs. + * @param name Name of the app. * @return the observable to the StringDictionaryInner object */ public Observable listApplicationSettingsAsync(String resourceGroupName, String name) { @@ -3379,11 +3099,11 @@ public StringDictionaryInner call(ServiceResponse respons } /** - * Gets the application settings of web app. - * Gets the application settings of web app. + * Gets the application settings of an app. + * Gets the application settings of an app. * - * @param resourceGroupName Name of resource group - * @param name Name of web app + * @param resourceGroupName Name of the resource group to which the resource belongs. + * @param name Name of the app. * @return the observable to the StringDictionaryInner object */ public Observable> listApplicationSettingsWithServiceResponseAsync(String resourceGroupName, String name) { @@ -3422,7 +3142,7 @@ private ServiceResponse listApplicationSettingsDelegate(R * Updates the Authentication / Authorization settings associated with web app. * Updates the Authentication / Authorization settings associated with web app. * - * @param resourceGroupName Name of resource group + * @param resourceGroupName Name of the resource group to which the resource belongs. * @param name Name of web app * @param siteAuthSettings Auth settings associated with web app * @return the SiteAuthSettingsInner object if successful. @@ -3435,7 +3155,7 @@ public SiteAuthSettingsInner updateAuthSettings(String resourceGroupName, String * Updates the Authentication / Authorization settings associated with web app. * Updates the Authentication / Authorization settings associated with web app. * - * @param resourceGroupName Name of resource group + * @param resourceGroupName Name of the resource group to which the resource belongs. * @param name Name of web app * @param siteAuthSettings Auth settings associated with web app * @param serviceCallback the async ServiceCallback to handle successful and failed responses. @@ -3449,7 +3169,7 @@ public ServiceCall updateAuthSettingsAsync(String resourc * Updates the Authentication / Authorization settings associated with web app. * Updates the Authentication / Authorization settings associated with web app. * - * @param resourceGroupName Name of resource group + * @param resourceGroupName Name of the resource group to which the resource belongs. * @param name Name of web app * @param siteAuthSettings Auth settings associated with web app * @return the observable to the SiteAuthSettingsInner object @@ -3467,7 +3187,7 @@ public SiteAuthSettingsInner call(ServiceResponse respons * Updates the Authentication / Authorization settings associated with web app. * Updates the Authentication / Authorization settings associated with web app. * - * @param resourceGroupName Name of resource group + * @param resourceGroupName Name of the resource group to which the resource belongs. * @param name Name of web app * @param siteAuthSettings Auth settings associated with web app * @return the observable to the SiteAuthSettingsInner object @@ -3509,40 +3229,40 @@ private ServiceResponse updateAuthSettingsDelegate(Respon } /** - * Gets the Authentication / Authorization settings associated with web app. - * Gets the Authentication / Authorization settings associated with web app. + * Gets the Authentication/Authorization settings of an app. + * Gets the Authentication/Authorization settings of an app. * - * @param resourceGroupName Name of resource group - * @param name Name of web app + * @param resourceGroupName Name of the resource group to which the resource belongs. + * @param name Name of the app. * @return the SiteAuthSettingsInner object if successful. */ - public SiteAuthSettingsInner listAuthSettings(String resourceGroupName, String name) { - return listAuthSettingsWithServiceResponseAsync(resourceGroupName, name).toBlocking().single().getBody(); + public SiteAuthSettingsInner getAuthSettings(String resourceGroupName, String name) { + return getAuthSettingsWithServiceResponseAsync(resourceGroupName, name).toBlocking().single().getBody(); } /** - * Gets the Authentication / Authorization settings associated with web app. - * Gets the Authentication / Authorization settings associated with web app. + * Gets the Authentication/Authorization settings of an app. + * Gets the Authentication/Authorization settings of an app. * - * @param resourceGroupName Name of resource group - * @param name Name of web app + * @param resourceGroupName Name of the resource group to which the resource belongs. + * @param name Name of the app. * @param serviceCallback the async ServiceCallback to handle successful and failed responses. * @return the {@link ServiceCall} object */ - public ServiceCall listAuthSettingsAsync(String resourceGroupName, String name, final ServiceCallback serviceCallback) { - return ServiceCall.create(listAuthSettingsWithServiceResponseAsync(resourceGroupName, name), serviceCallback); + public ServiceCall getAuthSettingsAsync(String resourceGroupName, String name, final ServiceCallback serviceCallback) { + return ServiceCall.create(getAuthSettingsWithServiceResponseAsync(resourceGroupName, name), serviceCallback); } /** - * Gets the Authentication / Authorization settings associated with web app. - * Gets the Authentication / Authorization settings associated with web app. + * Gets the Authentication/Authorization settings of an app. + * Gets the Authentication/Authorization settings of an app. * - * @param resourceGroupName Name of resource group - * @param name Name of web app + * @param resourceGroupName Name of the resource group to which the resource belongs. + * @param name Name of the app. * @return the observable to the SiteAuthSettingsInner object */ - public Observable listAuthSettingsAsync(String resourceGroupName, String name) { - return listAuthSettingsWithServiceResponseAsync(resourceGroupName, name).map(new Func1, SiteAuthSettingsInner>() { + public Observable getAuthSettingsAsync(String resourceGroupName, String name) { + return getAuthSettingsWithServiceResponseAsync(resourceGroupName, name).map(new Func1, SiteAuthSettingsInner>() { @Override public SiteAuthSettingsInner call(ServiceResponse response) { return response.getBody(); @@ -3551,14 +3271,14 @@ public SiteAuthSettingsInner call(ServiceResponse respons } /** - * Gets the Authentication / Authorization settings associated with web app. - * Gets the Authentication / Authorization settings associated with web app. + * Gets the Authentication/Authorization settings of an app. + * Gets the Authentication/Authorization settings of an app. * - * @param resourceGroupName Name of resource group - * @param name Name of web app + * @param resourceGroupName Name of the resource group to which the resource belongs. + * @param name Name of the app. * @return the observable to the SiteAuthSettingsInner object */ - public Observable> listAuthSettingsWithServiceResponseAsync(String resourceGroupName, String name) { + public Observable> getAuthSettingsWithServiceResponseAsync(String resourceGroupName, String name) { if (resourceGroupName == null) { throw new IllegalArgumentException("Parameter resourceGroupName is required and cannot be null."); } @@ -3569,12 +3289,12 @@ public Observable> listAuthSettingsWithSe throw new IllegalArgumentException("Parameter this.client.subscriptionId() is required and cannot be null."); } final String apiVersion = "2016-08-01"; - return service.listAuthSettings(resourceGroupName, name, this.client.subscriptionId(), apiVersion, this.client.acceptLanguage(), this.client.userAgent()) + return service.getAuthSettings(resourceGroupName, name, this.client.subscriptionId(), apiVersion, this.client.acceptLanguage(), this.client.userAgent()) .flatMap(new Func1, Observable>>() { @Override public Observable> call(Response response) { try { - ServiceResponse clientResponse = listAuthSettingsDelegate(response); + ServiceResponse clientResponse = getAuthSettingsDelegate(response); return Observable.just(clientResponse); } catch (Throwable t) { return Observable.error(t); @@ -3583,7 +3303,7 @@ public Observable> call(Response listAuthSettingsDelegate(Response response) throws CloudException, IOException, IllegalArgumentException { + private ServiceResponse getAuthSettingsDelegate(Response response) throws CloudException, IOException, IllegalArgumentException { return new AzureServiceResponseBuilder(this.client.mapperAdapter()) .register(200, new TypeToken() { }.getType()) .registerError(CloudException.class) @@ -3591,12 +3311,12 @@ private ServiceResponse listAuthSettingsDelegate(Response } /** - * Updates backup configuration of web app. - * Updates backup configuration of web app. + * Updates the backup configuration of an app. + * Updates the backup configuration of an app. * - * @param resourceGroupName Name of resource group - * @param name Name of web app - * @param request Information on backup request + * @param resourceGroupName Name of the resource group to which the resource belongs. + * @param name Name of the app. + * @param request Edited backup configuration. * @return the BackupRequestInner object if successful. */ public BackupRequestInner updateBackupConfiguration(String resourceGroupName, String name, BackupRequestInner request) { @@ -3604,12 +3324,12 @@ public BackupRequestInner updateBackupConfiguration(String resourceGroupName, St } /** - * Updates backup configuration of web app. - * Updates backup configuration of web app. + * Updates the backup configuration of an app. + * Updates the backup configuration of an app. * - * @param resourceGroupName Name of resource group - * @param name Name of web app - * @param request Information on backup request + * @param resourceGroupName Name of the resource group to which the resource belongs. + * @param name Name of the app. + * @param request Edited backup configuration. * @param serviceCallback the async ServiceCallback to handle successful and failed responses. * @return the {@link ServiceCall} object */ @@ -3618,12 +3338,12 @@ public ServiceCall updateBackupConfigurationAsync(String res } /** - * Updates backup configuration of web app. - * Updates backup configuration of web app. + * Updates the backup configuration of an app. + * Updates the backup configuration of an app. * - * @param resourceGroupName Name of resource group - * @param name Name of web app - * @param request Information on backup request + * @param resourceGroupName Name of the resource group to which the resource belongs. + * @param name Name of the app. + * @param request Edited backup configuration. * @return the observable to the BackupRequestInner object */ public Observable updateBackupConfigurationAsync(String resourceGroupName, String name, BackupRequestInner request) { @@ -3636,12 +3356,12 @@ public BackupRequestInner call(ServiceResponse response) { } /** - * Updates backup configuration of web app. - * Updates backup configuration of web app. + * Updates the backup configuration of an app. + * Updates the backup configuration of an app. * - * @param resourceGroupName Name of resource group - * @param name Name of web app - * @param request Information on backup request + * @param resourceGroupName Name of the resource group to which the resource belongs. + * @param name Name of the app. + * @param request Edited backup configuration. * @return the observable to the BackupRequestInner object */ public Observable> updateBackupConfigurationWithServiceResponseAsync(String resourceGroupName, String name, BackupRequestInner request) { @@ -3681,56 +3401,55 @@ private ServiceResponse updateBackupConfigurationDelegate(Re } /** - * Removes the backup configuration for a web app. - * Removes the backup configuration for a web app. + * Deletes the backup configuration of an app. + * Deletes the backup configuration of an app. * - * @param resourceGroupName Name of resource group - * @param name Name of web app - * @return the Object object if successful. + * @param resourceGroupName Name of the resource group to which the resource belongs. + * @param name Name of the app. */ - public Object deleteBackupConfiguration(String resourceGroupName, String name) { - return deleteBackupConfigurationWithServiceResponseAsync(resourceGroupName, name).toBlocking().single().getBody(); + public void deleteBackupConfiguration(String resourceGroupName, String name) { + deleteBackupConfigurationWithServiceResponseAsync(resourceGroupName, name).toBlocking().single().getBody(); } /** - * Removes the backup configuration for a web app. - * Removes the backup configuration for a web app. + * Deletes the backup configuration of an app. + * Deletes the backup configuration of an app. * - * @param resourceGroupName Name of resource group - * @param name Name of web app + * @param resourceGroupName Name of the resource group to which the resource belongs. + * @param name Name of the app. * @param serviceCallback the async ServiceCallback to handle successful and failed responses. * @return the {@link ServiceCall} object */ - public ServiceCall deleteBackupConfigurationAsync(String resourceGroupName, String name, final ServiceCallback serviceCallback) { + public ServiceCall deleteBackupConfigurationAsync(String resourceGroupName, String name, final ServiceCallback serviceCallback) { return ServiceCall.create(deleteBackupConfigurationWithServiceResponseAsync(resourceGroupName, name), serviceCallback); } /** - * Removes the backup configuration for a web app. - * Removes the backup configuration for a web app. + * Deletes the backup configuration of an app. + * Deletes the backup configuration of an app. * - * @param resourceGroupName Name of resource group - * @param name Name of web app - * @return the observable to the Object object + * @param resourceGroupName Name of the resource group to which the resource belongs. + * @param name Name of the app. + * @return the {@link ServiceResponse} object if successful. */ - public Observable deleteBackupConfigurationAsync(String resourceGroupName, String name) { - return deleteBackupConfigurationWithServiceResponseAsync(resourceGroupName, name).map(new Func1, Object>() { + public Observable deleteBackupConfigurationAsync(String resourceGroupName, String name) { + return deleteBackupConfigurationWithServiceResponseAsync(resourceGroupName, name).map(new Func1, Void>() { @Override - public Object call(ServiceResponse response) { + public Void call(ServiceResponse response) { return response.getBody(); } }); } /** - * Removes the backup configuration for a web app. - * Removes the backup configuration for a web app. + * Deletes the backup configuration of an app. + * Deletes the backup configuration of an app. * - * @param resourceGroupName Name of resource group - * @param name Name of web app - * @return the observable to the Object object + * @param resourceGroupName Name of the resource group to which the resource belongs. + * @param name Name of the app. + * @return the {@link ServiceResponse} object if successful. */ - public Observable> deleteBackupConfigurationWithServiceResponseAsync(String resourceGroupName, String name) { + public Observable> deleteBackupConfigurationWithServiceResponseAsync(String resourceGroupName, String name) { if (resourceGroupName == null) { throw new IllegalArgumentException("Parameter resourceGroupName is required and cannot be null."); } @@ -3742,11 +3461,11 @@ public Observable> deleteBackupConfigurationWithServiceR } final String apiVersion = "2016-08-01"; return service.deleteBackupConfiguration(resourceGroupName, name, this.client.subscriptionId(), apiVersion, this.client.acceptLanguage(), this.client.userAgent()) - .flatMap(new Func1, Observable>>() { + .flatMap(new Func1, Observable>>() { @Override - public Observable> call(Response response) { + public Observable> call(Response response) { try { - ServiceResponse clientResponse = deleteBackupConfigurationDelegate(response); + ServiceResponse clientResponse = deleteBackupConfigurationDelegate(response); return Observable.just(clientResponse); } catch (Throwable t) { return Observable.error(t); @@ -3755,19 +3474,18 @@ public Observable> call(Response response) }); } - private ServiceResponse deleteBackupConfigurationDelegate(Response response) throws CloudException, IOException, IllegalArgumentException { - return new AzureServiceResponseBuilder(this.client.mapperAdapter()) - .register(200, new TypeToken() { }.getType()) - .registerError(CloudException.class) + private ServiceResponse deleteBackupConfigurationDelegate(Response response) throws CloudException, IOException, IllegalArgumentException { + return new AzureServiceResponseBuilder(this.client.mapperAdapter()) + .register(200, new TypeToken() { }.getType()) .build(response); } /** - * Gets the backup configuration for a web app. - * Gets the backup configuration for a web app. + * Gets the backup configuration of an app. + * Gets the backup configuration of an app. * - * @param resourceGroupName Name of resource group - * @param name Name of web app + * @param resourceGroupName Name of the resource group to which the resource belongs. + * @param name Name of the app. * @return the BackupRequestInner object if successful. */ public BackupRequestInner getBackupConfiguration(String resourceGroupName, String name) { @@ -3775,11 +3493,11 @@ public BackupRequestInner getBackupConfiguration(String resourceGroupName, Strin } /** - * Gets the backup configuration for a web app. - * Gets the backup configuration for a web app. + * Gets the backup configuration of an app. + * Gets the backup configuration of an app. * - * @param resourceGroupName Name of resource group - * @param name Name of web app + * @param resourceGroupName Name of the resource group to which the resource belongs. + * @param name Name of the app. * @param serviceCallback the async ServiceCallback to handle successful and failed responses. * @return the {@link ServiceCall} object */ @@ -3788,11 +3506,11 @@ public ServiceCall getBackupConfigurationAsync(String resour } /** - * Gets the backup configuration for a web app. - * Gets the backup configuration for a web app. + * Gets the backup configuration of an app. + * Gets the backup configuration of an app. * - * @param resourceGroupName Name of resource group - * @param name Name of web app + * @param resourceGroupName Name of the resource group to which the resource belongs. + * @param name Name of the app. * @return the observable to the BackupRequestInner object */ public Observable getBackupConfigurationAsync(String resourceGroupName, String name) { @@ -3805,11 +3523,11 @@ public BackupRequestInner call(ServiceResponse response) { } /** - * Gets the backup configuration for a web app. - * Gets the backup configuration for a web app. + * Gets the backup configuration of an app. + * Gets the backup configuration of an app. * - * @param resourceGroupName Name of resource group - * @param name Name of web app + * @param resourceGroupName Name of the resource group to which the resource belongs. + * @param name Name of the app. * @return the observable to the BackupRequestInner object */ public Observable> getBackupConfigurationWithServiceResponseAsync(String resourceGroupName, String name) { @@ -3845,12 +3563,12 @@ private ServiceResponse getBackupConfigurationDelegate(Respo } /** - * Updates the connection strings associated with web app. - * Updates the connection strings associated with web app. + * Replaces the connection strings of an app. + * Replaces the connection strings of an app. * - * @param resourceGroupName Name of resource group - * @param name Name of web app - * @param connectionStrings Connection strings associated with web app + * @param resourceGroupName Name of the resource group to which the resource belongs. + * @param name Name of the app. + * @param connectionStrings Connection strings of the app or deployment slot. See example. * @return the ConnectionStringDictionaryInner object if successful. */ public ConnectionStringDictionaryInner updateConnectionStrings(String resourceGroupName, String name, ConnectionStringDictionaryInner connectionStrings) { @@ -3858,12 +3576,12 @@ public ConnectionStringDictionaryInner updateConnectionStrings(String resourceGr } /** - * Updates the connection strings associated with web app. - * Updates the connection strings associated with web app. + * Replaces the connection strings of an app. + * Replaces the connection strings of an app. * - * @param resourceGroupName Name of resource group - * @param name Name of web app - * @param connectionStrings Connection strings associated with web app + * @param resourceGroupName Name of the resource group to which the resource belongs. + * @param name Name of the app. + * @param connectionStrings Connection strings of the app or deployment slot. See example. * @param serviceCallback the async ServiceCallback to handle successful and failed responses. * @return the {@link ServiceCall} object */ @@ -3872,12 +3590,12 @@ public ServiceCall updateConnectionStringsAsync } /** - * Updates the connection strings associated with web app. - * Updates the connection strings associated with web app. + * Replaces the connection strings of an app. + * Replaces the connection strings of an app. * - * @param resourceGroupName Name of resource group - * @param name Name of web app - * @param connectionStrings Connection strings associated with web app + * @param resourceGroupName Name of the resource group to which the resource belongs. + * @param name Name of the app. + * @param connectionStrings Connection strings of the app or deployment slot. See example. * @return the observable to the ConnectionStringDictionaryInner object */ public Observable updateConnectionStringsAsync(String resourceGroupName, String name, ConnectionStringDictionaryInner connectionStrings) { @@ -3890,12 +3608,12 @@ public ConnectionStringDictionaryInner call(ServiceResponse> updateConnectionStringsWithServiceResponseAsync(String resourceGroupName, String name, ConnectionStringDictionaryInner connectionStrings) { @@ -3935,11 +3653,11 @@ private ServiceResponse updateConnectionStrings } /** - * Gets the connection strings associated with web app. - * Gets the connection strings associated with web app. + * Gets the connection strings of an app. + * Gets the connection strings of an app. * - * @param resourceGroupName Name of resource group - * @param name Name of web app + * @param resourceGroupName Name of the resource group to which the resource belongs. + * @param name Name of the app. * @return the ConnectionStringDictionaryInner object if successful. */ public ConnectionStringDictionaryInner listConnectionStrings(String resourceGroupName, String name) { @@ -3947,11 +3665,11 @@ public ConnectionStringDictionaryInner listConnectionStrings(String resourceGrou } /** - * Gets the connection strings associated with web app. - * Gets the connection strings associated with web app. + * Gets the connection strings of an app. + * Gets the connection strings of an app. * - * @param resourceGroupName Name of resource group - * @param name Name of web app + * @param resourceGroupName Name of the resource group to which the resource belongs. + * @param name Name of the app. * @param serviceCallback the async ServiceCallback to handle successful and failed responses. * @return the {@link ServiceCall} object */ @@ -3960,11 +3678,11 @@ public ServiceCall listConnectionStringsAsync(S } /** - * Gets the connection strings associated with web app. - * Gets the connection strings associated with web app. + * Gets the connection strings of an app. + * Gets the connection strings of an app. * - * @param resourceGroupName Name of resource group - * @param name Name of web app + * @param resourceGroupName Name of the resource group to which the resource belongs. + * @param name Name of the app. * @return the observable to the ConnectionStringDictionaryInner object */ public Observable listConnectionStringsAsync(String resourceGroupName, String name) { @@ -3977,11 +3695,11 @@ public ConnectionStringDictionaryInner call(ServiceResponse> listConnectionStringsWithServiceResponseAsync(String resourceGroupName, String name) { @@ -4017,11 +3735,11 @@ private ServiceResponse listConnectionStringsDe } /** - * Gets the web app logs configuration. - * Gets the web app logs configuration. + * Gets the logging configuration of an app. + * Gets the logging configuration of an app. * - * @param resourceGroupName Name of resource group - * @param name Name of web app + * @param resourceGroupName Name of the resource group to which the resource belongs. + * @param name Name of the app. * @return the SiteLogsConfigInner object if successful. */ public SiteLogsConfigInner getDiagnosticLogsConfiguration(String resourceGroupName, String name) { @@ -4029,11 +3747,11 @@ public SiteLogsConfigInner getDiagnosticLogsConfiguration(String resourceGroupNa } /** - * Gets the web app logs configuration. - * Gets the web app logs configuration. + * Gets the logging configuration of an app. + * Gets the logging configuration of an app. * - * @param resourceGroupName Name of resource group - * @param name Name of web app + * @param resourceGroupName Name of the resource group to which the resource belongs. + * @param name Name of the app. * @param serviceCallback the async ServiceCallback to handle successful and failed responses. * @return the {@link ServiceCall} object */ @@ -4042,11 +3760,11 @@ public ServiceCall getDiagnosticLogsConfigurationAsync(Stri } /** - * Gets the web app logs configuration. - * Gets the web app logs configuration. + * Gets the logging configuration of an app. + * Gets the logging configuration of an app. * - * @param resourceGroupName Name of resource group - * @param name Name of web app + * @param resourceGroupName Name of the resource group to which the resource belongs. + * @param name Name of the app. * @return the observable to the SiteLogsConfigInner object */ public Observable getDiagnosticLogsConfigurationAsync(String resourceGroupName, String name) { @@ -4059,11 +3777,11 @@ public SiteLogsConfigInner call(ServiceResponse response) { } /** - * Gets the web app logs configuration. - * Gets the web app logs configuration. + * Gets the logging configuration of an app. + * Gets the logging configuration of an app. * - * @param resourceGroupName Name of resource group - * @param name Name of web app + * @param resourceGroupName Name of the resource group to which the resource belongs. + * @param name Name of the app. * @return the observable to the SiteLogsConfigInner object */ public Observable> getDiagnosticLogsConfigurationWithServiceResponseAsync(String resourceGroupName, String name) { @@ -4099,12 +3817,12 @@ private ServiceResponse getDiagnosticLogsConfigurationDeleg } /** - * Updates the meta data for web app. - * Updates the meta data for web app. + * Updates the logging configuration of an app. + * Updates the logging configuration of an app. * - * @param resourceGroupName Name of resource group - * @param name Name of web app - * @param siteLogsConfig Site logs configuration + * @param resourceGroupName Name of the resource group to which the resource belongs. + * @param name Name of the app. + * @param siteLogsConfig A SiteLogsConfig JSON object that contains the logging configuration to change in the "properties" property. * @return the SiteLogsConfigInner object if successful. */ public SiteLogsConfigInner updateDiagnosticLogsConfig(String resourceGroupName, String name, SiteLogsConfigInner siteLogsConfig) { @@ -4112,12 +3830,12 @@ public SiteLogsConfigInner updateDiagnosticLogsConfig(String resourceGroupName, } /** - * Updates the meta data for web app. - * Updates the meta data for web app. + * Updates the logging configuration of an app. + * Updates the logging configuration of an app. * - * @param resourceGroupName Name of resource group - * @param name Name of web app - * @param siteLogsConfig Site logs configuration + * @param resourceGroupName Name of the resource group to which the resource belongs. + * @param name Name of the app. + * @param siteLogsConfig A SiteLogsConfig JSON object that contains the logging configuration to change in the "properties" property. * @param serviceCallback the async ServiceCallback to handle successful and failed responses. * @return the {@link ServiceCall} object */ @@ -4126,12 +3844,12 @@ public ServiceCall updateDiagnosticLogsConfigAsync(String r } /** - * Updates the meta data for web app. - * Updates the meta data for web app. + * Updates the logging configuration of an app. + * Updates the logging configuration of an app. * - * @param resourceGroupName Name of resource group - * @param name Name of web app - * @param siteLogsConfig Site logs configuration + * @param resourceGroupName Name of the resource group to which the resource belongs. + * @param name Name of the app. + * @param siteLogsConfig A SiteLogsConfig JSON object that contains the logging configuration to change in the "properties" property. * @return the observable to the SiteLogsConfigInner object */ public Observable updateDiagnosticLogsConfigAsync(String resourceGroupName, String name, SiteLogsConfigInner siteLogsConfig) { @@ -4144,12 +3862,12 @@ public SiteLogsConfigInner call(ServiceResponse response) { } /** - * Updates the meta data for web app. - * Updates the meta data for web app. + * Updates the logging configuration of an app. + * Updates the logging configuration of an app. * - * @param resourceGroupName Name of resource group - * @param name Name of web app - * @param siteLogsConfig Site logs configuration + * @param resourceGroupName Name of the resource group to which the resource belongs. + * @param name Name of the app. + * @param siteLogsConfig A SiteLogsConfig JSON object that contains the logging configuration to change in the "properties" property. * @return the observable to the SiteLogsConfigInner object */ public Observable> updateDiagnosticLogsConfigWithServiceResponseAsync(String resourceGroupName, String name, SiteLogsConfigInner siteLogsConfig) { @@ -4189,12 +3907,12 @@ private ServiceResponse updateDiagnosticLogsConfigDelegate( } /** - * Updates the meta data for web app. - * Updates the meta data for web app. + * Replaces the metadata of an app. + * Replaces the metadata of an app. * - * @param resourceGroupName Name of resource group - * @param name Name of web app - * @param metadata Meta data of web app + * @param resourceGroupName Name of the resource group to which the resource belongs. + * @param name Name of the app. + * @param metadata Edited metadata of the app or deployment slot. See example. * @return the StringDictionaryInner object if successful. */ public StringDictionaryInner updateMetadata(String resourceGroupName, String name, StringDictionaryInner metadata) { @@ -4202,12 +3920,12 @@ public StringDictionaryInner updateMetadata(String resourceGroupName, String nam } /** - * Updates the meta data for web app. - * Updates the meta data for web app. + * Replaces the metadata of an app. + * Replaces the metadata of an app. * - * @param resourceGroupName Name of resource group - * @param name Name of web app - * @param metadata Meta data of web app + * @param resourceGroupName Name of the resource group to which the resource belongs. + * @param name Name of the app. + * @param metadata Edited metadata of the app or deployment slot. See example. * @param serviceCallback the async ServiceCallback to handle successful and failed responses. * @return the {@link ServiceCall} object */ @@ -4216,12 +3934,12 @@ public ServiceCall updateMetadataAsync(String resourceGro } /** - * Updates the meta data for web app. - * Updates the meta data for web app. + * Replaces the metadata of an app. + * Replaces the metadata of an app. * - * @param resourceGroupName Name of resource group - * @param name Name of web app - * @param metadata Meta data of web app + * @param resourceGroupName Name of the resource group to which the resource belongs. + * @param name Name of the app. + * @param metadata Edited metadata of the app or deployment slot. See example. * @return the observable to the StringDictionaryInner object */ public Observable updateMetadataAsync(String resourceGroupName, String name, StringDictionaryInner metadata) { @@ -4234,12 +3952,12 @@ public StringDictionaryInner call(ServiceResponse respons } /** - * Updates the meta data for web app. - * Updates the meta data for web app. + * Replaces the metadata of an app. + * Replaces the metadata of an app. * - * @param resourceGroupName Name of resource group - * @param name Name of web app - * @param metadata Meta data of web app + * @param resourceGroupName Name of the resource group to which the resource belongs. + * @param name Name of the app. + * @param metadata Edited metadata of the app or deployment slot. See example. * @return the observable to the StringDictionaryInner object */ public Observable> updateMetadataWithServiceResponseAsync(String resourceGroupName, String name, StringDictionaryInner metadata) { @@ -4279,11 +3997,11 @@ private ServiceResponse updateMetadataDelegate(Response listMetadataAsync(String resourceGroup } /** - * Gets the web app meta data. - * Gets the web app meta data. + * Gets the metadata of an app. + * Gets the metadata of an app. * - * @param resourceGroupName Name of resource group - * @param name Name of web app + * @param resourceGroupName Name of the resource group to which the resource belongs. + * @param name Name of the app. * @return the observable to the StringDictionaryInner object */ public Observable listMetadataAsync(String resourceGroupName, String name) { @@ -4321,11 +4039,11 @@ public StringDictionaryInner call(ServiceResponse respons } /** - * Gets the web app meta data. - * Gets the web app meta data. + * Gets the metadata of an app. + * Gets the metadata of an app. * - * @param resourceGroupName Name of resource group - * @param name Name of web app + * @param resourceGroupName Name of the resource group to which the resource belongs. + * @param name Name of the app. * @return the observable to the StringDictionaryInner object */ public Observable> listMetadataWithServiceResponseAsync(String resourceGroupName, String name) { @@ -4361,11 +4079,11 @@ private ServiceResponse listMetadataDelegate(Response listPublishingCredentialsAsync(String resourceGrou } /** - * Gets the web app publishing credentials. - * Gets the web app publishing credentials. + * Gets the Git/FTP publishing credentials of an app. + * Gets the Git/FTP publishing credentials of an app. * - * @param resourceGroupName Name of resource group - * @param name Name of web app + * @param resourceGroupName Name of the resource group to which the resource belongs. + * @param name Name of the app. * @return the observable for the request */ public Observable listPublishingCredentialsAsync(String resourceGroupName, String name) { @@ -4403,11 +4121,11 @@ public UserInner call(ServiceResponse response) { } /** - * Gets the web app publishing credentials. - * Gets the web app publishing credentials. + * Gets the Git/FTP publishing credentials of an app. + * Gets the Git/FTP publishing credentials of an app. * - * @param resourceGroupName Name of resource group - * @param name Name of web app + * @param resourceGroupName Name of the resource group to which the resource belongs. + * @param name Name of the app. * @return the observable for the request */ public Observable> listPublishingCredentialsWithServiceResponseAsync(String resourceGroupName, String name) { @@ -4426,11 +4144,11 @@ public Observable> listPublishingCredentialsWithServi } /** - * Gets the web app publishing credentials. - * Gets the web app publishing credentials. + * Gets the Git/FTP publishing credentials of an app. + * Gets the Git/FTP publishing credentials of an app. * - * @param resourceGroupName Name of resource group - * @param name Name of web app + * @param resourceGroupName Name of the resource group to which the resource belongs. + * @param name Name of the app. * @return the UserInner object if successful. */ public UserInner beginListPublishingCredentials(String resourceGroupName, String name) { @@ -4438,11 +4156,11 @@ public UserInner beginListPublishingCredentials(String resourceGroupName, String } /** - * Gets the web app publishing credentials. - * Gets the web app publishing credentials. + * Gets the Git/FTP publishing credentials of an app. + * Gets the Git/FTP publishing credentials of an app. * - * @param resourceGroupName Name of resource group - * @param name Name of web app + * @param resourceGroupName Name of the resource group to which the resource belongs. + * @param name Name of the app. * @param serviceCallback the async ServiceCallback to handle successful and failed responses. * @return the {@link ServiceCall} object */ @@ -4451,11 +4169,11 @@ public ServiceCall beginListPublishingCredentialsAsync(String resourc } /** - * Gets the web app publishing credentials. - * Gets the web app publishing credentials. + * Gets the Git/FTP publishing credentials of an app. + * Gets the Git/FTP publishing credentials of an app. * - * @param resourceGroupName Name of resource group - * @param name Name of web app + * @param resourceGroupName Name of the resource group to which the resource belongs. + * @param name Name of the app. * @return the observable to the UserInner object */ public Observable beginListPublishingCredentialsAsync(String resourceGroupName, String name) { @@ -4468,11 +4186,11 @@ public UserInner call(ServiceResponse response) { } /** - * Gets the web app publishing credentials. - * Gets the web app publishing credentials. + * Gets the Git/FTP publishing credentials of an app. + * Gets the Git/FTP publishing credentials of an app. * - * @param resourceGroupName Name of resource group - * @param name Name of web app + * @param resourceGroupName Name of the resource group to which the resource belongs. + * @param name Name of the app. * @return the observable to the UserInner object */ public Observable> beginListPublishingCredentialsWithServiceResponseAsync(String resourceGroupName, String name) { @@ -4511,7 +4229,7 @@ private ServiceResponse beginListPublishingCredentialsDelegate(Respon * Updates the Push settings associated with web app. * Updates the Push settings associated with web app. * - * @param resourceGroupName Name of resource group + * @param resourceGroupName Name of the resource group to which the resource belongs. * @param name Name of web app * @param pushSettings Push settings associated with web app * @return the PushSettingsInner object if successful. @@ -4524,7 +4242,7 @@ public PushSettingsInner updateSitePushSettings(String resourceGroupName, String * Updates the Push settings associated with web app. * Updates the Push settings associated with web app. * - * @param resourceGroupName Name of resource group + * @param resourceGroupName Name of the resource group to which the resource belongs. * @param name Name of web app * @param pushSettings Push settings associated with web app * @param serviceCallback the async ServiceCallback to handle successful and failed responses. @@ -4538,7 +4256,7 @@ public ServiceCall updateSitePushSettingsAsync(String resourc * Updates the Push settings associated with web app. * Updates the Push settings associated with web app. * - * @param resourceGroupName Name of resource group + * @param resourceGroupName Name of the resource group to which the resource belongs. * @param name Name of web app * @param pushSettings Push settings associated with web app * @return the observable to the PushSettingsInner object @@ -4556,7 +4274,7 @@ public PushSettingsInner call(ServiceResponse response) { * Updates the Push settings associated with web app. * Updates the Push settings associated with web app. * - * @param resourceGroupName Name of resource group + * @param resourceGroupName Name of the resource group to which the resource belongs. * @param name Name of web app * @param pushSettings Push settings associated with web app * @return the observable to the PushSettingsInner object @@ -4601,7 +4319,7 @@ private ServiceResponse updateSitePushSettingsDelegate(Respon * Gets the Push settings associated with web app. * Gets the Push settings associated with web app. * - * @param resourceGroupName Name of resource group + * @param resourceGroupName Name of the resource group to which the resource belongs. * @param name Name of web app * @return the PushSettingsInner object if successful. */ @@ -4613,7 +4331,7 @@ public PushSettingsInner listSitePushSettings(String resourceGroupName, String n * Gets the Push settings associated with web app. * Gets the Push settings associated with web app. * - * @param resourceGroupName Name of resource group + * @param resourceGroupName Name of the resource group to which the resource belongs. * @param name Name of web app * @param serviceCallback the async ServiceCallback to handle successful and failed responses. * @return the {@link ServiceCall} object @@ -4626,7 +4344,7 @@ public ServiceCall listSitePushSettingsAsync(String resourceG * Gets the Push settings associated with web app. * Gets the Push settings associated with web app. * - * @param resourceGroupName Name of resource group + * @param resourceGroupName Name of the resource group to which the resource belongs. * @param name Name of web app * @return the observable to the PushSettingsInner object */ @@ -4643,7 +4361,7 @@ public PushSettingsInner call(ServiceResponse response) { * Gets the Push settings associated with web app. * Gets the Push settings associated with web app. * - * @param resourceGroupName Name of resource group + * @param resourceGroupName Name of the resource group to which the resource belongs. * @param name Name of web app * @return the observable to the PushSettingsInner object */ @@ -4680,11 +4398,11 @@ private ServiceResponse listSitePushSettingsDelegate(Response } /** - * Gets the names of application settings and connection string that remain with the slot during swap operation. - * Gets the names of application settings and connection string that remain with the slot during swap operation. + * Gets the names of app settings and connection strings that stick to the slot (not swapped). + * Gets the names of app settings and connection strings that stick to the slot (not swapped). * - * @param resourceGroupName Name of resource group - * @param name Name of web app + * @param resourceGroupName Name of the resource group to which the resource belongs. + * @param name Name of the app. * @return the SlotConfigNamesResourceInner object if successful. */ public SlotConfigNamesResourceInner listSlotConfigurationNames(String resourceGroupName, String name) { @@ -4692,11 +4410,11 @@ public SlotConfigNamesResourceInner listSlotConfigurationNames(String resourceGr } /** - * Gets the names of application settings and connection string that remain with the slot during swap operation. - * Gets the names of application settings and connection string that remain with the slot during swap operation. + * Gets the names of app settings and connection strings that stick to the slot (not swapped). + * Gets the names of app settings and connection strings that stick to the slot (not swapped). * - * @param resourceGroupName Name of resource group - * @param name Name of web app + * @param resourceGroupName Name of the resource group to which the resource belongs. + * @param name Name of the app. * @param serviceCallback the async ServiceCallback to handle successful and failed responses. * @return the {@link ServiceCall} object */ @@ -4705,11 +4423,11 @@ public ServiceCall listSlotConfigurationNamesAsync } /** - * Gets the names of application settings and connection string that remain with the slot during swap operation. - * Gets the names of application settings and connection string that remain with the slot during swap operation. + * Gets the names of app settings and connection strings that stick to the slot (not swapped). + * Gets the names of app settings and connection strings that stick to the slot (not swapped). * - * @param resourceGroupName Name of resource group - * @param name Name of web app + * @param resourceGroupName Name of the resource group to which the resource belongs. + * @param name Name of the app. * @return the observable to the SlotConfigNamesResourceInner object */ public Observable listSlotConfigurationNamesAsync(String resourceGroupName, String name) { @@ -4722,11 +4440,11 @@ public SlotConfigNamesResourceInner call(ServiceResponse> listSlotConfigurationNamesWithServiceResponseAsync(String resourceGroupName, String name) { @@ -4765,9 +4483,9 @@ private ServiceResponse listSlotConfigurationNames * Updates the names of application settings and connection string that remain with the slot during swap operation. * Updates the names of application settings and connection string that remain with the slot during swap operation. * - * @param resourceGroupName Name of resource group - * @param name Name of web app - * @param slotConfigNames Request body containing the names of application settings and connection strings + * @param resourceGroupName Name of the resource group to which the resource belongs. + * @param name Name of the app. + * @param slotConfigNames Names of application settings and connection strings. See example. * @return the SlotConfigNamesResourceInner object if successful. */ public SlotConfigNamesResourceInner updateSlotConfigurationNames(String resourceGroupName, String name, SlotConfigNamesResourceInner slotConfigNames) { @@ -4778,9 +4496,9 @@ public SlotConfigNamesResourceInner updateSlotConfigurationNames(String resource * Updates the names of application settings and connection string that remain with the slot during swap operation. * Updates the names of application settings and connection string that remain with the slot during swap operation. * - * @param resourceGroupName Name of resource group - * @param name Name of web app - * @param slotConfigNames Request body containing the names of application settings and connection strings + * @param resourceGroupName Name of the resource group to which the resource belongs. + * @param name Name of the app. + * @param slotConfigNames Names of application settings and connection strings. See example. * @param serviceCallback the async ServiceCallback to handle successful and failed responses. * @return the {@link ServiceCall} object */ @@ -4792,9 +4510,9 @@ public ServiceCall updateSlotConfigurationNamesAsy * Updates the names of application settings and connection string that remain with the slot during swap operation. * Updates the names of application settings and connection string that remain with the slot during swap operation. * - * @param resourceGroupName Name of resource group - * @param name Name of web app - * @param slotConfigNames Request body containing the names of application settings and connection strings + * @param resourceGroupName Name of the resource group to which the resource belongs. + * @param name Name of the app. + * @param slotConfigNames Names of application settings and connection strings. See example. * @return the observable to the SlotConfigNamesResourceInner object */ public Observable updateSlotConfigurationNamesAsync(String resourceGroupName, String name, SlotConfigNamesResourceInner slotConfigNames) { @@ -4810,9 +4528,9 @@ public SlotConfigNamesResourceInner call(ServiceResponse> updateSlotConfigurationNamesWithServiceResponseAsync(String resourceGroupName, String name, SlotConfigNamesResourceInner slotConfigNames) { @@ -4852,11 +4570,11 @@ private ServiceResponse updateSlotConfigurationNam } /** - * Gets the configuration of the web app. - * Gets the configuration of the web app. + * Gets the configuration of an app, such as platform version and bitness, default documents, virtual applications, Always On, etc. + * Gets the configuration of an app, such as platform version and bitness, default documents, virtual applications, Always On, etc. * - * @param resourceGroupName Name of resource group - * @param name Name of web app + * @param resourceGroupName Name of the resource group to which the resource belongs. + * @param name Name of the app. * @return the SiteConfigInner object if successful. */ public SiteConfigInner getConfiguration(String resourceGroupName, String name) { @@ -4864,11 +4582,11 @@ public SiteConfigInner getConfiguration(String resourceGroupName, String name) { } /** - * Gets the configuration of the web app. - * Gets the configuration of the web app. + * Gets the configuration of an app, such as platform version and bitness, default documents, virtual applications, Always On, etc. + * Gets the configuration of an app, such as platform version and bitness, default documents, virtual applications, Always On, etc. * - * @param resourceGroupName Name of resource group - * @param name Name of web app + * @param resourceGroupName Name of the resource group to which the resource belongs. + * @param name Name of the app. * @param serviceCallback the async ServiceCallback to handle successful and failed responses. * @return the {@link ServiceCall} object */ @@ -4877,11 +4595,11 @@ public ServiceCall getConfigurationAsync(String resourceGroupNa } /** - * Gets the configuration of the web app. - * Gets the configuration of the web app. + * Gets the configuration of an app, such as platform version and bitness, default documents, virtual applications, Always On, etc. + * Gets the configuration of an app, such as platform version and bitness, default documents, virtual applications, Always On, etc. * - * @param resourceGroupName Name of resource group - * @param name Name of web app + * @param resourceGroupName Name of the resource group to which the resource belongs. + * @param name Name of the app. * @return the observable to the SiteConfigInner object */ public Observable getConfigurationAsync(String resourceGroupName, String name) { @@ -4894,11 +4612,11 @@ public SiteConfigInner call(ServiceResponse response) { } /** - * Gets the configuration of the web app. - * Gets the configuration of the web app. + * Gets the configuration of an app, such as platform version and bitness, default documents, virtual applications, Always On, etc. + * Gets the configuration of an app, such as platform version and bitness, default documents, virtual applications, Always On, etc. * - * @param resourceGroupName Name of resource group - * @param name Name of web app + * @param resourceGroupName Name of the resource group to which the resource belongs. + * @param name Name of the app. * @return the observable to the SiteConfigInner object */ public Observable> getConfigurationWithServiceResponseAsync(String resourceGroupName, String name) { @@ -4934,12 +4652,12 @@ private ServiceResponse getConfigurationDelegate(Response createOrUpdateConfigurationAsync(String reso } /** - * Update the configuration of web app. - * Update the configuration of web app. + * Updates the configuration of an app. + * Updates the configuration of an app. * - * @param resourceGroupName Name of resource group - * @param name Name of web app - * @param siteConfig Request body that contains the configuraiton setting for the web app + * @param resourceGroupName Name of the resource group to which the resource belongs. + * @param name Name of the app. + * @param siteConfig JSON representation of a SiteConfig object. See example. * @return the observable to the SiteConfigInner object */ public Observable createOrUpdateConfigurationAsync(String resourceGroupName, String name, SiteConfigInner siteConfig) { @@ -4979,12 +4697,12 @@ public SiteConfigInner call(ServiceResponse response) { } /** - * Update the configuration of web app. - * Update the configuration of web app. + * Updates the configuration of an app. + * Updates the configuration of an app. * - * @param resourceGroupName Name of resource group - * @param name Name of web app - * @param siteConfig Request body that contains the configuraiton setting for the web app + * @param resourceGroupName Name of the resource group to which the resource belongs. + * @param name Name of the app. + * @param siteConfig JSON representation of a SiteConfig object. See example. * @return the observable to the SiteConfigInner object */ public Observable> createOrUpdateConfigurationWithServiceResponseAsync(String resourceGroupName, String name, SiteConfigInner siteConfig) { @@ -5024,12 +4742,12 @@ private ServiceResponse createOrUpdateConfigurationDelegate(Res } /** - * Update the configuration of web app. - * Update the configuration of web app. + * Updates the configuration of an app. + * Updates the configuration of an app. * - * @param resourceGroupName Name of resource group - * @param name Name of web app - * @param siteConfig Request body that contains the configuraiton setting for the web app + * @param resourceGroupName Name of the resource group to which the resource belongs. + * @param name Name of the app. + * @param siteConfig JSON representation of a SiteConfig object. See example. * @return the SiteConfigInner object if successful. */ public SiteConfigInner updateConfiguration(String resourceGroupName, String name, SiteConfigInner siteConfig) { @@ -5037,12 +4755,12 @@ public SiteConfigInner updateConfiguration(String resourceGroupName, String name } /** - * Update the configuration of web app. - * Update the configuration of web app. + * Updates the configuration of an app. + * Updates the configuration of an app. * - * @param resourceGroupName Name of resource group - * @param name Name of web app - * @param siteConfig Request body that contains the configuraiton setting for the web app + * @param resourceGroupName Name of the resource group to which the resource belongs. + * @param name Name of the app. + * @param siteConfig JSON representation of a SiteConfig object. See example. * @param serviceCallback the async ServiceCallback to handle successful and failed responses. * @return the {@link ServiceCall} object */ @@ -5051,12 +4769,12 @@ public ServiceCall updateConfigurationAsync(String resourceGrou } /** - * Update the configuration of web app. - * Update the configuration of web app. + * Updates the configuration of an app. + * Updates the configuration of an app. * - * @param resourceGroupName Name of resource group - * @param name Name of web app - * @param siteConfig Request body that contains the configuraiton setting for the web app + * @param resourceGroupName Name of the resource group to which the resource belongs. + * @param name Name of the app. + * @param siteConfig JSON representation of a SiteConfig object. See example. * @return the observable to the SiteConfigInner object */ public Observable updateConfigurationAsync(String resourceGroupName, String name, SiteConfigInner siteConfig) { @@ -5069,12 +4787,12 @@ public SiteConfigInner call(ServiceResponse response) { } /** - * Update the configuration of web app. - * Update the configuration of web app. + * Updates the configuration of an app. + * Updates the configuration of an app. * - * @param resourceGroupName Name of resource group - * @param name Name of web app - * @param siteConfig Request body that contains the configuraiton setting for the web app + * @param resourceGroupName Name of the resource group to which the resource belongs. + * @param name Name of the app. + * @param siteConfig JSON representation of a SiteConfig object. See example. * @return the observable to the SiteConfigInner object */ public Observable> updateConfigurationWithServiceResponseAsync(String resourceGroupName, String name, SiteConfigInner siteConfig) { @@ -5114,11 +4832,11 @@ private ServiceResponse updateConfigurationDelegate(Response listDeployments(final String resourceGroupName, final String name) { @@ -5132,11 +4850,11 @@ public Page nextPage(String nextPageLink) { } /** - * List deployments. - * List deployments. + * List deployments for an app, or a deployment slot, or for an instance of a scaled-out app. + * List deployments for an app, or a deployment slot, or for an instance of a scaled-out app. * - * @param resourceGroupName Name of resource group - * @param name Name of web app + * @param resourceGroupName Name of the resource group to which the resource belongs. + * @param name Name of the app. * @param serviceCallback the async ServiceCallback to handle successful and failed responses. * @return the {@link ServiceCall} object */ @@ -5153,11 +4871,11 @@ public Observable>> call(String nextPageLi } /** - * List deployments. - * List deployments. + * List deployments for an app, or a deployment slot, or for an instance of a scaled-out app. + * List deployments for an app, or a deployment slot, or for an instance of a scaled-out app. * - * @param resourceGroupName Name of resource group - * @param name Name of web app + * @param resourceGroupName Name of the resource group to which the resource belongs. + * @param name Name of the app. * @return the observable to the PagedList<DeploymentInner> object */ public Observable> listDeploymentsAsync(final String resourceGroupName, final String name) { @@ -5171,11 +4889,11 @@ public Page call(ServiceResponse> respons } /** - * List deployments. - * List deployments. + * List deployments for an app, or a deployment slot, or for an instance of a scaled-out app. + * List deployments for an app, or a deployment slot, or for an instance of a scaled-out app. * - * @param resourceGroupName Name of resource group - * @param name Name of web app + * @param resourceGroupName Name of the resource group to which the resource belongs. + * @param name Name of the app. * @return the observable to the PagedList<DeploymentInner> object */ public Observable>> listDeploymentsWithServiceResponseAsync(final String resourceGroupName, final String name) { @@ -5193,11 +4911,11 @@ public Observable>> call(ServiceResponse

> * @param resourceGroupName Name of resource group - ServiceResponse> * @param name Name of web app + ServiceResponse> * @param resourceGroupName Name of the resource group to which the resource belongs. + ServiceResponse> * @param name Name of the app. * @return the PagedList<DeploymentInner> object wrapped in {@link ServiceResponse} if successful. */ public Observable>> listDeploymentsSinglePageAsync(final String resourceGroupName, final String name) { @@ -5233,12 +4951,12 @@ private ServiceResponse> listDeploymentsDelegate(Respo } /** - * Get the deployment. - * Get the deployment. + * Get a deployment by its ID for an app, a specific deployment slot, and/or a specific scaled-out instance. + * Get a deployment by its ID for an app, a specific deployment slot, and/or a specific scaled-out instance. * - * @param resourceGroupName Name of resource group - * @param name Name of web app - * @param id Id of the deployment + * @param resourceGroupName Name of the resource group to which the resource belongs. + * @param name Name of the app. + * @param id Deployment ID. * @return the DeploymentInner object if successful. */ public DeploymentInner getDeployment(String resourceGroupName, String name, String id) { @@ -5246,12 +4964,12 @@ public DeploymentInner getDeployment(String resourceGroupName, String name, Stri } /** - * Get the deployment. - * Get the deployment. + * Get a deployment by its ID for an app, a specific deployment slot, and/or a specific scaled-out instance. + * Get a deployment by its ID for an app, a specific deployment slot, and/or a specific scaled-out instance. * - * @param resourceGroupName Name of resource group - * @param name Name of web app - * @param id Id of the deployment + * @param resourceGroupName Name of the resource group to which the resource belongs. + * @param name Name of the app. + * @param id Deployment ID. * @param serviceCallback the async ServiceCallback to handle successful and failed responses. * @return the {@link ServiceCall} object */ @@ -5260,12 +4978,12 @@ public ServiceCall getDeploymentAsync(String resourceGroupName, } /** - * Get the deployment. - * Get the deployment. + * Get a deployment by its ID for an app, a specific deployment slot, and/or a specific scaled-out instance. + * Get a deployment by its ID for an app, a specific deployment slot, and/or a specific scaled-out instance. * - * @param resourceGroupName Name of resource group - * @param name Name of web app - * @param id Id of the deployment + * @param resourceGroupName Name of the resource group to which the resource belongs. + * @param name Name of the app. + * @param id Deployment ID. * @return the observable to the DeploymentInner object */ public Observable getDeploymentAsync(String resourceGroupName, String name, String id) { @@ -5278,12 +4996,12 @@ public DeploymentInner call(ServiceResponse response) { } /** - * Get the deployment. - * Get the deployment. + * Get a deployment by its ID for an app, a specific deployment slot, and/or a specific scaled-out instance. + * Get a deployment by its ID for an app, a specific deployment slot, and/or a specific scaled-out instance. * - * @param resourceGroupName Name of resource group - * @param name Name of web app - * @param id Id of the deployment + * @param resourceGroupName Name of the resource group to which the resource belongs. + * @param name Name of the app. + * @param id Deployment ID. * @return the observable to the DeploymentInner object */ public Observable> getDeploymentWithServiceResponseAsync(String resourceGroupName, String name, String id) { @@ -5322,13 +5040,13 @@ private ServiceResponse getDeploymentDelegate(Response createDeploymentAsync(String resourceGroupNa } /** - * Create a deployment. - * Create a deployment. + * Create a deployment for an app, a specific deployment slot, and/or a specific scaled-out instance. + * Create a deployment for an app, a specific deployment slot, and/or a specific scaled-out instance. * - * @param resourceGroupName Name of resource group - * @param name Name of web app - * @param id Id of the deployment - * @param deployment Details of deployment + * @param resourceGroupName Name of the resource group to which the resource belongs. + * @param name Name of the app. + * @param id ID of an existing deployment. + * @param deployment Deployment details. * @return the observable to the DeploymentInner object */ public Observable createDeploymentAsync(String resourceGroupName, String name, String id, DeploymentInner deployment) { @@ -5370,13 +5088,13 @@ public DeploymentInner call(ServiceResponse response) { } /** - * Create a deployment. - * Create a deployment. + * Create a deployment for an app, a specific deployment slot, and/or a specific scaled-out instance. + * Create a deployment for an app, a specific deployment slot, and/or a specific scaled-out instance. * - * @param resourceGroupName Name of resource group - * @param name Name of web app - * @param id Id of the deployment - * @param deployment Details of deployment + * @param resourceGroupName Name of the resource group to which the resource belongs. + * @param name Name of the app. + * @param id ID of an existing deployment. + * @param deployment Deployment details. * @return the observable to the DeploymentInner object */ public Observable> createDeploymentWithServiceResponseAsync(String resourceGroupName, String name, String id, DeploymentInner deployment) { @@ -5419,60 +5137,59 @@ private ServiceResponse createDeploymentDelegate(Response deleteDeploymentAsync(String resourceGroupName, String name, String id, final ServiceCallback serviceCallback) { + public ServiceCall deleteDeploymentAsync(String resourceGroupName, String name, String id, final ServiceCallback serviceCallback) { return ServiceCall.create(deleteDeploymentWithServiceResponseAsync(resourceGroupName, name, id), serviceCallback); } /** - * Delete the deployment. - * Delete the deployment. + * Delete a deployment by its ID for an app, a specific deployment slot, and/or a specific scaled-out instance. + * Delete a deployment by its ID for an app, a specific deployment slot, and/or a specific scaled-out instance. * - * @param resourceGroupName Name of resource group - * @param name Name of web app - * @param id Id of the deployment - * @return the observable to the Object object + * @param resourceGroupName Name of the resource group to which the resource belongs. + * @param name Name of the app. + * @param id Deployment ID. + * @return the {@link ServiceResponse} object if successful. */ - public Observable deleteDeploymentAsync(String resourceGroupName, String name, String id) { - return deleteDeploymentWithServiceResponseAsync(resourceGroupName, name, id).map(new Func1, Object>() { + public Observable deleteDeploymentAsync(String resourceGroupName, String name, String id) { + return deleteDeploymentWithServiceResponseAsync(resourceGroupName, name, id).map(new Func1, Void>() { @Override - public Object call(ServiceResponse response) { + public Void call(ServiceResponse response) { return response.getBody(); } }); } /** - * Delete the deployment. - * Delete the deployment. + * Delete a deployment by its ID for an app, a specific deployment slot, and/or a specific scaled-out instance. + * Delete a deployment by its ID for an app, a specific deployment slot, and/or a specific scaled-out instance. * - * @param resourceGroupName Name of resource group - * @param name Name of web app - * @param id Id of the deployment - * @return the observable to the Object object + * @param resourceGroupName Name of the resource group to which the resource belongs. + * @param name Name of the app. + * @param id Deployment ID. + * @return the {@link ServiceResponse} object if successful. */ - public Observable> deleteDeploymentWithServiceResponseAsync(String resourceGroupName, String name, String id) { + public Observable> deleteDeploymentWithServiceResponseAsync(String resourceGroupName, String name, String id) { if (resourceGroupName == null) { throw new IllegalArgumentException("Parameter resourceGroupName is required and cannot be null."); } @@ -5487,11 +5204,11 @@ public Observable> deleteDeploymentWithServiceResponseAs } final String apiVersion = "2016-08-01"; return service.deleteDeployment(resourceGroupName, name, id, this.client.subscriptionId(), apiVersion, this.client.acceptLanguage(), this.client.userAgent()) - .flatMap(new Func1, Observable>>() { + .flatMap(new Func1, Observable>>() { @Override - public Observable> call(Response response) { + public Observable> call(Response response) { try { - ServiceResponse clientResponse = deleteDeploymentDelegate(response); + ServiceResponse clientResponse = deleteDeploymentDelegate(response); return Observable.just(clientResponse); } catch (Throwable t) { return Observable.error(t); @@ -5500,101 +5217,101 @@ public Observable> call(Response response) }); } - private ServiceResponse deleteDeploymentDelegate(Response response) throws CloudException, IOException, IllegalArgumentException { - return new AzureServiceResponseBuilder(this.client.mapperAdapter()) - .register(200, new TypeToken() { }.getType()) - .registerError(CloudException.class) + private ServiceResponse deleteDeploymentDelegate(Response response) throws CloudException, IOException, IllegalArgumentException { + return new AzureServiceResponseBuilder(this.client.mapperAdapter()) + .register(200, new TypeToken() { }.getType()) + .register(204, new TypeToken() { }.getType()) .build(response); } /** - * Get web app hostname bindings. - * Get web app hostname bindings. + * Lists ownership identifiers for domain associated with web app. + * Lists ownership identifiers for domain associated with web app. * - * @param resourceGroupName Name of resource group - * @param name Name of web app - * @return the PagedList<HostNameBindingInner> object if successful. + * @param resourceGroupName Name of the resource group to which the resource belongs. + * @param name Name of the app. + * @return the PagedList<IdentifierInner> object if successful. */ - public PagedList listHostNameBindings(final String resourceGroupName, final String name) { - ServiceResponse> response = listHostNameBindingsSinglePageAsync(resourceGroupName, name).toBlocking().single(); - return new PagedList(response.getBody()) { + public PagedList listDomainOwnershipIdentifiers(final String resourceGroupName, final String name) { + ServiceResponse> response = listDomainOwnershipIdentifiersSinglePageAsync(resourceGroupName, name).toBlocking().single(); + return new PagedList(response.getBody()) { @Override - public Page nextPage(String nextPageLink) { - return listHostNameBindingsNextSinglePageAsync(nextPageLink).toBlocking().single().getBody(); + public Page nextPage(String nextPageLink) { + return listDomainOwnershipIdentifiersNextSinglePageAsync(nextPageLink).toBlocking().single().getBody(); } }; } /** - * Get web app hostname bindings. - * Get web app hostname bindings. + * Lists ownership identifiers for domain associated with web app. + * Lists ownership identifiers for domain associated with web app. * - * @param resourceGroupName Name of resource group - * @param name Name of web app + * @param resourceGroupName Name of the resource group to which the resource belongs. + * @param name Name of the app. * @param serviceCallback the async ServiceCallback to handle successful and failed responses. * @return the {@link ServiceCall} object */ - public ServiceCall> listHostNameBindingsAsync(final String resourceGroupName, final String name, final ListOperationCallback serviceCallback) { + public ServiceCall> listDomainOwnershipIdentifiersAsync(final String resourceGroupName, final String name, final ListOperationCallback serviceCallback) { return AzureServiceCall.create( - listHostNameBindingsSinglePageAsync(resourceGroupName, name), - new Func1>>>() { + listDomainOwnershipIdentifiersSinglePageAsync(resourceGroupName, name), + new Func1>>>() { @Override - public Observable>> call(String nextPageLink) { - return listHostNameBindingsNextSinglePageAsync(nextPageLink); + public Observable>> call(String nextPageLink) { + return listDomainOwnershipIdentifiersNextSinglePageAsync(nextPageLink); } }, serviceCallback); } /** - * Get web app hostname bindings. - * Get web app hostname bindings. + * Lists ownership identifiers for domain associated with web app. + * Lists ownership identifiers for domain associated with web app. * - * @param resourceGroupName Name of resource group - * @param name Name of web app - * @return the observable to the PagedList<HostNameBindingInner> object + * @param resourceGroupName Name of the resource group to which the resource belongs. + * @param name Name of the app. + * @return the observable to the PagedList<IdentifierInner> object */ - public Observable> listHostNameBindingsAsync(final String resourceGroupName, final String name) { - return listHostNameBindingsWithServiceResponseAsync(resourceGroupName, name) - .map(new Func1>, Page>() { + public Observable> listDomainOwnershipIdentifiersAsync(final String resourceGroupName, final String name) { + return listDomainOwnershipIdentifiersWithServiceResponseAsync(resourceGroupName, name) + .map(new Func1>, Page>() { @Override - public Page call(ServiceResponse> response) { + public Page call(ServiceResponse> response) { return response.getBody(); } }); } /** - * Get web app hostname bindings. - * Get web app hostname bindings. + * Lists ownership identifiers for domain associated with web app. + * Lists ownership identifiers for domain associated with web app. * - * @param resourceGroupName Name of resource group - * @param name Name of web app - * @return the observable to the PagedList<HostNameBindingInner> object + * @param resourceGroupName Name of the resource group to which the resource belongs. + * @param name Name of the app. + * @return the observable to the PagedList<IdentifierInner> object */ - public Observable>> listHostNameBindingsWithServiceResponseAsync(final String resourceGroupName, final String name) { - return listHostNameBindingsSinglePageAsync(resourceGroupName, name) - .concatMap(new Func1>, Observable>>>() { + public Observable>> listDomainOwnershipIdentifiersWithServiceResponseAsync(final String resourceGroupName, final String name) { + return listDomainOwnershipIdentifiersSinglePageAsync(resourceGroupName, name) + .concatMap(new Func1>, Observable>>>() { @Override - public Observable>> call(ServiceResponse> page) { + public Observable>> call(ServiceResponse> page) { String nextPageLink = page.getBody().getNextPageLink(); if (nextPageLink == null) { return Observable.just(page); } - return Observable.just(page).concatWith(listHostNameBindingsNextWithServiceResponseAsync(nextPageLink)); + return Observable.just(page).concatWith(listDomainOwnershipIdentifiersNextWithServiceResponseAsync(nextPageLink)); } }); } /** - * Get web app hostname bindings. - * Get web app hostname bindings. + * Lists ownership identifiers for domain associated with web app. + * Lists ownership identifiers for domain associated with web app. * - ServiceResponse> * @param resourceGroupName Name of resource group - ServiceResponse> * @param name Name of web app - * @return the PagedList<HostNameBindingInner> object wrapped in {@link ServiceResponse} if successful. + ServiceResponse> * @param resourceGroupName Name of the resource group to which the resource belongs. + ServiceResponse> * @param name Name of the app. + * @return the PagedList<IdentifierInner> object wrapped in {@link ServiceResponse} if successful. */ - public Observable>> listHostNameBindingsSinglePageAsync(final String resourceGroupName, final String name) { + public Observable>> listDomainOwnershipIdentifiersSinglePageAsync(final String resourceGroupName, final String name) { if (resourceGroupName == null) { throw new IllegalArgumentException("Parameter resourceGroupName is required and cannot be null."); } @@ -5605,13 +5322,13 @@ public Observable>> listHostNameBindi throw new IllegalArgumentException("Parameter this.client.subscriptionId() is required and cannot be null."); } final String apiVersion = "2016-08-01"; - return service.listHostNameBindings(resourceGroupName, name, this.client.subscriptionId(), apiVersion, this.client.acceptLanguage(), this.client.userAgent()) - .flatMap(new Func1, Observable>>>() { + return service.listDomainOwnershipIdentifiers(resourceGroupName, name, this.client.subscriptionId(), apiVersion, this.client.acceptLanguage(), this.client.userAgent()) + .flatMap(new Func1, Observable>>>() { @Override - public Observable>> call(Response response) { + public Observable>> call(Response response) { try { - ServiceResponse> result = listHostNameBindingsDelegate(response); - return Observable.just(new ServiceResponse>(result.getBody(), result.getResponse())); + ServiceResponse> result = listDomainOwnershipIdentifiersDelegate(response); + return Observable.just(new ServiceResponse>(result.getBody(), result.getResponse())); } catch (Throwable t) { return Observable.error(t); } @@ -5619,87 +5336,87 @@ public Observable>> call(Response> listHostNameBindingsDelegate(Response response) throws CloudException, IOException, IllegalArgumentException { - return new AzureServiceResponseBuilder, CloudException>(this.client.mapperAdapter()) - .register(200, new TypeToken>() { }.getType()) + private ServiceResponse> listDomainOwnershipIdentifiersDelegate(Response response) throws CloudException, IOException, IllegalArgumentException { + return new AzureServiceResponseBuilder, CloudException>(this.client.mapperAdapter()) + .register(200, new TypeToken>() { }.getType()) .registerError(CloudException.class) .build(response); } /** - * Get web app binding for a hostname. - * Get web app binding for a hostname. + * Get domain ownership identifier for web app. + * Get domain ownership identifier for web app. * - * @param resourceGroupName Name of resource group - * @param name Name of web app - * @param hostName Name of host - * @return the HostNameBindingInner object if successful. + * @param resourceGroupName Name of the resource group to which the resource belongs. + * @param name Name of the app. + * @param domainOwnershipIdentifierName Name of domain ownership identifier. + * @return the IdentifierInner object if successful. */ - public HostNameBindingInner getHostNameBinding(String resourceGroupName, String name, String hostName) { - return getHostNameBindingWithServiceResponseAsync(resourceGroupName, name, hostName).toBlocking().single().getBody(); + public IdentifierInner getDomainOwnershipIdentifier(String resourceGroupName, String name, String domainOwnershipIdentifierName) { + return getDomainOwnershipIdentifierWithServiceResponseAsync(resourceGroupName, name, domainOwnershipIdentifierName).toBlocking().single().getBody(); } /** - * Get web app binding for a hostname. - * Get web app binding for a hostname. + * Get domain ownership identifier for web app. + * Get domain ownership identifier for web app. * - * @param resourceGroupName Name of resource group - * @param name Name of web app - * @param hostName Name of host + * @param resourceGroupName Name of the resource group to which the resource belongs. + * @param name Name of the app. + * @param domainOwnershipIdentifierName Name of domain ownership identifier. * @param serviceCallback the async ServiceCallback to handle successful and failed responses. * @return the {@link ServiceCall} object */ - public ServiceCall getHostNameBindingAsync(String resourceGroupName, String name, String hostName, final ServiceCallback serviceCallback) { - return ServiceCall.create(getHostNameBindingWithServiceResponseAsync(resourceGroupName, name, hostName), serviceCallback); + public ServiceCall getDomainOwnershipIdentifierAsync(String resourceGroupName, String name, String domainOwnershipIdentifierName, final ServiceCallback serviceCallback) { + return ServiceCall.create(getDomainOwnershipIdentifierWithServiceResponseAsync(resourceGroupName, name, domainOwnershipIdentifierName), serviceCallback); } /** - * Get web app binding for a hostname. - * Get web app binding for a hostname. + * Get domain ownership identifier for web app. + * Get domain ownership identifier for web app. * - * @param resourceGroupName Name of resource group - * @param name Name of web app - * @param hostName Name of host - * @return the observable to the HostNameBindingInner object + * @param resourceGroupName Name of the resource group to which the resource belongs. + * @param name Name of the app. + * @param domainOwnershipIdentifierName Name of domain ownership identifier. + * @return the observable to the IdentifierInner object */ - public Observable getHostNameBindingAsync(String resourceGroupName, String name, String hostName) { - return getHostNameBindingWithServiceResponseAsync(resourceGroupName, name, hostName).map(new Func1, HostNameBindingInner>() { + public Observable getDomainOwnershipIdentifierAsync(String resourceGroupName, String name, String domainOwnershipIdentifierName) { + return getDomainOwnershipIdentifierWithServiceResponseAsync(resourceGroupName, name, domainOwnershipIdentifierName).map(new Func1, IdentifierInner>() { @Override - public HostNameBindingInner call(ServiceResponse response) { + public IdentifierInner call(ServiceResponse response) { return response.getBody(); } }); } /** - * Get web app binding for a hostname. - * Get web app binding for a hostname. + * Get domain ownership identifier for web app. + * Get domain ownership identifier for web app. * - * @param resourceGroupName Name of resource group - * @param name Name of web app - * @param hostName Name of host - * @return the observable to the HostNameBindingInner object + * @param resourceGroupName Name of the resource group to which the resource belongs. + * @param name Name of the app. + * @param domainOwnershipIdentifierName Name of domain ownership identifier. + * @return the observable to the IdentifierInner object */ - public Observable> getHostNameBindingWithServiceResponseAsync(String resourceGroupName, String name, String hostName) { + public Observable> getDomainOwnershipIdentifierWithServiceResponseAsync(String resourceGroupName, String name, String domainOwnershipIdentifierName) { if (resourceGroupName == null) { throw new IllegalArgumentException("Parameter resourceGroupName is required and cannot be null."); } if (name == null) { throw new IllegalArgumentException("Parameter name is required and cannot be null."); } - if (hostName == null) { - throw new IllegalArgumentException("Parameter hostName is required and cannot be null."); + if (domainOwnershipIdentifierName == null) { + throw new IllegalArgumentException("Parameter domainOwnershipIdentifierName is required and cannot be null."); } if (this.client.subscriptionId() == null) { throw new IllegalArgumentException("Parameter this.client.subscriptionId() is required and cannot be null."); } final String apiVersion = "2016-08-01"; - return service.getHostNameBinding(resourceGroupName, name, hostName, this.client.subscriptionId(), apiVersion, this.client.acceptLanguage(), this.client.userAgent()) - .flatMap(new Func1, Observable>>() { + return service.getDomainOwnershipIdentifier(resourceGroupName, name, domainOwnershipIdentifierName, this.client.subscriptionId(), apiVersion, this.client.acceptLanguage(), this.client.userAgent()) + .flatMap(new Func1, Observable>>() { @Override - public Observable> call(Response response) { + public Observable> call(Response response) { try { - ServiceResponse clientResponse = getHostNameBindingDelegate(response); + ServiceResponse clientResponse = getDomainOwnershipIdentifierDelegate(response); return Observable.just(clientResponse); } catch (Throwable t) { return Observable.error(t); @@ -5708,95 +5425,95 @@ public Observable> call(Response getHostNameBindingDelegate(Response response) throws CloudException, IOException, IllegalArgumentException { - return new AzureServiceResponseBuilder(this.client.mapperAdapter()) - .register(200, new TypeToken() { }.getType()) + private ServiceResponse getDomainOwnershipIdentifierDelegate(Response response) throws CloudException, IOException, IllegalArgumentException { + return new AzureServiceResponseBuilder(this.client.mapperAdapter()) + .register(200, new TypeToken() { }.getType()) .registerError(CloudException.class) .build(response); } /** - * Creates a web app hostname binding. - * Creates a web app hostname binding. + * Creates a domain ownership identifier for web app, or updates an existing ownership identifier. + * Creates a domain ownership identifier for web app, or updates an existing ownership identifier. * - * @param resourceGroupName Name of resource group - * @param name Name of web app - * @param hostName Name of host - * @param hostNameBinding Host name binding information - * @return the HostNameBindingInner object if successful. + * @param resourceGroupName Name of the resource group to which the resource belongs. + * @param name Name of the app. + * @param domainOwnershipIdentifierName Name of domain ownership identifier. + * @param domainOwnershipIdentifier A JSON representation of the domain ownership properties. + * @return the IdentifierInner object if successful. */ - public HostNameBindingInner createOrUpdateHostNameBinding(String resourceGroupName, String name, String hostName, HostNameBindingInner hostNameBinding) { - return createOrUpdateHostNameBindingWithServiceResponseAsync(resourceGroupName, name, hostName, hostNameBinding).toBlocking().single().getBody(); + public IdentifierInner createOrUpdateDomainOwnershipIdentifier(String resourceGroupName, String name, String domainOwnershipIdentifierName, IdentifierInner domainOwnershipIdentifier) { + return createOrUpdateDomainOwnershipIdentifierWithServiceResponseAsync(resourceGroupName, name, domainOwnershipIdentifierName, domainOwnershipIdentifier).toBlocking().single().getBody(); } /** - * Creates a web app hostname binding. - * Creates a web app hostname binding. + * Creates a domain ownership identifier for web app, or updates an existing ownership identifier. + * Creates a domain ownership identifier for web app, or updates an existing ownership identifier. * - * @param resourceGroupName Name of resource group - * @param name Name of web app - * @param hostName Name of host - * @param hostNameBinding Host name binding information + * @param resourceGroupName Name of the resource group to which the resource belongs. + * @param name Name of the app. + * @param domainOwnershipIdentifierName Name of domain ownership identifier. + * @param domainOwnershipIdentifier A JSON representation of the domain ownership properties. * @param serviceCallback the async ServiceCallback to handle successful and failed responses. * @return the {@link ServiceCall} object */ - public ServiceCall createOrUpdateHostNameBindingAsync(String resourceGroupName, String name, String hostName, HostNameBindingInner hostNameBinding, final ServiceCallback serviceCallback) { - return ServiceCall.create(createOrUpdateHostNameBindingWithServiceResponseAsync(resourceGroupName, name, hostName, hostNameBinding), serviceCallback); + public ServiceCall createOrUpdateDomainOwnershipIdentifierAsync(String resourceGroupName, String name, String domainOwnershipIdentifierName, IdentifierInner domainOwnershipIdentifier, final ServiceCallback serviceCallback) { + return ServiceCall.create(createOrUpdateDomainOwnershipIdentifierWithServiceResponseAsync(resourceGroupName, name, domainOwnershipIdentifierName, domainOwnershipIdentifier), serviceCallback); } /** - * Creates a web app hostname binding. - * Creates a web app hostname binding. + * Creates a domain ownership identifier for web app, or updates an existing ownership identifier. + * Creates a domain ownership identifier for web app, or updates an existing ownership identifier. * - * @param resourceGroupName Name of resource group - * @param name Name of web app - * @param hostName Name of host - * @param hostNameBinding Host name binding information - * @return the observable to the HostNameBindingInner object + * @param resourceGroupName Name of the resource group to which the resource belongs. + * @param name Name of the app. + * @param domainOwnershipIdentifierName Name of domain ownership identifier. + * @param domainOwnershipIdentifier A JSON representation of the domain ownership properties. + * @return the observable to the IdentifierInner object */ - public Observable createOrUpdateHostNameBindingAsync(String resourceGroupName, String name, String hostName, HostNameBindingInner hostNameBinding) { - return createOrUpdateHostNameBindingWithServiceResponseAsync(resourceGroupName, name, hostName, hostNameBinding).map(new Func1, HostNameBindingInner>() { + public Observable createOrUpdateDomainOwnershipIdentifierAsync(String resourceGroupName, String name, String domainOwnershipIdentifierName, IdentifierInner domainOwnershipIdentifier) { + return createOrUpdateDomainOwnershipIdentifierWithServiceResponseAsync(resourceGroupName, name, domainOwnershipIdentifierName, domainOwnershipIdentifier).map(new Func1, IdentifierInner>() { @Override - public HostNameBindingInner call(ServiceResponse response) { + public IdentifierInner call(ServiceResponse response) { return response.getBody(); } }); } /** - * Creates a web app hostname binding. - * Creates a web app hostname binding. + * Creates a domain ownership identifier for web app, or updates an existing ownership identifier. + * Creates a domain ownership identifier for web app, or updates an existing ownership identifier. * - * @param resourceGroupName Name of resource group - * @param name Name of web app - * @param hostName Name of host - * @param hostNameBinding Host name binding information - * @return the observable to the HostNameBindingInner object + * @param resourceGroupName Name of the resource group to which the resource belongs. + * @param name Name of the app. + * @param domainOwnershipIdentifierName Name of domain ownership identifier. + * @param domainOwnershipIdentifier A JSON representation of the domain ownership properties. + * @return the observable to the IdentifierInner object */ - public Observable> createOrUpdateHostNameBindingWithServiceResponseAsync(String resourceGroupName, String name, String hostName, HostNameBindingInner hostNameBinding) { + public Observable> createOrUpdateDomainOwnershipIdentifierWithServiceResponseAsync(String resourceGroupName, String name, String domainOwnershipIdentifierName, IdentifierInner domainOwnershipIdentifier) { if (resourceGroupName == null) { throw new IllegalArgumentException("Parameter resourceGroupName is required and cannot be null."); } if (name == null) { throw new IllegalArgumentException("Parameter name is required and cannot be null."); } - if (hostName == null) { - throw new IllegalArgumentException("Parameter hostName is required and cannot be null."); + if (domainOwnershipIdentifierName == null) { + throw new IllegalArgumentException("Parameter domainOwnershipIdentifierName is required and cannot be null."); } if (this.client.subscriptionId() == null) { throw new IllegalArgumentException("Parameter this.client.subscriptionId() is required and cannot be null."); } - if (hostNameBinding == null) { - throw new IllegalArgumentException("Parameter hostNameBinding is required and cannot be null."); + if (domainOwnershipIdentifier == null) { + throw new IllegalArgumentException("Parameter domainOwnershipIdentifier is required and cannot be null."); } - Validator.validate(hostNameBinding); + Validator.validate(domainOwnershipIdentifier); final String apiVersion = "2016-08-01"; - return service.createOrUpdateHostNameBinding(resourceGroupName, name, hostName, this.client.subscriptionId(), hostNameBinding, apiVersion, this.client.acceptLanguage(), this.client.userAgent()) - .flatMap(new Func1, Observable>>() { + return service.createOrUpdateDomainOwnershipIdentifier(resourceGroupName, name, domainOwnershipIdentifierName, this.client.subscriptionId(), domainOwnershipIdentifier, apiVersion, this.client.acceptLanguage(), this.client.userAgent()) + .flatMap(new Func1, Observable>>() { @Override - public Observable> call(Response response) { + public Observable> call(Response response) { try { - ServiceResponse clientResponse = createOrUpdateHostNameBindingDelegate(response); + ServiceResponse clientResponse = createOrUpdateDomainOwnershipIdentifierDelegate(response); return Observable.just(clientResponse); } catch (Throwable t) { return Observable.error(t); @@ -5805,87 +5522,86 @@ public Observable> call(Response createOrUpdateHostNameBindingDelegate(Response response) throws CloudException, IOException, IllegalArgumentException { - return new AzureServiceResponseBuilder(this.client.mapperAdapter()) - .register(200, new TypeToken() { }.getType()) + private ServiceResponse createOrUpdateDomainOwnershipIdentifierDelegate(Response response) throws CloudException, IOException, IllegalArgumentException { + return new AzureServiceResponseBuilder(this.client.mapperAdapter()) + .register(200, new TypeToken() { }.getType()) .registerError(CloudException.class) .build(response); } /** - * Deletes a host name binding. - * Deletes a host name binding. + * Deletes a domain ownership identifier for a web app. + * Deletes a domain ownership identifier for a web app. * - * @param resourceGroupName Name of resource group - * @param name Name of web app - * @param hostName Name of host - * @return the Object object if successful. + * @param resourceGroupName Name of the resource group to which the resource belongs. + * @param name Name of the app. + * @param domainOwnershipIdentifierName Name of domain ownership identifier. */ - public Object deleteHostNameBinding(String resourceGroupName, String name, String hostName) { - return deleteHostNameBindingWithServiceResponseAsync(resourceGroupName, name, hostName).toBlocking().single().getBody(); + public void deleteDomainOwnershipIdentifier(String resourceGroupName, String name, String domainOwnershipIdentifierName) { + deleteDomainOwnershipIdentifierWithServiceResponseAsync(resourceGroupName, name, domainOwnershipIdentifierName).toBlocking().single().getBody(); } /** - * Deletes a host name binding. - * Deletes a host name binding. + * Deletes a domain ownership identifier for a web app. + * Deletes a domain ownership identifier for a web app. * - * @param resourceGroupName Name of resource group - * @param name Name of web app - * @param hostName Name of host + * @param resourceGroupName Name of the resource group to which the resource belongs. + * @param name Name of the app. + * @param domainOwnershipIdentifierName Name of domain ownership identifier. * @param serviceCallback the async ServiceCallback to handle successful and failed responses. * @return the {@link ServiceCall} object */ - public ServiceCall deleteHostNameBindingAsync(String resourceGroupName, String name, String hostName, final ServiceCallback serviceCallback) { - return ServiceCall.create(deleteHostNameBindingWithServiceResponseAsync(resourceGroupName, name, hostName), serviceCallback); + public ServiceCall deleteDomainOwnershipIdentifierAsync(String resourceGroupName, String name, String domainOwnershipIdentifierName, final ServiceCallback serviceCallback) { + return ServiceCall.create(deleteDomainOwnershipIdentifierWithServiceResponseAsync(resourceGroupName, name, domainOwnershipIdentifierName), serviceCallback); } /** - * Deletes a host name binding. - * Deletes a host name binding. + * Deletes a domain ownership identifier for a web app. + * Deletes a domain ownership identifier for a web app. * - * @param resourceGroupName Name of resource group - * @param name Name of web app - * @param hostName Name of host - * @return the observable to the Object object + * @param resourceGroupName Name of the resource group to which the resource belongs. + * @param name Name of the app. + * @param domainOwnershipIdentifierName Name of domain ownership identifier. + * @return the {@link ServiceResponse} object if successful. */ - public Observable deleteHostNameBindingAsync(String resourceGroupName, String name, String hostName) { - return deleteHostNameBindingWithServiceResponseAsync(resourceGroupName, name, hostName).map(new Func1, Object>() { + public Observable deleteDomainOwnershipIdentifierAsync(String resourceGroupName, String name, String domainOwnershipIdentifierName) { + return deleteDomainOwnershipIdentifierWithServiceResponseAsync(resourceGroupName, name, domainOwnershipIdentifierName).map(new Func1, Void>() { @Override - public Object call(ServiceResponse response) { + public Void call(ServiceResponse response) { return response.getBody(); } }); } /** - * Deletes a host name binding. - * Deletes a host name binding. + * Deletes a domain ownership identifier for a web app. + * Deletes a domain ownership identifier for a web app. * - * @param resourceGroupName Name of resource group - * @param name Name of web app - * @param hostName Name of host - * @return the observable to the Object object + * @param resourceGroupName Name of the resource group to which the resource belongs. + * @param name Name of the app. + * @param domainOwnershipIdentifierName Name of domain ownership identifier. + * @return the {@link ServiceResponse} object if successful. */ - public Observable> deleteHostNameBindingWithServiceResponseAsync(String resourceGroupName, String name, String hostName) { + public Observable> deleteDomainOwnershipIdentifierWithServiceResponseAsync(String resourceGroupName, String name, String domainOwnershipIdentifierName) { if (resourceGroupName == null) { throw new IllegalArgumentException("Parameter resourceGroupName is required and cannot be null."); } if (name == null) { throw new IllegalArgumentException("Parameter name is required and cannot be null."); } - if (hostName == null) { - throw new IllegalArgumentException("Parameter hostName is required and cannot be null."); + if (domainOwnershipIdentifierName == null) { + throw new IllegalArgumentException("Parameter domainOwnershipIdentifierName is required and cannot be null."); } if (this.client.subscriptionId() == null) { throw new IllegalArgumentException("Parameter this.client.subscriptionId() is required and cannot be null."); } final String apiVersion = "2016-08-01"; - return service.deleteHostNameBinding(resourceGroupName, name, hostName, this.client.subscriptionId(), apiVersion, this.client.acceptLanguage(), this.client.userAgent()) - .flatMap(new Func1, Observable>>() { + return service.deleteDomainOwnershipIdentifier(resourceGroupName, name, domainOwnershipIdentifierName, this.client.subscriptionId(), apiVersion, this.client.acceptLanguage(), this.client.userAgent()) + .flatMap(new Func1, Observable>>() { @Override - public Observable> call(Response response) { + public Observable> call(Response response) { try { - ServiceResponse clientResponse = deleteHostNameBindingDelegate(response); + ServiceResponse clientResponse = deleteDomainOwnershipIdentifierDelegate(response); return Observable.just(clientResponse); } catch (Throwable t) { return Observable.error(t); @@ -5894,94 +5610,95 @@ public Observable> call(Response response) }); } - private ServiceResponse deleteHostNameBindingDelegate(Response response) throws CloudException, IOException, IllegalArgumentException { - return new AzureServiceResponseBuilder(this.client.mapperAdapter()) - .register(200, new TypeToken() { }.getType()) - .registerError(CloudException.class) + private ServiceResponse deleteDomainOwnershipIdentifierDelegate(Response response) throws CloudException, IOException, IllegalArgumentException { + return new AzureServiceResponseBuilder(this.client.mapperAdapter()) + .register(200, new TypeToken() { }.getType()) + .register(204, new TypeToken() { }.getType()) .build(response); } /** - * Retrieves a specific Service Bus Hybrid Connection used by this Web App. - * Retrieves a specific Service Bus Hybrid Connection used by this Web App. + * Creates a domain ownership identifier for web app, or updates an existing ownership identifier. + * Creates a domain ownership identifier for web app, or updates an existing ownership identifier. * - * @param resourceGroupName The resource group name - * @param name The name of the web app - * @param namespaceName The namespace for this hybrid connection - * @param relayName The relay name for this hybrid connection - * @return the HybridConnectionInner object if successful. + * @param resourceGroupName Name of the resource group to which the resource belongs. + * @param name Name of the app. + * @param domainOwnershipIdentifierName Name of domain ownership identifier. + * @param domainOwnershipIdentifier A JSON representation of the domain ownership properties. + * @return the IdentifierInner object if successful. */ - public HybridConnectionInner getHybridConnection(String resourceGroupName, String name, String namespaceName, String relayName) { - return getHybridConnectionWithServiceResponseAsync(resourceGroupName, name, namespaceName, relayName).toBlocking().single().getBody(); + public IdentifierInner updateDomainOwnershipIdentifier(String resourceGroupName, String name, String domainOwnershipIdentifierName, IdentifierInner domainOwnershipIdentifier) { + return updateDomainOwnershipIdentifierWithServiceResponseAsync(resourceGroupName, name, domainOwnershipIdentifierName, domainOwnershipIdentifier).toBlocking().single().getBody(); } /** - * Retrieves a specific Service Bus Hybrid Connection used by this Web App. - * Retrieves a specific Service Bus Hybrid Connection used by this Web App. + * Creates a domain ownership identifier for web app, or updates an existing ownership identifier. + * Creates a domain ownership identifier for web app, or updates an existing ownership identifier. * - * @param resourceGroupName The resource group name - * @param name The name of the web app - * @param namespaceName The namespace for this hybrid connection - * @param relayName The relay name for this hybrid connection + * @param resourceGroupName Name of the resource group to which the resource belongs. + * @param name Name of the app. + * @param domainOwnershipIdentifierName Name of domain ownership identifier. + * @param domainOwnershipIdentifier A JSON representation of the domain ownership properties. * @param serviceCallback the async ServiceCallback to handle successful and failed responses. * @return the {@link ServiceCall} object */ - public ServiceCall getHybridConnectionAsync(String resourceGroupName, String name, String namespaceName, String relayName, final ServiceCallback serviceCallback) { - return ServiceCall.create(getHybridConnectionWithServiceResponseAsync(resourceGroupName, name, namespaceName, relayName), serviceCallback); + public ServiceCall updateDomainOwnershipIdentifierAsync(String resourceGroupName, String name, String domainOwnershipIdentifierName, IdentifierInner domainOwnershipIdentifier, final ServiceCallback serviceCallback) { + return ServiceCall.create(updateDomainOwnershipIdentifierWithServiceResponseAsync(resourceGroupName, name, domainOwnershipIdentifierName, domainOwnershipIdentifier), serviceCallback); } /** - * Retrieves a specific Service Bus Hybrid Connection used by this Web App. - * Retrieves a specific Service Bus Hybrid Connection used by this Web App. + * Creates a domain ownership identifier for web app, or updates an existing ownership identifier. + * Creates a domain ownership identifier for web app, or updates an existing ownership identifier. * - * @param resourceGroupName The resource group name - * @param name The name of the web app - * @param namespaceName The namespace for this hybrid connection - * @param relayName The relay name for this hybrid connection - * @return the observable to the HybridConnectionInner object + * @param resourceGroupName Name of the resource group to which the resource belongs. + * @param name Name of the app. + * @param domainOwnershipIdentifierName Name of domain ownership identifier. + * @param domainOwnershipIdentifier A JSON representation of the domain ownership properties. + * @return the observable to the IdentifierInner object */ - public Observable getHybridConnectionAsync(String resourceGroupName, String name, String namespaceName, String relayName) { - return getHybridConnectionWithServiceResponseAsync(resourceGroupName, name, namespaceName, relayName).map(new Func1, HybridConnectionInner>() { + public Observable updateDomainOwnershipIdentifierAsync(String resourceGroupName, String name, String domainOwnershipIdentifierName, IdentifierInner domainOwnershipIdentifier) { + return updateDomainOwnershipIdentifierWithServiceResponseAsync(resourceGroupName, name, domainOwnershipIdentifierName, domainOwnershipIdentifier).map(new Func1, IdentifierInner>() { @Override - public HybridConnectionInner call(ServiceResponse response) { + public IdentifierInner call(ServiceResponse response) { return response.getBody(); } }); } /** - * Retrieves a specific Service Bus Hybrid Connection used by this Web App. - * Retrieves a specific Service Bus Hybrid Connection used by this Web App. + * Creates a domain ownership identifier for web app, or updates an existing ownership identifier. + * Creates a domain ownership identifier for web app, or updates an existing ownership identifier. * - * @param resourceGroupName The resource group name - * @param name The name of the web app - * @param namespaceName The namespace for this hybrid connection - * @param relayName The relay name for this hybrid connection - * @return the observable to the HybridConnectionInner object + * @param resourceGroupName Name of the resource group to which the resource belongs. + * @param name Name of the app. + * @param domainOwnershipIdentifierName Name of domain ownership identifier. + * @param domainOwnershipIdentifier A JSON representation of the domain ownership properties. + * @return the observable to the IdentifierInner object */ - public Observable> getHybridConnectionWithServiceResponseAsync(String resourceGroupName, String name, String namespaceName, String relayName) { + public Observable> updateDomainOwnershipIdentifierWithServiceResponseAsync(String resourceGroupName, String name, String domainOwnershipIdentifierName, IdentifierInner domainOwnershipIdentifier) { if (resourceGroupName == null) { throw new IllegalArgumentException("Parameter resourceGroupName is required and cannot be null."); } if (name == null) { throw new IllegalArgumentException("Parameter name is required and cannot be null."); } - if (namespaceName == null) { - throw new IllegalArgumentException("Parameter namespaceName is required and cannot be null."); - } - if (relayName == null) { - throw new IllegalArgumentException("Parameter relayName is required and cannot be null."); + if (domainOwnershipIdentifierName == null) { + throw new IllegalArgumentException("Parameter domainOwnershipIdentifierName is required and cannot be null."); } if (this.client.subscriptionId() == null) { throw new IllegalArgumentException("Parameter this.client.subscriptionId() is required and cannot be null."); } + if (domainOwnershipIdentifier == null) { + throw new IllegalArgumentException("Parameter domainOwnershipIdentifier is required and cannot be null."); + } + Validator.validate(domainOwnershipIdentifier); final String apiVersion = "2016-08-01"; - return service.getHybridConnection(resourceGroupName, name, namespaceName, relayName, this.client.subscriptionId(), apiVersion, this.client.acceptLanguage(), this.client.userAgent()) - .flatMap(new Func1, Observable>>() { + return service.updateDomainOwnershipIdentifier(resourceGroupName, name, domainOwnershipIdentifierName, this.client.subscriptionId(), domainOwnershipIdentifier, apiVersion, this.client.acceptLanguage(), this.client.userAgent()) + .flatMap(new Func1, Observable>>() { @Override - public Observable> call(Response response) { + public Observable> call(Response response) { try { - ServiceResponse clientResponse = getHybridConnectionDelegate(response); + ServiceResponse clientResponse = updateDomainOwnershipIdentifierDelegate(response); return Observable.just(clientResponse); } catch (Throwable t) { return Observable.error(t); @@ -5990,103 +5707,118 @@ public Observable> call(Response getHybridConnectionDelegate(Response response) throws CloudException, IOException, IllegalArgumentException { - return new AzureServiceResponseBuilder(this.client.mapperAdapter()) - .register(200, new TypeToken() { }.getType()) + private ServiceResponse updateDomainOwnershipIdentifierDelegate(Response response) throws CloudException, IOException, IllegalArgumentException { + return new AzureServiceResponseBuilder(this.client.mapperAdapter()) + .register(200, new TypeToken() { }.getType()) .registerError(CloudException.class) .build(response); } /** - * Creates a new Hybrid Connection using a Service Bus relay. - * Creates a new Hybrid Connection using a Service Bus relay. + * Get hostname bindings for an app or a deployment slot. + * Get hostname bindings for an app or a deployment slot. * - * @param resourceGroupName The resource group name - * @param name The name of the web app - * @param namespaceName The namespace for this hybrid connection - * @param relayName The relay name for this hybrid connection - * @param connectionEnvelope The details of the hybrid connection - * @return the HybridConnectionInner object if successful. + * @param resourceGroupName Name of the resource group to which the resource belongs. + * @param name Name of the app. + * @return the PagedList<HostNameBindingInner> object if successful. */ - public HybridConnectionInner createOrUpdateHybridConnection(String resourceGroupName, String name, String namespaceName, String relayName, HybridConnectionInner connectionEnvelope) { - return createOrUpdateHybridConnectionWithServiceResponseAsync(resourceGroupName, name, namespaceName, relayName, connectionEnvelope).toBlocking().single().getBody(); + public PagedList listHostNameBindings(final String resourceGroupName, final String name) { + ServiceResponse> response = listHostNameBindingsSinglePageAsync(resourceGroupName, name).toBlocking().single(); + return new PagedList(response.getBody()) { + @Override + public Page nextPage(String nextPageLink) { + return listHostNameBindingsNextSinglePageAsync(nextPageLink).toBlocking().single().getBody(); + } + }; } /** - * Creates a new Hybrid Connection using a Service Bus relay. - * Creates a new Hybrid Connection using a Service Bus relay. + * Get hostname bindings for an app or a deployment slot. + * Get hostname bindings for an app or a deployment slot. * - * @param resourceGroupName The resource group name - * @param name The name of the web app - * @param namespaceName The namespace for this hybrid connection - * @param relayName The relay name for this hybrid connection - * @param connectionEnvelope The details of the hybrid connection + * @param resourceGroupName Name of the resource group to which the resource belongs. + * @param name Name of the app. * @param serviceCallback the async ServiceCallback to handle successful and failed responses. * @return the {@link ServiceCall} object */ - public ServiceCall createOrUpdateHybridConnectionAsync(String resourceGroupName, String name, String namespaceName, String relayName, HybridConnectionInner connectionEnvelope, final ServiceCallback serviceCallback) { - return ServiceCall.create(createOrUpdateHybridConnectionWithServiceResponseAsync(resourceGroupName, name, namespaceName, relayName, connectionEnvelope), serviceCallback); + public ServiceCall> listHostNameBindingsAsync(final String resourceGroupName, final String name, final ListOperationCallback serviceCallback) { + return AzureServiceCall.create( + listHostNameBindingsSinglePageAsync(resourceGroupName, name), + new Func1>>>() { + @Override + public Observable>> call(String nextPageLink) { + return listHostNameBindingsNextSinglePageAsync(nextPageLink); + } + }, + serviceCallback); } /** - * Creates a new Hybrid Connection using a Service Bus relay. - * Creates a new Hybrid Connection using a Service Bus relay. + * Get hostname bindings for an app or a deployment slot. + * Get hostname bindings for an app or a deployment slot. * - * @param resourceGroupName The resource group name - * @param name The name of the web app - * @param namespaceName The namespace for this hybrid connection - * @param relayName The relay name for this hybrid connection - * @param connectionEnvelope The details of the hybrid connection - * @return the observable to the HybridConnectionInner object + * @param resourceGroupName Name of the resource group to which the resource belongs. + * @param name Name of the app. + * @return the observable to the PagedList<HostNameBindingInner> object */ - public Observable createOrUpdateHybridConnectionAsync(String resourceGroupName, String name, String namespaceName, String relayName, HybridConnectionInner connectionEnvelope) { - return createOrUpdateHybridConnectionWithServiceResponseAsync(resourceGroupName, name, namespaceName, relayName, connectionEnvelope).map(new Func1, HybridConnectionInner>() { - @Override - public HybridConnectionInner call(ServiceResponse response) { - return response.getBody(); - } - }); + public Observable> listHostNameBindingsAsync(final String resourceGroupName, final String name) { + return listHostNameBindingsWithServiceResponseAsync(resourceGroupName, name) + .map(new Func1>, Page>() { + @Override + public Page call(ServiceResponse> response) { + return response.getBody(); + } + }); } /** - * Creates a new Hybrid Connection using a Service Bus relay. - * Creates a new Hybrid Connection using a Service Bus relay. + * Get hostname bindings for an app or a deployment slot. + * Get hostname bindings for an app or a deployment slot. * - * @param resourceGroupName The resource group name - * @param name The name of the web app - * @param namespaceName The namespace for this hybrid connection - * @param relayName The relay name for this hybrid connection - * @param connectionEnvelope The details of the hybrid connection - * @return the observable to the HybridConnectionInner object + * @param resourceGroupName Name of the resource group to which the resource belongs. + * @param name Name of the app. + * @return the observable to the PagedList<HostNameBindingInner> object */ - public Observable> createOrUpdateHybridConnectionWithServiceResponseAsync(String resourceGroupName, String name, String namespaceName, String relayName, HybridConnectionInner connectionEnvelope) { + public Observable>> listHostNameBindingsWithServiceResponseAsync(final String resourceGroupName, final String name) { + return listHostNameBindingsSinglePageAsync(resourceGroupName, name) + .concatMap(new Func1>, Observable>>>() { + @Override + public Observable>> call(ServiceResponse> page) { + String nextPageLink = page.getBody().getNextPageLink(); + if (nextPageLink == null) { + return Observable.just(page); + } + return Observable.just(page).concatWith(listHostNameBindingsNextWithServiceResponseAsync(nextPageLink)); + } + }); + } + + /** + * Get hostname bindings for an app or a deployment slot. + * Get hostname bindings for an app or a deployment slot. + * + ServiceResponse> * @param resourceGroupName Name of the resource group to which the resource belongs. + ServiceResponse> * @param name Name of the app. + * @return the PagedList<HostNameBindingInner> object wrapped in {@link ServiceResponse} if successful. + */ + public Observable>> listHostNameBindingsSinglePageAsync(final String resourceGroupName, final String name) { if (resourceGroupName == null) { throw new IllegalArgumentException("Parameter resourceGroupName is required and cannot be null."); } if (name == null) { throw new IllegalArgumentException("Parameter name is required and cannot be null."); } - if (namespaceName == null) { - throw new IllegalArgumentException("Parameter namespaceName is required and cannot be null."); - } - if (relayName == null) { - throw new IllegalArgumentException("Parameter relayName is required and cannot be null."); - } if (this.client.subscriptionId() == null) { throw new IllegalArgumentException("Parameter this.client.subscriptionId() is required and cannot be null."); } - if (connectionEnvelope == null) { - throw new IllegalArgumentException("Parameter connectionEnvelope is required and cannot be null."); - } - Validator.validate(connectionEnvelope); final String apiVersion = "2016-08-01"; - return service.createOrUpdateHybridConnection(resourceGroupName, name, namespaceName, relayName, this.client.subscriptionId(), connectionEnvelope, apiVersion, this.client.acceptLanguage(), this.client.userAgent()) - .flatMap(new Func1, Observable>>() { + return service.listHostNameBindings(resourceGroupName, name, this.client.subscriptionId(), apiVersion, this.client.acceptLanguage(), this.client.userAgent()) + .flatMap(new Func1, Observable>>>() { @Override - public Observable> call(Response response) { + public Observable>> call(Response response) { try { - ServiceResponse clientResponse = createOrUpdateHybridConnectionDelegate(response); - return Observable.just(clientResponse); + ServiceResponse> result = listHostNameBindingsDelegate(response); + return Observable.just(new ServiceResponse>(result.getBody(), result.getResponse())); } catch (Throwable t) { return Observable.error(t); } @@ -6094,94 +5826,87 @@ public Observable> call(Response createOrUpdateHybridConnectionDelegate(Response response) throws CloudException, IOException, IllegalArgumentException { - return new AzureServiceResponseBuilder(this.client.mapperAdapter()) - .register(200, new TypeToken() { }.getType()) + private ServiceResponse> listHostNameBindingsDelegate(Response response) throws CloudException, IOException, IllegalArgumentException { + return new AzureServiceResponseBuilder, CloudException>(this.client.mapperAdapter()) + .register(200, new TypeToken>() { }.getType()) .registerError(CloudException.class) .build(response); } /** - * Removes a Hybrid Connection from this site. - * Removes a Hybrid Connection from this site. + * Get the named hostname binding for an app (or deployment slot, if specified). + * Get the named hostname binding for an app (or deployment slot, if specified). * - * @param resourceGroupName The resource group name - * @param name The name of the web app - * @param namespaceName The namespace for this hybrid connection - * @param relayName The relay name for this hybrid connection - * @return the Object object if successful. + * @param resourceGroupName Name of the resource group to which the resource belongs. + * @param name Name of the app. + * @param hostName Hostname in the hostname binding. + * @return the HostNameBindingInner object if successful. */ - public Object deleteHybridConnection(String resourceGroupName, String name, String namespaceName, String relayName) { - return deleteHybridConnectionWithServiceResponseAsync(resourceGroupName, name, namespaceName, relayName).toBlocking().single().getBody(); + public HostNameBindingInner getHostNameBinding(String resourceGroupName, String name, String hostName) { + return getHostNameBindingWithServiceResponseAsync(resourceGroupName, name, hostName).toBlocking().single().getBody(); } /** - * Removes a Hybrid Connection from this site. - * Removes a Hybrid Connection from this site. + * Get the named hostname binding for an app (or deployment slot, if specified). + * Get the named hostname binding for an app (or deployment slot, if specified). * - * @param resourceGroupName The resource group name - * @param name The name of the web app - * @param namespaceName The namespace for this hybrid connection - * @param relayName The relay name for this hybrid connection + * @param resourceGroupName Name of the resource group to which the resource belongs. + * @param name Name of the app. + * @param hostName Hostname in the hostname binding. * @param serviceCallback the async ServiceCallback to handle successful and failed responses. * @return the {@link ServiceCall} object */ - public ServiceCall deleteHybridConnectionAsync(String resourceGroupName, String name, String namespaceName, String relayName, final ServiceCallback serviceCallback) { - return ServiceCall.create(deleteHybridConnectionWithServiceResponseAsync(resourceGroupName, name, namespaceName, relayName), serviceCallback); + public ServiceCall getHostNameBindingAsync(String resourceGroupName, String name, String hostName, final ServiceCallback serviceCallback) { + return ServiceCall.create(getHostNameBindingWithServiceResponseAsync(resourceGroupName, name, hostName), serviceCallback); } /** - * Removes a Hybrid Connection from this site. - * Removes a Hybrid Connection from this site. + * Get the named hostname binding for an app (or deployment slot, if specified). + * Get the named hostname binding for an app (or deployment slot, if specified). * - * @param resourceGroupName The resource group name - * @param name The name of the web app - * @param namespaceName The namespace for this hybrid connection - * @param relayName The relay name for this hybrid connection - * @return the observable to the Object object + * @param resourceGroupName Name of the resource group to which the resource belongs. + * @param name Name of the app. + * @param hostName Hostname in the hostname binding. + * @return the observable to the HostNameBindingInner object */ - public Observable deleteHybridConnectionAsync(String resourceGroupName, String name, String namespaceName, String relayName) { - return deleteHybridConnectionWithServiceResponseAsync(resourceGroupName, name, namespaceName, relayName).map(new Func1, Object>() { + public Observable getHostNameBindingAsync(String resourceGroupName, String name, String hostName) { + return getHostNameBindingWithServiceResponseAsync(resourceGroupName, name, hostName).map(new Func1, HostNameBindingInner>() { @Override - public Object call(ServiceResponse response) { + public HostNameBindingInner call(ServiceResponse response) { return response.getBody(); } }); } /** - * Removes a Hybrid Connection from this site. - * Removes a Hybrid Connection from this site. + * Get the named hostname binding for an app (or deployment slot, if specified). + * Get the named hostname binding for an app (or deployment slot, if specified). * - * @param resourceGroupName The resource group name - * @param name The name of the web app - * @param namespaceName The namespace for this hybrid connection - * @param relayName The relay name for this hybrid connection - * @return the observable to the Object object + * @param resourceGroupName Name of the resource group to which the resource belongs. + * @param name Name of the app. + * @param hostName Hostname in the hostname binding. + * @return the observable to the HostNameBindingInner object */ - public Observable> deleteHybridConnectionWithServiceResponseAsync(String resourceGroupName, String name, String namespaceName, String relayName) { + public Observable> getHostNameBindingWithServiceResponseAsync(String resourceGroupName, String name, String hostName) { if (resourceGroupName == null) { throw new IllegalArgumentException("Parameter resourceGroupName is required and cannot be null."); } if (name == null) { throw new IllegalArgumentException("Parameter name is required and cannot be null."); } - if (namespaceName == null) { - throw new IllegalArgumentException("Parameter namespaceName is required and cannot be null."); - } - if (relayName == null) { - throw new IllegalArgumentException("Parameter relayName is required and cannot be null."); + if (hostName == null) { + throw new IllegalArgumentException("Parameter hostName is required and cannot be null."); } if (this.client.subscriptionId() == null) { throw new IllegalArgumentException("Parameter this.client.subscriptionId() is required and cannot be null."); } final String apiVersion = "2016-08-01"; - return service.deleteHybridConnection(resourceGroupName, name, namespaceName, relayName, this.client.subscriptionId(), apiVersion, this.client.acceptLanguage(), this.client.userAgent()) - .flatMap(new Func1, Observable>>() { + return service.getHostNameBinding(resourceGroupName, name, hostName, this.client.subscriptionId(), apiVersion, this.client.acceptLanguage(), this.client.userAgent()) + .flatMap(new Func1, Observable>>() { @Override - public Observable> call(Response response) { + public Observable> call(Response response) { try { - ServiceResponse clientResponse = deleteHybridConnectionDelegate(response); + ServiceResponse clientResponse = getHostNameBindingDelegate(response); return Observable.just(clientResponse); } catch (Throwable t) { return Observable.error(t); @@ -6190,102 +5915,95 @@ public Observable> call(Response response) }); } - private ServiceResponse deleteHybridConnectionDelegate(Response response) throws CloudException, IOException, IllegalArgumentException { - return new AzureServiceResponseBuilder(this.client.mapperAdapter()) - .register(200, new TypeToken() { }.getType()) + private ServiceResponse getHostNameBindingDelegate(Response response) throws CloudException, IOException, IllegalArgumentException { + return new AzureServiceResponseBuilder(this.client.mapperAdapter()) + .register(200, new TypeToken() { }.getType()) .registerError(CloudException.class) .build(response); } /** - * Creates a new Hybrid Connection using a Service Bus relay. - * Creates a new Hybrid Connection using a Service Bus relay. + * Creates a hostname binding for an app. + * Creates a hostname binding for an app. * - * @param resourceGroupName The resource group name - * @param name The name of the web app - * @param namespaceName The namespace for this hybrid connection - * @param relayName The relay name for this hybrid connection - * @param connectionEnvelope The details of the hybrid connection - * @return the HybridConnectionInner object if successful. + * @param resourceGroupName Name of the resource group to which the resource belongs. + * @param name Name of the app. + * @param hostName Hostname in the hostname binding. + * @param hostNameBinding Binding details. This is the JSON representation of a HostNameBinding object. + * @return the HostNameBindingInner object if successful. */ - public HybridConnectionInner updateHybridConnection(String resourceGroupName, String name, String namespaceName, String relayName, HybridConnectionInner connectionEnvelope) { - return updateHybridConnectionWithServiceResponseAsync(resourceGroupName, name, namespaceName, relayName, connectionEnvelope).toBlocking().single().getBody(); + public HostNameBindingInner createOrUpdateHostNameBinding(String resourceGroupName, String name, String hostName, HostNameBindingInner hostNameBinding) { + return createOrUpdateHostNameBindingWithServiceResponseAsync(resourceGroupName, name, hostName, hostNameBinding).toBlocking().single().getBody(); } /** - * Creates a new Hybrid Connection using a Service Bus relay. - * Creates a new Hybrid Connection using a Service Bus relay. + * Creates a hostname binding for an app. + * Creates a hostname binding for an app. * - * @param resourceGroupName The resource group name - * @param name The name of the web app - * @param namespaceName The namespace for this hybrid connection - * @param relayName The relay name for this hybrid connection - * @param connectionEnvelope The details of the hybrid connection + * @param resourceGroupName Name of the resource group to which the resource belongs. + * @param name Name of the app. + * @param hostName Hostname in the hostname binding. + * @param hostNameBinding Binding details. This is the JSON representation of a HostNameBinding object. * @param serviceCallback the async ServiceCallback to handle successful and failed responses. * @return the {@link ServiceCall} object */ - public ServiceCall updateHybridConnectionAsync(String resourceGroupName, String name, String namespaceName, String relayName, HybridConnectionInner connectionEnvelope, final ServiceCallback serviceCallback) { - return ServiceCall.create(updateHybridConnectionWithServiceResponseAsync(resourceGroupName, name, namespaceName, relayName, connectionEnvelope), serviceCallback); + public ServiceCall createOrUpdateHostNameBindingAsync(String resourceGroupName, String name, String hostName, HostNameBindingInner hostNameBinding, final ServiceCallback serviceCallback) { + return ServiceCall.create(createOrUpdateHostNameBindingWithServiceResponseAsync(resourceGroupName, name, hostName, hostNameBinding), serviceCallback); } /** - * Creates a new Hybrid Connection using a Service Bus relay. - * Creates a new Hybrid Connection using a Service Bus relay. + * Creates a hostname binding for an app. + * Creates a hostname binding for an app. * - * @param resourceGroupName The resource group name - * @param name The name of the web app - * @param namespaceName The namespace for this hybrid connection - * @param relayName The relay name for this hybrid connection - * @param connectionEnvelope The details of the hybrid connection - * @return the observable to the HybridConnectionInner object + * @param resourceGroupName Name of the resource group to which the resource belongs. + * @param name Name of the app. + * @param hostName Hostname in the hostname binding. + * @param hostNameBinding Binding details. This is the JSON representation of a HostNameBinding object. + * @return the observable to the HostNameBindingInner object */ - public Observable updateHybridConnectionAsync(String resourceGroupName, String name, String namespaceName, String relayName, HybridConnectionInner connectionEnvelope) { - return updateHybridConnectionWithServiceResponseAsync(resourceGroupName, name, namespaceName, relayName, connectionEnvelope).map(new Func1, HybridConnectionInner>() { + public Observable createOrUpdateHostNameBindingAsync(String resourceGroupName, String name, String hostName, HostNameBindingInner hostNameBinding) { + return createOrUpdateHostNameBindingWithServiceResponseAsync(resourceGroupName, name, hostName, hostNameBinding).map(new Func1, HostNameBindingInner>() { @Override - public HybridConnectionInner call(ServiceResponse response) { + public HostNameBindingInner call(ServiceResponse response) { return response.getBody(); } }); } /** - * Creates a new Hybrid Connection using a Service Bus relay. - * Creates a new Hybrid Connection using a Service Bus relay. + * Creates a hostname binding for an app. + * Creates a hostname binding for an app. * - * @param resourceGroupName The resource group name - * @param name The name of the web app - * @param namespaceName The namespace for this hybrid connection - * @param relayName The relay name for this hybrid connection - * @param connectionEnvelope The details of the hybrid connection - * @return the observable to the HybridConnectionInner object + * @param resourceGroupName Name of the resource group to which the resource belongs. + * @param name Name of the app. + * @param hostName Hostname in the hostname binding. + * @param hostNameBinding Binding details. This is the JSON representation of a HostNameBinding object. + * @return the observable to the HostNameBindingInner object */ - public Observable> updateHybridConnectionWithServiceResponseAsync(String resourceGroupName, String name, String namespaceName, String relayName, HybridConnectionInner connectionEnvelope) { + public Observable> createOrUpdateHostNameBindingWithServiceResponseAsync(String resourceGroupName, String name, String hostName, HostNameBindingInner hostNameBinding) { if (resourceGroupName == null) { throw new IllegalArgumentException("Parameter resourceGroupName is required and cannot be null."); } if (name == null) { throw new IllegalArgumentException("Parameter name is required and cannot be null."); } - if (namespaceName == null) { - throw new IllegalArgumentException("Parameter namespaceName is required and cannot be null."); - } - if (relayName == null) { - throw new IllegalArgumentException("Parameter relayName is required and cannot be null."); + if (hostName == null) { + throw new IllegalArgumentException("Parameter hostName is required and cannot be null."); } if (this.client.subscriptionId() == null) { throw new IllegalArgumentException("Parameter this.client.subscriptionId() is required and cannot be null."); } - if (connectionEnvelope == null) { - throw new IllegalArgumentException("Parameter connectionEnvelope is required and cannot be null."); + if (hostNameBinding == null) { + throw new IllegalArgumentException("Parameter hostNameBinding is required and cannot be null."); } - Validator.validate(connectionEnvelope); + Validator.validate(hostNameBinding); final String apiVersion = "2016-08-01"; - return service.updateHybridConnection(resourceGroupName, name, namespaceName, relayName, this.client.subscriptionId(), connectionEnvelope, apiVersion, this.client.acceptLanguage(), this.client.userAgent()) - .flatMap(new Func1, Observable>>() { + return service.createOrUpdateHostNameBinding(resourceGroupName, name, hostName, this.client.subscriptionId(), hostNameBinding, apiVersion, this.client.acceptLanguage(), this.client.userAgent()) + .flatMap(new Func1, Observable>>() { @Override - public Observable> call(Response response) { + public Observable> call(Response response) { try { - ServiceResponse clientResponse = updateHybridConnectionDelegate(response); + ServiceResponse clientResponse = createOrUpdateHostNameBindingDelegate(response); return Observable.just(clientResponse); } catch (Throwable t) { return Observable.error(t); @@ -6294,94 +6012,86 @@ public Observable> call(Response updateHybridConnectionDelegate(Response response) throws CloudException, IOException, IllegalArgumentException { - return new AzureServiceResponseBuilder(this.client.mapperAdapter()) - .register(200, new TypeToken() { }.getType()) + private ServiceResponse createOrUpdateHostNameBindingDelegate(Response response) throws CloudException, IOException, IllegalArgumentException { + return new AzureServiceResponseBuilder(this.client.mapperAdapter()) + .register(200, new TypeToken() { }.getType()) .registerError(CloudException.class) .build(response); } /** - * Gets the send key name and value for a Hybrid Connection. - * Gets the send key name and value for a Hybrid Connection. + * Deletes a hostname binding for an app. + * Deletes a hostname binding for an app. * - * @param resourceGroupName The resource group name - * @param name The name of the web app - * @param namespaceName The namespace for this hybrid connection - * @param relayName The relay name for this hybrid connection - * @return the Object object if successful. + * @param resourceGroupName Name of the resource group to which the resource belongs. + * @param name Name of the app. + * @param hostName Hostname in the hostname binding. */ - public Object listHybridConnectionKeys(String resourceGroupName, String name, String namespaceName, String relayName) { - return listHybridConnectionKeysWithServiceResponseAsync(resourceGroupName, name, namespaceName, relayName).toBlocking().single().getBody(); + public void deleteHostNameBinding(String resourceGroupName, String name, String hostName) { + deleteHostNameBindingWithServiceResponseAsync(resourceGroupName, name, hostName).toBlocking().single().getBody(); } /** - * Gets the send key name and value for a Hybrid Connection. - * Gets the send key name and value for a Hybrid Connection. + * Deletes a hostname binding for an app. + * Deletes a hostname binding for an app. * - * @param resourceGroupName The resource group name - * @param name The name of the web app - * @param namespaceName The namespace for this hybrid connection - * @param relayName The relay name for this hybrid connection + * @param resourceGroupName Name of the resource group to which the resource belongs. + * @param name Name of the app. + * @param hostName Hostname in the hostname binding. * @param serviceCallback the async ServiceCallback to handle successful and failed responses. * @return the {@link ServiceCall} object */ - public ServiceCall listHybridConnectionKeysAsync(String resourceGroupName, String name, String namespaceName, String relayName, final ServiceCallback serviceCallback) { - return ServiceCall.create(listHybridConnectionKeysWithServiceResponseAsync(resourceGroupName, name, namespaceName, relayName), serviceCallback); + public ServiceCall deleteHostNameBindingAsync(String resourceGroupName, String name, String hostName, final ServiceCallback serviceCallback) { + return ServiceCall.create(deleteHostNameBindingWithServiceResponseAsync(resourceGroupName, name, hostName), serviceCallback); } /** - * Gets the send key name and value for a Hybrid Connection. - * Gets the send key name and value for a Hybrid Connection. + * Deletes a hostname binding for an app. + * Deletes a hostname binding for an app. * - * @param resourceGroupName The resource group name - * @param name The name of the web app - * @param namespaceName The namespace for this hybrid connection - * @param relayName The relay name for this hybrid connection - * @return the observable to the Object object + * @param resourceGroupName Name of the resource group to which the resource belongs. + * @param name Name of the app. + * @param hostName Hostname in the hostname binding. + * @return the {@link ServiceResponse} object if successful. */ - public Observable listHybridConnectionKeysAsync(String resourceGroupName, String name, String namespaceName, String relayName) { - return listHybridConnectionKeysWithServiceResponseAsync(resourceGroupName, name, namespaceName, relayName).map(new Func1, Object>() { + public Observable deleteHostNameBindingAsync(String resourceGroupName, String name, String hostName) { + return deleteHostNameBindingWithServiceResponseAsync(resourceGroupName, name, hostName).map(new Func1, Void>() { @Override - public Object call(ServiceResponse response) { + public Void call(ServiceResponse response) { return response.getBody(); } }); } /** - * Gets the send key name and value for a Hybrid Connection. - * Gets the send key name and value for a Hybrid Connection. + * Deletes a hostname binding for an app. + * Deletes a hostname binding for an app. * - * @param resourceGroupName The resource group name - * @param name The name of the web app - * @param namespaceName The namespace for this hybrid connection - * @param relayName The relay name for this hybrid connection - * @return the observable to the Object object + * @param resourceGroupName Name of the resource group to which the resource belongs. + * @param name Name of the app. + * @param hostName Hostname in the hostname binding. + * @return the {@link ServiceResponse} object if successful. */ - public Observable> listHybridConnectionKeysWithServiceResponseAsync(String resourceGroupName, String name, String namespaceName, String relayName) { + public Observable> deleteHostNameBindingWithServiceResponseAsync(String resourceGroupName, String name, String hostName) { if (resourceGroupName == null) { throw new IllegalArgumentException("Parameter resourceGroupName is required and cannot be null."); } if (name == null) { throw new IllegalArgumentException("Parameter name is required and cannot be null."); } - if (namespaceName == null) { - throw new IllegalArgumentException("Parameter namespaceName is required and cannot be null."); - } - if (relayName == null) { - throw new IllegalArgumentException("Parameter relayName is required and cannot be null."); + if (hostName == null) { + throw new IllegalArgumentException("Parameter hostName is required and cannot be null."); } if (this.client.subscriptionId() == null) { throw new IllegalArgumentException("Parameter this.client.subscriptionId() is required and cannot be null."); } final String apiVersion = "2016-08-01"; - return service.listHybridConnectionKeys(resourceGroupName, name, namespaceName, relayName, this.client.subscriptionId(), apiVersion, this.client.acceptLanguage(), this.client.userAgent()) - .flatMap(new Func1, Observable>>() { + return service.deleteHostNameBinding(resourceGroupName, name, hostName, this.client.subscriptionId(), apiVersion, this.client.acceptLanguage(), this.client.userAgent()) + .flatMap(new Func1, Observable>>() { @Override - public Observable> call(Response response) { + public Observable> call(Response response) { try { - ServiceResponse clientResponse = listHybridConnectionKeysDelegate(response); + ServiceResponse clientResponse = deleteHostNameBindingDelegate(response); return Observable.just(clientResponse); } catch (Throwable t) { return Observable.error(t); @@ -6390,48 +6100,54 @@ public Observable> call(Response response) }); } - private ServiceResponse listHybridConnectionKeysDelegate(Response response) throws CloudException, IOException, IllegalArgumentException { - return new AzureServiceResponseBuilder(this.client.mapperAdapter()) - .register(200, new TypeToken() { }.getType()) - .registerError(CloudException.class) + private ServiceResponse deleteHostNameBindingDelegate(Response response) throws CloudException, IOException, IllegalArgumentException { + return new AzureServiceResponseBuilder(this.client.mapperAdapter()) + .register(200, new TypeToken() { }.getType()) + .register(204, new TypeToken() { }.getType()) .build(response); } /** - * Retrieves all Service Bus Hybrid Connections used by this Web App. - * Retrieves all Service Bus Hybrid Connections used by this Web App. + * Retrieves a specific Service Bus Hybrid Connection used by this Web App. + * Retrieves a specific Service Bus Hybrid Connection used by this Web App. * - * @param resourceGroupName The resource group name + * @param resourceGroupName Name of the resource group to which the resource belongs. * @param name The name of the web app + * @param namespaceName The namespace for this hybrid connection + * @param relayName The relay name for this hybrid connection * @return the HybridConnectionInner object if successful. */ - public HybridConnectionInner listHybridConnections(String resourceGroupName, String name) { - return listHybridConnectionsWithServiceResponseAsync(resourceGroupName, name).toBlocking().single().getBody(); + public HybridConnectionInner getHybridConnection(String resourceGroupName, String name, String namespaceName, String relayName) { + return getHybridConnectionWithServiceResponseAsync(resourceGroupName, name, namespaceName, relayName).toBlocking().single().getBody(); } /** - * Retrieves all Service Bus Hybrid Connections used by this Web App. - * Retrieves all Service Bus Hybrid Connections used by this Web App. + * Retrieves a specific Service Bus Hybrid Connection used by this Web App. + * Retrieves a specific Service Bus Hybrid Connection used by this Web App. * - * @param resourceGroupName The resource group name + * @param resourceGroupName Name of the resource group to which the resource belongs. * @param name The name of the web app + * @param namespaceName The namespace for this hybrid connection + * @param relayName The relay name for this hybrid connection * @param serviceCallback the async ServiceCallback to handle successful and failed responses. * @return the {@link ServiceCall} object */ - public ServiceCall listHybridConnectionsAsync(String resourceGroupName, String name, final ServiceCallback serviceCallback) { - return ServiceCall.create(listHybridConnectionsWithServiceResponseAsync(resourceGroupName, name), serviceCallback); + public ServiceCall getHybridConnectionAsync(String resourceGroupName, String name, String namespaceName, String relayName, final ServiceCallback serviceCallback) { + return ServiceCall.create(getHybridConnectionWithServiceResponseAsync(resourceGroupName, name, namespaceName, relayName), serviceCallback); } /** - * Retrieves all Service Bus Hybrid Connections used by this Web App. - * Retrieves all Service Bus Hybrid Connections used by this Web App. + * Retrieves a specific Service Bus Hybrid Connection used by this Web App. + * Retrieves a specific Service Bus Hybrid Connection used by this Web App. * - * @param resourceGroupName The resource group name + * @param resourceGroupName Name of the resource group to which the resource belongs. * @param name The name of the web app + * @param namespaceName The namespace for this hybrid connection + * @param relayName The relay name for this hybrid connection * @return the observable to the HybridConnectionInner object */ - public Observable listHybridConnectionsAsync(String resourceGroupName, String name) { - return listHybridConnectionsWithServiceResponseAsync(resourceGroupName, name).map(new Func1, HybridConnectionInner>() { + public Observable getHybridConnectionAsync(String resourceGroupName, String name, String namespaceName, String relayName) { + return getHybridConnectionWithServiceResponseAsync(resourceGroupName, name, namespaceName, relayName).map(new Func1, HybridConnectionInner>() { @Override public HybridConnectionInner call(ServiceResponse response) { return response.getBody(); @@ -6440,30 +6156,38 @@ public HybridConnectionInner call(ServiceResponse respons } /** - * Retrieves all Service Bus Hybrid Connections used by this Web App. - * Retrieves all Service Bus Hybrid Connections used by this Web App. + * Retrieves a specific Service Bus Hybrid Connection used by this Web App. + * Retrieves a specific Service Bus Hybrid Connection used by this Web App. * - * @param resourceGroupName The resource group name + * @param resourceGroupName Name of the resource group to which the resource belongs. * @param name The name of the web app + * @param namespaceName The namespace for this hybrid connection + * @param relayName The relay name for this hybrid connection * @return the observable to the HybridConnectionInner object */ - public Observable> listHybridConnectionsWithServiceResponseAsync(String resourceGroupName, String name) { + public Observable> getHybridConnectionWithServiceResponseAsync(String resourceGroupName, String name, String namespaceName, String relayName) { if (resourceGroupName == null) { throw new IllegalArgumentException("Parameter resourceGroupName is required and cannot be null."); } if (name == null) { throw new IllegalArgumentException("Parameter name is required and cannot be null."); } + if (namespaceName == null) { + throw new IllegalArgumentException("Parameter namespaceName is required and cannot be null."); + } + if (relayName == null) { + throw new IllegalArgumentException("Parameter relayName is required and cannot be null."); + } if (this.client.subscriptionId() == null) { throw new IllegalArgumentException("Parameter this.client.subscriptionId() is required and cannot be null."); } final String apiVersion = "2016-08-01"; - return service.listHybridConnections(resourceGroupName, name, this.client.subscriptionId(), apiVersion, this.client.acceptLanguage(), this.client.userAgent()) + return service.getHybridConnection(resourceGroupName, name, namespaceName, relayName, this.client.subscriptionId(), apiVersion, this.client.acceptLanguage(), this.client.userAgent()) .flatMap(new Func1, Observable>>() { @Override public Observable> call(Response response) { try { - ServiceResponse clientResponse = listHybridConnectionsDelegate(response); + ServiceResponse clientResponse = getHybridConnectionDelegate(response); return Observable.just(clientResponse); } catch (Throwable t) { return Observable.error(t); @@ -6472,7 +6196,7 @@ public Observable> call(Response listHybridConnectionsDelegate(Response response) throws CloudException, IOException, IllegalArgumentException { + private ServiceResponse getHybridConnectionDelegate(Response response) throws CloudException, IOException, IllegalArgumentException { return new AzureServiceResponseBuilder(this.client.mapperAdapter()) .register(200, new TypeToken() { }.getType()) .registerError(CloudException.class) @@ -6480,72 +6204,94 @@ private ServiceResponse listHybridConnectionsDelegate(Res } /** - * Retrieves all Biztalk Hybrid Connections associated with this web app. - * Retrieves all Biztalk Hybrid Connections associated with this web app. + * Creates a new Hybrid Connection using a Service Bus relay. + * Creates a new Hybrid Connection using a Service Bus relay. * - * @param resourceGroupName The resource group name + * @param resourceGroupName Name of the resource group to which the resource belongs. * @param name The name of the web app - * @return the RelayServiceConnectionEntityInner object if successful. + * @param namespaceName The namespace for this hybrid connection + * @param relayName The relay name for this hybrid connection + * @param connectionEnvelope The details of the hybrid connection + * @return the HybridConnectionInner object if successful. */ - public RelayServiceConnectionEntityInner listRelayServiceConnections(String resourceGroupName, String name) { - return listRelayServiceConnectionsWithServiceResponseAsync(resourceGroupName, name).toBlocking().single().getBody(); + public HybridConnectionInner createOrUpdateHybridConnection(String resourceGroupName, String name, String namespaceName, String relayName, HybridConnectionInner connectionEnvelope) { + return createOrUpdateHybridConnectionWithServiceResponseAsync(resourceGroupName, name, namespaceName, relayName, connectionEnvelope).toBlocking().single().getBody(); } /** - * Retrieves all Biztalk Hybrid Connections associated with this web app. - * Retrieves all Biztalk Hybrid Connections associated with this web app. + * Creates a new Hybrid Connection using a Service Bus relay. + * Creates a new Hybrid Connection using a Service Bus relay. * - * @param resourceGroupName The resource group name + * @param resourceGroupName Name of the resource group to which the resource belongs. * @param name The name of the web app + * @param namespaceName The namespace for this hybrid connection + * @param relayName The relay name for this hybrid connection + * @param connectionEnvelope The details of the hybrid connection * @param serviceCallback the async ServiceCallback to handle successful and failed responses. * @return the {@link ServiceCall} object */ - public ServiceCall listRelayServiceConnectionsAsync(String resourceGroupName, String name, final ServiceCallback serviceCallback) { - return ServiceCall.create(listRelayServiceConnectionsWithServiceResponseAsync(resourceGroupName, name), serviceCallback); + public ServiceCall createOrUpdateHybridConnectionAsync(String resourceGroupName, String name, String namespaceName, String relayName, HybridConnectionInner connectionEnvelope, final ServiceCallback serviceCallback) { + return ServiceCall.create(createOrUpdateHybridConnectionWithServiceResponseAsync(resourceGroupName, name, namespaceName, relayName, connectionEnvelope), serviceCallback); } /** - * Retrieves all Biztalk Hybrid Connections associated with this web app. - * Retrieves all Biztalk Hybrid Connections associated with this web app. + * Creates a new Hybrid Connection using a Service Bus relay. + * Creates a new Hybrid Connection using a Service Bus relay. * - * @param resourceGroupName The resource group name + * @param resourceGroupName Name of the resource group to which the resource belongs. * @param name The name of the web app - * @return the observable to the RelayServiceConnectionEntityInner object + * @param namespaceName The namespace for this hybrid connection + * @param relayName The relay name for this hybrid connection + * @param connectionEnvelope The details of the hybrid connection + * @return the observable to the HybridConnectionInner object */ - public Observable listRelayServiceConnectionsAsync(String resourceGroupName, String name) { - return listRelayServiceConnectionsWithServiceResponseAsync(resourceGroupName, name).map(new Func1, RelayServiceConnectionEntityInner>() { + public Observable createOrUpdateHybridConnectionAsync(String resourceGroupName, String name, String namespaceName, String relayName, HybridConnectionInner connectionEnvelope) { + return createOrUpdateHybridConnectionWithServiceResponseAsync(resourceGroupName, name, namespaceName, relayName, connectionEnvelope).map(new Func1, HybridConnectionInner>() { @Override - public RelayServiceConnectionEntityInner call(ServiceResponse response) { + public HybridConnectionInner call(ServiceResponse response) { return response.getBody(); } }); } /** - * Retrieves all Biztalk Hybrid Connections associated with this web app. - * Retrieves all Biztalk Hybrid Connections associated with this web app. + * Creates a new Hybrid Connection using a Service Bus relay. + * Creates a new Hybrid Connection using a Service Bus relay. * - * @param resourceGroupName The resource group name + * @param resourceGroupName Name of the resource group to which the resource belongs. * @param name The name of the web app - * @return the observable to the RelayServiceConnectionEntityInner object + * @param namespaceName The namespace for this hybrid connection + * @param relayName The relay name for this hybrid connection + * @param connectionEnvelope The details of the hybrid connection + * @return the observable to the HybridConnectionInner object */ - public Observable> listRelayServiceConnectionsWithServiceResponseAsync(String resourceGroupName, String name) { + public Observable> createOrUpdateHybridConnectionWithServiceResponseAsync(String resourceGroupName, String name, String namespaceName, String relayName, HybridConnectionInner connectionEnvelope) { if (resourceGroupName == null) { throw new IllegalArgumentException("Parameter resourceGroupName is required and cannot be null."); } if (name == null) { throw new IllegalArgumentException("Parameter name is required and cannot be null."); } + if (namespaceName == null) { + throw new IllegalArgumentException("Parameter namespaceName is required and cannot be null."); + } + if (relayName == null) { + throw new IllegalArgumentException("Parameter relayName is required and cannot be null."); + } if (this.client.subscriptionId() == null) { throw new IllegalArgumentException("Parameter this.client.subscriptionId() is required and cannot be null."); } + if (connectionEnvelope == null) { + throw new IllegalArgumentException("Parameter connectionEnvelope is required and cannot be null."); + } + Validator.validate(connectionEnvelope); final String apiVersion = "2016-08-01"; - return service.listRelayServiceConnections(resourceGroupName, name, this.client.subscriptionId(), apiVersion, this.client.acceptLanguage(), this.client.userAgent()) - .flatMap(new Func1, Observable>>() { + return service.createOrUpdateHybridConnection(resourceGroupName, name, namespaceName, relayName, this.client.subscriptionId(), connectionEnvelope, apiVersion, this.client.acceptLanguage(), this.client.userAgent()) + .flatMap(new Func1, Observable>>() { @Override - public Observable> call(Response response) { + public Observable> call(Response response) { try { - ServiceResponse clientResponse = listRelayServiceConnectionsDelegate(response); + ServiceResponse clientResponse = createOrUpdateHybridConnectionDelegate(response); return Observable.just(clientResponse); } catch (Throwable t) { return Observable.error(t); @@ -6554,87 +6300,93 @@ public Observable> call(Respo }); } - private ServiceResponse listRelayServiceConnectionsDelegate(Response response) throws CloudException, IOException, IllegalArgumentException { - return new AzureServiceResponseBuilder(this.client.mapperAdapter()) - .register(200, new TypeToken() { }.getType()) + private ServiceResponse createOrUpdateHybridConnectionDelegate(Response response) throws CloudException, IOException, IllegalArgumentException { + return new AzureServiceResponseBuilder(this.client.mapperAdapter()) + .register(200, new TypeToken() { }.getType()) .registerError(CloudException.class) .build(response); } /** - * Retrieves a Biztalk Hybrid Connection identified by its entity name. - * Retrieves a Biztalk Hybrid Connection identified by its entity name. + * Removes a Hybrid Connection from this site. + * Removes a Hybrid Connection from this site. * - * @param resourceGroupName The resource group name + * @param resourceGroupName Name of the resource group to which the resource belongs. * @param name The name of the web app - * @param entityName The name by which the Hybrid Connection is identified - * @return the RelayServiceConnectionEntityInner object if successful. + * @param namespaceName The namespace for this hybrid connection + * @param relayName The relay name for this hybrid connection */ - public RelayServiceConnectionEntityInner getRelayServiceConnection(String resourceGroupName, String name, String entityName) { - return getRelayServiceConnectionWithServiceResponseAsync(resourceGroupName, name, entityName).toBlocking().single().getBody(); + public void deleteHybridConnection(String resourceGroupName, String name, String namespaceName, String relayName) { + deleteHybridConnectionWithServiceResponseAsync(resourceGroupName, name, namespaceName, relayName).toBlocking().single().getBody(); } /** - * Retrieves a Biztalk Hybrid Connection identified by its entity name. - * Retrieves a Biztalk Hybrid Connection identified by its entity name. + * Removes a Hybrid Connection from this site. + * Removes a Hybrid Connection from this site. * - * @param resourceGroupName The resource group name + * @param resourceGroupName Name of the resource group to which the resource belongs. * @param name The name of the web app - * @param entityName The name by which the Hybrid Connection is identified - * @param serviceCallback the async ServiceCallback to handle successful and failed responses. + * @param namespaceName The namespace for this hybrid connection + * @param relayName The relay name for this hybrid connection + * @param serviceCallback the async ServiceCallback to handle successful and failed responses. * @return the {@link ServiceCall} object */ - public ServiceCall getRelayServiceConnectionAsync(String resourceGroupName, String name, String entityName, final ServiceCallback serviceCallback) { - return ServiceCall.create(getRelayServiceConnectionWithServiceResponseAsync(resourceGroupName, name, entityName), serviceCallback); + public ServiceCall deleteHybridConnectionAsync(String resourceGroupName, String name, String namespaceName, String relayName, final ServiceCallback serviceCallback) { + return ServiceCall.create(deleteHybridConnectionWithServiceResponseAsync(resourceGroupName, name, namespaceName, relayName), serviceCallback); } /** - * Retrieves a Biztalk Hybrid Connection identified by its entity name. - * Retrieves a Biztalk Hybrid Connection identified by its entity name. + * Removes a Hybrid Connection from this site. + * Removes a Hybrid Connection from this site. * - * @param resourceGroupName The resource group name + * @param resourceGroupName Name of the resource group to which the resource belongs. * @param name The name of the web app - * @param entityName The name by which the Hybrid Connection is identified - * @return the observable to the RelayServiceConnectionEntityInner object + * @param namespaceName The namespace for this hybrid connection + * @param relayName The relay name for this hybrid connection + * @return the {@link ServiceResponse} object if successful. */ - public Observable getRelayServiceConnectionAsync(String resourceGroupName, String name, String entityName) { - return getRelayServiceConnectionWithServiceResponseAsync(resourceGroupName, name, entityName).map(new Func1, RelayServiceConnectionEntityInner>() { + public Observable deleteHybridConnectionAsync(String resourceGroupName, String name, String namespaceName, String relayName) { + return deleteHybridConnectionWithServiceResponseAsync(resourceGroupName, name, namespaceName, relayName).map(new Func1, Void>() { @Override - public RelayServiceConnectionEntityInner call(ServiceResponse response) { + public Void call(ServiceResponse response) { return response.getBody(); } }); } /** - * Retrieves a Biztalk Hybrid Connection identified by its entity name. - * Retrieves a Biztalk Hybrid Connection identified by its entity name. + * Removes a Hybrid Connection from this site. + * Removes a Hybrid Connection from this site. * - * @param resourceGroupName The resource group name + * @param resourceGroupName Name of the resource group to which the resource belongs. * @param name The name of the web app - * @param entityName The name by which the Hybrid Connection is identified - * @return the observable to the RelayServiceConnectionEntityInner object + * @param namespaceName The namespace for this hybrid connection + * @param relayName The relay name for this hybrid connection + * @return the {@link ServiceResponse} object if successful. */ - public Observable> getRelayServiceConnectionWithServiceResponseAsync(String resourceGroupName, String name, String entityName) { + public Observable> deleteHybridConnectionWithServiceResponseAsync(String resourceGroupName, String name, String namespaceName, String relayName) { if (resourceGroupName == null) { throw new IllegalArgumentException("Parameter resourceGroupName is required and cannot be null."); } if (name == null) { throw new IllegalArgumentException("Parameter name is required and cannot be null."); } - if (entityName == null) { - throw new IllegalArgumentException("Parameter entityName is required and cannot be null."); + if (namespaceName == null) { + throw new IllegalArgumentException("Parameter namespaceName is required and cannot be null."); + } + if (relayName == null) { + throw new IllegalArgumentException("Parameter relayName is required and cannot be null."); } if (this.client.subscriptionId() == null) { throw new IllegalArgumentException("Parameter this.client.subscriptionId() is required and cannot be null."); } final String apiVersion = "2016-08-01"; - return service.getRelayServiceConnection(resourceGroupName, name, entityName, this.client.subscriptionId(), apiVersion, this.client.acceptLanguage(), this.client.userAgent()) - .flatMap(new Func1, Observable>>() { + return service.deleteHybridConnection(resourceGroupName, name, namespaceName, relayName, this.client.subscriptionId(), apiVersion, this.client.acceptLanguage(), this.client.userAgent()) + .flatMap(new Func1, Observable>>() { @Override - public Observable> call(Response response) { + public Observable> call(Response response) { try { - ServiceResponse clientResponse = getRelayServiceConnectionDelegate(response); + ServiceResponse clientResponse = deleteHybridConnectionDelegate(response); return Observable.just(clientResponse); } catch (Throwable t) { return Observable.error(t); @@ -6643,80 +6395,87 @@ public Observable> call(Respo }); } - private ServiceResponse getRelayServiceConnectionDelegate(Response response) throws CloudException, IOException, IllegalArgumentException { - return new AzureServiceResponseBuilder(this.client.mapperAdapter()) - .register(200, new TypeToken() { }.getType()) - .registerError(CloudException.class) + private ServiceResponse deleteHybridConnectionDelegate(Response response) throws CloudException, IOException, IllegalArgumentException { + return new AzureServiceResponseBuilder(this.client.mapperAdapter()) + .register(200, new TypeToken() { }.getType()) + .register(404, new TypeToken() { }.getType()) .build(response); } /** - * Creates a new association to a Biztalk Hybrid Connection, or updates an existing one. - * Creates a new association to a Biztalk Hybrid Connection, or updates an existing one. + * Creates a new Hybrid Connection using a Service Bus relay. + * Creates a new Hybrid Connection using a Service Bus relay. * - * @param resourceGroupName The resource group name + * @param resourceGroupName Name of the resource group to which the resource belongs. * @param name The name of the web app - * @param entityName The name by which the Hybrid Connection is identified - * @param connectionEnvelope The details of the Hybrid Connection - * @return the RelayServiceConnectionEntityInner object if successful. + * @param namespaceName The namespace for this hybrid connection + * @param relayName The relay name for this hybrid connection + * @param connectionEnvelope The details of the hybrid connection + * @return the HybridConnectionInner object if successful. */ - public RelayServiceConnectionEntityInner createOrUpdateRelayServiceConnection(String resourceGroupName, String name, String entityName, RelayServiceConnectionEntityInner connectionEnvelope) { - return createOrUpdateRelayServiceConnectionWithServiceResponseAsync(resourceGroupName, name, entityName, connectionEnvelope).toBlocking().single().getBody(); + public HybridConnectionInner updateHybridConnection(String resourceGroupName, String name, String namespaceName, String relayName, HybridConnectionInner connectionEnvelope) { + return updateHybridConnectionWithServiceResponseAsync(resourceGroupName, name, namespaceName, relayName, connectionEnvelope).toBlocking().single().getBody(); } /** - * Creates a new association to a Biztalk Hybrid Connection, or updates an existing one. - * Creates a new association to a Biztalk Hybrid Connection, or updates an existing one. + * Creates a new Hybrid Connection using a Service Bus relay. + * Creates a new Hybrid Connection using a Service Bus relay. * - * @param resourceGroupName The resource group name + * @param resourceGroupName Name of the resource group to which the resource belongs. * @param name The name of the web app - * @param entityName The name by which the Hybrid Connection is identified - * @param connectionEnvelope The details of the Hybrid Connection + * @param namespaceName The namespace for this hybrid connection + * @param relayName The relay name for this hybrid connection + * @param connectionEnvelope The details of the hybrid connection * @param serviceCallback the async ServiceCallback to handle successful and failed responses. * @return the {@link ServiceCall} object */ - public ServiceCall createOrUpdateRelayServiceConnectionAsync(String resourceGroupName, String name, String entityName, RelayServiceConnectionEntityInner connectionEnvelope, final ServiceCallback serviceCallback) { - return ServiceCall.create(createOrUpdateRelayServiceConnectionWithServiceResponseAsync(resourceGroupName, name, entityName, connectionEnvelope), serviceCallback); + public ServiceCall updateHybridConnectionAsync(String resourceGroupName, String name, String namespaceName, String relayName, HybridConnectionInner connectionEnvelope, final ServiceCallback serviceCallback) { + return ServiceCall.create(updateHybridConnectionWithServiceResponseAsync(resourceGroupName, name, namespaceName, relayName, connectionEnvelope), serviceCallback); } /** - * Creates a new association to a Biztalk Hybrid Connection, or updates an existing one. - * Creates a new association to a Biztalk Hybrid Connection, or updates an existing one. + * Creates a new Hybrid Connection using a Service Bus relay. + * Creates a new Hybrid Connection using a Service Bus relay. * - * @param resourceGroupName The resource group name + * @param resourceGroupName Name of the resource group to which the resource belongs. * @param name The name of the web app - * @param entityName The name by which the Hybrid Connection is identified - * @param connectionEnvelope The details of the Hybrid Connection - * @return the observable to the RelayServiceConnectionEntityInner object + * @param namespaceName The namespace for this hybrid connection + * @param relayName The relay name for this hybrid connection + * @param connectionEnvelope The details of the hybrid connection + * @return the observable to the HybridConnectionInner object */ - public Observable createOrUpdateRelayServiceConnectionAsync(String resourceGroupName, String name, String entityName, RelayServiceConnectionEntityInner connectionEnvelope) { - return createOrUpdateRelayServiceConnectionWithServiceResponseAsync(resourceGroupName, name, entityName, connectionEnvelope).map(new Func1, RelayServiceConnectionEntityInner>() { + public Observable updateHybridConnectionAsync(String resourceGroupName, String name, String namespaceName, String relayName, HybridConnectionInner connectionEnvelope) { + return updateHybridConnectionWithServiceResponseAsync(resourceGroupName, name, namespaceName, relayName, connectionEnvelope).map(new Func1, HybridConnectionInner>() { @Override - public RelayServiceConnectionEntityInner call(ServiceResponse response) { + public HybridConnectionInner call(ServiceResponse response) { return response.getBody(); } }); } /** - * Creates a new association to a Biztalk Hybrid Connection, or updates an existing one. - * Creates a new association to a Biztalk Hybrid Connection, or updates an existing one. + * Creates a new Hybrid Connection using a Service Bus relay. + * Creates a new Hybrid Connection using a Service Bus relay. * - * @param resourceGroupName The resource group name + * @param resourceGroupName Name of the resource group to which the resource belongs. * @param name The name of the web app - * @param entityName The name by which the Hybrid Connection is identified - * @param connectionEnvelope The details of the Hybrid Connection - * @return the observable to the RelayServiceConnectionEntityInner object + * @param namespaceName The namespace for this hybrid connection + * @param relayName The relay name for this hybrid connection + * @param connectionEnvelope The details of the hybrid connection + * @return the observable to the HybridConnectionInner object */ - public Observable> createOrUpdateRelayServiceConnectionWithServiceResponseAsync(String resourceGroupName, String name, String entityName, RelayServiceConnectionEntityInner connectionEnvelope) { + public Observable> updateHybridConnectionWithServiceResponseAsync(String resourceGroupName, String name, String namespaceName, String relayName, HybridConnectionInner connectionEnvelope) { if (resourceGroupName == null) { throw new IllegalArgumentException("Parameter resourceGroupName is required and cannot be null."); } if (name == null) { throw new IllegalArgumentException("Parameter name is required and cannot be null."); } - if (entityName == null) { - throw new IllegalArgumentException("Parameter entityName is required and cannot be null."); + if (namespaceName == null) { + throw new IllegalArgumentException("Parameter namespaceName is required and cannot be null."); + } + if (relayName == null) { + throw new IllegalArgumentException("Parameter relayName is required and cannot be null."); } if (this.client.subscriptionId() == null) { throw new IllegalArgumentException("Parameter this.client.subscriptionId() is required and cannot be null."); @@ -6726,12 +6485,12 @@ public Observable> createOrUp } Validator.validate(connectionEnvelope); final String apiVersion = "2016-08-01"; - return service.createOrUpdateRelayServiceConnection(resourceGroupName, name, entityName, this.client.subscriptionId(), connectionEnvelope, apiVersion, this.client.acceptLanguage(), this.client.userAgent()) - .flatMap(new Func1, Observable>>() { + return service.updateHybridConnection(resourceGroupName, name, namespaceName, relayName, this.client.subscriptionId(), connectionEnvelope, apiVersion, this.client.acceptLanguage(), this.client.userAgent()) + .flatMap(new Func1, Observable>>() { @Override - public Observable> call(Response response) { + public Observable> call(Response response) { try { - ServiceResponse clientResponse = createOrUpdateRelayServiceConnectionDelegate(response); + ServiceResponse clientResponse = updateHybridConnectionDelegate(response); return Observable.just(clientResponse); } catch (Throwable t) { return Observable.error(t); @@ -6740,87 +6499,94 @@ public Observable> call(Respo }); } - private ServiceResponse createOrUpdateRelayServiceConnectionDelegate(Response response) throws CloudException, IOException, IllegalArgumentException { - return new AzureServiceResponseBuilder(this.client.mapperAdapter()) - .register(200, new TypeToken() { }.getType()) + private ServiceResponse updateHybridConnectionDelegate(Response response) throws CloudException, IOException, IllegalArgumentException { + return new AzureServiceResponseBuilder(this.client.mapperAdapter()) + .register(200, new TypeToken() { }.getType()) .registerError(CloudException.class) .build(response); } /** - * Removes the association to a Biztalk Hybrid Connection, identified by its entity name. - * Removes the association to a Biztalk Hybrid Connection, identified by its entity name. + * Gets the send key name and value for a Hybrid Connection. + * Gets the send key name and value for a Hybrid Connection. * - * @param resourceGroupName The resource group name + * @param resourceGroupName Name of the resource group to which the resource belongs. * @param name The name of the web app - * @param entityName The name by which the Hybrid Connection is identified - * @return the Object object if successful. + * @param namespaceName The namespace for this hybrid connection + * @param relayName The relay name for this hybrid connection + * @return the HybridConnectionKeyInner object if successful. */ - public Object deleteRelayServiceConnection(String resourceGroupName, String name, String entityName) { - return deleteRelayServiceConnectionWithServiceResponseAsync(resourceGroupName, name, entityName).toBlocking().single().getBody(); + public HybridConnectionKeyInner listHybridConnectionKeys(String resourceGroupName, String name, String namespaceName, String relayName) { + return listHybridConnectionKeysWithServiceResponseAsync(resourceGroupName, name, namespaceName, relayName).toBlocking().single().getBody(); } /** - * Removes the association to a Biztalk Hybrid Connection, identified by its entity name. - * Removes the association to a Biztalk Hybrid Connection, identified by its entity name. + * Gets the send key name and value for a Hybrid Connection. + * Gets the send key name and value for a Hybrid Connection. * - * @param resourceGroupName The resource group name + * @param resourceGroupName Name of the resource group to which the resource belongs. * @param name The name of the web app - * @param entityName The name by which the Hybrid Connection is identified + * @param namespaceName The namespace for this hybrid connection + * @param relayName The relay name for this hybrid connection * @param serviceCallback the async ServiceCallback to handle successful and failed responses. * @return the {@link ServiceCall} object */ - public ServiceCall deleteRelayServiceConnectionAsync(String resourceGroupName, String name, String entityName, final ServiceCallback serviceCallback) { - return ServiceCall.create(deleteRelayServiceConnectionWithServiceResponseAsync(resourceGroupName, name, entityName), serviceCallback); + public ServiceCall listHybridConnectionKeysAsync(String resourceGroupName, String name, String namespaceName, String relayName, final ServiceCallback serviceCallback) { + return ServiceCall.create(listHybridConnectionKeysWithServiceResponseAsync(resourceGroupName, name, namespaceName, relayName), serviceCallback); } /** - * Removes the association to a Biztalk Hybrid Connection, identified by its entity name. - * Removes the association to a Biztalk Hybrid Connection, identified by its entity name. + * Gets the send key name and value for a Hybrid Connection. + * Gets the send key name and value for a Hybrid Connection. * - * @param resourceGroupName The resource group name + * @param resourceGroupName Name of the resource group to which the resource belongs. * @param name The name of the web app - * @param entityName The name by which the Hybrid Connection is identified - * @return the observable to the Object object + * @param namespaceName The namespace for this hybrid connection + * @param relayName The relay name for this hybrid connection + * @return the observable to the HybridConnectionKeyInner object */ - public Observable deleteRelayServiceConnectionAsync(String resourceGroupName, String name, String entityName) { - return deleteRelayServiceConnectionWithServiceResponseAsync(resourceGroupName, name, entityName).map(new Func1, Object>() { + public Observable listHybridConnectionKeysAsync(String resourceGroupName, String name, String namespaceName, String relayName) { + return listHybridConnectionKeysWithServiceResponseAsync(resourceGroupName, name, namespaceName, relayName).map(new Func1, HybridConnectionKeyInner>() { @Override - public Object call(ServiceResponse response) { + public HybridConnectionKeyInner call(ServiceResponse response) { return response.getBody(); } }); } /** - * Removes the association to a Biztalk Hybrid Connection, identified by its entity name. - * Removes the association to a Biztalk Hybrid Connection, identified by its entity name. + * Gets the send key name and value for a Hybrid Connection. + * Gets the send key name and value for a Hybrid Connection. * - * @param resourceGroupName The resource group name + * @param resourceGroupName Name of the resource group to which the resource belongs. * @param name The name of the web app - * @param entityName The name by which the Hybrid Connection is identified - * @return the observable to the Object object + * @param namespaceName The namespace for this hybrid connection + * @param relayName The relay name for this hybrid connection + * @return the observable to the HybridConnectionKeyInner object */ - public Observable> deleteRelayServiceConnectionWithServiceResponseAsync(String resourceGroupName, String name, String entityName) { + public Observable> listHybridConnectionKeysWithServiceResponseAsync(String resourceGroupName, String name, String namespaceName, String relayName) { if (resourceGroupName == null) { throw new IllegalArgumentException("Parameter resourceGroupName is required and cannot be null."); } if (name == null) { throw new IllegalArgumentException("Parameter name is required and cannot be null."); } - if (entityName == null) { - throw new IllegalArgumentException("Parameter entityName is required and cannot be null."); + if (namespaceName == null) { + throw new IllegalArgumentException("Parameter namespaceName is required and cannot be null."); + } + if (relayName == null) { + throw new IllegalArgumentException("Parameter relayName is required and cannot be null."); } if (this.client.subscriptionId() == null) { throw new IllegalArgumentException("Parameter this.client.subscriptionId() is required and cannot be null."); } final String apiVersion = "2016-08-01"; - return service.deleteRelayServiceConnection(resourceGroupName, name, entityName, this.client.subscriptionId(), apiVersion, this.client.acceptLanguage(), this.client.userAgent()) - .flatMap(new Func1, Observable>>() { + return service.listHybridConnectionKeys(resourceGroupName, name, namespaceName, relayName, this.client.subscriptionId(), apiVersion, this.client.acceptLanguage(), this.client.userAgent()) + .flatMap(new Func1, Observable>>() { @Override - public Observable> call(Response response) { + public Observable> call(Response response) { try { - ServiceResponse clientResponse = deleteRelayServiceConnectionDelegate(response); + ServiceResponse clientResponse = listHybridConnectionKeysDelegate(response); return Observable.just(clientResponse); } catch (Throwable t) { return Observable.error(t); @@ -6829,95 +6595,80 @@ public Observable> call(Response response) }); } - private ServiceResponse deleteRelayServiceConnectionDelegate(Response response) throws CloudException, IOException, IllegalArgumentException { - return new AzureServiceResponseBuilder(this.client.mapperAdapter()) - .register(200, new TypeToken() { }.getType()) + private ServiceResponse listHybridConnectionKeysDelegate(Response response) throws CloudException, IOException, IllegalArgumentException { + return new AzureServiceResponseBuilder(this.client.mapperAdapter()) + .register(200, new TypeToken() { }.getType()) .registerError(CloudException.class) .build(response); } /** - * Creates a new association to a Biztalk Hybrid Connection, or updates an existing one. - * Creates a new association to a Biztalk Hybrid Connection, or updates an existing one. + * Retrieves all Service Bus Hybrid Connections used by this Web App. + * Retrieves all Service Bus Hybrid Connections used by this Web App. * - * @param resourceGroupName The resource group name + * @param resourceGroupName Name of the resource group to which the resource belongs. * @param name The name of the web app - * @param entityName The name by which the Hybrid Connection is identified - * @param connectionEnvelope The details of the Hybrid Connection - * @return the RelayServiceConnectionEntityInner object if successful. + * @return the HybridConnectionInner object if successful. */ - public RelayServiceConnectionEntityInner updateRelayServiceConnection(String resourceGroupName, String name, String entityName, RelayServiceConnectionEntityInner connectionEnvelope) { - return updateRelayServiceConnectionWithServiceResponseAsync(resourceGroupName, name, entityName, connectionEnvelope).toBlocking().single().getBody(); + public HybridConnectionInner listHybridConnections(String resourceGroupName, String name) { + return listHybridConnectionsWithServiceResponseAsync(resourceGroupName, name).toBlocking().single().getBody(); } /** - * Creates a new association to a Biztalk Hybrid Connection, or updates an existing one. - * Creates a new association to a Biztalk Hybrid Connection, or updates an existing one. + * Retrieves all Service Bus Hybrid Connections used by this Web App. + * Retrieves all Service Bus Hybrid Connections used by this Web App. * - * @param resourceGroupName The resource group name + * @param resourceGroupName Name of the resource group to which the resource belongs. * @param name The name of the web app - * @param entityName The name by which the Hybrid Connection is identified - * @param connectionEnvelope The details of the Hybrid Connection * @param serviceCallback the async ServiceCallback to handle successful and failed responses. * @return the {@link ServiceCall} object */ - public ServiceCall updateRelayServiceConnectionAsync(String resourceGroupName, String name, String entityName, RelayServiceConnectionEntityInner connectionEnvelope, final ServiceCallback serviceCallback) { - return ServiceCall.create(updateRelayServiceConnectionWithServiceResponseAsync(resourceGroupName, name, entityName, connectionEnvelope), serviceCallback); + public ServiceCall listHybridConnectionsAsync(String resourceGroupName, String name, final ServiceCallback serviceCallback) { + return ServiceCall.create(listHybridConnectionsWithServiceResponseAsync(resourceGroupName, name), serviceCallback); } /** - * Creates a new association to a Biztalk Hybrid Connection, or updates an existing one. - * Creates a new association to a Biztalk Hybrid Connection, or updates an existing one. + * Retrieves all Service Bus Hybrid Connections used by this Web App. + * Retrieves all Service Bus Hybrid Connections used by this Web App. * - * @param resourceGroupName The resource group name + * @param resourceGroupName Name of the resource group to which the resource belongs. * @param name The name of the web app - * @param entityName The name by which the Hybrid Connection is identified - * @param connectionEnvelope The details of the Hybrid Connection - * @return the observable to the RelayServiceConnectionEntityInner object + * @return the observable to the HybridConnectionInner object */ - public Observable updateRelayServiceConnectionAsync(String resourceGroupName, String name, String entityName, RelayServiceConnectionEntityInner connectionEnvelope) { - return updateRelayServiceConnectionWithServiceResponseAsync(resourceGroupName, name, entityName, connectionEnvelope).map(new Func1, RelayServiceConnectionEntityInner>() { + public Observable listHybridConnectionsAsync(String resourceGroupName, String name) { + return listHybridConnectionsWithServiceResponseAsync(resourceGroupName, name).map(new Func1, HybridConnectionInner>() { @Override - public RelayServiceConnectionEntityInner call(ServiceResponse response) { + public HybridConnectionInner call(ServiceResponse response) { return response.getBody(); } }); } /** - * Creates a new association to a Biztalk Hybrid Connection, or updates an existing one. - * Creates a new association to a Biztalk Hybrid Connection, or updates an existing one. + * Retrieves all Service Bus Hybrid Connections used by this Web App. + * Retrieves all Service Bus Hybrid Connections used by this Web App. * - * @param resourceGroupName The resource group name + * @param resourceGroupName Name of the resource group to which the resource belongs. * @param name The name of the web app - * @param entityName The name by which the Hybrid Connection is identified - * @param connectionEnvelope The details of the Hybrid Connection - * @return the observable to the RelayServiceConnectionEntityInner object + * @return the observable to the HybridConnectionInner object */ - public Observable> updateRelayServiceConnectionWithServiceResponseAsync(String resourceGroupName, String name, String entityName, RelayServiceConnectionEntityInner connectionEnvelope) { + public Observable> listHybridConnectionsWithServiceResponseAsync(String resourceGroupName, String name) { if (resourceGroupName == null) { throw new IllegalArgumentException("Parameter resourceGroupName is required and cannot be null."); } if (name == null) { throw new IllegalArgumentException("Parameter name is required and cannot be null."); } - if (entityName == null) { - throw new IllegalArgumentException("Parameter entityName is required and cannot be null."); - } if (this.client.subscriptionId() == null) { throw new IllegalArgumentException("Parameter this.client.subscriptionId() is required and cannot be null."); } - if (connectionEnvelope == null) { - throw new IllegalArgumentException("Parameter connectionEnvelope is required and cannot be null."); - } - Validator.validate(connectionEnvelope); final String apiVersion = "2016-08-01"; - return service.updateRelayServiceConnection(resourceGroupName, name, entityName, this.client.subscriptionId(), connectionEnvelope, apiVersion, this.client.acceptLanguage(), this.client.userAgent()) - .flatMap(new Func1, Observable>>() { + return service.listHybridConnections(resourceGroupName, name, this.client.subscriptionId(), apiVersion, this.client.acceptLanguage(), this.client.userAgent()) + .flatMap(new Func1, Observable>>() { @Override - public Observable> call(Response response) { + public Observable> call(Response response) { try { - ServiceResponse clientResponse = updateRelayServiceConnectionDelegate(response); + ServiceResponse clientResponse = listHybridConnectionsDelegate(response); return Observable.just(clientResponse); } catch (Throwable t) { return Observable.error(t); @@ -6926,101 +6677,64 @@ public Observable> call(Respo }); } - private ServiceResponse updateRelayServiceConnectionDelegate(Response response) throws CloudException, IOException, IllegalArgumentException { - return new AzureServiceResponseBuilder(this.client.mapperAdapter()) - .register(200, new TypeToken() { }.getType()) + private ServiceResponse listHybridConnectionsDelegate(Response response) throws CloudException, IOException, IllegalArgumentException { + return new AzureServiceResponseBuilder(this.client.mapperAdapter()) + .register(200, new TypeToken() { }.getType()) .registerError(CloudException.class) .build(response); } /** - * Gets all instance of a web app. - * Gets all instance of a web app. + * Gets hybrid connections configured for an app (or deployment slot, if specified). + * Gets hybrid connections configured for an app (or deployment slot, if specified). * - * @param resourceGroupName Name of resource group - * @param name Name of web app - * @return the PagedList<SiteInstanceInner> object if successful. + * @param resourceGroupName Name of the resource group to which the resource belongs. + * @param name Name of the app. + * @return the RelayServiceConnectionEntityInner object if successful. */ - public PagedList listInstanceIdentifiers(final String resourceGroupName, final String name) { - ServiceResponse> response = listInstanceIdentifiersSinglePageAsync(resourceGroupName, name).toBlocking().single(); - return new PagedList(response.getBody()) { - @Override - public Page nextPage(String nextPageLink) { - return listInstanceIdentifiersNextSinglePageAsync(nextPageLink).toBlocking().single().getBody(); - } - }; + public RelayServiceConnectionEntityInner listRelayServiceConnections(String resourceGroupName, String name) { + return listRelayServiceConnectionsWithServiceResponseAsync(resourceGroupName, name).toBlocking().single().getBody(); } /** - * Gets all instance of a web app. - * Gets all instance of a web app. + * Gets hybrid connections configured for an app (or deployment slot, if specified). + * Gets hybrid connections configured for an app (or deployment slot, if specified). * - * @param resourceGroupName Name of resource group - * @param name Name of web app + * @param resourceGroupName Name of the resource group to which the resource belongs. + * @param name Name of the app. * @param serviceCallback the async ServiceCallback to handle successful and failed responses. * @return the {@link ServiceCall} object */ - public ServiceCall> listInstanceIdentifiersAsync(final String resourceGroupName, final String name, final ListOperationCallback serviceCallback) { - return AzureServiceCall.create( - listInstanceIdentifiersSinglePageAsync(resourceGroupName, name), - new Func1>>>() { - @Override - public Observable>> call(String nextPageLink) { - return listInstanceIdentifiersNextSinglePageAsync(nextPageLink); - } - }, - serviceCallback); - } - - /** - * Gets all instance of a web app. - * Gets all instance of a web app. - * - * @param resourceGroupName Name of resource group - * @param name Name of web app - * @return the observable to the PagedList<SiteInstanceInner> object - */ - public Observable> listInstanceIdentifiersAsync(final String resourceGroupName, final String name) { - return listInstanceIdentifiersWithServiceResponseAsync(resourceGroupName, name) - .map(new Func1>, Page>() { - @Override - public Page call(ServiceResponse> response) { - return response.getBody(); - } - }); + public ServiceCall listRelayServiceConnectionsAsync(String resourceGroupName, String name, final ServiceCallback serviceCallback) { + return ServiceCall.create(listRelayServiceConnectionsWithServiceResponseAsync(resourceGroupName, name), serviceCallback); } /** - * Gets all instance of a web app. - * Gets all instance of a web app. + * Gets hybrid connections configured for an app (or deployment slot, if specified). + * Gets hybrid connections configured for an app (or deployment slot, if specified). * - * @param resourceGroupName Name of resource group - * @param name Name of web app - * @return the observable to the PagedList<SiteInstanceInner> object + * @param resourceGroupName Name of the resource group to which the resource belongs. + * @param name Name of the app. + * @return the observable to the RelayServiceConnectionEntityInner object */ - public Observable>> listInstanceIdentifiersWithServiceResponseAsync(final String resourceGroupName, final String name) { - return listInstanceIdentifiersSinglePageAsync(resourceGroupName, name) - .concatMap(new Func1>, Observable>>>() { - @Override - public Observable>> call(ServiceResponse> page) { - String nextPageLink = page.getBody().getNextPageLink(); - if (nextPageLink == null) { - return Observable.just(page); - } - return Observable.just(page).concatWith(listInstanceIdentifiersNextWithServiceResponseAsync(nextPageLink)); - } - }); + public Observable listRelayServiceConnectionsAsync(String resourceGroupName, String name) { + return listRelayServiceConnectionsWithServiceResponseAsync(resourceGroupName, name).map(new Func1, RelayServiceConnectionEntityInner>() { + @Override + public RelayServiceConnectionEntityInner call(ServiceResponse response) { + return response.getBody(); + } + }); } /** - * Gets all instance of a web app. - * Gets all instance of a web app. + * Gets hybrid connections configured for an app (or deployment slot, if specified). + * Gets hybrid connections configured for an app (or deployment slot, if specified). * - ServiceResponse> * @param resourceGroupName Name of resource group - ServiceResponse> * @param name Name of web app - * @return the PagedList<SiteInstanceInner> object wrapped in {@link ServiceResponse} if successful. + * @param resourceGroupName Name of the resource group to which the resource belongs. + * @param name Name of the app. + * @return the observable to the RelayServiceConnectionEntityInner object */ - public Observable>> listInstanceIdentifiersSinglePageAsync(final String resourceGroupName, final String name) { + public Observable> listRelayServiceConnectionsWithServiceResponseAsync(String resourceGroupName, String name) { if (resourceGroupName == null) { throw new IllegalArgumentException("Parameter resourceGroupName is required and cannot be null."); } @@ -7031,13 +6745,13 @@ public Observable>> listInstanceIdentifi throw new IllegalArgumentException("Parameter this.client.subscriptionId() is required and cannot be null."); } final String apiVersion = "2016-08-01"; - return service.listInstanceIdentifiers(resourceGroupName, name, this.client.subscriptionId(), apiVersion, this.client.acceptLanguage(), this.client.userAgent()) - .flatMap(new Func1, Observable>>>() { + return service.listRelayServiceConnections(resourceGroupName, name, this.client.subscriptionId(), apiVersion, this.client.acceptLanguage(), this.client.userAgent()) + .flatMap(new Func1, Observable>>() { @Override - public Observable>> call(Response response) { + public Observable> call(Response response) { try { - ServiceResponse> result = listInstanceIdentifiersDelegate(response); - return Observable.just(new ServiceResponse>(result.getBody(), result.getResponse())); + ServiceResponse clientResponse = listRelayServiceConnectionsDelegate(response); + return Observable.just(clientResponse); } catch (Throwable t) { return Observable.error(t); } @@ -7045,126 +6759,88 @@ public Observable>> call(Response> listInstanceIdentifiersDelegate(Response response) throws CloudException, IOException, IllegalArgumentException { - return new AzureServiceResponseBuilder, CloudException>(this.client.mapperAdapter()) - .register(200, new TypeToken>() { }.getType()) + private ServiceResponse listRelayServiceConnectionsDelegate(Response response) throws CloudException, IOException, IllegalArgumentException { + return new AzureServiceResponseBuilder(this.client.mapperAdapter()) + .register(200, new TypeToken() { }.getType()) .registerError(CloudException.class) .build(response); } /** - * List deployments. - * List deployments. + * Gets a hybrid connection configuration by its name. + * Gets a hybrid connection configuration by its name. * - * @param resourceGroupName Name of resource group - * @param name Name of web app - * @param instanceId Id of web app instance - * @return the PagedList<DeploymentInner> object if successful. + * @param resourceGroupName Name of the resource group to which the resource belongs. + * @param name Name of the app. + * @param entityName Name of the hybrid connection. + * @return the RelayServiceConnectionEntityInner object if successful. */ - public PagedList listInstanceDeployments(final String resourceGroupName, final String name, final String instanceId) { - ServiceResponse> response = listInstanceDeploymentsSinglePageAsync(resourceGroupName, name, instanceId).toBlocking().single(); - return new PagedList(response.getBody()) { - @Override - public Page nextPage(String nextPageLink) { - return listInstanceDeploymentsNextSinglePageAsync(nextPageLink).toBlocking().single().getBody(); - } - }; + public RelayServiceConnectionEntityInner getRelayServiceConnection(String resourceGroupName, String name, String entityName) { + return getRelayServiceConnectionWithServiceResponseAsync(resourceGroupName, name, entityName).toBlocking().single().getBody(); } /** - * List deployments. - * List deployments. + * Gets a hybrid connection configuration by its name. + * Gets a hybrid connection configuration by its name. * - * @param resourceGroupName Name of resource group - * @param name Name of web app - * @param instanceId Id of web app instance + * @param resourceGroupName Name of the resource group to which the resource belongs. + * @param name Name of the app. + * @param entityName Name of the hybrid connection. * @param serviceCallback the async ServiceCallback to handle successful and failed responses. * @return the {@link ServiceCall} object */ - public ServiceCall> listInstanceDeploymentsAsync(final String resourceGroupName, final String name, final String instanceId, final ListOperationCallback serviceCallback) { - return AzureServiceCall.create( - listInstanceDeploymentsSinglePageAsync(resourceGroupName, name, instanceId), - new Func1>>>() { - @Override - public Observable>> call(String nextPageLink) { - return listInstanceDeploymentsNextSinglePageAsync(nextPageLink); - } - }, - serviceCallback); - } - - /** - * List deployments. - * List deployments. - * - * @param resourceGroupName Name of resource group - * @param name Name of web app - * @param instanceId Id of web app instance - * @return the observable to the PagedList<DeploymentInner> object - */ - public Observable> listInstanceDeploymentsAsync(final String resourceGroupName, final String name, final String instanceId) { - return listInstanceDeploymentsWithServiceResponseAsync(resourceGroupName, name, instanceId) - .map(new Func1>, Page>() { - @Override - public Page call(ServiceResponse> response) { - return response.getBody(); - } - }); + public ServiceCall getRelayServiceConnectionAsync(String resourceGroupName, String name, String entityName, final ServiceCallback serviceCallback) { + return ServiceCall.create(getRelayServiceConnectionWithServiceResponseAsync(resourceGroupName, name, entityName), serviceCallback); } /** - * List deployments. - * List deployments. + * Gets a hybrid connection configuration by its name. + * Gets a hybrid connection configuration by its name. * - * @param resourceGroupName Name of resource group - * @param name Name of web app - * @param instanceId Id of web app instance - * @return the observable to the PagedList<DeploymentInner> object + * @param resourceGroupName Name of the resource group to which the resource belongs. + * @param name Name of the app. + * @param entityName Name of the hybrid connection. + * @return the observable to the RelayServiceConnectionEntityInner object */ - public Observable>> listInstanceDeploymentsWithServiceResponseAsync(final String resourceGroupName, final String name, final String instanceId) { - return listInstanceDeploymentsSinglePageAsync(resourceGroupName, name, instanceId) - .concatMap(new Func1>, Observable>>>() { - @Override - public Observable>> call(ServiceResponse> page) { - String nextPageLink = page.getBody().getNextPageLink(); - if (nextPageLink == null) { - return Observable.just(page); - } - return Observable.just(page).concatWith(listInstanceDeploymentsNextWithServiceResponseAsync(nextPageLink)); - } - }); + public Observable getRelayServiceConnectionAsync(String resourceGroupName, String name, String entityName) { + return getRelayServiceConnectionWithServiceResponseAsync(resourceGroupName, name, entityName).map(new Func1, RelayServiceConnectionEntityInner>() { + @Override + public RelayServiceConnectionEntityInner call(ServiceResponse response) { + return response.getBody(); + } + }); } /** - * List deployments. - * List deployments. + * Gets a hybrid connection configuration by its name. + * Gets a hybrid connection configuration by its name. * - ServiceResponse> * @param resourceGroupName Name of resource group - ServiceResponse> * @param name Name of web app - ServiceResponse> * @param instanceId Id of web app instance - * @return the PagedList<DeploymentInner> object wrapped in {@link ServiceResponse} if successful. + * @param resourceGroupName Name of the resource group to which the resource belongs. + * @param name Name of the app. + * @param entityName Name of the hybrid connection. + * @return the observable to the RelayServiceConnectionEntityInner object */ - public Observable>> listInstanceDeploymentsSinglePageAsync(final String resourceGroupName, final String name, final String instanceId) { + public Observable> getRelayServiceConnectionWithServiceResponseAsync(String resourceGroupName, String name, String entityName) { if (resourceGroupName == null) { throw new IllegalArgumentException("Parameter resourceGroupName is required and cannot be null."); } if (name == null) { throw new IllegalArgumentException("Parameter name is required and cannot be null."); } - if (instanceId == null) { - throw new IllegalArgumentException("Parameter instanceId is required and cannot be null."); + if (entityName == null) { + throw new IllegalArgumentException("Parameter entityName is required and cannot be null."); } if (this.client.subscriptionId() == null) { throw new IllegalArgumentException("Parameter this.client.subscriptionId() is required and cannot be null."); } final String apiVersion = "2016-08-01"; - return service.listInstanceDeployments(resourceGroupName, name, instanceId, this.client.subscriptionId(), apiVersion, this.client.acceptLanguage(), this.client.userAgent()) - .flatMap(new Func1, Observable>>>() { + return service.getRelayServiceConnection(resourceGroupName, name, entityName, this.client.subscriptionId(), apiVersion, this.client.acceptLanguage(), this.client.userAgent()) + .flatMap(new Func1, Observable>>() { @Override - public Observable>> call(Response response) { + public Observable> call(Response response) { try { - ServiceResponse> result = listInstanceDeploymentsDelegate(response); - return Observable.just(new ServiceResponse>(result.getBody(), result.getResponse())); + ServiceResponse clientResponse = getRelayServiceConnectionDelegate(response); + return Observable.just(clientResponse); } catch (Throwable t) { return Observable.error(t); } @@ -7172,94 +6848,95 @@ public Observable>> call(Response> listInstanceDeploymentsDelegate(Response response) throws CloudException, IOException, IllegalArgumentException { - return new AzureServiceResponseBuilder, CloudException>(this.client.mapperAdapter()) - .register(200, new TypeToken>() { }.getType()) + private ServiceResponse getRelayServiceConnectionDelegate(Response response) throws CloudException, IOException, IllegalArgumentException { + return new AzureServiceResponseBuilder(this.client.mapperAdapter()) + .register(200, new TypeToken() { }.getType()) .registerError(CloudException.class) .build(response); } /** - * Get the deployment. - * Get the deployment. + * Creates a new hybrid connection configuration (PUT), or updates an existing one (PATCH). + * Creates a new hybrid connection configuration (PUT), or updates an existing one (PATCH). * - * @param resourceGroupName Name of resource group - * @param name Name of web app - * @param id Id of the deployment - * @param instanceId Id of web app instance - * @return the DeploymentInner object if successful. + * @param resourceGroupName Name of the resource group to which the resource belongs. + * @param name Name of the app. + * @param entityName Name of the hybrid connection configuration. + * @param connectionEnvelope Details of the hybrid connection configuration. + * @return the RelayServiceConnectionEntityInner object if successful. */ - public DeploymentInner getInstanceDeployment(String resourceGroupName, String name, String id, String instanceId) { - return getInstanceDeploymentWithServiceResponseAsync(resourceGroupName, name, id, instanceId).toBlocking().single().getBody(); + public RelayServiceConnectionEntityInner createOrUpdateRelayServiceConnection(String resourceGroupName, String name, String entityName, RelayServiceConnectionEntityInner connectionEnvelope) { + return createOrUpdateRelayServiceConnectionWithServiceResponseAsync(resourceGroupName, name, entityName, connectionEnvelope).toBlocking().single().getBody(); } /** - * Get the deployment. - * Get the deployment. + * Creates a new hybrid connection configuration (PUT), or updates an existing one (PATCH). + * Creates a new hybrid connection configuration (PUT), or updates an existing one (PATCH). * - * @param resourceGroupName Name of resource group - * @param name Name of web app - * @param id Id of the deployment - * @param instanceId Id of web app instance + * @param resourceGroupName Name of the resource group to which the resource belongs. + * @param name Name of the app. + * @param entityName Name of the hybrid connection configuration. + * @param connectionEnvelope Details of the hybrid connection configuration. * @param serviceCallback the async ServiceCallback to handle successful and failed responses. * @return the {@link ServiceCall} object */ - public ServiceCall getInstanceDeploymentAsync(String resourceGroupName, String name, String id, String instanceId, final ServiceCallback serviceCallback) { - return ServiceCall.create(getInstanceDeploymentWithServiceResponseAsync(resourceGroupName, name, id, instanceId), serviceCallback); + public ServiceCall createOrUpdateRelayServiceConnectionAsync(String resourceGroupName, String name, String entityName, RelayServiceConnectionEntityInner connectionEnvelope, final ServiceCallback serviceCallback) { + return ServiceCall.create(createOrUpdateRelayServiceConnectionWithServiceResponseAsync(resourceGroupName, name, entityName, connectionEnvelope), serviceCallback); } /** - * Get the deployment. - * Get the deployment. + * Creates a new hybrid connection configuration (PUT), or updates an existing one (PATCH). + * Creates a new hybrid connection configuration (PUT), or updates an existing one (PATCH). * - * @param resourceGroupName Name of resource group - * @param name Name of web app - * @param id Id of the deployment - * @param instanceId Id of web app instance - * @return the observable to the DeploymentInner object + * @param resourceGroupName Name of the resource group to which the resource belongs. + * @param name Name of the app. + * @param entityName Name of the hybrid connection configuration. + * @param connectionEnvelope Details of the hybrid connection configuration. + * @return the observable to the RelayServiceConnectionEntityInner object */ - public Observable getInstanceDeploymentAsync(String resourceGroupName, String name, String id, String instanceId) { - return getInstanceDeploymentWithServiceResponseAsync(resourceGroupName, name, id, instanceId).map(new Func1, DeploymentInner>() { + public Observable createOrUpdateRelayServiceConnectionAsync(String resourceGroupName, String name, String entityName, RelayServiceConnectionEntityInner connectionEnvelope) { + return createOrUpdateRelayServiceConnectionWithServiceResponseAsync(resourceGroupName, name, entityName, connectionEnvelope).map(new Func1, RelayServiceConnectionEntityInner>() { @Override - public DeploymentInner call(ServiceResponse response) { + public RelayServiceConnectionEntityInner call(ServiceResponse response) { return response.getBody(); } }); } /** - * Get the deployment. - * Get the deployment. + * Creates a new hybrid connection configuration (PUT), or updates an existing one (PATCH). + * Creates a new hybrid connection configuration (PUT), or updates an existing one (PATCH). * - * @param resourceGroupName Name of resource group - * @param name Name of web app - * @param id Id of the deployment - * @param instanceId Id of web app instance - * @return the observable to the DeploymentInner object + * @param resourceGroupName Name of the resource group to which the resource belongs. + * @param name Name of the app. + * @param entityName Name of the hybrid connection configuration. + * @param connectionEnvelope Details of the hybrid connection configuration. + * @return the observable to the RelayServiceConnectionEntityInner object */ - public Observable> getInstanceDeploymentWithServiceResponseAsync(String resourceGroupName, String name, String id, String instanceId) { + public Observable> createOrUpdateRelayServiceConnectionWithServiceResponseAsync(String resourceGroupName, String name, String entityName, RelayServiceConnectionEntityInner connectionEnvelope) { if (resourceGroupName == null) { throw new IllegalArgumentException("Parameter resourceGroupName is required and cannot be null."); } if (name == null) { throw new IllegalArgumentException("Parameter name is required and cannot be null."); } - if (id == null) { - throw new IllegalArgumentException("Parameter id is required and cannot be null."); - } - if (instanceId == null) { - throw new IllegalArgumentException("Parameter instanceId is required and cannot be null."); + if (entityName == null) { + throw new IllegalArgumentException("Parameter entityName is required and cannot be null."); } if (this.client.subscriptionId() == null) { throw new IllegalArgumentException("Parameter this.client.subscriptionId() is required and cannot be null."); } + if (connectionEnvelope == null) { + throw new IllegalArgumentException("Parameter connectionEnvelope is required and cannot be null."); + } + Validator.validate(connectionEnvelope); final String apiVersion = "2016-08-01"; - return service.getInstanceDeployment(resourceGroupName, name, id, instanceId, this.client.subscriptionId(), apiVersion, this.client.acceptLanguage(), this.client.userAgent()) - .flatMap(new Func1, Observable>>() { + return service.createOrUpdateRelayServiceConnection(resourceGroupName, name, entityName, this.client.subscriptionId(), connectionEnvelope, apiVersion, this.client.acceptLanguage(), this.client.userAgent()) + .flatMap(new Func1, Observable>>() { @Override - public Observable> call(Response response) { + public Observable> call(Response response) { try { - ServiceResponse clientResponse = getInstanceDeploymentDelegate(response); + ServiceResponse clientResponse = createOrUpdateRelayServiceConnectionDelegate(response); return Observable.just(clientResponse); } catch (Throwable t) { return Observable.error(t); @@ -7268,102 +6945,86 @@ public Observable> call(Response }); } - private ServiceResponse getInstanceDeploymentDelegate(Response response) throws CloudException, IOException, IllegalArgumentException { - return new AzureServiceResponseBuilder(this.client.mapperAdapter()) - .register(200, new TypeToken() { }.getType()) + private ServiceResponse createOrUpdateRelayServiceConnectionDelegate(Response response) throws CloudException, IOException, IllegalArgumentException { + return new AzureServiceResponseBuilder(this.client.mapperAdapter()) + .register(200, new TypeToken() { }.getType()) .registerError(CloudException.class) .build(response); } /** - * Create a deployment. - * Create a deployment. + * Deletes a relay service connection by its name. + * Deletes a relay service connection by its name. * - * @param resourceGroupName Name of resource group - * @param name Name of web app - * @param id Id of the deployment - * @param instanceId Id of web app instance - * @param deployment Details of deployment - * @return the DeploymentInner object if successful. + * @param resourceGroupName Name of the resource group to which the resource belongs. + * @param name Name of the app. + * @param entityName Name of the hybrid connection configuration. */ - public DeploymentInner createInstanceDeployment(String resourceGroupName, String name, String id, String instanceId, DeploymentInner deployment) { - return createInstanceDeploymentWithServiceResponseAsync(resourceGroupName, name, id, instanceId, deployment).toBlocking().single().getBody(); + public void deleteRelayServiceConnection(String resourceGroupName, String name, String entityName) { + deleteRelayServiceConnectionWithServiceResponseAsync(resourceGroupName, name, entityName).toBlocking().single().getBody(); } /** - * Create a deployment. - * Create a deployment. + * Deletes a relay service connection by its name. + * Deletes a relay service connection by its name. * - * @param resourceGroupName Name of resource group - * @param name Name of web app - * @param id Id of the deployment - * @param instanceId Id of web app instance - * @param deployment Details of deployment + * @param resourceGroupName Name of the resource group to which the resource belongs. + * @param name Name of the app. + * @param entityName Name of the hybrid connection configuration. * @param serviceCallback the async ServiceCallback to handle successful and failed responses. * @return the {@link ServiceCall} object */ - public ServiceCall createInstanceDeploymentAsync(String resourceGroupName, String name, String id, String instanceId, DeploymentInner deployment, final ServiceCallback serviceCallback) { - return ServiceCall.create(createInstanceDeploymentWithServiceResponseAsync(resourceGroupName, name, id, instanceId, deployment), serviceCallback); + public ServiceCall deleteRelayServiceConnectionAsync(String resourceGroupName, String name, String entityName, final ServiceCallback serviceCallback) { + return ServiceCall.create(deleteRelayServiceConnectionWithServiceResponseAsync(resourceGroupName, name, entityName), serviceCallback); } /** - * Create a deployment. - * Create a deployment. + * Deletes a relay service connection by its name. + * Deletes a relay service connection by its name. * - * @param resourceGroupName Name of resource group - * @param name Name of web app - * @param id Id of the deployment - * @param instanceId Id of web app instance - * @param deployment Details of deployment - * @return the observable to the DeploymentInner object + * @param resourceGroupName Name of the resource group to which the resource belongs. + * @param name Name of the app. + * @param entityName Name of the hybrid connection configuration. + * @return the {@link ServiceResponse} object if successful. */ - public Observable createInstanceDeploymentAsync(String resourceGroupName, String name, String id, String instanceId, DeploymentInner deployment) { - return createInstanceDeploymentWithServiceResponseAsync(resourceGroupName, name, id, instanceId, deployment).map(new Func1, DeploymentInner>() { + public Observable deleteRelayServiceConnectionAsync(String resourceGroupName, String name, String entityName) { + return deleteRelayServiceConnectionWithServiceResponseAsync(resourceGroupName, name, entityName).map(new Func1, Void>() { @Override - public DeploymentInner call(ServiceResponse response) { + public Void call(ServiceResponse response) { return response.getBody(); } }); } /** - * Create a deployment. - * Create a deployment. + * Deletes a relay service connection by its name. + * Deletes a relay service connection by its name. * - * @param resourceGroupName Name of resource group - * @param name Name of web app - * @param id Id of the deployment - * @param instanceId Id of web app instance - * @param deployment Details of deployment - * @return the observable to the DeploymentInner object + * @param resourceGroupName Name of the resource group to which the resource belongs. + * @param name Name of the app. + * @param entityName Name of the hybrid connection configuration. + * @return the {@link ServiceResponse} object if successful. */ - public Observable> createInstanceDeploymentWithServiceResponseAsync(String resourceGroupName, String name, String id, String instanceId, DeploymentInner deployment) { + public Observable> deleteRelayServiceConnectionWithServiceResponseAsync(String resourceGroupName, String name, String entityName) { if (resourceGroupName == null) { throw new IllegalArgumentException("Parameter resourceGroupName is required and cannot be null."); } if (name == null) { throw new IllegalArgumentException("Parameter name is required and cannot be null."); } - if (id == null) { - throw new IllegalArgumentException("Parameter id is required and cannot be null."); - } - if (instanceId == null) { - throw new IllegalArgumentException("Parameter instanceId is required and cannot be null."); + if (entityName == null) { + throw new IllegalArgumentException("Parameter entityName is required and cannot be null."); } if (this.client.subscriptionId() == null) { throw new IllegalArgumentException("Parameter this.client.subscriptionId() is required and cannot be null."); } - if (deployment == null) { - throw new IllegalArgumentException("Parameter deployment is required and cannot be null."); - } - Validator.validate(deployment); final String apiVersion = "2016-08-01"; - return service.createInstanceDeployment(resourceGroupName, name, id, instanceId, this.client.subscriptionId(), deployment, apiVersion, this.client.acceptLanguage(), this.client.userAgent()) - .flatMap(new Func1, Observable>>() { + return service.deleteRelayServiceConnection(resourceGroupName, name, entityName, this.client.subscriptionId(), apiVersion, this.client.acceptLanguage(), this.client.userAgent()) + .flatMap(new Func1, Observable>>() { @Override - public Observable> call(Response response) { + public Observable> call(Response response) { try { - ServiceResponse clientResponse = createInstanceDeploymentDelegate(response); + ServiceResponse clientResponse = deleteRelayServiceConnectionDelegate(response); return Observable.just(clientResponse); } catch (Throwable t) { return Observable.error(t); @@ -7372,94 +7033,95 @@ public Observable> call(Response }); } - private ServiceResponse createInstanceDeploymentDelegate(Response response) throws CloudException, IOException, IllegalArgumentException { - return new AzureServiceResponseBuilder(this.client.mapperAdapter()) - .register(200, new TypeToken() { }.getType()) - .registerError(CloudException.class) + private ServiceResponse deleteRelayServiceConnectionDelegate(Response response) throws CloudException, IOException, IllegalArgumentException { + return new AzureServiceResponseBuilder(this.client.mapperAdapter()) + .register(200, new TypeToken() { }.getType()) + .register(404, new TypeToken() { }.getType()) .build(response); } /** - * Delete the deployment. - * Delete the deployment. + * Creates a new hybrid connection configuration (PUT), or updates an existing one (PATCH). + * Creates a new hybrid connection configuration (PUT), or updates an existing one (PATCH). * - * @param resourceGroupName Name of resource group - * @param name Name of web app - * @param id Id of the deployment - * @param instanceId Id of web app instance - * @return the Object object if successful. + * @param resourceGroupName Name of the resource group to which the resource belongs. + * @param name Name of the app. + * @param entityName Name of the hybrid connection configuration. + * @param connectionEnvelope Details of the hybrid connection configuration. + * @return the RelayServiceConnectionEntityInner object if successful. */ - public Object deleteInstanceDeployment(String resourceGroupName, String name, String id, String instanceId) { - return deleteInstanceDeploymentWithServiceResponseAsync(resourceGroupName, name, id, instanceId).toBlocking().single().getBody(); + public RelayServiceConnectionEntityInner updateRelayServiceConnection(String resourceGroupName, String name, String entityName, RelayServiceConnectionEntityInner connectionEnvelope) { + return updateRelayServiceConnectionWithServiceResponseAsync(resourceGroupName, name, entityName, connectionEnvelope).toBlocking().single().getBody(); } /** - * Delete the deployment. - * Delete the deployment. + * Creates a new hybrid connection configuration (PUT), or updates an existing one (PATCH). + * Creates a new hybrid connection configuration (PUT), or updates an existing one (PATCH). * - * @param resourceGroupName Name of resource group - * @param name Name of web app - * @param id Id of the deployment - * @param instanceId Id of web app instance + * @param resourceGroupName Name of the resource group to which the resource belongs. + * @param name Name of the app. + * @param entityName Name of the hybrid connection configuration. + * @param connectionEnvelope Details of the hybrid connection configuration. * @param serviceCallback the async ServiceCallback to handle successful and failed responses. * @return the {@link ServiceCall} object */ - public ServiceCall deleteInstanceDeploymentAsync(String resourceGroupName, String name, String id, String instanceId, final ServiceCallback serviceCallback) { - return ServiceCall.create(deleteInstanceDeploymentWithServiceResponseAsync(resourceGroupName, name, id, instanceId), serviceCallback); + public ServiceCall updateRelayServiceConnectionAsync(String resourceGroupName, String name, String entityName, RelayServiceConnectionEntityInner connectionEnvelope, final ServiceCallback serviceCallback) { + return ServiceCall.create(updateRelayServiceConnectionWithServiceResponseAsync(resourceGroupName, name, entityName, connectionEnvelope), serviceCallback); } /** - * Delete the deployment. - * Delete the deployment. + * Creates a new hybrid connection configuration (PUT), or updates an existing one (PATCH). + * Creates a new hybrid connection configuration (PUT), or updates an existing one (PATCH). * - * @param resourceGroupName Name of resource group - * @param name Name of web app - * @param id Id of the deployment - * @param instanceId Id of web app instance - * @return the observable to the Object object + * @param resourceGroupName Name of the resource group to which the resource belongs. + * @param name Name of the app. + * @param entityName Name of the hybrid connection configuration. + * @param connectionEnvelope Details of the hybrid connection configuration. + * @return the observable to the RelayServiceConnectionEntityInner object */ - public Observable deleteInstanceDeploymentAsync(String resourceGroupName, String name, String id, String instanceId) { - return deleteInstanceDeploymentWithServiceResponseAsync(resourceGroupName, name, id, instanceId).map(new Func1, Object>() { + public Observable updateRelayServiceConnectionAsync(String resourceGroupName, String name, String entityName, RelayServiceConnectionEntityInner connectionEnvelope) { + return updateRelayServiceConnectionWithServiceResponseAsync(resourceGroupName, name, entityName, connectionEnvelope).map(new Func1, RelayServiceConnectionEntityInner>() { @Override - public Object call(ServiceResponse response) { + public RelayServiceConnectionEntityInner call(ServiceResponse response) { return response.getBody(); } }); } /** - * Delete the deployment. - * Delete the deployment. + * Creates a new hybrid connection configuration (PUT), or updates an existing one (PATCH). + * Creates a new hybrid connection configuration (PUT), or updates an existing one (PATCH). * - * @param resourceGroupName Name of resource group - * @param name Name of web app - * @param id Id of the deployment - * @param instanceId Id of web app instance - * @return the observable to the Object object + * @param resourceGroupName Name of the resource group to which the resource belongs. + * @param name Name of the app. + * @param entityName Name of the hybrid connection configuration. + * @param connectionEnvelope Details of the hybrid connection configuration. + * @return the observable to the RelayServiceConnectionEntityInner object */ - public Observable> deleteInstanceDeploymentWithServiceResponseAsync(String resourceGroupName, String name, String id, String instanceId) { + public Observable> updateRelayServiceConnectionWithServiceResponseAsync(String resourceGroupName, String name, String entityName, RelayServiceConnectionEntityInner connectionEnvelope) { if (resourceGroupName == null) { throw new IllegalArgumentException("Parameter resourceGroupName is required and cannot be null."); } if (name == null) { throw new IllegalArgumentException("Parameter name is required and cannot be null."); } - if (id == null) { - throw new IllegalArgumentException("Parameter id is required and cannot be null."); - } - if (instanceId == null) { - throw new IllegalArgumentException("Parameter instanceId is required and cannot be null."); + if (entityName == null) { + throw new IllegalArgumentException("Parameter entityName is required and cannot be null."); } if (this.client.subscriptionId() == null) { throw new IllegalArgumentException("Parameter this.client.subscriptionId() is required and cannot be null."); } + if (connectionEnvelope == null) { + throw new IllegalArgumentException("Parameter connectionEnvelope is required and cannot be null."); + } + Validator.validate(connectionEnvelope); final String apiVersion = "2016-08-01"; - return service.deleteInstanceDeployment(resourceGroupName, name, id, instanceId, this.client.subscriptionId(), apiVersion, this.client.acceptLanguage(), this.client.userAgent()) - .flatMap(new Func1, Observable>>() { + return service.updateRelayServiceConnection(resourceGroupName, name, entityName, this.client.subscriptionId(), connectionEnvelope, apiVersion, this.client.acceptLanguage(), this.client.userAgent()) + .flatMap(new Func1, Observable>>() { @Override - public Observable> call(Response response) { + public Observable> call(Response response) { try { - ServiceResponse clientResponse = deleteInstanceDeploymentDelegate(response); + ServiceResponse clientResponse = updateRelayServiceConnectionDelegate(response); return Observable.just(clientResponse); } catch (Throwable t) { return Observable.error(t); @@ -7468,44 +7130,585 @@ public Observable> call(Response response) }); } - private ServiceResponse deleteInstanceDeploymentDelegate(Response response) throws CloudException, IOException, IllegalArgumentException { - return new AzureServiceResponseBuilder(this.client.mapperAdapter()) - .register(200, new TypeToken() { }.getType()) + private ServiceResponse updateRelayServiceConnectionDelegate(Response response) throws CloudException, IOException, IllegalArgumentException { + return new AzureServiceResponseBuilder(this.client.mapperAdapter()) + .register(200, new TypeToken() { }.getType()) .registerError(CloudException.class) .build(response); } /** - * Creates a new web app or modifies an existing web app. - * Creates a new web app or modifies an existing web app. + * Gets all scale-out instances of an app. + * Gets all scale-out instances of an app. * - * @param resourceGroupName Name of the resource group - * @param name Name of the web app - * @return the SiteCloneabilityInner object if successful. + * @param resourceGroupName Name of the resource group to which the resource belongs. + * @param name Name of the app. + * @return the PagedList<SiteInstanceInner> object if successful. */ - public SiteCloneabilityInner isCloneable(String resourceGroupName, String name) { - return isCloneableWithServiceResponseAsync(resourceGroupName, name).toBlocking().single().getBody(); + public PagedList listInstanceIdentifiers(final String resourceGroupName, final String name) { + ServiceResponse> response = listInstanceIdentifiersSinglePageAsync(resourceGroupName, name).toBlocking().single(); + return new PagedList(response.getBody()) { + @Override + public Page nextPage(String nextPageLink) { + return listInstanceIdentifiersNextSinglePageAsync(nextPageLink).toBlocking().single().getBody(); + } + }; } /** - * Creates a new web app or modifies an existing web app. - * Creates a new web app or modifies an existing web app. + * Gets all scale-out instances of an app. + * Gets all scale-out instances of an app. * - * @param resourceGroupName Name of the resource group - * @param name Name of the web app + * @param resourceGroupName Name of the resource group to which the resource belongs. + * @param name Name of the app. * @param serviceCallback the async ServiceCallback to handle successful and failed responses. * @return the {@link ServiceCall} object */ - public ServiceCall isCloneableAsync(String resourceGroupName, String name, final ServiceCallback serviceCallback) { - return ServiceCall.create(isCloneableWithServiceResponseAsync(resourceGroupName, name), serviceCallback); + public ServiceCall> listInstanceIdentifiersAsync(final String resourceGroupName, final String name, final ListOperationCallback serviceCallback) { + return AzureServiceCall.create( + listInstanceIdentifiersSinglePageAsync(resourceGroupName, name), + new Func1>>>() { + @Override + public Observable>> call(String nextPageLink) { + return listInstanceIdentifiersNextSinglePageAsync(nextPageLink); + } + }, + serviceCallback); } /** - * Creates a new web app or modifies an existing web app. - * Creates a new web app or modifies an existing web app. + * Gets all scale-out instances of an app. + * Gets all scale-out instances of an app. * - * @param resourceGroupName Name of the resource group - * @param name Name of the web app + * @param resourceGroupName Name of the resource group to which the resource belongs. + * @param name Name of the app. + * @return the observable to the PagedList<SiteInstanceInner> object + */ + public Observable> listInstanceIdentifiersAsync(final String resourceGroupName, final String name) { + return listInstanceIdentifiersWithServiceResponseAsync(resourceGroupName, name) + .map(new Func1>, Page>() { + @Override + public Page call(ServiceResponse> response) { + return response.getBody(); + } + }); + } + + /** + * Gets all scale-out instances of an app. + * Gets all scale-out instances of an app. + * + * @param resourceGroupName Name of the resource group to which the resource belongs. + * @param name Name of the app. + * @return the observable to the PagedList<SiteInstanceInner> object + */ + public Observable>> listInstanceIdentifiersWithServiceResponseAsync(final String resourceGroupName, final String name) { + return listInstanceIdentifiersSinglePageAsync(resourceGroupName, name) + .concatMap(new Func1>, Observable>>>() { + @Override + public Observable>> call(ServiceResponse> page) { + String nextPageLink = page.getBody().getNextPageLink(); + if (nextPageLink == null) { + return Observable.just(page); + } + return Observable.just(page).concatWith(listInstanceIdentifiersNextWithServiceResponseAsync(nextPageLink)); + } + }); + } + + /** + * Gets all scale-out instances of an app. + * Gets all scale-out instances of an app. + * + ServiceResponse> * @param resourceGroupName Name of the resource group to which the resource belongs. + ServiceResponse> * @param name Name of the app. + * @return the PagedList<SiteInstanceInner> object wrapped in {@link ServiceResponse} if successful. + */ + public Observable>> listInstanceIdentifiersSinglePageAsync(final String resourceGroupName, final String name) { + if (resourceGroupName == null) { + throw new IllegalArgumentException("Parameter resourceGroupName is required and cannot be null."); + } + if (name == null) { + throw new IllegalArgumentException("Parameter name is required and cannot be null."); + } + if (this.client.subscriptionId() == null) { + throw new IllegalArgumentException("Parameter this.client.subscriptionId() is required and cannot be null."); + } + final String apiVersion = "2016-08-01"; + return service.listInstanceIdentifiers(resourceGroupName, name, this.client.subscriptionId(), apiVersion, this.client.acceptLanguage(), this.client.userAgent()) + .flatMap(new Func1, Observable>>>() { + @Override + public Observable>> call(Response response) { + try { + ServiceResponse> result = listInstanceIdentifiersDelegate(response); + return Observable.just(new ServiceResponse>(result.getBody(), result.getResponse())); + } catch (Throwable t) { + return Observable.error(t); + } + } + }); + } + + private ServiceResponse> listInstanceIdentifiersDelegate(Response response) throws CloudException, IOException, IllegalArgumentException { + return new AzureServiceResponseBuilder, CloudException>(this.client.mapperAdapter()) + .register(200, new TypeToken>() { }.getType()) + .registerError(CloudException.class) + .build(response); + } + + /** + * List deployments for an app, or a deployment slot, or for an instance of a scaled-out app. + * List deployments for an app, or a deployment slot, or for an instance of a scaled-out app. + * + * @param resourceGroupName Name of the resource group to which the resource belongs. + * @param name Name of the app. + * @param instanceId The ID of a specific scaled-out instance. This is the value of the name property in the JSON response from "GET api/sites/{siteName}/instances" + * @return the PagedList<DeploymentInner> object if successful. + */ + public PagedList listInstanceDeployments(final String resourceGroupName, final String name, final String instanceId) { + ServiceResponse> response = listInstanceDeploymentsSinglePageAsync(resourceGroupName, name, instanceId).toBlocking().single(); + return new PagedList(response.getBody()) { + @Override + public Page nextPage(String nextPageLink) { + return listInstanceDeploymentsNextSinglePageAsync(nextPageLink).toBlocking().single().getBody(); + } + }; + } + + /** + * List deployments for an app, or a deployment slot, or for an instance of a scaled-out app. + * List deployments for an app, or a deployment slot, or for an instance of a scaled-out app. + * + * @param resourceGroupName Name of the resource group to which the resource belongs. + * @param name Name of the app. + * @param instanceId The ID of a specific scaled-out instance. This is the value of the name property in the JSON response from "GET api/sites/{siteName}/instances" + * @param serviceCallback the async ServiceCallback to handle successful and failed responses. + * @return the {@link ServiceCall} object + */ + public ServiceCall> listInstanceDeploymentsAsync(final String resourceGroupName, final String name, final String instanceId, final ListOperationCallback serviceCallback) { + return AzureServiceCall.create( + listInstanceDeploymentsSinglePageAsync(resourceGroupName, name, instanceId), + new Func1>>>() { + @Override + public Observable>> call(String nextPageLink) { + return listInstanceDeploymentsNextSinglePageAsync(nextPageLink); + } + }, + serviceCallback); + } + + /** + * List deployments for an app, or a deployment slot, or for an instance of a scaled-out app. + * List deployments for an app, or a deployment slot, or for an instance of a scaled-out app. + * + * @param resourceGroupName Name of the resource group to which the resource belongs. + * @param name Name of the app. + * @param instanceId The ID of a specific scaled-out instance. This is the value of the name property in the JSON response from "GET api/sites/{siteName}/instances" + * @return the observable to the PagedList<DeploymentInner> object + */ + public Observable> listInstanceDeploymentsAsync(final String resourceGroupName, final String name, final String instanceId) { + return listInstanceDeploymentsWithServiceResponseAsync(resourceGroupName, name, instanceId) + .map(new Func1>, Page>() { + @Override + public Page call(ServiceResponse> response) { + return response.getBody(); + } + }); + } + + /** + * List deployments for an app, or a deployment slot, or for an instance of a scaled-out app. + * List deployments for an app, or a deployment slot, or for an instance of a scaled-out app. + * + * @param resourceGroupName Name of the resource group to which the resource belongs. + * @param name Name of the app. + * @param instanceId The ID of a specific scaled-out instance. This is the value of the name property in the JSON response from "GET api/sites/{siteName}/instances" + * @return the observable to the PagedList<DeploymentInner> object + */ + public Observable>> listInstanceDeploymentsWithServiceResponseAsync(final String resourceGroupName, final String name, final String instanceId) { + return listInstanceDeploymentsSinglePageAsync(resourceGroupName, name, instanceId) + .concatMap(new Func1>, Observable>>>() { + @Override + public Observable>> call(ServiceResponse> page) { + String nextPageLink = page.getBody().getNextPageLink(); + if (nextPageLink == null) { + return Observable.just(page); + } + return Observable.just(page).concatWith(listInstanceDeploymentsNextWithServiceResponseAsync(nextPageLink)); + } + }); + } + + /** + * List deployments for an app, or a deployment slot, or for an instance of a scaled-out app. + * List deployments for an app, or a deployment slot, or for an instance of a scaled-out app. + * + ServiceResponse> * @param resourceGroupName Name of the resource group to which the resource belongs. + ServiceResponse> * @param name Name of the app. + ServiceResponse> * @param instanceId The ID of a specific scaled-out instance. This is the value of the name property in the JSON response from "GET api/sites/{siteName}/instances" + * @return the PagedList<DeploymentInner> object wrapped in {@link ServiceResponse} if successful. + */ + public Observable>> listInstanceDeploymentsSinglePageAsync(final String resourceGroupName, final String name, final String instanceId) { + if (resourceGroupName == null) { + throw new IllegalArgumentException("Parameter resourceGroupName is required and cannot be null."); + } + if (name == null) { + throw new IllegalArgumentException("Parameter name is required and cannot be null."); + } + if (instanceId == null) { + throw new IllegalArgumentException("Parameter instanceId is required and cannot be null."); + } + if (this.client.subscriptionId() == null) { + throw new IllegalArgumentException("Parameter this.client.subscriptionId() is required and cannot be null."); + } + final String apiVersion = "2016-08-01"; + return service.listInstanceDeployments(resourceGroupName, name, instanceId, this.client.subscriptionId(), apiVersion, this.client.acceptLanguage(), this.client.userAgent()) + .flatMap(new Func1, Observable>>>() { + @Override + public Observable>> call(Response response) { + try { + ServiceResponse> result = listInstanceDeploymentsDelegate(response); + return Observable.just(new ServiceResponse>(result.getBody(), result.getResponse())); + } catch (Throwable t) { + return Observable.error(t); + } + } + }); + } + + private ServiceResponse> listInstanceDeploymentsDelegate(Response response) throws CloudException, IOException, IllegalArgumentException { + return new AzureServiceResponseBuilder, CloudException>(this.client.mapperAdapter()) + .register(200, new TypeToken>() { }.getType()) + .registerError(CloudException.class) + .build(response); + } + + /** + * Get a deployment by its ID for an app, a specific deployment slot, and/or a specific scaled-out instance. + * Get a deployment by its ID for an app, a specific deployment slot, and/or a specific scaled-out instance. + * + * @param resourceGroupName Name of the resource group to which the resource belongs. + * @param name Name of the app. + * @param id Deployment ID. + * @param instanceId ID of a specific scaled-out instance. This is the value of the name property in the JSON response from "GET api/sites/{siteName}/instances" + * @return the DeploymentInner object if successful. + */ + public DeploymentInner getInstanceDeployment(String resourceGroupName, String name, String id, String instanceId) { + return getInstanceDeploymentWithServiceResponseAsync(resourceGroupName, name, id, instanceId).toBlocking().single().getBody(); + } + + /** + * Get a deployment by its ID for an app, a specific deployment slot, and/or a specific scaled-out instance. + * Get a deployment by its ID for an app, a specific deployment slot, and/or a specific scaled-out instance. + * + * @param resourceGroupName Name of the resource group to which the resource belongs. + * @param name Name of the app. + * @param id Deployment ID. + * @param instanceId ID of a specific scaled-out instance. This is the value of the name property in the JSON response from "GET api/sites/{siteName}/instances" + * @param serviceCallback the async ServiceCallback to handle successful and failed responses. + * @return the {@link ServiceCall} object + */ + public ServiceCall getInstanceDeploymentAsync(String resourceGroupName, String name, String id, String instanceId, final ServiceCallback serviceCallback) { + return ServiceCall.create(getInstanceDeploymentWithServiceResponseAsync(resourceGroupName, name, id, instanceId), serviceCallback); + } + + /** + * Get a deployment by its ID for an app, a specific deployment slot, and/or a specific scaled-out instance. + * Get a deployment by its ID for an app, a specific deployment slot, and/or a specific scaled-out instance. + * + * @param resourceGroupName Name of the resource group to which the resource belongs. + * @param name Name of the app. + * @param id Deployment ID. + * @param instanceId ID of a specific scaled-out instance. This is the value of the name property in the JSON response from "GET api/sites/{siteName}/instances" + * @return the observable to the DeploymentInner object + */ + public Observable getInstanceDeploymentAsync(String resourceGroupName, String name, String id, String instanceId) { + return getInstanceDeploymentWithServiceResponseAsync(resourceGroupName, name, id, instanceId).map(new Func1, DeploymentInner>() { + @Override + public DeploymentInner call(ServiceResponse response) { + return response.getBody(); + } + }); + } + + /** + * Get a deployment by its ID for an app, a specific deployment slot, and/or a specific scaled-out instance. + * Get a deployment by its ID for an app, a specific deployment slot, and/or a specific scaled-out instance. + * + * @param resourceGroupName Name of the resource group to which the resource belongs. + * @param name Name of the app. + * @param id Deployment ID. + * @param instanceId ID of a specific scaled-out instance. This is the value of the name property in the JSON response from "GET api/sites/{siteName}/instances" + * @return the observable to the DeploymentInner object + */ + public Observable> getInstanceDeploymentWithServiceResponseAsync(String resourceGroupName, String name, String id, String instanceId) { + if (resourceGroupName == null) { + throw new IllegalArgumentException("Parameter resourceGroupName is required and cannot be null."); + } + if (name == null) { + throw new IllegalArgumentException("Parameter name is required and cannot be null."); + } + if (id == null) { + throw new IllegalArgumentException("Parameter id is required and cannot be null."); + } + if (instanceId == null) { + throw new IllegalArgumentException("Parameter instanceId is required and cannot be null."); + } + if (this.client.subscriptionId() == null) { + throw new IllegalArgumentException("Parameter this.client.subscriptionId() is required and cannot be null."); + } + final String apiVersion = "2016-08-01"; + return service.getInstanceDeployment(resourceGroupName, name, id, instanceId, this.client.subscriptionId(), apiVersion, this.client.acceptLanguage(), this.client.userAgent()) + .flatMap(new Func1, Observable>>() { + @Override + public Observable> call(Response response) { + try { + ServiceResponse clientResponse = getInstanceDeploymentDelegate(response); + return Observable.just(clientResponse); + } catch (Throwable t) { + return Observable.error(t); + } + } + }); + } + + private ServiceResponse getInstanceDeploymentDelegate(Response response) throws CloudException, IOException, IllegalArgumentException { + return new AzureServiceResponseBuilder(this.client.mapperAdapter()) + .register(200, new TypeToken() { }.getType()) + .registerError(CloudException.class) + .build(response); + } + + /** + * Create a deployment for an app, a specific deployment slot, and/or a specific scaled-out instance. + * Create a deployment for an app, a specific deployment slot, and/or a specific scaled-out instance. + * + * @param resourceGroupName Name of the resource group to which the resource belongs. + * @param name Name of the app. + * @param id ID of an existing deployment. + * @param instanceId ID of a specific scaled-out instance. This is the value of the name property in the JSON response from "GET api/sites/{siteName}/instances" + * @param deployment Deployment details. + * @return the DeploymentInner object if successful. + */ + public DeploymentInner createInstanceDeployment(String resourceGroupName, String name, String id, String instanceId, DeploymentInner deployment) { + return createInstanceDeploymentWithServiceResponseAsync(resourceGroupName, name, id, instanceId, deployment).toBlocking().single().getBody(); + } + + /** + * Create a deployment for an app, a specific deployment slot, and/or a specific scaled-out instance. + * Create a deployment for an app, a specific deployment slot, and/or a specific scaled-out instance. + * + * @param resourceGroupName Name of the resource group to which the resource belongs. + * @param name Name of the app. + * @param id ID of an existing deployment. + * @param instanceId ID of a specific scaled-out instance. This is the value of the name property in the JSON response from "GET api/sites/{siteName}/instances" + * @param deployment Deployment details. + * @param serviceCallback the async ServiceCallback to handle successful and failed responses. + * @return the {@link ServiceCall} object + */ + public ServiceCall createInstanceDeploymentAsync(String resourceGroupName, String name, String id, String instanceId, DeploymentInner deployment, final ServiceCallback serviceCallback) { + return ServiceCall.create(createInstanceDeploymentWithServiceResponseAsync(resourceGroupName, name, id, instanceId, deployment), serviceCallback); + } + + /** + * Create a deployment for an app, a specific deployment slot, and/or a specific scaled-out instance. + * Create a deployment for an app, a specific deployment slot, and/or a specific scaled-out instance. + * + * @param resourceGroupName Name of the resource group to which the resource belongs. + * @param name Name of the app. + * @param id ID of an existing deployment. + * @param instanceId ID of a specific scaled-out instance. This is the value of the name property in the JSON response from "GET api/sites/{siteName}/instances" + * @param deployment Deployment details. + * @return the observable to the DeploymentInner object + */ + public Observable createInstanceDeploymentAsync(String resourceGroupName, String name, String id, String instanceId, DeploymentInner deployment) { + return createInstanceDeploymentWithServiceResponseAsync(resourceGroupName, name, id, instanceId, deployment).map(new Func1, DeploymentInner>() { + @Override + public DeploymentInner call(ServiceResponse response) { + return response.getBody(); + } + }); + } + + /** + * Create a deployment for an app, a specific deployment slot, and/or a specific scaled-out instance. + * Create a deployment for an app, a specific deployment slot, and/or a specific scaled-out instance. + * + * @param resourceGroupName Name of the resource group to which the resource belongs. + * @param name Name of the app. + * @param id ID of an existing deployment. + * @param instanceId ID of a specific scaled-out instance. This is the value of the name property in the JSON response from "GET api/sites/{siteName}/instances" + * @param deployment Deployment details. + * @return the observable to the DeploymentInner object + */ + public Observable> createInstanceDeploymentWithServiceResponseAsync(String resourceGroupName, String name, String id, String instanceId, DeploymentInner deployment) { + if (resourceGroupName == null) { + throw new IllegalArgumentException("Parameter resourceGroupName is required and cannot be null."); + } + if (name == null) { + throw new IllegalArgumentException("Parameter name is required and cannot be null."); + } + if (id == null) { + throw new IllegalArgumentException("Parameter id is required and cannot be null."); + } + if (instanceId == null) { + throw new IllegalArgumentException("Parameter instanceId is required and cannot be null."); + } + if (this.client.subscriptionId() == null) { + throw new IllegalArgumentException("Parameter this.client.subscriptionId() is required and cannot be null."); + } + if (deployment == null) { + throw new IllegalArgumentException("Parameter deployment is required and cannot be null."); + } + Validator.validate(deployment); + final String apiVersion = "2016-08-01"; + return service.createInstanceDeployment(resourceGroupName, name, id, instanceId, this.client.subscriptionId(), deployment, apiVersion, this.client.acceptLanguage(), this.client.userAgent()) + .flatMap(new Func1, Observable>>() { + @Override + public Observable> call(Response response) { + try { + ServiceResponse clientResponse = createInstanceDeploymentDelegate(response); + return Observable.just(clientResponse); + } catch (Throwable t) { + return Observable.error(t); + } + } + }); + } + + private ServiceResponse createInstanceDeploymentDelegate(Response response) throws CloudException, IOException, IllegalArgumentException { + return new AzureServiceResponseBuilder(this.client.mapperAdapter()) + .register(200, new TypeToken() { }.getType()) + .registerError(CloudException.class) + .build(response); + } + + /** + * Delete a deployment by its ID for an app, a specific deployment slot, and/or a specific scaled-out instance. + * Delete a deployment by its ID for an app, a specific deployment slot, and/or a specific scaled-out instance. + * + * @param resourceGroupName Name of the resource group to which the resource belongs. + * @param name Name of the app. + * @param id Deployment ID. + * @param instanceId ID of a specific scaled-out instance. This is the value of the name property in the JSON response from "GET api/sites/{siteName}/instances" + */ + public void deleteInstanceDeployment(String resourceGroupName, String name, String id, String instanceId) { + deleteInstanceDeploymentWithServiceResponseAsync(resourceGroupName, name, id, instanceId).toBlocking().single().getBody(); + } + + /** + * Delete a deployment by its ID for an app, a specific deployment slot, and/or a specific scaled-out instance. + * Delete a deployment by its ID for an app, a specific deployment slot, and/or a specific scaled-out instance. + * + * @param resourceGroupName Name of the resource group to which the resource belongs. + * @param name Name of the app. + * @param id Deployment ID. + * @param instanceId ID of a specific scaled-out instance. This is the value of the name property in the JSON response from "GET api/sites/{siteName}/instances" + * @param serviceCallback the async ServiceCallback to handle successful and failed responses. + * @return the {@link ServiceCall} object + */ + public ServiceCall deleteInstanceDeploymentAsync(String resourceGroupName, String name, String id, String instanceId, final ServiceCallback serviceCallback) { + return ServiceCall.create(deleteInstanceDeploymentWithServiceResponseAsync(resourceGroupName, name, id, instanceId), serviceCallback); + } + + /** + * Delete a deployment by its ID for an app, a specific deployment slot, and/or a specific scaled-out instance. + * Delete a deployment by its ID for an app, a specific deployment slot, and/or a specific scaled-out instance. + * + * @param resourceGroupName Name of the resource group to which the resource belongs. + * @param name Name of the app. + * @param id Deployment ID. + * @param instanceId ID of a specific scaled-out instance. This is the value of the name property in the JSON response from "GET api/sites/{siteName}/instances" + * @return the {@link ServiceResponse} object if successful. + */ + public Observable deleteInstanceDeploymentAsync(String resourceGroupName, String name, String id, String instanceId) { + return deleteInstanceDeploymentWithServiceResponseAsync(resourceGroupName, name, id, instanceId).map(new Func1, Void>() { + @Override + public Void call(ServiceResponse response) { + return response.getBody(); + } + }); + } + + /** + * Delete a deployment by its ID for an app, a specific deployment slot, and/or a specific scaled-out instance. + * Delete a deployment by its ID for an app, a specific deployment slot, and/or a specific scaled-out instance. + * + * @param resourceGroupName Name of the resource group to which the resource belongs. + * @param name Name of the app. + * @param id Deployment ID. + * @param instanceId ID of a specific scaled-out instance. This is the value of the name property in the JSON response from "GET api/sites/{siteName}/instances" + * @return the {@link ServiceResponse} object if successful. + */ + public Observable> deleteInstanceDeploymentWithServiceResponseAsync(String resourceGroupName, String name, String id, String instanceId) { + if (resourceGroupName == null) { + throw new IllegalArgumentException("Parameter resourceGroupName is required and cannot be null."); + } + if (name == null) { + throw new IllegalArgumentException("Parameter name is required and cannot be null."); + } + if (id == null) { + throw new IllegalArgumentException("Parameter id is required and cannot be null."); + } + if (instanceId == null) { + throw new IllegalArgumentException("Parameter instanceId is required and cannot be null."); + } + if (this.client.subscriptionId() == null) { + throw new IllegalArgumentException("Parameter this.client.subscriptionId() is required and cannot be null."); + } + final String apiVersion = "2016-08-01"; + return service.deleteInstanceDeployment(resourceGroupName, name, id, instanceId, this.client.subscriptionId(), apiVersion, this.client.acceptLanguage(), this.client.userAgent()) + .flatMap(new Func1, Observable>>() { + @Override + public Observable> call(Response response) { + try { + ServiceResponse clientResponse = deleteInstanceDeploymentDelegate(response); + return Observable.just(clientResponse); + } catch (Throwable t) { + return Observable.error(t); + } + } + }); + } + + private ServiceResponse deleteInstanceDeploymentDelegate(Response response) throws CloudException, IOException, IllegalArgumentException { + return new AzureServiceResponseBuilder(this.client.mapperAdapter()) + .register(200, new TypeToken() { }.getType()) + .register(204, new TypeToken() { }.getType()) + .build(response); + } + + /** + * Shows whether an app can be cloned to another resource group or subscription. + * Shows whether an app can be cloned to another resource group or subscription. + * + * @param resourceGroupName Name of the resource group to which the resource belongs. + * @param name Name of the app. + * @return the SiteCloneabilityInner object if successful. + */ + public SiteCloneabilityInner isCloneable(String resourceGroupName, String name) { + return isCloneableWithServiceResponseAsync(resourceGroupName, name).toBlocking().single().getBody(); + } + + /** + * Shows whether an app can be cloned to another resource group or subscription. + * Shows whether an app can be cloned to another resource group or subscription. + * + * @param resourceGroupName Name of the resource group to which the resource belongs. + * @param name Name of the app. + * @param serviceCallback the async ServiceCallback to handle successful and failed responses. + * @return the {@link ServiceCall} object + */ + public ServiceCall isCloneableAsync(String resourceGroupName, String name, final ServiceCallback serviceCallback) { + return ServiceCall.create(isCloneableWithServiceResponseAsync(resourceGroupName, name), serviceCallback); + } + + /** + * Shows whether an app can be cloned to another resource group or subscription. + * Shows whether an app can be cloned to another resource group or subscription. + * + * @param resourceGroupName Name of the resource group to which the resource belongs. + * @param name Name of the app. * @return the observable to the SiteCloneabilityInner object */ public Observable isCloneableAsync(String resourceGroupName, String name) { @@ -7518,11 +7721,11 @@ public SiteCloneabilityInner call(ServiceResponse respons } /** - * Creates a new web app or modifies an existing web app. - * Creates a new web app or modifies an existing web app. + * Shows whether an app can be cloned to another resource group or subscription. + * Shows whether an app can be cloned to another resource group or subscription. * - * @param resourceGroupName Name of the resource group - * @param name Name of the web app + * @param resourceGroupName Name of the resource group to which the resource belongs. + * @param name Name of the app. * @return the observable to the SiteCloneabilityInner object */ public Observable> isCloneableWithServiceResponseAsync(String resourceGroupName, String name) { @@ -7558,38 +7761,38 @@ private ServiceResponse isCloneableDelegate(Response listMetricDefinitions(final String resourceGroupName, final String name) { - ServiceResponse> response = listMetricDefinitionsSinglePageAsync(resourceGroupName, name).toBlocking().single(); - return new PagedList(response.getBody()) { + public PagedList listMetricDefinitions(final String resourceGroupName, final String name) { + ServiceResponse> response = listMetricDefinitionsSinglePageAsync(resourceGroupName, name).toBlocking().single(); + return new PagedList(response.getBody()) { @Override - public Page nextPage(String nextPageLink) { + public Page nextPage(String nextPageLink) { return listMetricDefinitionsNextSinglePageAsync(nextPageLink).toBlocking().single().getBody(); } }; } /** - * Gets metric definitions for web app. - * Gets metric definitions for web app. + * Gets all metric definitions of an app (or deployment slot, if specified). + * Gets all metric definitions of an app (or deployment slot, if specified). * - * @param resourceGroupName Name of resource group - * @param name Name of web app + * @param resourceGroupName Name of the resource group to which the resource belongs. + * @param name Name of the app. * @param serviceCallback the async ServiceCallback to handle successful and failed responses. * @return the {@link ServiceCall} object */ - public ServiceCall> listMetricDefinitionsAsync(final String resourceGroupName, final String name, final ListOperationCallback serviceCallback) { + public ServiceCall> listMetricDefinitionsAsync(final String resourceGroupName, final String name, final ListOperationCallback serviceCallback) { return AzureServiceCall.create( listMetricDefinitionsSinglePageAsync(resourceGroupName, name), - new Func1>>>() { + new Func1>>>() { @Override - public Observable>> call(String nextPageLink) { + public Observable>> call(String nextPageLink) { return listMetricDefinitionsNextSinglePageAsync(nextPageLink); } }, @@ -7597,36 +7800,36 @@ public Observable>> call(String next } /** - * Gets metric definitions for web app. - * Gets metric definitions for web app. + * Gets all metric definitions of an app (or deployment slot, if specified). + * Gets all metric definitions of an app (or deployment slot, if specified). * - * @param resourceGroupName Name of resource group - * @param name Name of web app - * @return the observable to the PagedList<MetricDefinitionInner> object + * @param resourceGroupName Name of the resource group to which the resource belongs. + * @param name Name of the app. + * @return the observable to the PagedList<ResourceMetricDefinitionInner> object */ - public Observable> listMetricDefinitionsAsync(final String resourceGroupName, final String name) { + public Observable> listMetricDefinitionsAsync(final String resourceGroupName, final String name) { return listMetricDefinitionsWithServiceResponseAsync(resourceGroupName, name) - .map(new Func1>, Page>() { + .map(new Func1>, Page>() { @Override - public Page call(ServiceResponse> response) { + public Page call(ServiceResponse> response) { return response.getBody(); } }); } /** - * Gets metric definitions for web app. - * Gets metric definitions for web app. + * Gets all metric definitions of an app (or deployment slot, if specified). + * Gets all metric definitions of an app (or deployment slot, if specified). * - * @param resourceGroupName Name of resource group - * @param name Name of web app - * @return the observable to the PagedList<MetricDefinitionInner> object + * @param resourceGroupName Name of the resource group to which the resource belongs. + * @param name Name of the app. + * @return the observable to the PagedList<ResourceMetricDefinitionInner> object */ - public Observable>> listMetricDefinitionsWithServiceResponseAsync(final String resourceGroupName, final String name) { + public Observable>> listMetricDefinitionsWithServiceResponseAsync(final String resourceGroupName, final String name) { return listMetricDefinitionsSinglePageAsync(resourceGroupName, name) - .concatMap(new Func1>, Observable>>>() { + .concatMap(new Func1>, Observable>>>() { @Override - public Observable>> call(ServiceResponse> page) { + public Observable>> call(ServiceResponse> page) { String nextPageLink = page.getBody().getNextPageLink(); if (nextPageLink == null) { return Observable.just(page); @@ -7637,14 +7840,14 @@ public Observable>> call(ServiceResp } /** - * Gets metric definitions for web app. - * Gets metric definitions for web app. + * Gets all metric definitions of an app (or deployment slot, if specified). + * Gets all metric definitions of an app (or deployment slot, if specified). * - ServiceResponse> * @param resourceGroupName Name of resource group - ServiceResponse> * @param name Name of web app - * @return the PagedList<MetricDefinitionInner> object wrapped in {@link ServiceResponse} if successful. + ServiceResponse> * @param resourceGroupName Name of the resource group to which the resource belongs. + ServiceResponse> * @param name Name of the app. + * @return the PagedList<ResourceMetricDefinitionInner> object wrapped in {@link ServiceResponse} if successful. */ - public Observable>> listMetricDefinitionsSinglePageAsync(final String resourceGroupName, final String name) { + public Observable>> listMetricDefinitionsSinglePageAsync(final String resourceGroupName, final String name) { if (resourceGroupName == null) { throw new IllegalArgumentException("Parameter resourceGroupName is required and cannot be null."); } @@ -7656,12 +7859,12 @@ public Observable>> listMetricDefini } final String apiVersion = "2016-08-01"; return service.listMetricDefinitions(resourceGroupName, name, this.client.subscriptionId(), apiVersion, this.client.acceptLanguage(), this.client.userAgent()) - .flatMap(new Func1, Observable>>>() { + .flatMap(new Func1, Observable>>>() { @Override - public Observable>> call(Response response) { + public Observable>> call(Response response) { try { - ServiceResponse> result = listMetricDefinitionsDelegate(response); - return Observable.just(new ServiceResponse>(result.getBody(), result.getResponse())); + ServiceResponse> result = listMetricDefinitionsDelegate(response); + return Observable.just(new ServiceResponse>(result.getBody(), result.getResponse())); } catch (Throwable t) { return Observable.error(t); } @@ -7669,19 +7872,19 @@ public Observable>> call(Response> listMetricDefinitionsDelegate(Response response) throws CloudException, IOException, IllegalArgumentException { - return new AzureServiceResponseBuilder, CloudException>(this.client.mapperAdapter()) - .register(200, new TypeToken>() { }.getType()) + private ServiceResponse> listMetricDefinitionsDelegate(Response response) throws CloudException, IOException, IllegalArgumentException { + return new AzureServiceResponseBuilder, CloudException>(this.client.mapperAdapter()) + .register(200, new TypeToken>() { }.getType()) .registerError(CloudException.class) .build(response); } /** - * Gets metrics for web app. - * Gets metrics for web app. + * Gets performance metrics of an app (or deployment slot, if specified). + * Gets performance metrics of an app (or deployment slot, if specified). * - * @param resourceGroupName Name of resource group - * @param name Name of web app + * @param resourceGroupName Name of the resource group to which the resource belongs. + * @param name Name of the app. * @return the PagedList<ResourceMetricInner> object if successful. */ public PagedList listMetrics(final String resourceGroupName, final String name) { @@ -7695,11 +7898,11 @@ public Page nextPage(String nextPageLink) { } /** - * Gets metrics for web app. - * Gets metrics for web app. + * Gets performance metrics of an app (or deployment slot, if specified). + * Gets performance metrics of an app (or deployment slot, if specified). * - * @param resourceGroupName Name of resource group - * @param name Name of web app + * @param resourceGroupName Name of the resource group to which the resource belongs. + * @param name Name of the app. * @param serviceCallback the async ServiceCallback to handle successful and failed responses. * @return the {@link ServiceCall} object */ @@ -7716,11 +7919,11 @@ public Observable>> call(String nextPa } /** - * Gets metrics for web app. - * Gets metrics for web app. + * Gets performance metrics of an app (or deployment slot, if specified). + * Gets performance metrics of an app (or deployment slot, if specified). * - * @param resourceGroupName Name of resource group - * @param name Name of web app + * @param resourceGroupName Name of the resource group to which the resource belongs. + * @param name Name of the app. * @return the observable to the PagedList<ResourceMetricInner> object */ public Observable> listMetricsAsync(final String resourceGroupName, final String name) { @@ -7734,11 +7937,11 @@ public Page call(ServiceResponse> } /** - * Gets metrics for web app. - * Gets metrics for web app. + * Gets performance metrics of an app (or deployment slot, if specified). + * Gets performance metrics of an app (or deployment slot, if specified). * - * @param resourceGroupName Name of resource group - * @param name Name of web app + * @param resourceGroupName Name of the resource group to which the resource belongs. + * @param name Name of the app. * @return the observable to the PagedList<ResourceMetricInner> object */ public Observable>> listMetricsWithServiceResponseAsync(final String resourceGroupName, final String name) { @@ -7756,11 +7959,11 @@ public Observable>> call(ServiceRespon } /** - * Gets metrics for web app. - * Gets metrics for web app. + * Gets performance metrics of an app (or deployment slot, if specified). + * Gets performance metrics of an app (or deployment slot, if specified). * - * @param resourceGroupName Name of resource group - * @param name Name of web app + * @param resourceGroupName Name of the resource group to which the resource belongs. + * @param name Name of the app. * @return the PagedList<ResourceMetricInner> object wrapped in {@link ServiceResponse} if successful. */ public Observable>> listMetricsSinglePageAsync(final String resourceGroupName, final String name) { @@ -7791,13 +7994,13 @@ public Observable>> call(Response listMetrics(final String resourceGroupName, final String name, final Boolean details, final String filter) { @@ -7811,13 +8014,13 @@ public Page nextPage(String nextPageLink) { } /** - * Gets metrics for web app. - * Gets metrics for web app. + * Gets performance metrics of an app (or deployment slot, if specified). + * Gets performance metrics of an app (or deployment slot, if specified). * - * @param resourceGroupName Name of resource group - * @param name Name of web app - * @param details If true, metric details are included in response - * @param filter Return only usages/metrics specified in the filter. Filter conforms to odata syntax. Example: $filter=(name.value eq 'Metric1' or name.value eq 'Metric2') and startTime eq '2014-01-01T00:00:00Z' and endTime eq '2014-12-31T23:59:59Z' and timeGrain eq duration'[Hour|Minute|Day]'. + * @param resourceGroupName Name of the resource group to which the resource belongs. + * @param name Name of the app. + * @param details Specify "true" to include metric details in the response. It is "false" by default. + * @param filter Return only metrics specified in the filter (using OData syntax). For example: $filter=(name.value eq 'Metric1' or name.value eq 'Metric2') and startTime eq '2014-01-01T00:00:00Z' and endTime eq '2014-12-31T23:59:59Z' and timeGrain eq duration'[Hour|Minute|Day]'. * @param serviceCallback the async ServiceCallback to handle successful and failed responses. * @return the {@link ServiceCall} object */ @@ -7834,13 +8037,13 @@ public Observable>> call(String nextPa } /** - * Gets metrics for web app. - * Gets metrics for web app. + * Gets performance metrics of an app (or deployment slot, if specified). + * Gets performance metrics of an app (or deployment slot, if specified). * - * @param resourceGroupName Name of resource group - * @param name Name of web app - * @param details If true, metric details are included in response - * @param filter Return only usages/metrics specified in the filter. Filter conforms to odata syntax. Example: $filter=(name.value eq 'Metric1' or name.value eq 'Metric2') and startTime eq '2014-01-01T00:00:00Z' and endTime eq '2014-12-31T23:59:59Z' and timeGrain eq duration'[Hour|Minute|Day]'. + * @param resourceGroupName Name of the resource group to which the resource belongs. + * @param name Name of the app. + * @param details Specify "true" to include metric details in the response. It is "false" by default. + * @param filter Return only metrics specified in the filter (using OData syntax). For example: $filter=(name.value eq 'Metric1' or name.value eq 'Metric2') and startTime eq '2014-01-01T00:00:00Z' and endTime eq '2014-12-31T23:59:59Z' and timeGrain eq duration'[Hour|Minute|Day]'. * @return the observable to the PagedList<ResourceMetricInner> object */ public Observable> listMetricsAsync(final String resourceGroupName, final String name, final Boolean details, final String filter) { @@ -7854,13 +8057,13 @@ public Page call(ServiceResponse> } /** - * Gets metrics for web app. - * Gets metrics for web app. + * Gets performance metrics of an app (or deployment slot, if specified). + * Gets performance metrics of an app (or deployment slot, if specified). * - * @param resourceGroupName Name of resource group - * @param name Name of web app - * @param details If true, metric details are included in response - * @param filter Return only usages/metrics specified in the filter. Filter conforms to odata syntax. Example: $filter=(name.value eq 'Metric1' or name.value eq 'Metric2') and startTime eq '2014-01-01T00:00:00Z' and endTime eq '2014-12-31T23:59:59Z' and timeGrain eq duration'[Hour|Minute|Day]'. + * @param resourceGroupName Name of the resource group to which the resource belongs. + * @param name Name of the app. + * @param details Specify "true" to include metric details in the response. It is "false" by default. + * @param filter Return only metrics specified in the filter (using OData syntax). For example: $filter=(name.value eq 'Metric1' or name.value eq 'Metric2') and startTime eq '2014-01-01T00:00:00Z' and endTime eq '2014-12-31T23:59:59Z' and timeGrain eq duration'[Hour|Minute|Day]'. * @return the observable to the PagedList<ResourceMetricInner> object */ public Observable>> listMetricsWithServiceResponseAsync(final String resourceGroupName, final String name, final Boolean details, final String filter) { @@ -7878,13 +8081,13 @@ public Observable>> call(ServiceRespon } /** - * Gets metrics for web app. - * Gets metrics for web app. + * Gets performance metrics of an app (or deployment slot, if specified). + * Gets performance metrics of an app (or deployment slot, if specified). * - ServiceResponse> * @param resourceGroupName Name of resource group - ServiceResponse> * @param name Name of web app - ServiceResponse> * @param details If true, metric details are included in response - ServiceResponse> * @param filter Return only usages/metrics specified in the filter. Filter conforms to odata syntax. Example: $filter=(name.value eq 'Metric1' or name.value eq 'Metric2') and startTime eq '2014-01-01T00:00:00Z' and endTime eq '2014-12-31T23:59:59Z' and timeGrain eq duration'[Hour|Minute|Day]'. + ServiceResponse> * @param resourceGroupName Name of the resource group to which the resource belongs. + ServiceResponse> * @param name Name of the app. + ServiceResponse> * @param details Specify "true" to include metric details in the response. It is "false" by default. + ServiceResponse> * @param filter Return only metrics specified in the filter (using OData syntax). For example: $filter=(name.value eq 'Metric1' or name.value eq 'Metric2') and startTime eq '2014-01-01T00:00:00Z' and endTime eq '2014-12-31T23:59:59Z' and timeGrain eq duration'[Hour|Minute|Day]'. * @return the PagedList<ResourceMetricInner> object wrapped in {@link ServiceResponse} if successful. */ public Observable>> listMetricsSinglePageAsync(final String resourceGroupName, final String name, final Boolean details, final String filter) { @@ -7923,7 +8126,7 @@ private ServiceResponse> listMetricsDelegate(Respo * Restores a web app. * Restores a web app. * - * @param resourceGroupName Name of resource group + * @param resourceGroupName Name of the resource group to which the resource belongs. * @param name Name of web app * @param subscriptionName Azure subscription * @param options Migration options @@ -7937,7 +8140,7 @@ public StorageMigrationResponseInner migrateStorage(String resourceGroupName, St * Restores a web app. * Restores a web app. * - * @param resourceGroupName Name of resource group + * @param resourceGroupName Name of the resource group to which the resource belongs. * @param name Name of web app * @param subscriptionName Azure subscription * @param options Migration options @@ -7952,7 +8155,7 @@ public ServiceCall migrateStorageAsync(String res * Restores a web app. * Restores a web app. * - * @param resourceGroupName Name of resource group + * @param resourceGroupName Name of the resource group to which the resource belongs. * @param name Name of web app * @param subscriptionName Azure subscription * @param options Migration options @@ -7971,7 +8174,7 @@ public StorageMigrationResponseInner call(ServiceResponse> migrateStorage * Restores a web app. * Restores a web app. * - * @param resourceGroupName Name of resource group + * @param resourceGroupName Name of the resource group to which the resource belongs. * @param name Name of web app * @param subscriptionName Azure subscription * @param options Migration options @@ -8017,7 +8220,7 @@ public StorageMigrationResponseInner beginMigrateStorage(String resourceGroupNam * Restores a web app. * Restores a web app. * - * @param resourceGroupName Name of resource group + * @param resourceGroupName Name of the resource group to which the resource belongs. * @param name Name of web app * @param subscriptionName Azure subscription * @param options Migration options @@ -8032,7 +8235,7 @@ public ServiceCall beginMigrateStorageAsync(Strin * Restores a web app. * Restores a web app. * - * @param resourceGroupName Name of resource group + * @param resourceGroupName Name of the resource group to which the resource belongs. * @param name Name of web app * @param subscriptionName Azure subscription * @param options Migration options @@ -8051,7 +8254,7 @@ public StorageMigrationResponseInner call(ServiceResponse beginMigrateStorageDelega * Migrates a local (in-app) MySql database to a remote MySql database. * Migrates a local (in-app) MySql database to a remote MySql database. * - * @param resourceGroupName Name of resource group + * @param resourceGroupName Name of the resource group to which the resource belongs. * @param name Name of web app * @param migrationRequestEnvelope MySql migration options * @return the OperationInner object if successful. @@ -8113,7 +8316,7 @@ public OperationInner migrateMySql(String resourceGroupName, String name, Migrat * Migrates a local (in-app) MySql database to a remote MySql database. * Migrates a local (in-app) MySql database to a remote MySql database. * - * @param resourceGroupName Name of resource group + * @param resourceGroupName Name of the resource group to which the resource belongs. * @param name Name of web app * @param migrationRequestEnvelope MySql migration options * @param serviceCallback the async ServiceCallback to handle successful and failed responses. @@ -8127,7 +8330,7 @@ public ServiceCall migrateMySqlAsync(String resourceGroupName, S * Migrates a local (in-app) MySql database to a remote MySql database. * Migrates a local (in-app) MySql database to a remote MySql database. * - * @param resourceGroupName Name of resource group + * @param resourceGroupName Name of the resource group to which the resource belongs. * @param name Name of web app * @param migrationRequestEnvelope MySql migration options * @return the observable for the request @@ -8145,7 +8348,7 @@ public OperationInner call(ServiceResponse response) { * Migrates a local (in-app) MySql database to a remote MySql database. * Migrates a local (in-app) MySql database to a remote MySql database. * - * @param resourceGroupName Name of resource group + * @param resourceGroupName Name of the resource group to which the resource belongs. * @param name Name of web app * @param migrationRequestEnvelope MySql migration options * @return the observable for the request @@ -8173,7 +8376,7 @@ public Observable> migrateMySqlWithServiceRespon * Migrates a local (in-app) MySql database to a remote MySql database. * Migrates a local (in-app) MySql database to a remote MySql database. * - * @param resourceGroupName Name of resource group + * @param resourceGroupName Name of the resource group to which the resource belongs. * @param name Name of web app * @param migrationRequestEnvelope MySql migration options * @return the OperationInner object if successful. @@ -8186,7 +8389,7 @@ public OperationInner beginMigrateMySql(String resourceGroupName, String name, M * Migrates a local (in-app) MySql database to a remote MySql database. * Migrates a local (in-app) MySql database to a remote MySql database. * - * @param resourceGroupName Name of resource group + * @param resourceGroupName Name of the resource group to which the resource belongs. * @param name Name of web app * @param migrationRequestEnvelope MySql migration options * @param serviceCallback the async ServiceCallback to handle successful and failed responses. @@ -8200,7 +8403,7 @@ public ServiceCall beginMigrateMySqlAsync(String resourceGroupNa * Migrates a local (in-app) MySql database to a remote MySql database. * Migrates a local (in-app) MySql database to a remote MySql database. * - * @param resourceGroupName Name of resource group + * @param resourceGroupName Name of the resource group to which the resource belongs. * @param name Name of web app * @param migrationRequestEnvelope MySql migration options * @return the observable to the OperationInner object @@ -8218,7 +8421,7 @@ public OperationInner call(ServiceResponse response) { * Migrates a local (in-app) MySql database to a remote MySql database. * Migrates a local (in-app) MySql database to a remote MySql database. * - * @param resourceGroupName Name of resource group + * @param resourceGroupName Name of the resource group to which the resource belongs. * @param name Name of web app * @param migrationRequestEnvelope MySql migration options * @return the observable to the OperationInner object @@ -8260,11 +8463,11 @@ private ServiceResponse beginMigrateMySqlDelegate(Response listNetworkFeaturesAsync(String resourc } /** - * Retrieves a view of all network features in use on this web app. - * Retrieves a view of all network features in use on this web app. + * Gets all network features used by the app (or deployment slot, if specified). + * Gets all network features used by the app (or deployment slot, if specified). * - * @param resourceGroupName The resource group name - * @param name The name of the web app + * @param resourceGroupName Name of the resource group to which the resource belongs. + * @param name Name of the app. * @param view The type of view. This can either be "summary" or "detailed". * @return the observable to the NetworkFeaturesInner object */ @@ -8305,11 +8508,11 @@ public NetworkFeaturesInner call(ServiceResponse response) } /** - * Retrieves a view of all network features in use on this web app. - * Retrieves a view of all network features in use on this web app. + * Gets all network features used by the app (or deployment slot, if specified). + * Gets all network features used by the app (or deployment slot, if specified). * - * @param resourceGroupName The resource group name - * @param name The name of the web app + * @param resourceGroupName Name of the resource group to which the resource belongs. + * @param name Name of the app. * @param view The type of view. This can either be "summary" or "detailed". * @return the observable to the NetworkFeaturesInner object */ @@ -8353,7 +8556,7 @@ private ServiceResponse listNetworkFeaturesDelegate(Respon * Start capturing network packets for the site. * Start capturing network packets for the site. * - * @param resourceGroupName The resource group name + * @param resourceGroupName Name of the resource group to which the resource belongs. * @param name The name of the web app * @return the String object if successful. */ @@ -8365,7 +8568,7 @@ public String startWebSiteNetworkTrace(String resourceGroupName, String name) { * Start capturing network packets for the site. * Start capturing network packets for the site. * - * @param resourceGroupName The resource group name + * @param resourceGroupName Name of the resource group to which the resource belongs. * @param name The name of the web app * @param serviceCallback the async ServiceCallback to handle successful and failed responses. * @return the {@link ServiceCall} object @@ -8378,7 +8581,7 @@ public ServiceCall startWebSiteNetworkTraceAsync(String resourceGroupNam * Start capturing network packets for the site. * Start capturing network packets for the site. * - * @param resourceGroupName The resource group name + * @param resourceGroupName Name of the resource group to which the resource belongs. * @param name The name of the web app * @return the observable to the String object */ @@ -8395,7 +8598,7 @@ public String call(ServiceResponse response) { * Start capturing network packets for the site. * Start capturing network packets for the site. * - * @param resourceGroupName The resource group name + * @param resourceGroupName Name of the resource group to which the resource belongs. * @param name The name of the web app * @return the observable to the String object */ @@ -8429,7 +8632,7 @@ public Observable> call(Response response) * Start capturing network packets for the site. * Start capturing network packets for the site. * - * @param resourceGroupName The resource group name + * @param resourceGroupName Name of the resource group to which the resource belongs. * @param name The name of the web app * @param durationInSeconds The duration to keep capturing in seconds * @return the String object if successful. @@ -8442,7 +8645,7 @@ public String startWebSiteNetworkTrace(String resourceGroupName, String name, In * Start capturing network packets for the site. * Start capturing network packets for the site. * - * @param resourceGroupName The resource group name + * @param resourceGroupName Name of the resource group to which the resource belongs. * @param name The name of the web app * @param durationInSeconds The duration to keep capturing in seconds * @param serviceCallback the async ServiceCallback to handle successful and failed responses. @@ -8456,7 +8659,7 @@ public ServiceCall startWebSiteNetworkTraceAsync(String resourceGroupNam * Start capturing network packets for the site. * Start capturing network packets for the site. * - * @param resourceGroupName The resource group name + * @param resourceGroupName Name of the resource group to which the resource belongs. * @param name The name of the web app * @param durationInSeconds The duration to keep capturing in seconds * @return the observable to the String object @@ -8474,7 +8677,7 @@ public String call(ServiceResponse response) { * Start capturing network packets for the site. * Start capturing network packets for the site. * - * @param resourceGroupName The resource group name + * @param resourceGroupName Name of the resource group to which the resource belongs. * @param name The name of the web app * @param durationInSeconds The duration to keep capturing in seconds * @return the observable to the String object @@ -8515,7 +8718,7 @@ private ServiceResponse startWebSiteNetworkTraceDelegate(Response stopWebSiteNetworkTraceAsync(String resourceGroupName * Stop ongoing capturing network packets for the site. * Stop ongoing capturing network packets for the site. * - * @param resourceGroupName The resource group name + * @param resourceGroupName Name of the resource group to which the resource belongs. * @param name The name of the web app * @return the observable to the String object */ @@ -8557,7 +8760,7 @@ public String call(ServiceResponse response) { * Stop ongoing capturing network packets for the site. * Stop ongoing capturing network packets for the site. * - * @param resourceGroupName The resource group name + * @param resourceGroupName Name of the resource group to which the resource belongs. * @param name The name of the web app * @return the observable to the String object */ @@ -8594,56 +8797,55 @@ private ServiceResponse stopWebSiteNetworkTraceDelegate(Response generateNewSitePublishingPasswordAsync(String resourceGroupName, String name, final ServiceCallback serviceCallback) { + public ServiceCall generateNewSitePublishingPasswordAsync(String resourceGroupName, String name, final ServiceCallback serviceCallback) { return ServiceCall.create(generateNewSitePublishingPasswordWithServiceResponseAsync(resourceGroupName, name), serviceCallback); } /** - * Generates new random app publishing password. - * Generates new random app publishing password. + * Generates a new publishing password for an app (or deployment slot, if specified). + * Generates a new publishing password for an app (or deployment slot, if specified). * - * @param resourceGroupName Name of resource group - * @param name Name of web app - * @return the observable to the Object object + * @param resourceGroupName Name of the resource group to which the resource belongs. + * @param name Name of the app. + * @return the {@link ServiceResponse} object if successful. */ - public Observable generateNewSitePublishingPasswordAsync(String resourceGroupName, String name) { - return generateNewSitePublishingPasswordWithServiceResponseAsync(resourceGroupName, name).map(new Func1, Object>() { + public Observable generateNewSitePublishingPasswordAsync(String resourceGroupName, String name) { + return generateNewSitePublishingPasswordWithServiceResponseAsync(resourceGroupName, name).map(new Func1, Void>() { @Override - public Object call(ServiceResponse response) { + public Void call(ServiceResponse response) { return response.getBody(); } }); } /** - * Generates new random app publishing password. - * Generates new random app publishing password. + * Generates a new publishing password for an app (or deployment slot, if specified). + * Generates a new publishing password for an app (or deployment slot, if specified). * - * @param resourceGroupName Name of resource group - * @param name Name of web app - * @return the observable to the Object object + * @param resourceGroupName Name of the resource group to which the resource belongs. + * @param name Name of the app. + * @return the {@link ServiceResponse} object if successful. */ - public Observable> generateNewSitePublishingPasswordWithServiceResponseAsync(String resourceGroupName, String name) { + public Observable> generateNewSitePublishingPasswordWithServiceResponseAsync(String resourceGroupName, String name) { if (resourceGroupName == null) { throw new IllegalArgumentException("Parameter resourceGroupName is required and cannot be null."); } @@ -8655,100 +8857,11 @@ public Observable> generateNewSitePublishingPasswordWith } final String apiVersion = "2016-08-01"; return service.generateNewSitePublishingPassword(resourceGroupName, name, this.client.subscriptionId(), apiVersion, this.client.acceptLanguage(), this.client.userAgent()) - .flatMap(new Func1, Observable>>() { - @Override - public Observable> call(Response response) { - try { - ServiceResponse clientResponse = generateNewSitePublishingPasswordDelegate(response); - return Observable.just(clientResponse); - } catch (Throwable t) { - return Observable.error(t); - } - } - }); - } - - private ServiceResponse generateNewSitePublishingPasswordDelegate(Response response) throws CloudException, IOException, IllegalArgumentException { - return new AzureServiceResponseBuilder(this.client.mapperAdapter()) - .register(200, new TypeToken() { }.getType()) - .registerError(CloudException.class) - .build(response); - } - - /** - * Gets the operation for a web app. - * Gets the operation for a web app. - * - * @param resourceGroupName Name of resource group - * @param name Name of web app - * @param operationId Id of an operation - * @return the Object object if successful. - */ - public Object getOperation(String resourceGroupName, String name, String operationId) { - return getOperationWithServiceResponseAsync(resourceGroupName, name, operationId).toBlocking().single().getBody(); - } - - /** - * Gets the operation for a web app. - * Gets the operation for a web app. - * - * @param resourceGroupName Name of resource group - * @param name Name of web app - * @param operationId Id of an operation - * @param serviceCallback the async ServiceCallback to handle successful and failed responses. - * @return the {@link ServiceCall} object - */ - public ServiceCall getOperationAsync(String resourceGroupName, String name, String operationId, final ServiceCallback serviceCallback) { - return ServiceCall.create(getOperationWithServiceResponseAsync(resourceGroupName, name, operationId), serviceCallback); - } - - /** - * Gets the operation for a web app. - * Gets the operation for a web app. - * - * @param resourceGroupName Name of resource group - * @param name Name of web app - * @param operationId Id of an operation - * @return the observable to the Object object - */ - public Observable getOperationAsync(String resourceGroupName, String name, String operationId) { - return getOperationWithServiceResponseAsync(resourceGroupName, name, operationId).map(new Func1, Object>() { - @Override - public Object call(ServiceResponse response) { - return response.getBody(); - } - }); - } - - /** - * Gets the operation for a web app. - * Gets the operation for a web app. - * - * @param resourceGroupName Name of resource group - * @param name Name of web app - * @param operationId Id of an operation - * @return the observable to the Object object - */ - public Observable> getOperationWithServiceResponseAsync(String resourceGroupName, String name, String operationId) { - if (resourceGroupName == null) { - throw new IllegalArgumentException("Parameter resourceGroupName is required and cannot be null."); - } - if (name == null) { - throw new IllegalArgumentException("Parameter name is required and cannot be null."); - } - if (operationId == null) { - throw new IllegalArgumentException("Parameter operationId is required and cannot be null."); - } - if (this.client.subscriptionId() == null) { - throw new IllegalArgumentException("Parameter this.client.subscriptionId() is required and cannot be null."); - } - final String apiVersion = "2016-08-01"; - return service.getOperation(resourceGroupName, name, operationId, this.client.subscriptionId(), apiVersion, this.client.acceptLanguage(), this.client.userAgent()) - .flatMap(new Func1, Observable>>() { + .flatMap(new Func1, Observable>>() { @Override - public Observable> call(Response response) { + public Observable> call(Response response) { try { - ServiceResponse clientResponse = getOperationDelegate(response); + ServiceResponse clientResponse = generateNewSitePublishingPasswordDelegate(response); return Observable.just(clientResponse); } catch (Throwable t) { return Observable.error(t); @@ -8757,10 +8870,9 @@ public Observable> call(Response response) }); } - private ServiceResponse getOperationDelegate(Response response) throws CloudException, IOException, IllegalArgumentException { - return new AzureServiceResponseBuilder(this.client.mapperAdapter()) - .register(200, new TypeToken() { }.getType()) - .registerError(CloudException.class) + private ServiceResponse generateNewSitePublishingPasswordDelegate(Response response) throws CloudException, IOException, IllegalArgumentException { + return new AzureServiceResponseBuilder(this.client.mapperAdapter()) + .register(204, new TypeToken() { }.getType()) .build(response); } @@ -8768,7 +8880,7 @@ private ServiceResponse getOperationDelegate(Response resp * Gets perfmon counters for web app. * Gets perfmon counters for web app. * - * @param resourceGroupName Name of resource group + * @param resourceGroupName Name of the resource group to which the resource belongs. * @param name Name of web app * @return the PagedList<PerfMonResponseInner> object if successful. */ @@ -8786,7 +8898,7 @@ public Page nextPage(String nextPageLink) { * Gets perfmon counters for web app. * Gets perfmon counters for web app. * - * @param resourceGroupName Name of resource group + * @param resourceGroupName Name of the resource group to which the resource belongs. * @param name Name of web app * @param serviceCallback the async ServiceCallback to handle successful and failed responses. * @return the {@link ServiceCall} object @@ -8807,7 +8919,7 @@ public Observable>> call(String nextP * Gets perfmon counters for web app. * Gets perfmon counters for web app. * - * @param resourceGroupName Name of resource group + * @param resourceGroupName Name of the resource group to which the resource belongs. * @param name Name of web app * @return the observable to the PagedList<PerfMonResponseInner> object */ @@ -8825,7 +8937,7 @@ public Page call(ServiceResponse>> call(ServiceRespo * Gets perfmon counters for web app. * Gets perfmon counters for web app. * - * @param resourceGroupName Name of resource group + * @param resourceGroupName Name of the resource group to which the resource belongs. * @param name Name of web app * @return the PagedList<PerfMonResponseInner> object wrapped in {@link ServiceResponse} if successful. */ @@ -8881,7 +8993,7 @@ public Observable>> call(Response nextPage(String nextPageLink) { * Gets perfmon counters for web app. * Gets perfmon counters for web app. * - * @param resourceGroupName Name of resource group + * @param resourceGroupName Name of the resource group to which the resource belongs. * @param name Name of web app * @param filter Return only usages/metrics specified in the filter. Filter conforms to odata syntax. Example: $filter=(startTime eq '2014-01-01T00:00:00Z' and endTime eq '2014-12-31T23:59:59Z' and timeGrain eq duration'[Hour|Minute|Day]'. * @param serviceCallback the async ServiceCallback to handle successful and failed responses. @@ -8922,7 +9034,7 @@ public Observable>> call(String nextP * Gets perfmon counters for web app. * Gets perfmon counters for web app. * - * @param resourceGroupName Name of resource group + * @param resourceGroupName Name of the resource group to which the resource belongs. * @param name Name of web app * @param filter Return only usages/metrics specified in the filter. Filter conforms to odata syntax. Example: $filter=(startTime eq '2014-01-01T00:00:00Z' and endTime eq '2014-12-31T23:59:59Z' and timeGrain eq duration'[Hour|Minute|Day]'. * @return the observable to the PagedList<PerfMonResponseInner> object @@ -8941,7 +9053,7 @@ public Page call(ServiceResponse>> call(ServiceRespo * Gets perfmon counters for web app. * Gets perfmon counters for web app. * - ServiceResponse> * @param resourceGroupName Name of resource group + ServiceResponse> * @param resourceGroupName Name of the resource group to which the resource belongs. ServiceResponse> * @param name Name of web app ServiceResponse> * @param filter Return only usages/metrics specified in the filter. Filter conforms to odata syntax. Example: $filter=(startTime eq '2014-01-01T00:00:00Z' and endTime eq '2014-12-31T23:59:59Z' and timeGrain eq duration'[Hour|Minute|Day]'. * @return the PagedList<PerfMonResponseInner> object wrapped in {@link ServiceResponse} if successful. @@ -9002,56 +9114,56 @@ private ServiceResponse> listPerfMonCountersDeleg } /** - * Gets sites's event logs. - * Gets sites's event logs. + * Gets web app's event logs. + * Gets web app's event logs. * - * @param resourceGroupName Name of resource group + * @param resourceGroupName Name of the resource group to which the resource belongs. * @param name Name of web app - * @return the List<Object> object if successful. + * @return the SitePhpErrorLogFlagInner object if successful. */ - public List getSitePhpErrorLogFlag(String resourceGroupName, String name) { + public SitePhpErrorLogFlagInner getSitePhpErrorLogFlag(String resourceGroupName, String name) { return getSitePhpErrorLogFlagWithServiceResponseAsync(resourceGroupName, name).toBlocking().single().getBody(); } /** - * Gets sites's event logs. - * Gets sites's event logs. + * Gets web app's event logs. + * Gets web app's event logs. * - * @param resourceGroupName Name of resource group + * @param resourceGroupName Name of the resource group to which the resource belongs. * @param name Name of web app * @param serviceCallback the async ServiceCallback to handle successful and failed responses. * @return the {@link ServiceCall} object */ - public ServiceCall> getSitePhpErrorLogFlagAsync(String resourceGroupName, String name, final ServiceCallback> serviceCallback) { + public ServiceCall getSitePhpErrorLogFlagAsync(String resourceGroupName, String name, final ServiceCallback serviceCallback) { return ServiceCall.create(getSitePhpErrorLogFlagWithServiceResponseAsync(resourceGroupName, name), serviceCallback); } /** - * Gets sites's event logs. - * Gets sites's event logs. + * Gets web app's event logs. + * Gets web app's event logs. * - * @param resourceGroupName Name of resource group + * @param resourceGroupName Name of the resource group to which the resource belongs. * @param name Name of web app - * @return the observable to the List<Object> object + * @return the observable to the SitePhpErrorLogFlagInner object */ - public Observable> getSitePhpErrorLogFlagAsync(String resourceGroupName, String name) { - return getSitePhpErrorLogFlagWithServiceResponseAsync(resourceGroupName, name).map(new Func1>, List>() { + public Observable getSitePhpErrorLogFlagAsync(String resourceGroupName, String name) { + return getSitePhpErrorLogFlagWithServiceResponseAsync(resourceGroupName, name).map(new Func1, SitePhpErrorLogFlagInner>() { @Override - public List call(ServiceResponse> response) { + public SitePhpErrorLogFlagInner call(ServiceResponse response) { return response.getBody(); } }); } /** - * Gets sites's event logs. - * Gets sites's event logs. + * Gets web app's event logs. + * Gets web app's event logs. * - * @param resourceGroupName Name of resource group + * @param resourceGroupName Name of the resource group to which the resource belongs. * @param name Name of web app - * @return the observable to the List<Object> object + * @return the observable to the SitePhpErrorLogFlagInner object */ - public Observable>> getSitePhpErrorLogFlagWithServiceResponseAsync(String resourceGroupName, String name) { + public Observable> getSitePhpErrorLogFlagWithServiceResponseAsync(String resourceGroupName, String name) { if (resourceGroupName == null) { throw new IllegalArgumentException("Parameter resourceGroupName is required and cannot be null."); } @@ -9063,11 +9175,11 @@ public Observable>> getSitePhpErrorLogFlagWithServi } final String apiVersion = "2016-08-01"; return service.getSitePhpErrorLogFlag(resourceGroupName, name, this.client.subscriptionId(), apiVersion, this.client.acceptLanguage(), this.client.userAgent()) - .flatMap(new Func1, Observable>>>() { + .flatMap(new Func1, Observable>>() { @Override - public Observable>> call(Response response) { + public Observable> call(Response response) { try { - ServiceResponse> clientResponse = getSitePhpErrorLogFlagDelegate(response); + ServiceResponse clientResponse = getSitePhpErrorLogFlagDelegate(response); return Observable.just(clientResponse); } catch (Throwable t) { return Observable.error(t); @@ -9076,64 +9188,64 @@ public Observable>> call(Response res }); } - private ServiceResponse> getSitePhpErrorLogFlagDelegate(Response response) throws CloudException, IOException, IllegalArgumentException { - return new AzureServiceResponseBuilder, CloudException>(this.client.mapperAdapter()) - .register(200, new TypeToken>() { }.getType()) + private ServiceResponse getSitePhpErrorLogFlagDelegate(Response response) throws CloudException, IOException, IllegalArgumentException { + return new AzureServiceResponseBuilder(this.client.mapperAdapter()) + .register(200, new TypeToken() { }.getType()) .registerError(CloudException.class) .build(response); } /** - * List premier add ons for web app. - * List premier add ons for web app. + * Gets the premier add-ons of an app. + * Gets the premier add-ons of an app. * - * @param resourceGroupName Resource group - * @param name web app name - * @return the Object object if successful. + * @param resourceGroupName Name of the resource group to which the resource belongs. + * @param name Name of the app. + * @return the PremierAddOnInner object if successful. */ - public Object listPremierAddOns(String resourceGroupName, String name) { + public PremierAddOnInner listPremierAddOns(String resourceGroupName, String name) { return listPremierAddOnsWithServiceResponseAsync(resourceGroupName, name).toBlocking().single().getBody(); } /** - * List premier add ons for web app. - * List premier add ons for web app. + * Gets the premier add-ons of an app. + * Gets the premier add-ons of an app. * - * @param resourceGroupName Resource group - * @param name web app name + * @param resourceGroupName Name of the resource group to which the resource belongs. + * @param name Name of the app. * @param serviceCallback the async ServiceCallback to handle successful and failed responses. * @return the {@link ServiceCall} object */ - public ServiceCall listPremierAddOnsAsync(String resourceGroupName, String name, final ServiceCallback serviceCallback) { + public ServiceCall listPremierAddOnsAsync(String resourceGroupName, String name, final ServiceCallback serviceCallback) { return ServiceCall.create(listPremierAddOnsWithServiceResponseAsync(resourceGroupName, name), serviceCallback); } /** - * List premier add ons for web app. - * List premier add ons for web app. + * Gets the premier add-ons of an app. + * Gets the premier add-ons of an app. * - * @param resourceGroupName Resource group - * @param name web app name - * @return the observable to the Object object + * @param resourceGroupName Name of the resource group to which the resource belongs. + * @param name Name of the app. + * @return the observable to the PremierAddOnInner object */ - public Observable listPremierAddOnsAsync(String resourceGroupName, String name) { - return listPremierAddOnsWithServiceResponseAsync(resourceGroupName, name).map(new Func1, Object>() { + public Observable listPremierAddOnsAsync(String resourceGroupName, String name) { + return listPremierAddOnsWithServiceResponseAsync(resourceGroupName, name).map(new Func1, PremierAddOnInner>() { @Override - public Object call(ServiceResponse response) { + public PremierAddOnInner call(ServiceResponse response) { return response.getBody(); } }); } /** - * List premier add ons for web app. - * List premier add ons for web app. + * Gets the premier add-ons of an app. + * Gets the premier add-ons of an app. * - * @param resourceGroupName Resource group - * @param name web app name - * @return the observable to the Object object + * @param resourceGroupName Name of the resource group to which the resource belongs. + * @param name Name of the app. + * @return the observable to the PremierAddOnInner object */ - public Observable> listPremierAddOnsWithServiceResponseAsync(String resourceGroupName, String name) { + public Observable> listPremierAddOnsWithServiceResponseAsync(String resourceGroupName, String name) { if (resourceGroupName == null) { throw new IllegalArgumentException("Parameter resourceGroupName is required and cannot be null."); } @@ -9145,11 +9257,11 @@ public Observable> listPremierAddOnsWithServiceResponseA } final String apiVersion = "2016-08-01"; return service.listPremierAddOns(resourceGroupName, name, this.client.subscriptionId(), apiVersion, this.client.acceptLanguage(), this.client.userAgent()) - .flatMap(new Func1, Observable>>() { + .flatMap(new Func1, Observable>>() { @Override - public Observable> call(Response response) { + public Observable> call(Response response) { try { - ServiceResponse clientResponse = listPremierAddOnsDelegate(response); + ServiceResponse clientResponse = listPremierAddOnsDelegate(response); return Observable.just(clientResponse); } catch (Throwable t) { return Observable.error(t); @@ -9158,68 +9270,68 @@ public Observable> call(Response response) }); } - private ServiceResponse listPremierAddOnsDelegate(Response response) throws CloudException, IOException, IllegalArgumentException { - return new AzureServiceResponseBuilder(this.client.mapperAdapter()) - .register(200, new TypeToken() { }.getType()) + private ServiceResponse listPremierAddOnsDelegate(Response response) throws CloudException, IOException, IllegalArgumentException { + return new AzureServiceResponseBuilder(this.client.mapperAdapter()) + .register(200, new TypeToken() { }.getType()) .registerError(CloudException.class) .build(response); } /** - * Gets a specific premier add on. - * Gets a specific premier add on. + * Gets a named add-on of an app. + * Gets a named add-on of an app. * - * @param resourceGroupName Resource group - * @param name web app name - * @param premierAddOnName Premier add on - * @return the Object object if successful. + * @param resourceGroupName Name of the resource group to which the resource belongs. + * @param name Name of the app. + * @param premierAddOnName Add-on name. + * @return the PremierAddOnInner object if successful. */ - public Object getPremierAddOn(String resourceGroupName, String name, String premierAddOnName) { + public PremierAddOnInner getPremierAddOn(String resourceGroupName, String name, String premierAddOnName) { return getPremierAddOnWithServiceResponseAsync(resourceGroupName, name, premierAddOnName).toBlocking().single().getBody(); } /** - * Gets a specific premier add on. - * Gets a specific premier add on. + * Gets a named add-on of an app. + * Gets a named add-on of an app. * - * @param resourceGroupName Resource group - * @param name web app name - * @param premierAddOnName Premier add on + * @param resourceGroupName Name of the resource group to which the resource belongs. + * @param name Name of the app. + * @param premierAddOnName Add-on name. * @param serviceCallback the async ServiceCallback to handle successful and failed responses. * @return the {@link ServiceCall} object */ - public ServiceCall getPremierAddOnAsync(String resourceGroupName, String name, String premierAddOnName, final ServiceCallback serviceCallback) { + public ServiceCall getPremierAddOnAsync(String resourceGroupName, String name, String premierAddOnName, final ServiceCallback serviceCallback) { return ServiceCall.create(getPremierAddOnWithServiceResponseAsync(resourceGroupName, name, premierAddOnName), serviceCallback); } /** - * Gets a specific premier add on. - * Gets a specific premier add on. + * Gets a named add-on of an app. + * Gets a named add-on of an app. * - * @param resourceGroupName Resource group - * @param name web app name - * @param premierAddOnName Premier add on - * @return the observable to the Object object + * @param resourceGroupName Name of the resource group to which the resource belongs. + * @param name Name of the app. + * @param premierAddOnName Add-on name. + * @return the observable to the PremierAddOnInner object */ - public Observable getPremierAddOnAsync(String resourceGroupName, String name, String premierAddOnName) { - return getPremierAddOnWithServiceResponseAsync(resourceGroupName, name, premierAddOnName).map(new Func1, Object>() { + public Observable getPremierAddOnAsync(String resourceGroupName, String name, String premierAddOnName) { + return getPremierAddOnWithServiceResponseAsync(resourceGroupName, name, premierAddOnName).map(new Func1, PremierAddOnInner>() { @Override - public Object call(ServiceResponse response) { + public PremierAddOnInner call(ServiceResponse response) { return response.getBody(); } }); } /** - * Gets a specific premier add on. - * Gets a specific premier add on. + * Gets a named add-on of an app. + * Gets a named add-on of an app. * - * @param resourceGroupName Resource group - * @param name web app name - * @param premierAddOnName Premier add on - * @return the observable to the Object object + * @param resourceGroupName Name of the resource group to which the resource belongs. + * @param name Name of the app. + * @param premierAddOnName Add-on name. + * @return the observable to the PremierAddOnInner object */ - public Observable> getPremierAddOnWithServiceResponseAsync(String resourceGroupName, String name, String premierAddOnName) { + public Observable> getPremierAddOnWithServiceResponseAsync(String resourceGroupName, String name, String premierAddOnName) { if (resourceGroupName == null) { throw new IllegalArgumentException("Parameter resourceGroupName is required and cannot be null."); } @@ -9234,11 +9346,11 @@ public Observable> getPremierAddOnWithServiceResponseAsy } final String apiVersion = "2016-08-01"; return service.getPremierAddOn(resourceGroupName, name, premierAddOnName, this.client.subscriptionId(), apiVersion, this.client.acceptLanguage(), this.client.userAgent()) - .flatMap(new Func1, Observable>>() { + .flatMap(new Func1, Observable>>() { @Override - public Observable> call(Response response) { + public Observable> call(Response response) { try { - ServiceResponse clientResponse = getPremierAddOnDelegate(response); + ServiceResponse clientResponse = getPremierAddOnDelegate(response); return Observable.just(clientResponse); } catch (Throwable t) { return Observable.error(t); @@ -9247,72 +9359,72 @@ public Observable> call(Response response) }); } - private ServiceResponse getPremierAddOnDelegate(Response response) throws CloudException, IOException, IllegalArgumentException { - return new AzureServiceResponseBuilder(this.client.mapperAdapter()) - .register(200, new TypeToken() { }.getType()) + private ServiceResponse getPremierAddOnDelegate(Response response) throws CloudException, IOException, IllegalArgumentException { + return new AzureServiceResponseBuilder(this.client.mapperAdapter()) + .register(200, new TypeToken() { }.getType()) .registerError(CloudException.class) .build(response); } /** - * Add premier add-on. - * Add premier add-on. + * Updates a named add-on of an app. + * Updates a named add-on of an app. * - * @param resourceGroupName Resource group - * @param name web app name - * @param premierAddOnName Premier add on - * @param premierAddOn Premier add on request - * @return the Object object if successful. + * @param resourceGroupName Name of the resource group to which the resource belongs. + * @param name Name of the app. + * @param premierAddOnName Add-on name. + * @param premierAddOn A JSON representation of the edited premier add-on. + * @return the PremierAddOnInner object if successful. */ - public Object addPremierAddOn(String resourceGroupName, String name, String premierAddOnName, PremierAddOnRequestInner premierAddOn) { + public PremierAddOnInner addPremierAddOn(String resourceGroupName, String name, String premierAddOnName, PremierAddOnInner premierAddOn) { return addPremierAddOnWithServiceResponseAsync(resourceGroupName, name, premierAddOnName, premierAddOn).toBlocking().single().getBody(); } /** - * Add premier add-on. - * Add premier add-on. + * Updates a named add-on of an app. + * Updates a named add-on of an app. * - * @param resourceGroupName Resource group - * @param name web app name - * @param premierAddOnName Premier add on - * @param premierAddOn Premier add on request + * @param resourceGroupName Name of the resource group to which the resource belongs. + * @param name Name of the app. + * @param premierAddOnName Add-on name. + * @param premierAddOn A JSON representation of the edited premier add-on. * @param serviceCallback the async ServiceCallback to handle successful and failed responses. * @return the {@link ServiceCall} object */ - public ServiceCall addPremierAddOnAsync(String resourceGroupName, String name, String premierAddOnName, PremierAddOnRequestInner premierAddOn, final ServiceCallback serviceCallback) { + public ServiceCall addPremierAddOnAsync(String resourceGroupName, String name, String premierAddOnName, PremierAddOnInner premierAddOn, final ServiceCallback serviceCallback) { return ServiceCall.create(addPremierAddOnWithServiceResponseAsync(resourceGroupName, name, premierAddOnName, premierAddOn), serviceCallback); } /** - * Add premier add-on. - * Add premier add-on. + * Updates a named add-on of an app. + * Updates a named add-on of an app. * - * @param resourceGroupName Resource group - * @param name web app name - * @param premierAddOnName Premier add on - * @param premierAddOn Premier add on request - * @return the observable to the Object object + * @param resourceGroupName Name of the resource group to which the resource belongs. + * @param name Name of the app. + * @param premierAddOnName Add-on name. + * @param premierAddOn A JSON representation of the edited premier add-on. + * @return the observable to the PremierAddOnInner object */ - public Observable addPremierAddOnAsync(String resourceGroupName, String name, String premierAddOnName, PremierAddOnRequestInner premierAddOn) { - return addPremierAddOnWithServiceResponseAsync(resourceGroupName, name, premierAddOnName, premierAddOn).map(new Func1, Object>() { + public Observable addPremierAddOnAsync(String resourceGroupName, String name, String premierAddOnName, PremierAddOnInner premierAddOn) { + return addPremierAddOnWithServiceResponseAsync(resourceGroupName, name, premierAddOnName, premierAddOn).map(new Func1, PremierAddOnInner>() { @Override - public Object call(ServiceResponse response) { + public PremierAddOnInner call(ServiceResponse response) { return response.getBody(); } }); } /** - * Add premier add-on. - * Add premier add-on. + * Updates a named add-on of an app. + * Updates a named add-on of an app. * - * @param resourceGroupName Resource group - * @param name web app name - * @param premierAddOnName Premier add on - * @param premierAddOn Premier add on request - * @return the observable to the Object object + * @param resourceGroupName Name of the resource group to which the resource belongs. + * @param name Name of the app. + * @param premierAddOnName Add-on name. + * @param premierAddOn A JSON representation of the edited premier add-on. + * @return the observable to the PremierAddOnInner object */ - public Observable> addPremierAddOnWithServiceResponseAsync(String resourceGroupName, String name, String premierAddOnName, PremierAddOnRequestInner premierAddOn) { + public Observable> addPremierAddOnWithServiceResponseAsync(String resourceGroupName, String name, String premierAddOnName, PremierAddOnInner premierAddOn) { if (resourceGroupName == null) { throw new IllegalArgumentException("Parameter resourceGroupName is required and cannot be null."); } @@ -9331,11 +9443,11 @@ public Observable> addPremierAddOnWithServiceResponseAsy Validator.validate(premierAddOn); final String apiVersion = "2016-08-01"; return service.addPremierAddOn(resourceGroupName, name, premierAddOnName, this.client.subscriptionId(), premierAddOn, apiVersion, this.client.acceptLanguage(), this.client.userAgent()) - .flatMap(new Func1, Observable>>() { + .flatMap(new Func1, Observable>>() { @Override - public Observable> call(Response response) { + public Observable> call(Response response) { try { - ServiceResponse clientResponse = addPremierAddOnDelegate(response); + ServiceResponse clientResponse = addPremierAddOnDelegate(response); return Observable.just(clientResponse); } catch (Throwable t) { return Observable.error(t); @@ -9344,68 +9456,67 @@ public Observable> call(Response response) }); } - private ServiceResponse addPremierAddOnDelegate(Response response) throws CloudException, IOException, IllegalArgumentException { - return new AzureServiceResponseBuilder(this.client.mapperAdapter()) - .register(200, new TypeToken() { }.getType()) + private ServiceResponse addPremierAddOnDelegate(Response response) throws CloudException, IOException, IllegalArgumentException { + return new AzureServiceResponseBuilder(this.client.mapperAdapter()) + .register(200, new TypeToken() { }.getType()) .registerError(CloudException.class) .build(response); } /** - * Delete premier add-on. - * Delete premier add-on. + * Delete a premier add-on from an app. + * Delete a premier add-on from an app. * - * @param resourceGroupName Resource group - * @param name web app name - * @param premierAddOnName Premier add on - * @return the Object object if successful. + * @param resourceGroupName Name of the resource group to which the resource belongs. + * @param name Name of the app. + * @param premierAddOnName Add-on name. */ - public Object deletePremierAddOn(String resourceGroupName, String name, String premierAddOnName) { - return deletePremierAddOnWithServiceResponseAsync(resourceGroupName, name, premierAddOnName).toBlocking().single().getBody(); + public void deletePremierAddOn(String resourceGroupName, String name, String premierAddOnName) { + deletePremierAddOnWithServiceResponseAsync(resourceGroupName, name, premierAddOnName).toBlocking().single().getBody(); } /** - * Delete premier add-on. - * Delete premier add-on. + * Delete a premier add-on from an app. + * Delete a premier add-on from an app. * - * @param resourceGroupName Resource group - * @param name web app name - * @param premierAddOnName Premier add on + * @param resourceGroupName Name of the resource group to which the resource belongs. + * @param name Name of the app. + * @param premierAddOnName Add-on name. * @param serviceCallback the async ServiceCallback to handle successful and failed responses. * @return the {@link ServiceCall} object */ - public ServiceCall deletePremierAddOnAsync(String resourceGroupName, String name, String premierAddOnName, final ServiceCallback serviceCallback) { + public ServiceCall deletePremierAddOnAsync(String resourceGroupName, String name, String premierAddOnName, final ServiceCallback serviceCallback) { return ServiceCall.create(deletePremierAddOnWithServiceResponseAsync(resourceGroupName, name, premierAddOnName), serviceCallback); } /** - * Delete premier add-on. - * Delete premier add-on. + * Delete a premier add-on from an app. + * Delete a premier add-on from an app. * - * @param resourceGroupName Resource group - * @param name web app name - * @param premierAddOnName Premier add on - * @return the observable to the Object object + * @param resourceGroupName Name of the resource group to which the resource belongs. + * @param name Name of the app. + * @param premierAddOnName Add-on name. + * @return the {@link ServiceResponse} object if successful. */ - public Observable deletePremierAddOnAsync(String resourceGroupName, String name, String premierAddOnName) { - return deletePremierAddOnWithServiceResponseAsync(resourceGroupName, name, premierAddOnName).map(new Func1, Object>() { + public Observable deletePremierAddOnAsync(String resourceGroupName, String name, String premierAddOnName) { + return deletePremierAddOnWithServiceResponseAsync(resourceGroupName, name, premierAddOnName).map(new Func1, Void>() { @Override - public Object call(ServiceResponse response) { + public Void call(ServiceResponse response) { return response.getBody(); } }); } /** - * Delete premier add-on. - * Delete premier add-on. + * Delete a premier add-on from an app. + * Delete a premier add-on from an app. * - * @param resourceGroupName Resource group - * @param name web app name - * @param premierAddOnName Premier add on - * @return the observable to the Object object + * @param resourceGroupName Name of the resource group to which the resource belongs. + * @param name Name of the app. + * @param premierAddOnName Add-on name. + * @return the {@link ServiceResponse} object if successful. */ - public Observable> deletePremierAddOnWithServiceResponseAsync(String resourceGroupName, String name, String premierAddOnName) { + public Observable> deletePremierAddOnWithServiceResponseAsync(String resourceGroupName, String name, String premierAddOnName) { if (resourceGroupName == null) { throw new IllegalArgumentException("Parameter resourceGroupName is required and cannot be null."); } @@ -9420,11 +9531,11 @@ public Observable> deletePremierAddOnWithServiceResponse } final String apiVersion = "2016-08-01"; return service.deletePremierAddOn(resourceGroupName, name, premierAddOnName, this.client.subscriptionId(), apiVersion, this.client.acceptLanguage(), this.client.userAgent()) - .flatMap(new Func1, Observable>>() { + .flatMap(new Func1, Observable>>() { @Override - public Observable> call(Response response) { + public Observable> call(Response response) { try { - ServiceResponse clientResponse = deletePremierAddOnDelegate(response); + ServiceResponse clientResponse = deletePremierAddOnDelegate(response); return Observable.just(clientResponse); } catch (Throwable t) { return Observable.error(t); @@ -9433,19 +9544,18 @@ public Observable> call(Response response) }); } - private ServiceResponse deletePremierAddOnDelegate(Response response) throws CloudException, IOException, IllegalArgumentException { - return new AzureServiceResponseBuilder(this.client.mapperAdapter()) - .register(200, new TypeToken() { }.getType()) - .registerError(CloudException.class) + private ServiceResponse deletePremierAddOnDelegate(Response response) throws CloudException, IOException, IllegalArgumentException { + return new AzureServiceResponseBuilder(this.client.mapperAdapter()) + .register(200, new TypeToken() { }.getType()) .build(response); } /** - * Gets the publishing profile for web app. - * Gets the publishing profile for web app. + * Gets the publishing profile for an app (or deployment slot, if specified). + * Gets the publishing profile for an app (or deployment slot, if specified). * - * @param resourceGroupName Name of resource group - * @param name Name of web app + * @param resourceGroupName Name of the resource group to which the resource belongs. + * @param name Name of the app. * @return the InputStream object if successful. */ public InputStream listPublishingProfileXmlWithSecrets(String resourceGroupName, String name) { @@ -9453,11 +9563,11 @@ public InputStream listPublishingProfileXmlWithSecrets(String resourceGroupName, } /** - * Gets the publishing profile for web app. - * Gets the publishing profile for web app. + * Gets the publishing profile for an app (or deployment slot, if specified). + * Gets the publishing profile for an app (or deployment slot, if specified). * - * @param resourceGroupName Name of resource group - * @param name Name of web app + * @param resourceGroupName Name of the resource group to which the resource belongs. + * @param name Name of the app. * @param serviceCallback the async ServiceCallback to handle successful and failed responses. * @return the {@link ServiceCall} object */ @@ -9466,11 +9576,11 @@ public ServiceCall listPublishingProfileXmlWithSecretsAsync(String } /** - * Gets the publishing profile for web app. - * Gets the publishing profile for web app. + * Gets the publishing profile for an app (or deployment slot, if specified). + * Gets the publishing profile for an app (or deployment slot, if specified). * - * @param resourceGroupName Name of resource group - * @param name Name of web app + * @param resourceGroupName Name of the resource group to which the resource belongs. + * @param name Name of the app. * @return the observable to the InputStream object */ public Observable listPublishingProfileXmlWithSecretsAsync(String resourceGroupName, String name) { @@ -9483,11 +9593,11 @@ public InputStream call(ServiceResponse response) { } /** - * Gets the publishing profile for web app. - * Gets the publishing profile for web app. + * Gets the publishing profile for an app (or deployment slot, if specified). + * Gets the publishing profile for an app (or deployment slot, if specified). * - * @param resourceGroupName Name of resource group - * @param name Name of web app + * @param resourceGroupName Name of the resource group to which the resource belongs. + * @param name Name of the app. * @return the observable to the InputStream object */ public Observable> listPublishingProfileXmlWithSecretsWithServiceResponseAsync(String resourceGroupName, String name) { @@ -9501,7 +9611,7 @@ public Observable> listPublishingProfileXmlWithSecr throw new IllegalArgumentException("Parameter this.client.subscriptionId() is required and cannot be null."); } final String apiVersion = "2016-08-01"; - final String format = null; + final PublishingProfileFormat format = null; CsmPublishingProfileOptions options = new CsmPublishingProfileOptions(); options.withFormat(null); return service.listPublishingProfileXmlWithSecrets(resourceGroupName, name, this.client.subscriptionId(), apiVersion, this.client.acceptLanguage(), options, this.client.userAgent()) @@ -9519,51 +9629,51 @@ public Observable> call(Response resp } /** - * Gets the publishing profile for web app. - * Gets the publishing profile for web app. + * Gets the publishing profile for an app (or deployment slot, if specified). + * Gets the publishing profile for an app (or deployment slot, if specified). * - * @param resourceGroupName Name of resource group - * @param name Name of web app + * @param resourceGroupName Name of the resource group to which the resource belongs. + * @param name Name of the app. * @param format Name of the format. Valid values are: - FileZilla3 - WebDeploy -- default - Ftp + FileZilla3 + WebDeploy -- default + Ftp. Possible values include: 'FileZilla3', 'WebDeploy', 'Ftp' * @return the InputStream object if successful. */ - public InputStream listPublishingProfileXmlWithSecrets(String resourceGroupName, String name, String format) { + public InputStream listPublishingProfileXmlWithSecrets(String resourceGroupName, String name, PublishingProfileFormat format) { return listPublishingProfileXmlWithSecretsWithServiceResponseAsync(resourceGroupName, name, format).toBlocking().single().getBody(); } /** - * Gets the publishing profile for web app. - * Gets the publishing profile for web app. + * Gets the publishing profile for an app (or deployment slot, if specified). + * Gets the publishing profile for an app (or deployment slot, if specified). * - * @param resourceGroupName Name of resource group - * @param name Name of web app + * @param resourceGroupName Name of the resource group to which the resource belongs. + * @param name Name of the app. * @param format Name of the format. Valid values are: - FileZilla3 - WebDeploy -- default - Ftp + FileZilla3 + WebDeploy -- default + Ftp. Possible values include: 'FileZilla3', 'WebDeploy', 'Ftp' * @param serviceCallback the async ServiceCallback to handle successful and failed responses. * @return the {@link ServiceCall} object */ - public ServiceCall listPublishingProfileXmlWithSecretsAsync(String resourceGroupName, String name, String format, final ServiceCallback serviceCallback) { + public ServiceCall listPublishingProfileXmlWithSecretsAsync(String resourceGroupName, String name, PublishingProfileFormat format, final ServiceCallback serviceCallback) { return ServiceCall.create(listPublishingProfileXmlWithSecretsWithServiceResponseAsync(resourceGroupName, name, format), serviceCallback); } /** - * Gets the publishing profile for web app. - * Gets the publishing profile for web app. + * Gets the publishing profile for an app (or deployment slot, if specified). + * Gets the publishing profile for an app (or deployment slot, if specified). * - * @param resourceGroupName Name of resource group - * @param name Name of web app + * @param resourceGroupName Name of the resource group to which the resource belongs. + * @param name Name of the app. * @param format Name of the format. Valid values are: - FileZilla3 - WebDeploy -- default - Ftp + FileZilla3 + WebDeploy -- default + Ftp. Possible values include: 'FileZilla3', 'WebDeploy', 'Ftp' * @return the observable to the InputStream object */ - public Observable listPublishingProfileXmlWithSecretsAsync(String resourceGroupName, String name, String format) { + public Observable listPublishingProfileXmlWithSecretsAsync(String resourceGroupName, String name, PublishingProfileFormat format) { return listPublishingProfileXmlWithSecretsWithServiceResponseAsync(resourceGroupName, name, format).map(new Func1, InputStream>() { @Override public InputStream call(ServiceResponse response) { @@ -9573,18 +9683,18 @@ public InputStream call(ServiceResponse response) { } /** - * Gets the publishing profile for web app. - * Gets the publishing profile for web app. + * Gets the publishing profile for an app (or deployment slot, if specified). + * Gets the publishing profile for an app (or deployment slot, if specified). * - * @param resourceGroupName Name of resource group - * @param name Name of web app + * @param resourceGroupName Name of the resource group to which the resource belongs. + * @param name Name of the app. * @param format Name of the format. Valid values are: - FileZilla3 - WebDeploy -- default - Ftp + FileZilla3 + WebDeploy -- default + Ftp. Possible values include: 'FileZilla3', 'WebDeploy', 'Ftp' * @return the observable to the InputStream object */ - public Observable> listPublishingProfileXmlWithSecretsWithServiceResponseAsync(String resourceGroupName, String name, String format) { + public Observable> listPublishingProfileXmlWithSecretsWithServiceResponseAsync(String resourceGroupName, String name, PublishingProfileFormat format) { if (resourceGroupName == null) { throw new IllegalArgumentException("Parameter resourceGroupName is required and cannot be null."); } @@ -9622,7 +9732,7 @@ private ServiceResponse listPublishingProfileXmlWithSecretsDelegate * Recovers a deleted web app. * Recovers a deleted web app. * - * @param resourceGroupName Name of resource group + * @param resourceGroupName Name of the resource group to which the resource belongs. * @param name Name of web app * @param recoveryEntity Snapshot data used for web app recovery. Snapshot information can be obtained by calling GetDeletedSites or GetSiteSnapshots API. * @return the RecoverResponseInner object if successful. @@ -9635,7 +9745,7 @@ public RecoverResponseInner recover(String resourceGroupName, String name, CsmSi * Recovers a deleted web app. * Recovers a deleted web app. * - * @param resourceGroupName Name of resource group + * @param resourceGroupName Name of the resource group to which the resource belongs. * @param name Name of web app * @param recoveryEntity Snapshot data used for web app recovery. Snapshot information can be obtained by calling GetDeletedSites or GetSiteSnapshots API. * @param serviceCallback the async ServiceCallback to handle successful and failed responses. @@ -9649,7 +9759,7 @@ public ServiceCall recoverAsync(String resourceGroupName, * Recovers a deleted web app. * Recovers a deleted web app. * - * @param resourceGroupName Name of resource group + * @param resourceGroupName Name of the resource group to which the resource belongs. * @param name Name of web app * @param recoveryEntity Snapshot data used for web app recovery. Snapshot information can be obtained by calling GetDeletedSites or GetSiteSnapshots API. * @return the observable for the request @@ -9667,7 +9777,7 @@ public RecoverResponseInner call(ServiceResponse response) * Recovers a deleted web app. * Recovers a deleted web app. * - * @param resourceGroupName Name of resource group + * @param resourceGroupName Name of the resource group to which the resource belongs. * @param name Name of web app * @param recoveryEntity Snapshot data used for web app recovery. Snapshot information can be obtained by calling GetDeletedSites or GetSiteSnapshots API. * @return the observable for the request @@ -9695,7 +9805,7 @@ public Observable> recoverWithServiceRespo * Recovers a deleted web app. * Recovers a deleted web app. * - * @param resourceGroupName Name of resource group + * @param resourceGroupName Name of the resource group to which the resource belongs. * @param name Name of web app * @param recoveryEntity Snapshot data used for web app recovery. Snapshot information can be obtained by calling GetDeletedSites or GetSiteSnapshots API. * @return the RecoverResponseInner object if successful. @@ -9708,7 +9818,7 @@ public RecoverResponseInner beginRecover(String resourceGroupName, String name, * Recovers a deleted web app. * Recovers a deleted web app. * - * @param resourceGroupName Name of resource group + * @param resourceGroupName Name of the resource group to which the resource belongs. * @param name Name of web app * @param recoveryEntity Snapshot data used for web app recovery. Snapshot information can be obtained by calling GetDeletedSites or GetSiteSnapshots API. * @param serviceCallback the async ServiceCallback to handle successful and failed responses. @@ -9722,7 +9832,7 @@ public ServiceCall beginRecoverAsync(String resourceGroupN * Recovers a deleted web app. * Recovers a deleted web app. * - * @param resourceGroupName Name of resource group + * @param resourceGroupName Name of the resource group to which the resource belongs. * @param name Name of web app * @param recoveryEntity Snapshot data used for web app recovery. Snapshot information can be obtained by calling GetDeletedSites or GetSiteSnapshots API. * @return the observable to the RecoverResponseInner object @@ -9740,7 +9850,7 @@ public RecoverResponseInner call(ServiceResponse response) * Recovers a deleted web app. * Recovers a deleted web app. * - * @param resourceGroupName Name of resource group + * @param resourceGroupName Name of the resource group to which the resource belongs. * @param name Name of web app * @param recoveryEntity Snapshot data used for web app recovery. Snapshot information can be obtained by calling GetDeletedSites or GetSiteSnapshots API. * @return the observable to the RecoverResponseInner object @@ -9782,56 +9892,55 @@ private ServiceResponse beginRecoverDelegate(Response resetProductionSlotConfigAsync(String resourceGroupName, String name, final ServiceCallback serviceCallback) { + public ServiceCall resetProductionSlotConfigAsync(String resourceGroupName, String name, final ServiceCallback serviceCallback) { return ServiceCall.create(resetProductionSlotConfigWithServiceResponseAsync(resourceGroupName, name), serviceCallback); } /** - * Resets the configuration settings of the current slot if they were previously modified by calling ApplySlotConfig API. - * Resets the configuration settings of the current slot if they were previously modified by calling ApplySlotConfig API. + * Resets the configuration settings of the current slot if they were previously modified by calling the API with POST. + * Resets the configuration settings of the current slot if they were previously modified by calling the API with POST. * - * @param resourceGroupName Name of resource group - * @param name Name of web app - * @return the observable to the Object object + * @param resourceGroupName Name of the resource group to which the resource belongs. + * @param name Name of the app. + * @return the {@link ServiceResponse} object if successful. */ - public Observable resetProductionSlotConfigAsync(String resourceGroupName, String name) { - return resetProductionSlotConfigWithServiceResponseAsync(resourceGroupName, name).map(new Func1, Object>() { + public Observable resetProductionSlotConfigAsync(String resourceGroupName, String name) { + return resetProductionSlotConfigWithServiceResponseAsync(resourceGroupName, name).map(new Func1, Void>() { @Override - public Object call(ServiceResponse response) { + public Void call(ServiceResponse response) { return response.getBody(); } }); } /** - * Resets the configuration settings of the current slot if they were previously modified by calling ApplySlotConfig API. - * Resets the configuration settings of the current slot if they were previously modified by calling ApplySlotConfig API. + * Resets the configuration settings of the current slot if they were previously modified by calling the API with POST. + * Resets the configuration settings of the current slot if they were previously modified by calling the API with POST. * - * @param resourceGroupName Name of resource group - * @param name Name of web app - * @return the observable to the Object object + * @param resourceGroupName Name of the resource group to which the resource belongs. + * @param name Name of the app. + * @return the {@link ServiceResponse} object if successful. */ - public Observable> resetProductionSlotConfigWithServiceResponseAsync(String resourceGroupName, String name) { + public Observable> resetProductionSlotConfigWithServiceResponseAsync(String resourceGroupName, String name) { if (resourceGroupName == null) { throw new IllegalArgumentException("Parameter resourceGroupName is required and cannot be null."); } @@ -9843,11 +9952,11 @@ public Observable> resetProductionSlotConfigWithServiceR } final String apiVersion = "2016-08-01"; return service.resetProductionSlotConfig(resourceGroupName, name, this.client.subscriptionId(), apiVersion, this.client.acceptLanguage(), this.client.userAgent()) - .flatMap(new Func1, Observable>>() { + .flatMap(new Func1, Observable>>() { @Override - public Observable> call(Response response) { + public Observable> call(Response response) { try { - ServiceResponse clientResponse = resetProductionSlotConfigDelegate(response); + ServiceResponse clientResponse = resetProductionSlotConfigDelegate(response); return Observable.just(clientResponse); } catch (Throwable t) { return Observable.error(t); @@ -9856,64 +9965,62 @@ public Observable> call(Response response) }); } - private ServiceResponse resetProductionSlotConfigDelegate(Response response) throws CloudException, IOException, IllegalArgumentException { - return new AzureServiceResponseBuilder(this.client.mapperAdapter()) - .register(200, new TypeToken() { }.getType()) - .registerError(CloudException.class) + private ServiceResponse resetProductionSlotConfigDelegate(Response response) throws CloudException, IOException, IllegalArgumentException { + return new AzureServiceResponseBuilder(this.client.mapperAdapter()) + .register(204, new TypeToken() { }.getType()) .build(response); } /** - * Restarts web app. - * Restarts web app. + * Restarts an app (or deployment slot, if specified). + * Restarts an app (or deployment slot, if specified). * - * @param resourceGroupName Name of resource group - * @param name Name of web app - * @return the Object object if successful. + * @param resourceGroupName Name of the resource group to which the resource belongs. + * @param name Name of the app. */ - public Object restart(String resourceGroupName, String name) { - return restartWithServiceResponseAsync(resourceGroupName, name).toBlocking().single().getBody(); + public void restart(String resourceGroupName, String name) { + restartWithServiceResponseAsync(resourceGroupName, name).toBlocking().single().getBody(); } /** - * Restarts web app. - * Restarts web app. + * Restarts an app (or deployment slot, if specified). + * Restarts an app (or deployment slot, if specified). * - * @param resourceGroupName Name of resource group - * @param name Name of web app + * @param resourceGroupName Name of the resource group to which the resource belongs. + * @param name Name of the app. * @param serviceCallback the async ServiceCallback to handle successful and failed responses. * @return the {@link ServiceCall} object */ - public ServiceCall restartAsync(String resourceGroupName, String name, final ServiceCallback serviceCallback) { + public ServiceCall restartAsync(String resourceGroupName, String name, final ServiceCallback serviceCallback) { return ServiceCall.create(restartWithServiceResponseAsync(resourceGroupName, name), serviceCallback); } /** - * Restarts web app. - * Restarts web app. + * Restarts an app (or deployment slot, if specified). + * Restarts an app (or deployment slot, if specified). * - * @param resourceGroupName Name of resource group - * @param name Name of web app - * @return the observable to the Object object + * @param resourceGroupName Name of the resource group to which the resource belongs. + * @param name Name of the app. + * @return the {@link ServiceResponse} object if successful. */ - public Observable restartAsync(String resourceGroupName, String name) { - return restartWithServiceResponseAsync(resourceGroupName, name).map(new Func1, Object>() { + public Observable restartAsync(String resourceGroupName, String name) { + return restartWithServiceResponseAsync(resourceGroupName, name).map(new Func1, Void>() { @Override - public Object call(ServiceResponse response) { + public Void call(ServiceResponse response) { return response.getBody(); } }); } /** - * Restarts web app. - * Restarts web app. + * Restarts an app (or deployment slot, if specified). + * Restarts an app (or deployment slot, if specified). * - * @param resourceGroupName Name of resource group - * @param name Name of web app - * @return the observable to the Object object + * @param resourceGroupName Name of the resource group to which the resource belongs. + * @param name Name of the app. + * @return the {@link ServiceResponse} object if successful. */ - public Observable> restartWithServiceResponseAsync(String resourceGroupName, String name) { + public Observable> restartWithServiceResponseAsync(String resourceGroupName, String name) { if (resourceGroupName == null) { throw new IllegalArgumentException("Parameter resourceGroupName is required and cannot be null."); } @@ -9927,11 +10034,11 @@ public Observable> restartWithServiceResponseAsync(Strin final Boolean softRestart = null; final Boolean synchronous = null; return service.restart(resourceGroupName, name, this.client.subscriptionId(), softRestart, synchronous, apiVersion, this.client.acceptLanguage(), this.client.userAgent()) - .flatMap(new Func1, Observable>>() { + .flatMap(new Func1, Observable>>() { @Override - public Observable> call(Response response) { + public Observable> call(Response response) { try { - ServiceResponse clientResponse = restartDelegate(response); + ServiceResponse clientResponse = restartDelegate(response); return Observable.just(clientResponse); } catch (Throwable t) { return Observable.error(t); @@ -9941,64 +10048,63 @@ public Observable> call(Response response) } /** - * Restarts web app. - * Restarts web app. + * Restarts an app (or deployment slot, if specified). + * Restarts an app (or deployment slot, if specified). * - * @param resourceGroupName Name of resource group - * @param name Name of web app - * @param softRestart Soft restart applies the configuration settings and restarts the app if necessary. Hard restart always restarts and reprovisions the app - * @param synchronous If true then the API will block until the app has been restarted - * @return the Object object if successful. + * @param resourceGroupName Name of the resource group to which the resource belongs. + * @param name Name of the app. + * @param softRestart Specify true to apply the configuration settings and restarts the app only if necessary. By default, the API always restarts and reprovisions the app. + * @param synchronous Specify true to block until the app is restarted. By default, it is set to false, and the API responds immediately (asynchronous). */ - public Object restart(String resourceGroupName, String name, Boolean softRestart, Boolean synchronous) { - return restartWithServiceResponseAsync(resourceGroupName, name, softRestart, synchronous).toBlocking().single().getBody(); + public void restart(String resourceGroupName, String name, Boolean softRestart, Boolean synchronous) { + restartWithServiceResponseAsync(resourceGroupName, name, softRestart, synchronous).toBlocking().single().getBody(); } /** - * Restarts web app. - * Restarts web app. + * Restarts an app (or deployment slot, if specified). + * Restarts an app (or deployment slot, if specified). * - * @param resourceGroupName Name of resource group - * @param name Name of web app - * @param softRestart Soft restart applies the configuration settings and restarts the app if necessary. Hard restart always restarts and reprovisions the app - * @param synchronous If true then the API will block until the app has been restarted + * @param resourceGroupName Name of the resource group to which the resource belongs. + * @param name Name of the app. + * @param softRestart Specify true to apply the configuration settings and restarts the app only if necessary. By default, the API always restarts and reprovisions the app. + * @param synchronous Specify true to block until the app is restarted. By default, it is set to false, and the API responds immediately (asynchronous). * @param serviceCallback the async ServiceCallback to handle successful and failed responses. * @return the {@link ServiceCall} object */ - public ServiceCall restartAsync(String resourceGroupName, String name, Boolean softRestart, Boolean synchronous, final ServiceCallback serviceCallback) { + public ServiceCall restartAsync(String resourceGroupName, String name, Boolean softRestart, Boolean synchronous, final ServiceCallback serviceCallback) { return ServiceCall.create(restartWithServiceResponseAsync(resourceGroupName, name, softRestart, synchronous), serviceCallback); } /** - * Restarts web app. - * Restarts web app. + * Restarts an app (or deployment slot, if specified). + * Restarts an app (or deployment slot, if specified). * - * @param resourceGroupName Name of resource group - * @param name Name of web app - * @param softRestart Soft restart applies the configuration settings and restarts the app if necessary. Hard restart always restarts and reprovisions the app - * @param synchronous If true then the API will block until the app has been restarted - * @return the observable to the Object object + * @param resourceGroupName Name of the resource group to which the resource belongs. + * @param name Name of the app. + * @param softRestart Specify true to apply the configuration settings and restarts the app only if necessary. By default, the API always restarts and reprovisions the app. + * @param synchronous Specify true to block until the app is restarted. By default, it is set to false, and the API responds immediately (asynchronous). + * @return the {@link ServiceResponse} object if successful. */ - public Observable restartAsync(String resourceGroupName, String name, Boolean softRestart, Boolean synchronous) { - return restartWithServiceResponseAsync(resourceGroupName, name, softRestart, synchronous).map(new Func1, Object>() { + public Observable restartAsync(String resourceGroupName, String name, Boolean softRestart, Boolean synchronous) { + return restartWithServiceResponseAsync(resourceGroupName, name, softRestart, synchronous).map(new Func1, Void>() { @Override - public Object call(ServiceResponse response) { + public Void call(ServiceResponse response) { return response.getBody(); } }); } /** - * Restarts web app. - * Restarts web app. + * Restarts an app (or deployment slot, if specified). + * Restarts an app (or deployment slot, if specified). * - * @param resourceGroupName Name of resource group - * @param name Name of web app - * @param softRestart Soft restart applies the configuration settings and restarts the app if necessary. Hard restart always restarts and reprovisions the app - * @param synchronous If true then the API will block until the app has been restarted - * @return the observable to the Object object + * @param resourceGroupName Name of the resource group to which the resource belongs. + * @param name Name of the app. + * @param softRestart Specify true to apply the configuration settings and restarts the app only if necessary. By default, the API always restarts and reprovisions the app. + * @param synchronous Specify true to block until the app is restarted. By default, it is set to false, and the API responds immediately (asynchronous). + * @return the {@link ServiceResponse} object if successful. */ - public Observable> restartWithServiceResponseAsync(String resourceGroupName, String name, Boolean softRestart, Boolean synchronous) { + public Observable> restartWithServiceResponseAsync(String resourceGroupName, String name, Boolean softRestart, Boolean synchronous) { if (resourceGroupName == null) { throw new IllegalArgumentException("Parameter resourceGroupName is required and cannot be null."); } @@ -10010,11 +10116,11 @@ public Observable> restartWithServiceResponseAsync(Strin } final String apiVersion = "2016-08-01"; return service.restart(resourceGroupName, name, this.client.subscriptionId(), softRestart, synchronous, apiVersion, this.client.acceptLanguage(), this.client.userAgent()) - .flatMap(new Func1, Observable>>() { + .flatMap(new Func1, Observable>>() { @Override - public Observable> call(Response response) { + public Observable> call(Response response) { try { - ServiceResponse clientResponse = restartDelegate(response); + ServiceResponse clientResponse = restartDelegate(response); return Observable.just(clientResponse); } catch (Throwable t) { return Observable.error(t); @@ -10023,19 +10129,18 @@ public Observable> call(Response response) }); } - private ServiceResponse restartDelegate(Response response) throws CloudException, IOException, IllegalArgumentException { - return new AzureServiceResponseBuilder(this.client.mapperAdapter()) - .register(200, new TypeToken() { }.getType()) - .registerError(CloudException.class) + private ServiceResponse restartDelegate(Response response) throws CloudException, IOException, IllegalArgumentException { + return new AzureServiceResponseBuilder(this.client.mapperAdapter()) + .register(204, new TypeToken() { }.getType()) .build(response); } /** - * Gets all the slots for a web apps. - * Gets all the slots for a web apps. + * Gets an app's deployment slots. + * Gets an app's deployment slots. * - * @param resourceGroupName Name of resource group - * @param name Name of web app + * @param resourceGroupName Name of the resource group to which the resource belongs. + * @param name Name of the app. * @return the PagedList<SiteInner> object if successful. */ public PagedList listSlots(final String resourceGroupName, final String name) { @@ -10049,11 +10154,11 @@ public Page nextPage(String nextPageLink) { } /** - * Gets all the slots for a web apps. - * Gets all the slots for a web apps. + * Gets an app's deployment slots. + * Gets an app's deployment slots. * - * @param resourceGroupName Name of resource group - * @param name Name of web app + * @param resourceGroupName Name of the resource group to which the resource belongs. + * @param name Name of the app. * @param serviceCallback the async ServiceCallback to handle successful and failed responses. * @return the {@link ServiceCall} object */ @@ -10070,11 +10175,11 @@ public Observable>> call(String nextPageLink) { } /** - * Gets all the slots for a web apps. - * Gets all the slots for a web apps. + * Gets an app's deployment slots. + * Gets an app's deployment slots. * - * @param resourceGroupName Name of resource group - * @param name Name of web app + * @param resourceGroupName Name of the resource group to which the resource belongs. + * @param name Name of the app. * @return the observable to the PagedList<SiteInner> object */ public Observable> listSlotsAsync(final String resourceGroupName, final String name) { @@ -10088,11 +10193,11 @@ public Page call(ServiceResponse> response) { } /** - * Gets all the slots for a web apps. - * Gets all the slots for a web apps. + * Gets an app's deployment slots. + * Gets an app's deployment slots. * - * @param resourceGroupName Name of resource group - * @param name Name of web app + * @param resourceGroupName Name of the resource group to which the resource belongs. + * @param name Name of the app. * @return the observable to the PagedList<SiteInner> object */ public Observable>> listSlotsWithServiceResponseAsync(final String resourceGroupName, final String name) { @@ -10110,11 +10215,11 @@ public Observable>> call(ServiceResponse> * @param resourceGroupName Name of the resource group to which the resource belongs. + ServiceResponse> * @param name Name of the app. * @return the PagedList<SiteInner> object wrapped in {@link ServiceResponse} if successful. */ public Observable>> listSlotsSinglePageAsync(final String resourceGroupName, final String name) { @@ -10128,8 +10233,7 @@ public Observable>> listSlotsSinglePageAsync(fin throw new IllegalArgumentException("Parameter this.client.subscriptionId() is required and cannot be null."); } final String apiVersion = "2016-08-01"; - final String propertiesToInclude = null; - return service.listSlots(resourceGroupName, name, this.client.subscriptionId(), propertiesToInclude, apiVersion, this.client.acceptLanguage(), this.client.userAgent()) + return service.listSlots(resourceGroupName, name, this.client.subscriptionId(), apiVersion, this.client.acceptLanguage(), this.client.userAgent()) .flatMap(new Func1, Observable>>>() { @Override public Observable>> call(Response response) { @@ -10143,116 +10247,88 @@ public Observable>> call(Response }); } - /** - * Gets all the slots for a web apps. - * Gets all the slots for a web apps. - * - * @param resourceGroupName Name of resource group - * @param name Name of web app - * @param propertiesToInclude List of app properties to include in the response - * @return the PagedList<SiteInner> object if successful. - */ - public PagedList listSlots(final String resourceGroupName, final String name, final String propertiesToInclude) { - ServiceResponse> response = listSlotsSinglePageAsync(resourceGroupName, name, propertiesToInclude).toBlocking().single(); - return new PagedList(response.getBody()) { - @Override - public Page nextPage(String nextPageLink) { - return listSlotsNextSinglePageAsync(nextPageLink).toBlocking().single().getBody(); - } - }; + private ServiceResponse> listSlotsDelegate(Response response) throws CloudException, IOException, IllegalArgumentException { + return new AzureServiceResponseBuilder, CloudException>(this.client.mapperAdapter()) + .register(200, new TypeToken>() { }.getType()) + .registerError(CloudException.class) + .build(response); } /** - * Gets all the slots for a web apps. - * Gets all the slots for a web apps. + * Gets the details of a web, mobile, or API app. + * Gets the details of a web, mobile, or API app. * - * @param resourceGroupName Name of resource group - * @param name Name of web app - * @param propertiesToInclude List of app properties to include in the response - * @param serviceCallback the async ServiceCallback to handle successful and failed responses. - * @return the {@link ServiceCall} object + * @param resourceGroupName Name of the resource group to which the resource belongs. + * @param name Name of the app. + * @param slot Name of the deployment slot. By default, this API returns the production slot. + * @return the SiteInner object if successful. */ - public ServiceCall> listSlotsAsync(final String resourceGroupName, final String name, final String propertiesToInclude, final ListOperationCallback serviceCallback) { - return AzureServiceCall.create( - listSlotsSinglePageAsync(resourceGroupName, name, propertiesToInclude), - new Func1>>>() { - @Override - public Observable>> call(String nextPageLink) { - return listSlotsNextSinglePageAsync(nextPageLink); - } - }, - serviceCallback); + public SiteInner getSlot(String resourceGroupName, String name, String slot) { + return getSlotWithServiceResponseAsync(resourceGroupName, name, slot).toBlocking().single().getBody(); } /** - * Gets all the slots for a web apps. - * Gets all the slots for a web apps. + * Gets the details of a web, mobile, or API app. + * Gets the details of a web, mobile, or API app. * - * @param resourceGroupName Name of resource group - * @param name Name of web app - * @param propertiesToInclude List of app properties to include in the response - * @return the observable to the PagedList<SiteInner> object + * @param resourceGroupName Name of the resource group to which the resource belongs. + * @param name Name of the app. + * @param slot Name of the deployment slot. By default, this API returns the production slot. + * @param serviceCallback the async ServiceCallback to handle successful and failed responses. + * @return the {@link ServiceCall} object */ - public Observable> listSlotsAsync(final String resourceGroupName, final String name, final String propertiesToInclude) { - return listSlotsWithServiceResponseAsync(resourceGroupName, name, propertiesToInclude) - .map(new Func1>, Page>() { - @Override - public Page call(ServiceResponse> response) { - return response.getBody(); - } - }); + public ServiceCall getSlotAsync(String resourceGroupName, String name, String slot, final ServiceCallback serviceCallback) { + return ServiceCall.create(getSlotWithServiceResponseAsync(resourceGroupName, name, slot), serviceCallback); } /** - * Gets all the slots for a web apps. - * Gets all the slots for a web apps. + * Gets the details of a web, mobile, or API app. + * Gets the details of a web, mobile, or API app. * - * @param resourceGroupName Name of resource group - * @param name Name of web app - * @param propertiesToInclude List of app properties to include in the response - * @return the observable to the PagedList<SiteInner> object + * @param resourceGroupName Name of the resource group to which the resource belongs. + * @param name Name of the app. + * @param slot Name of the deployment slot. By default, this API returns the production slot. + * @return the observable to the SiteInner object */ - public Observable>> listSlotsWithServiceResponseAsync(final String resourceGroupName, final String name, final String propertiesToInclude) { - return listSlotsSinglePageAsync(resourceGroupName, name, propertiesToInclude) - .concatMap(new Func1>, Observable>>>() { - @Override - public Observable>> call(ServiceResponse> page) { - String nextPageLink = page.getBody().getNextPageLink(); - if (nextPageLink == null) { - return Observable.just(page); - } - return Observable.just(page).concatWith(listSlotsNextWithServiceResponseAsync(nextPageLink)); - } - }); + public Observable getSlotAsync(String resourceGroupName, String name, String slot) { + return getSlotWithServiceResponseAsync(resourceGroupName, name, slot).map(new Func1, SiteInner>() { + @Override + public SiteInner call(ServiceResponse response) { + return response.getBody(); + } + }); } /** - * Gets all the slots for a web apps. - * Gets all the slots for a web apps. + * Gets the details of a web, mobile, or API app. + * Gets the details of a web, mobile, or API app. * - ServiceResponse> * @param resourceGroupName Name of resource group - ServiceResponse> * @param name Name of web app - ServiceResponse> * @param propertiesToInclude List of app properties to include in the response - * @return the PagedList<SiteInner> object wrapped in {@link ServiceResponse} if successful. + * @param resourceGroupName Name of the resource group to which the resource belongs. + * @param name Name of the app. + * @param slot Name of the deployment slot. By default, this API returns the production slot. + * @return the observable to the SiteInner object */ - public Observable>> listSlotsSinglePageAsync(final String resourceGroupName, final String name, final String propertiesToInclude) { + public Observable> getSlotWithServiceResponseAsync(String resourceGroupName, String name, String slot) { if (resourceGroupName == null) { throw new IllegalArgumentException("Parameter resourceGroupName is required and cannot be null."); } if (name == null) { throw new IllegalArgumentException("Parameter name is required and cannot be null."); } + if (slot == null) { + throw new IllegalArgumentException("Parameter slot is required and cannot be null."); + } if (this.client.subscriptionId() == null) { throw new IllegalArgumentException("Parameter this.client.subscriptionId() is required and cannot be null."); } final String apiVersion = "2016-08-01"; - return service.listSlots(resourceGroupName, name, this.client.subscriptionId(), propertiesToInclude, apiVersion, this.client.acceptLanguage(), this.client.userAgent()) - .flatMap(new Func1, Observable>>>() { + return service.getSlot(resourceGroupName, name, slot, this.client.subscriptionId(), apiVersion, this.client.acceptLanguage(), this.client.userAgent()) + .flatMap(new Func1, Observable>>() { @Override - public Observable>> call(Response response) { + public Observable> call(Response response) { try { - ServiceResponse> result = listSlotsDelegate(response); - return Observable.just(new ServiceResponse>(result.getBody(), result.getResponse())); + ServiceResponse clientResponse = getSlotDelegate(response); + return Observable.just(clientResponse); } catch (Throwable t) { return Observable.error(t); } @@ -10260,51 +10336,237 @@ public Observable>> call(Response }); } - private ServiceResponse> listSlotsDelegate(Response response) throws CloudException, IOException, IllegalArgumentException { - return new AzureServiceResponseBuilder, CloudException>(this.client.mapperAdapter()) - .register(200, new TypeToken>() { }.getType()) + private ServiceResponse getSlotDelegate(Response response) throws CloudException, IOException, IllegalArgumentException { + return new AzureServiceResponseBuilder(this.client.mapperAdapter()) + .register(200, new TypeToken() { }.getType()) .registerError(CloudException.class) .build(response); } /** - * Get details of a web app. - * Get details of a web app. + * Creates a new web, mobile, or API app in an existing resource group, or updates an existing app. + * Creates a new web, mobile, or API app in an existing resource group, or updates an existing app. * - * @param resourceGroupName Name of resource group - * @param name Name of web app - * @param slot Name of web app slot. If not specified then will default to production slot. + * @param resourceGroupName Name of the resource group to which the resource belongs. + * @param name Unique name of the app to create or update. To create or update a deployment slot, use the {slot} parameter. + * @param slot Name of the deployment slot to create or update. By default, this API attempts to create or modify the production slot. + * @param siteEnvelope A JSON representation of the app properties. See example. + * @return the SiteInner object if successful. + */ + public SiteInner createOrUpdateSlot(String resourceGroupName, String name, String slot, SiteInner siteEnvelope) { + return createOrUpdateSlotWithServiceResponseAsync(resourceGroupName, name, slot, siteEnvelope).toBlocking().last().getBody(); + } + + /** + * Creates a new web, mobile, or API app in an existing resource group, or updates an existing app. + * Creates a new web, mobile, or API app in an existing resource group, or updates an existing app. + * + * @param resourceGroupName Name of the resource group to which the resource belongs. + * @param name Unique name of the app to create or update. To create or update a deployment slot, use the {slot} parameter. + * @param slot Name of the deployment slot to create or update. By default, this API attempts to create or modify the production slot. + * @param siteEnvelope A JSON representation of the app properties. See example. + * @param serviceCallback the async ServiceCallback to handle successful and failed responses. + * @return the {@link ServiceCall} object + */ + public ServiceCall createOrUpdateSlotAsync(String resourceGroupName, String name, String slot, SiteInner siteEnvelope, final ServiceCallback serviceCallback) { + return ServiceCall.create(createOrUpdateSlotWithServiceResponseAsync(resourceGroupName, name, slot, siteEnvelope), serviceCallback); + } + + /** + * Creates a new web, mobile, or API app in an existing resource group, or updates an existing app. + * Creates a new web, mobile, or API app in an existing resource group, or updates an existing app. + * + * @param resourceGroupName Name of the resource group to which the resource belongs. + * @param name Unique name of the app to create or update. To create or update a deployment slot, use the {slot} parameter. + * @param slot Name of the deployment slot to create or update. By default, this API attempts to create or modify the production slot. + * @param siteEnvelope A JSON representation of the app properties. See example. + * @return the observable for the request + */ + public Observable createOrUpdateSlotAsync(String resourceGroupName, String name, String slot, SiteInner siteEnvelope) { + return createOrUpdateSlotWithServiceResponseAsync(resourceGroupName, name, slot, siteEnvelope).map(new Func1, SiteInner>() { + @Override + public SiteInner call(ServiceResponse response) { + return response.getBody(); + } + }); + } + + /** + * Creates a new web, mobile, or API app in an existing resource group, or updates an existing app. + * Creates a new web, mobile, or API app in an existing resource group, or updates an existing app. + * + * @param resourceGroupName Name of the resource group to which the resource belongs. + * @param name Unique name of the app to create or update. To create or update a deployment slot, use the {slot} parameter. + * @param slot Name of the deployment slot to create or update. By default, this API attempts to create or modify the production slot. + * @param siteEnvelope A JSON representation of the app properties. See example. + * @return the observable for the request + */ + public Observable> createOrUpdateSlotWithServiceResponseAsync(String resourceGroupName, String name, String slot, SiteInner siteEnvelope) { + if (resourceGroupName == null) { + throw new IllegalArgumentException("Parameter resourceGroupName is required and cannot be null."); + } + if (name == null) { + throw new IllegalArgumentException("Parameter name is required and cannot be null."); + } + if (slot == null) { + throw new IllegalArgumentException("Parameter slot is required and cannot be null."); + } + if (this.client.subscriptionId() == null) { + throw new IllegalArgumentException("Parameter this.client.subscriptionId() is required and cannot be null."); + } + if (siteEnvelope == null) { + throw new IllegalArgumentException("Parameter siteEnvelope is required and cannot be null."); + } + Validator.validate(siteEnvelope); + final String apiVersion = "2016-08-01"; + final Boolean skipDnsRegistration = null; + final Boolean skipCustomDomainVerification = null; + final Boolean forceDnsRegistration = null; + final String ttlInSeconds = null; + Observable> observable = service.createOrUpdateSlot(resourceGroupName, name, slot, this.client.subscriptionId(), siteEnvelope, skipDnsRegistration, skipCustomDomainVerification, forceDnsRegistration, ttlInSeconds, apiVersion, this.client.acceptLanguage(), this.client.userAgent()); + return client.getAzureClient().getPutOrPatchResultAsync(observable, new TypeToken() { }.getType()); + } + /** + * Creates a new web, mobile, or API app in an existing resource group, or updates an existing app. + * Creates a new web, mobile, or API app in an existing resource group, or updates an existing app. + * + * @param resourceGroupName Name of the resource group to which the resource belongs. + * @param name Unique name of the app to create or update. To create or update a deployment slot, use the {slot} parameter. + * @param slot Name of the deployment slot to create or update. By default, this API attempts to create or modify the production slot. + * @param siteEnvelope A JSON representation of the app properties. See example. + * @param skipDnsRegistration If true web app hostname is not registered with DNS on creation. This parameter is + only used for app creation + * @param skipCustomDomainVerification If true, custom (non *.azurewebsites.net) domains associated with web app are not verified. + * @param forceDnsRegistration If true, web app hostname is force registered with DNS + * @param ttlInSeconds Time to live in seconds for web app's default domain name * @return the SiteInner object if successful. */ - public SiteInner getSlot(String resourceGroupName, String name, String slot) { - return getSlotWithServiceResponseAsync(resourceGroupName, name, slot).toBlocking().single().getBody(); + public SiteInner createOrUpdateSlot(String resourceGroupName, String name, String slot, SiteInner siteEnvelope, Boolean skipDnsRegistration, Boolean skipCustomDomainVerification, Boolean forceDnsRegistration, String ttlInSeconds) { + return createOrUpdateSlotWithServiceResponseAsync(resourceGroupName, name, slot, siteEnvelope, skipDnsRegistration, skipCustomDomainVerification, forceDnsRegistration, ttlInSeconds).toBlocking().last().getBody(); } /** - * Get details of a web app. - * Get details of a web app. + * Creates a new web, mobile, or API app in an existing resource group, or updates an existing app. + * Creates a new web, mobile, or API app in an existing resource group, or updates an existing app. * - * @param resourceGroupName Name of resource group - * @param name Name of web app - * @param slot Name of web app slot. If not specified then will default to production slot. + * @param resourceGroupName Name of the resource group to which the resource belongs. + * @param name Unique name of the app to create or update. To create or update a deployment slot, use the {slot} parameter. + * @param slot Name of the deployment slot to create or update. By default, this API attempts to create or modify the production slot. + * @param siteEnvelope A JSON representation of the app properties. See example. + * @param skipDnsRegistration If true web app hostname is not registered with DNS on creation. This parameter is + only used for app creation + * @param skipCustomDomainVerification If true, custom (non *.azurewebsites.net) domains associated with web app are not verified. + * @param forceDnsRegistration If true, web app hostname is force registered with DNS + * @param ttlInSeconds Time to live in seconds for web app's default domain name * @param serviceCallback the async ServiceCallback to handle successful and failed responses. * @return the {@link ServiceCall} object */ - public ServiceCall getSlotAsync(String resourceGroupName, String name, String slot, final ServiceCallback serviceCallback) { - return ServiceCall.create(getSlotWithServiceResponseAsync(resourceGroupName, name, slot), serviceCallback); + public ServiceCall createOrUpdateSlotAsync(String resourceGroupName, String name, String slot, SiteInner siteEnvelope, Boolean skipDnsRegistration, Boolean skipCustomDomainVerification, Boolean forceDnsRegistration, String ttlInSeconds, final ServiceCallback serviceCallback) { + return ServiceCall.create(createOrUpdateSlotWithServiceResponseAsync(resourceGroupName, name, slot, siteEnvelope, skipDnsRegistration, skipCustomDomainVerification, forceDnsRegistration, ttlInSeconds), serviceCallback); } /** - * Get details of a web app. - * Get details of a web app. + * Creates a new web, mobile, or API app in an existing resource group, or updates an existing app. + * Creates a new web, mobile, or API app in an existing resource group, or updates an existing app. * - * @param resourceGroupName Name of resource group - * @param name Name of web app - * @param slot Name of web app slot. If not specified then will default to production slot. + * @param resourceGroupName Name of the resource group to which the resource belongs. + * @param name Unique name of the app to create or update. To create or update a deployment slot, use the {slot} parameter. + * @param slot Name of the deployment slot to create or update. By default, this API attempts to create or modify the production slot. + * @param siteEnvelope A JSON representation of the app properties. See example. + * @param skipDnsRegistration If true web app hostname is not registered with DNS on creation. This parameter is + only used for app creation + * @param skipCustomDomainVerification If true, custom (non *.azurewebsites.net) domains associated with web app are not verified. + * @param forceDnsRegistration If true, web app hostname is force registered with DNS + * @param ttlInSeconds Time to live in seconds for web app's default domain name + * @return the observable for the request + */ + public Observable createOrUpdateSlotAsync(String resourceGroupName, String name, String slot, SiteInner siteEnvelope, Boolean skipDnsRegistration, Boolean skipCustomDomainVerification, Boolean forceDnsRegistration, String ttlInSeconds) { + return createOrUpdateSlotWithServiceResponseAsync(resourceGroupName, name, slot, siteEnvelope, skipDnsRegistration, skipCustomDomainVerification, forceDnsRegistration, ttlInSeconds).map(new Func1, SiteInner>() { + @Override + public SiteInner call(ServiceResponse response) { + return response.getBody(); + } + }); + } + + /** + * Creates a new web, mobile, or API app in an existing resource group, or updates an existing app. + * Creates a new web, mobile, or API app in an existing resource group, or updates an existing app. + * + * @param resourceGroupName Name of the resource group to which the resource belongs. + * @param name Unique name of the app to create or update. To create or update a deployment slot, use the {slot} parameter. + * @param slot Name of the deployment slot to create or update. By default, this API attempts to create or modify the production slot. + * @param siteEnvelope A JSON representation of the app properties. See example. + * @param skipDnsRegistration If true web app hostname is not registered with DNS on creation. This parameter is + only used for app creation + * @param skipCustomDomainVerification If true, custom (non *.azurewebsites.net) domains associated with web app are not verified. + * @param forceDnsRegistration If true, web app hostname is force registered with DNS + * @param ttlInSeconds Time to live in seconds for web app's default domain name + * @return the observable for the request + */ + public Observable> createOrUpdateSlotWithServiceResponseAsync(String resourceGroupName, String name, String slot, SiteInner siteEnvelope, Boolean skipDnsRegistration, Boolean skipCustomDomainVerification, Boolean forceDnsRegistration, String ttlInSeconds) { + if (resourceGroupName == null) { + throw new IllegalArgumentException("Parameter resourceGroupName is required and cannot be null."); + } + if (name == null) { + throw new IllegalArgumentException("Parameter name is required and cannot be null."); + } + if (slot == null) { + throw new IllegalArgumentException("Parameter slot is required and cannot be null."); + } + if (this.client.subscriptionId() == null) { + throw new IllegalArgumentException("Parameter this.client.subscriptionId() is required and cannot be null."); + } + if (siteEnvelope == null) { + throw new IllegalArgumentException("Parameter siteEnvelope is required and cannot be null."); + } + Validator.validate(siteEnvelope); + final String apiVersion = "2016-08-01"; + Observable> observable = service.createOrUpdateSlot(resourceGroupName, name, slot, this.client.subscriptionId(), siteEnvelope, skipDnsRegistration, skipCustomDomainVerification, forceDnsRegistration, ttlInSeconds, apiVersion, this.client.acceptLanguage(), this.client.userAgent()); + return client.getAzureClient().getPutOrPatchResultAsync(observable, new TypeToken() { }.getType()); + } + + /** + * Creates a new web, mobile, or API app in an existing resource group, or updates an existing app. + * Creates a new web, mobile, or API app in an existing resource group, or updates an existing app. + * + * @param resourceGroupName Name of the resource group to which the resource belongs. + * @param name Unique name of the app to create or update. To create or update a deployment slot, use the {slot} parameter. + * @param slot Name of the deployment slot to create or update. By default, this API attempts to create or modify the production slot. + * @param siteEnvelope A JSON representation of the app properties. See example. + * @return the SiteInner object if successful. + */ + public SiteInner beginCreateOrUpdateSlot(String resourceGroupName, String name, String slot, SiteInner siteEnvelope) { + return beginCreateOrUpdateSlotWithServiceResponseAsync(resourceGroupName, name, slot, siteEnvelope).toBlocking().single().getBody(); + } + + /** + * Creates a new web, mobile, or API app in an existing resource group, or updates an existing app. + * Creates a new web, mobile, or API app in an existing resource group, or updates an existing app. + * + * @param resourceGroupName Name of the resource group to which the resource belongs. + * @param name Unique name of the app to create or update. To create or update a deployment slot, use the {slot} parameter. + * @param slot Name of the deployment slot to create or update. By default, this API attempts to create or modify the production slot. + * @param siteEnvelope A JSON representation of the app properties. See example. + * @param serviceCallback the async ServiceCallback to handle successful and failed responses. + * @return the {@link ServiceCall} object + */ + public ServiceCall beginCreateOrUpdateSlotAsync(String resourceGroupName, String name, String slot, SiteInner siteEnvelope, final ServiceCallback serviceCallback) { + return ServiceCall.create(beginCreateOrUpdateSlotWithServiceResponseAsync(resourceGroupName, name, slot, siteEnvelope), serviceCallback); + } + + /** + * Creates a new web, mobile, or API app in an existing resource group, or updates an existing app. + * Creates a new web, mobile, or API app in an existing resource group, or updates an existing app. + * + * @param resourceGroupName Name of the resource group to which the resource belongs. + * @param name Unique name of the app to create or update. To create or update a deployment slot, use the {slot} parameter. + * @param slot Name of the deployment slot to create or update. By default, this API attempts to create or modify the production slot. + * @param siteEnvelope A JSON representation of the app properties. See example. * @return the observable to the SiteInner object */ - public Observable getSlotAsync(String resourceGroupName, String name, String slot) { - return getSlotWithServiceResponseAsync(resourceGroupName, name, slot).map(new Func1, SiteInner>() { + public Observable beginCreateOrUpdateSlotAsync(String resourceGroupName, String name, String slot, SiteInner siteEnvelope) { + return beginCreateOrUpdateSlotWithServiceResponseAsync(resourceGroupName, name, slot, siteEnvelope).map(new Func1, SiteInner>() { @Override public SiteInner call(ServiceResponse response) { return response.getBody(); @@ -10313,15 +10575,16 @@ public SiteInner call(ServiceResponse response) { } /** - * Get details of a web app. - * Get details of a web app. + * Creates a new web, mobile, or API app in an existing resource group, or updates an existing app. + * Creates a new web, mobile, or API app in an existing resource group, or updates an existing app. * - * @param resourceGroupName Name of resource group - * @param name Name of web app - * @param slot Name of web app slot. If not specified then will default to production slot. + * @param resourceGroupName Name of the resource group to which the resource belongs. + * @param name Unique name of the app to create or update. To create or update a deployment slot, use the {slot} parameter. + * @param slot Name of the deployment slot to create or update. By default, this API attempts to create or modify the production slot. + * @param siteEnvelope A JSON representation of the app properties. See example. * @return the observable to the SiteInner object */ - public Observable> getSlotWithServiceResponseAsync(String resourceGroupName, String name, String slot) { + public Observable> beginCreateOrUpdateSlotWithServiceResponseAsync(String resourceGroupName, String name, String slot, SiteInner siteEnvelope) { if (resourceGroupName == null) { throw new IllegalArgumentException("Parameter resourceGroupName is required and cannot be null."); } @@ -10334,14 +10597,21 @@ public Observable> getSlotWithServiceResponseAsync(St if (this.client.subscriptionId() == null) { throw new IllegalArgumentException("Parameter this.client.subscriptionId() is required and cannot be null."); } + if (siteEnvelope == null) { + throw new IllegalArgumentException("Parameter siteEnvelope is required and cannot be null."); + } + Validator.validate(siteEnvelope); final String apiVersion = "2016-08-01"; - final String propertiesToInclude = null; - return service.getSlot(resourceGroupName, name, slot, this.client.subscriptionId(), propertiesToInclude, apiVersion, this.client.acceptLanguage(), this.client.userAgent()) + final Boolean skipDnsRegistration = null; + final Boolean skipCustomDomainVerification = null; + final Boolean forceDnsRegistration = null; + final String ttlInSeconds = null; + return service.beginCreateOrUpdateSlot(resourceGroupName, name, slot, this.client.subscriptionId(), siteEnvelope, skipDnsRegistration, skipCustomDomainVerification, forceDnsRegistration, ttlInSeconds, apiVersion, this.client.acceptLanguage(), this.client.userAgent()) .flatMap(new Func1, Observable>>() { @Override public Observable> call(Response response) { try { - ServiceResponse clientResponse = getSlotDelegate(response); + ServiceResponse clientResponse = beginCreateOrUpdateSlotDelegate(response); return Observable.just(clientResponse); } catch (Throwable t) { return Observable.error(t); @@ -10351,46 +10621,61 @@ public Observable> call(Response respon } /** - * Get details of a web app. - * Get details of a web app. + * Creates a new web, mobile, or API app in an existing resource group, or updates an existing app. + * Creates a new web, mobile, or API app in an existing resource group, or updates an existing app. * - * @param resourceGroupName Name of resource group - * @param name Name of web app - * @param slot Name of web app slot. If not specified then will default to production slot. - * @param propertiesToInclude Additional web app properties included in the response + * @param resourceGroupName Name of the resource group to which the resource belongs. + * @param name Unique name of the app to create or update. To create or update a deployment slot, use the {slot} parameter. + * @param slot Name of the deployment slot to create or update. By default, this API attempts to create or modify the production slot. + * @param siteEnvelope A JSON representation of the app properties. See example. + * @param skipDnsRegistration If true web app hostname is not registered with DNS on creation. This parameter is + only used for app creation + * @param skipCustomDomainVerification If true, custom (non *.azurewebsites.net) domains associated with web app are not verified. + * @param forceDnsRegistration If true, web app hostname is force registered with DNS + * @param ttlInSeconds Time to live in seconds for web app's default domain name * @return the SiteInner object if successful. */ - public SiteInner getSlot(String resourceGroupName, String name, String slot, String propertiesToInclude) { - return getSlotWithServiceResponseAsync(resourceGroupName, name, slot, propertiesToInclude).toBlocking().single().getBody(); + public SiteInner beginCreateOrUpdateSlot(String resourceGroupName, String name, String slot, SiteInner siteEnvelope, Boolean skipDnsRegistration, Boolean skipCustomDomainVerification, Boolean forceDnsRegistration, String ttlInSeconds) { + return beginCreateOrUpdateSlotWithServiceResponseAsync(resourceGroupName, name, slot, siteEnvelope, skipDnsRegistration, skipCustomDomainVerification, forceDnsRegistration, ttlInSeconds).toBlocking().single().getBody(); } /** - * Get details of a web app. - * Get details of a web app. + * Creates a new web, mobile, or API app in an existing resource group, or updates an existing app. + * Creates a new web, mobile, or API app in an existing resource group, or updates an existing app. * - * @param resourceGroupName Name of resource group - * @param name Name of web app - * @param slot Name of web app slot. If not specified then will default to production slot. - * @param propertiesToInclude Additional web app properties included in the response + * @param resourceGroupName Name of the resource group to which the resource belongs. + * @param name Unique name of the app to create or update. To create or update a deployment slot, use the {slot} parameter. + * @param slot Name of the deployment slot to create or update. By default, this API attempts to create or modify the production slot. + * @param siteEnvelope A JSON representation of the app properties. See example. + * @param skipDnsRegistration If true web app hostname is not registered with DNS on creation. This parameter is + only used for app creation + * @param skipCustomDomainVerification If true, custom (non *.azurewebsites.net) domains associated with web app are not verified. + * @param forceDnsRegistration If true, web app hostname is force registered with DNS + * @param ttlInSeconds Time to live in seconds for web app's default domain name * @param serviceCallback the async ServiceCallback to handle successful and failed responses. * @return the {@link ServiceCall} object */ - public ServiceCall getSlotAsync(String resourceGroupName, String name, String slot, String propertiesToInclude, final ServiceCallback serviceCallback) { - return ServiceCall.create(getSlotWithServiceResponseAsync(resourceGroupName, name, slot, propertiesToInclude), serviceCallback); + public ServiceCall beginCreateOrUpdateSlotAsync(String resourceGroupName, String name, String slot, SiteInner siteEnvelope, Boolean skipDnsRegistration, Boolean skipCustomDomainVerification, Boolean forceDnsRegistration, String ttlInSeconds, final ServiceCallback serviceCallback) { + return ServiceCall.create(beginCreateOrUpdateSlotWithServiceResponseAsync(resourceGroupName, name, slot, siteEnvelope, skipDnsRegistration, skipCustomDomainVerification, forceDnsRegistration, ttlInSeconds), serviceCallback); } /** - * Get details of a web app. - * Get details of a web app. + * Creates a new web, mobile, or API app in an existing resource group, or updates an existing app. + * Creates a new web, mobile, or API app in an existing resource group, or updates an existing app. * - * @param resourceGroupName Name of resource group - * @param name Name of web app - * @param slot Name of web app slot. If not specified then will default to production slot. - * @param propertiesToInclude Additional web app properties included in the response + * @param resourceGroupName Name of the resource group to which the resource belongs. + * @param name Unique name of the app to create or update. To create or update a deployment slot, use the {slot} parameter. + * @param slot Name of the deployment slot to create or update. By default, this API attempts to create or modify the production slot. + * @param siteEnvelope A JSON representation of the app properties. See example. + * @param skipDnsRegistration If true web app hostname is not registered with DNS on creation. This parameter is + only used for app creation + * @param skipCustomDomainVerification If true, custom (non *.azurewebsites.net) domains associated with web app are not verified. + * @param forceDnsRegistration If true, web app hostname is force registered with DNS + * @param ttlInSeconds Time to live in seconds for web app's default domain name * @return the observable to the SiteInner object */ - public Observable getSlotAsync(String resourceGroupName, String name, String slot, String propertiesToInclude) { - return getSlotWithServiceResponseAsync(resourceGroupName, name, slot, propertiesToInclude).map(new Func1, SiteInner>() { + public Observable beginCreateOrUpdateSlotAsync(String resourceGroupName, String name, String slot, SiteInner siteEnvelope, Boolean skipDnsRegistration, Boolean skipCustomDomainVerification, Boolean forceDnsRegistration, String ttlInSeconds) { + return beginCreateOrUpdateSlotWithServiceResponseAsync(resourceGroupName, name, slot, siteEnvelope, skipDnsRegistration, skipCustomDomainVerification, forceDnsRegistration, ttlInSeconds).map(new Func1, SiteInner>() { @Override public SiteInner call(ServiceResponse response) { return response.getBody(); @@ -10399,16 +10684,21 @@ public SiteInner call(ServiceResponse response) { } /** - * Get details of a web app. - * Get details of a web app. + * Creates a new web, mobile, or API app in an existing resource group, or updates an existing app. + * Creates a new web, mobile, or API app in an existing resource group, or updates an existing app. * - * @param resourceGroupName Name of resource group - * @param name Name of web app - * @param slot Name of web app slot. If not specified then will default to production slot. - * @param propertiesToInclude Additional web app properties included in the response + * @param resourceGroupName Name of the resource group to which the resource belongs. + * @param name Unique name of the app to create or update. To create or update a deployment slot, use the {slot} parameter. + * @param slot Name of the deployment slot to create or update. By default, this API attempts to create or modify the production slot. + * @param siteEnvelope A JSON representation of the app properties. See example. + * @param skipDnsRegistration If true web app hostname is not registered with DNS on creation. This parameter is + only used for app creation + * @param skipCustomDomainVerification If true, custom (non *.azurewebsites.net) domains associated with web app are not verified. + * @param forceDnsRegistration If true, web app hostname is force registered with DNS + * @param ttlInSeconds Time to live in seconds for web app's default domain name * @return the observable to the SiteInner object */ - public Observable> getSlotWithServiceResponseAsync(String resourceGroupName, String name, String slot, String propertiesToInclude) { + public Observable> beginCreateOrUpdateSlotWithServiceResponseAsync(String resourceGroupName, String name, String slot, SiteInner siteEnvelope, Boolean skipDnsRegistration, Boolean skipCustomDomainVerification, Boolean forceDnsRegistration, String ttlInSeconds) { if (resourceGroupName == null) { throw new IllegalArgumentException("Parameter resourceGroupName is required and cannot be null."); } @@ -10421,13 +10711,17 @@ public Observable> getSlotWithServiceResponseAsync(St if (this.client.subscriptionId() == null) { throw new IllegalArgumentException("Parameter this.client.subscriptionId() is required and cannot be null."); } + if (siteEnvelope == null) { + throw new IllegalArgumentException("Parameter siteEnvelope is required and cannot be null."); + } + Validator.validate(siteEnvelope); final String apiVersion = "2016-08-01"; - return service.getSlot(resourceGroupName, name, slot, this.client.subscriptionId(), propertiesToInclude, apiVersion, this.client.acceptLanguage(), this.client.userAgent()) + return service.beginCreateOrUpdateSlot(resourceGroupName, name, slot, this.client.subscriptionId(), siteEnvelope, skipDnsRegistration, skipCustomDomainVerification, forceDnsRegistration, ttlInSeconds, apiVersion, this.client.acceptLanguage(), this.client.userAgent()) .flatMap(new Func1, Observable>>() { @Override public Observable> call(Response response) { try { - ServiceResponse clientResponse = getSlotDelegate(response); + ServiceResponse clientResponse = beginCreateOrUpdateSlotDelegate(response); return Observable.just(clientResponse); } catch (Throwable t) { return Observable.error(t); @@ -10436,72 +10730,68 @@ public Observable> call(Response respon }); } - private ServiceResponse getSlotDelegate(Response response) throws CloudException, IOException, IllegalArgumentException { + private ServiceResponse beginCreateOrUpdateSlotDelegate(Response response) throws CloudException, IOException, IllegalArgumentException { return new AzureServiceResponseBuilder(this.client.mapperAdapter()) .register(200, new TypeToken() { }.getType()) + .register(202, new TypeToken() { }.getType()) .registerError(CloudException.class) .build(response); } /** - * Creates a new web app or modifies an existing web app. - * Creates a new web app or modifies an existing web app. + * Deletes a web, mobile, or API app, or one of the deployment slots. + * Deletes a web, mobile, or API app, or one of the deployment slots. * - * @param resourceGroupName Name of the resource group - * @param name Name of the web app - * @param slot Name of web app slot. If not specified then will default to production slot. - * @param siteEnvelope Details of web app if it exists already - * @return the SiteInner object if successful. + * @param resourceGroupName Name of the resource group to which the resource belongs. + * @param name Name of the app to delete. + * @param slot Name of the deployment slot to delete. By default, the API deletes the production slot. */ - public SiteInner createOrUpdateSlot(String resourceGroupName, String name, String slot, SiteInner siteEnvelope) { - return createOrUpdateSlotWithServiceResponseAsync(resourceGroupName, name, slot, siteEnvelope).toBlocking().last().getBody(); + public void deleteSlot(String resourceGroupName, String name, String slot) { + deleteSlotWithServiceResponseAsync(resourceGroupName, name, slot).toBlocking().single().getBody(); } /** - * Creates a new web app or modifies an existing web app. - * Creates a new web app or modifies an existing web app. + * Deletes a web, mobile, or API app, or one of the deployment slots. + * Deletes a web, mobile, or API app, or one of the deployment slots. * - * @param resourceGroupName Name of the resource group - * @param name Name of the web app - * @param slot Name of web app slot. If not specified then will default to production slot. - * @param siteEnvelope Details of web app if it exists already + * @param resourceGroupName Name of the resource group to which the resource belongs. + * @param name Name of the app to delete. + * @param slot Name of the deployment slot to delete. By default, the API deletes the production slot. * @param serviceCallback the async ServiceCallback to handle successful and failed responses. * @return the {@link ServiceCall} object */ - public ServiceCall createOrUpdateSlotAsync(String resourceGroupName, String name, String slot, SiteInner siteEnvelope, final ServiceCallback serviceCallback) { - return ServiceCall.create(createOrUpdateSlotWithServiceResponseAsync(resourceGroupName, name, slot, siteEnvelope), serviceCallback); + public ServiceCall deleteSlotAsync(String resourceGroupName, String name, String slot, final ServiceCallback serviceCallback) { + return ServiceCall.create(deleteSlotWithServiceResponseAsync(resourceGroupName, name, slot), serviceCallback); } /** - * Creates a new web app or modifies an existing web app. - * Creates a new web app or modifies an existing web app. + * Deletes a web, mobile, or API app, or one of the deployment slots. + * Deletes a web, mobile, or API app, or one of the deployment slots. * - * @param resourceGroupName Name of the resource group - * @param name Name of the web app - * @param slot Name of web app slot. If not specified then will default to production slot. - * @param siteEnvelope Details of web app if it exists already - * @return the observable for the request + * @param resourceGroupName Name of the resource group to which the resource belongs. + * @param name Name of the app to delete. + * @param slot Name of the deployment slot to delete. By default, the API deletes the production slot. + * @return the {@link ServiceResponse} object if successful. */ - public Observable createOrUpdateSlotAsync(String resourceGroupName, String name, String slot, SiteInner siteEnvelope) { - return createOrUpdateSlotWithServiceResponseAsync(resourceGroupName, name, slot, siteEnvelope).map(new Func1, SiteInner>() { + public Observable deleteSlotAsync(String resourceGroupName, String name, String slot) { + return deleteSlotWithServiceResponseAsync(resourceGroupName, name, slot).map(new Func1, Void>() { @Override - public SiteInner call(ServiceResponse response) { + public Void call(ServiceResponse response) { return response.getBody(); } }); } /** - * Creates a new web app or modifies an existing web app. - * Creates a new web app or modifies an existing web app. + * Deletes a web, mobile, or API app, or one of the deployment slots. + * Deletes a web, mobile, or API app, or one of the deployment slots. * - * @param resourceGroupName Name of the resource group - * @param name Name of the web app - * @param slot Name of web app slot. If not specified then will default to production slot. - * @param siteEnvelope Details of web app if it exists already - * @return the observable for the request + * @param resourceGroupName Name of the resource group to which the resource belongs. + * @param name Name of the app to delete. + * @param slot Name of the deployment slot to delete. By default, the API deletes the production slot. + * @return the {@link ServiceResponse} object if successful. */ - public Observable> createOrUpdateSlotWithServiceResponseAsync(String resourceGroupName, String name, String slot, SiteInner siteEnvelope) { + public Observable> deleteSlotWithServiceResponseAsync(String resourceGroupName, String name, String slot) { if (resourceGroupName == null) { throw new IllegalArgumentException("Parameter resourceGroupName is required and cannot be null."); } @@ -10514,97 +10804,90 @@ public Observable> createOrUpdateSlotWithServiceRespo if (this.client.subscriptionId() == null) { throw new IllegalArgumentException("Parameter this.client.subscriptionId() is required and cannot be null."); } - if (siteEnvelope == null) { - throw new IllegalArgumentException("Parameter siteEnvelope is required and cannot be null."); - } - Validator.validate(siteEnvelope); final String apiVersion = "2016-08-01"; + final Boolean deleteMetrics = null; + final Boolean deleteEmptyServerFarm = null; final Boolean skipDnsRegistration = null; - final Boolean skipCustomDomainVerification = null; - final Boolean forceDnsRegistration = null; - final String ttlInSeconds = null; - Observable> observable = service.createOrUpdateSlot(resourceGroupName, name, slot, this.client.subscriptionId(), siteEnvelope, skipDnsRegistration, skipCustomDomainVerification, forceDnsRegistration, ttlInSeconds, apiVersion, this.client.acceptLanguage(), this.client.userAgent()); - return client.getAzureClient().getPutOrPatchResultAsync(observable, new TypeToken() { }.getType()); + return service.deleteSlot(resourceGroupName, name, slot, this.client.subscriptionId(), deleteMetrics, deleteEmptyServerFarm, skipDnsRegistration, apiVersion, this.client.acceptLanguage(), this.client.userAgent()) + .flatMap(new Func1, Observable>>() { + @Override + public Observable> call(Response response) { + try { + ServiceResponse clientResponse = deleteSlotDelegate(response); + return Observable.just(clientResponse); + } catch (Throwable t) { + return Observable.error(t); + } + } + }); } + /** - * Creates a new web app or modifies an existing web app. - * Creates a new web app or modifies an existing web app. + * Deletes a web, mobile, or API app, or one of the deployment slots. + * Deletes a web, mobile, or API app, or one of the deployment slots. * - * @param resourceGroupName Name of the resource group - * @param name Name of the web app - * @param slot Name of web app slot. If not specified then will default to production slot. - * @param siteEnvelope Details of web app if it exists already - * @param skipDnsRegistration If true web app hostname is not registered with DNS on creation. This parameter is - only used for app creation - * @param skipCustomDomainVerification If true, custom (non *.azurewebsites.net) domains associated with web app are not verified. - * @param forceDnsRegistration If true, web app hostname is force registered with DNS - * @param ttlInSeconds Time to live in seconds for web app's default domain name - * @return the SiteInner object if successful. + * @param resourceGroupName Name of the resource group to which the resource belongs. + * @param name Name of the app to delete. + * @param slot Name of the deployment slot to delete. By default, the API deletes the production slot. + * @param deleteMetrics If true, web app metrics are also deleted + * @param deleteEmptyServerFarm Specify true if the App Service plan will be empty after app deletion and you want to delete the empty App Service plan. By default, the empty App Service plan is not deleted. + * @param skipDnsRegistration If true, DNS registration is skipped */ - public SiteInner createOrUpdateSlot(String resourceGroupName, String name, String slot, SiteInner siteEnvelope, Boolean skipDnsRegistration, Boolean skipCustomDomainVerification, Boolean forceDnsRegistration, String ttlInSeconds) { - return createOrUpdateSlotWithServiceResponseAsync(resourceGroupName, name, slot, siteEnvelope, skipDnsRegistration, skipCustomDomainVerification, forceDnsRegistration, ttlInSeconds).toBlocking().last().getBody(); + public void deleteSlot(String resourceGroupName, String name, String slot, Boolean deleteMetrics, Boolean deleteEmptyServerFarm, Boolean skipDnsRegistration) { + deleteSlotWithServiceResponseAsync(resourceGroupName, name, slot, deleteMetrics, deleteEmptyServerFarm, skipDnsRegistration).toBlocking().single().getBody(); } /** - * Creates a new web app or modifies an existing web app. - * Creates a new web app or modifies an existing web app. + * Deletes a web, mobile, or API app, or one of the deployment slots. + * Deletes a web, mobile, or API app, or one of the deployment slots. * - * @param resourceGroupName Name of the resource group - * @param name Name of the web app - * @param slot Name of web app slot. If not specified then will default to production slot. - * @param siteEnvelope Details of web app if it exists already - * @param skipDnsRegistration If true web app hostname is not registered with DNS on creation. This parameter is - only used for app creation - * @param skipCustomDomainVerification If true, custom (non *.azurewebsites.net) domains associated with web app are not verified. - * @param forceDnsRegistration If true, web app hostname is force registered with DNS - * @param ttlInSeconds Time to live in seconds for web app's default domain name + * @param resourceGroupName Name of the resource group to which the resource belongs. + * @param name Name of the app to delete. + * @param slot Name of the deployment slot to delete. By default, the API deletes the production slot. + * @param deleteMetrics If true, web app metrics are also deleted + * @param deleteEmptyServerFarm Specify true if the App Service plan will be empty after app deletion and you want to delete the empty App Service plan. By default, the empty App Service plan is not deleted. + * @param skipDnsRegistration If true, DNS registration is skipped * @param serviceCallback the async ServiceCallback to handle successful and failed responses. * @return the {@link ServiceCall} object */ - public ServiceCall createOrUpdateSlotAsync(String resourceGroupName, String name, String slot, SiteInner siteEnvelope, Boolean skipDnsRegistration, Boolean skipCustomDomainVerification, Boolean forceDnsRegistration, String ttlInSeconds, final ServiceCallback serviceCallback) { - return ServiceCall.create(createOrUpdateSlotWithServiceResponseAsync(resourceGroupName, name, slot, siteEnvelope, skipDnsRegistration, skipCustomDomainVerification, forceDnsRegistration, ttlInSeconds), serviceCallback); + public ServiceCall deleteSlotAsync(String resourceGroupName, String name, String slot, Boolean deleteMetrics, Boolean deleteEmptyServerFarm, Boolean skipDnsRegistration, final ServiceCallback serviceCallback) { + return ServiceCall.create(deleteSlotWithServiceResponseAsync(resourceGroupName, name, slot, deleteMetrics, deleteEmptyServerFarm, skipDnsRegistration), serviceCallback); } /** - * Creates a new web app or modifies an existing web app. - * Creates a new web app or modifies an existing web app. + * Deletes a web, mobile, or API app, or one of the deployment slots. + * Deletes a web, mobile, or API app, or one of the deployment slots. * - * @param resourceGroupName Name of the resource group - * @param name Name of the web app - * @param slot Name of web app slot. If not specified then will default to production slot. - * @param siteEnvelope Details of web app if it exists already - * @param skipDnsRegistration If true web app hostname is not registered with DNS on creation. This parameter is - only used for app creation - * @param skipCustomDomainVerification If true, custom (non *.azurewebsites.net) domains associated with web app are not verified. - * @param forceDnsRegistration If true, web app hostname is force registered with DNS - * @param ttlInSeconds Time to live in seconds for web app's default domain name - * @return the observable for the request + * @param resourceGroupName Name of the resource group to which the resource belongs. + * @param name Name of the app to delete. + * @param slot Name of the deployment slot to delete. By default, the API deletes the production slot. + * @param deleteMetrics If true, web app metrics are also deleted + * @param deleteEmptyServerFarm Specify true if the App Service plan will be empty after app deletion and you want to delete the empty App Service plan. By default, the empty App Service plan is not deleted. + * @param skipDnsRegistration If true, DNS registration is skipped + * @return the {@link ServiceResponse} object if successful. */ - public Observable createOrUpdateSlotAsync(String resourceGroupName, String name, String slot, SiteInner siteEnvelope, Boolean skipDnsRegistration, Boolean skipCustomDomainVerification, Boolean forceDnsRegistration, String ttlInSeconds) { - return createOrUpdateSlotWithServiceResponseAsync(resourceGroupName, name, slot, siteEnvelope, skipDnsRegistration, skipCustomDomainVerification, forceDnsRegistration, ttlInSeconds).map(new Func1, SiteInner>() { + public Observable deleteSlotAsync(String resourceGroupName, String name, String slot, Boolean deleteMetrics, Boolean deleteEmptyServerFarm, Boolean skipDnsRegistration) { + return deleteSlotWithServiceResponseAsync(resourceGroupName, name, slot, deleteMetrics, deleteEmptyServerFarm, skipDnsRegistration).map(new Func1, Void>() { @Override - public SiteInner call(ServiceResponse response) { + public Void call(ServiceResponse response) { return response.getBody(); } }); } /** - * Creates a new web app or modifies an existing web app. - * Creates a new web app or modifies an existing web app. + * Deletes a web, mobile, or API app, or one of the deployment slots. + * Deletes a web, mobile, or API app, or one of the deployment slots. * - * @param resourceGroupName Name of the resource group - * @param name Name of the web app - * @param slot Name of web app slot. If not specified then will default to production slot. - * @param siteEnvelope Details of web app if it exists already - * @param skipDnsRegistration If true web app hostname is not registered with DNS on creation. This parameter is - only used for app creation - * @param skipCustomDomainVerification If true, custom (non *.azurewebsites.net) domains associated with web app are not verified. - * @param forceDnsRegistration If true, web app hostname is force registered with DNS - * @param ttlInSeconds Time to live in seconds for web app's default domain name - * @return the observable for the request + * @param resourceGroupName Name of the resource group to which the resource belongs. + * @param name Name of the app to delete. + * @param slot Name of the deployment slot to delete. By default, the API deletes the production slot. + * @param deleteMetrics If true, web app metrics are also deleted + * @param deleteEmptyServerFarm Specify true if the App Service plan will be empty after app deletion and you want to delete the empty App Service plan. By default, the empty App Service plan is not deleted. + * @param skipDnsRegistration If true, DNS registration is skipped + * @return the {@link ServiceResponse} object if successful. */ - public Observable> createOrUpdateSlotWithServiceResponseAsync(String resourceGroupName, String name, String slot, SiteInner siteEnvelope, Boolean skipDnsRegistration, Boolean skipCustomDomainVerification, Boolean forceDnsRegistration, String ttlInSeconds) { + public Observable> deleteSlotWithServiceResponseAsync(String resourceGroupName, String name, String slot, Boolean deleteMetrics, Boolean deleteEmptyServerFarm, Boolean skipDnsRegistration) { if (resourceGroupName == null) { throw new IllegalArgumentException("Parameter resourceGroupName is required and cannot be null."); } @@ -10617,74 +10900,83 @@ public Observable> createOrUpdateSlotWithServiceRespo if (this.client.subscriptionId() == null) { throw new IllegalArgumentException("Parameter this.client.subscriptionId() is required and cannot be null."); } - if (siteEnvelope == null) { - throw new IllegalArgumentException("Parameter siteEnvelope is required and cannot be null."); - } - Validator.validate(siteEnvelope); final String apiVersion = "2016-08-01"; - Observable> observable = service.createOrUpdateSlot(resourceGroupName, name, slot, this.client.subscriptionId(), siteEnvelope, skipDnsRegistration, skipCustomDomainVerification, forceDnsRegistration, ttlInSeconds, apiVersion, this.client.acceptLanguage(), this.client.userAgent()); - return client.getAzureClient().getPutOrPatchResultAsync(observable, new TypeToken() { }.getType()); + return service.deleteSlot(resourceGroupName, name, slot, this.client.subscriptionId(), deleteMetrics, deleteEmptyServerFarm, skipDnsRegistration, apiVersion, this.client.acceptLanguage(), this.client.userAgent()) + .flatMap(new Func1, Observable>>() { + @Override + public Observable> call(Response response) { + try { + ServiceResponse clientResponse = deleteSlotDelegate(response); + return Observable.just(clientResponse); + } catch (Throwable t) { + return Observable.error(t); + } + } + }); + } + + private ServiceResponse deleteSlotDelegate(Response response) throws CloudException, IOException, IllegalArgumentException { + return new AzureServiceResponseBuilder(this.client.mapperAdapter()) + .register(200, new TypeToken() { }.getType()) + .register(404, new TypeToken() { }.getType()) + .build(response); } /** - * Creates a new web app or modifies an existing web app. - * Creates a new web app or modifies an existing web app. + * Analyze a custom hostname. + * Analyze a custom hostname. * - * @param resourceGroupName Name of the resource group - * @param name Name of the web app + * @param resourceGroupName Name of the resource group to which the resource belongs. + * @param name Name of web app * @param slot Name of web app slot. If not specified then will default to production slot. - * @param siteEnvelope Details of web app if it exists already - * @return the SiteInner object if successful. + * @return the CustomHostnameAnalysisResultInner object if successful. */ - public SiteInner beginCreateOrUpdateSlot(String resourceGroupName, String name, String slot, SiteInner siteEnvelope) { - return beginCreateOrUpdateSlotWithServiceResponseAsync(resourceGroupName, name, slot, siteEnvelope).toBlocking().single().getBody(); + public CustomHostnameAnalysisResultInner analyzeCustomHostnameSlot(String resourceGroupName, String name, String slot) { + return analyzeCustomHostnameSlotWithServiceResponseAsync(resourceGroupName, name, slot).toBlocking().single().getBody(); } /** - * Creates a new web app or modifies an existing web app. - * Creates a new web app or modifies an existing web app. + * Analyze a custom hostname. + * Analyze a custom hostname. * - * @param resourceGroupName Name of the resource group - * @param name Name of the web app + * @param resourceGroupName Name of the resource group to which the resource belongs. + * @param name Name of web app * @param slot Name of web app slot. If not specified then will default to production slot. - * @param siteEnvelope Details of web app if it exists already * @param serviceCallback the async ServiceCallback to handle successful and failed responses. * @return the {@link ServiceCall} object */ - public ServiceCall beginCreateOrUpdateSlotAsync(String resourceGroupName, String name, String slot, SiteInner siteEnvelope, final ServiceCallback serviceCallback) { - return ServiceCall.create(beginCreateOrUpdateSlotWithServiceResponseAsync(resourceGroupName, name, slot, siteEnvelope), serviceCallback); + public ServiceCall analyzeCustomHostnameSlotAsync(String resourceGroupName, String name, String slot, final ServiceCallback serviceCallback) { + return ServiceCall.create(analyzeCustomHostnameSlotWithServiceResponseAsync(resourceGroupName, name, slot), serviceCallback); } /** - * Creates a new web app or modifies an existing web app. - * Creates a new web app or modifies an existing web app. + * Analyze a custom hostname. + * Analyze a custom hostname. * - * @param resourceGroupName Name of the resource group - * @param name Name of the web app + * @param resourceGroupName Name of the resource group to which the resource belongs. + * @param name Name of web app * @param slot Name of web app slot. If not specified then will default to production slot. - * @param siteEnvelope Details of web app if it exists already - * @return the observable to the SiteInner object + * @return the observable to the CustomHostnameAnalysisResultInner object */ - public Observable beginCreateOrUpdateSlotAsync(String resourceGroupName, String name, String slot, SiteInner siteEnvelope) { - return beginCreateOrUpdateSlotWithServiceResponseAsync(resourceGroupName, name, slot, siteEnvelope).map(new Func1, SiteInner>() { + public Observable analyzeCustomHostnameSlotAsync(String resourceGroupName, String name, String slot) { + return analyzeCustomHostnameSlotWithServiceResponseAsync(resourceGroupName, name, slot).map(new Func1, CustomHostnameAnalysisResultInner>() { @Override - public SiteInner call(ServiceResponse response) { + public CustomHostnameAnalysisResultInner call(ServiceResponse response) { return response.getBody(); } }); } /** - * Creates a new web app or modifies an existing web app. - * Creates a new web app or modifies an existing web app. + * Analyze a custom hostname. + * Analyze a custom hostname. * - * @param resourceGroupName Name of the resource group - * @param name Name of the web app + * @param resourceGroupName Name of the resource group to which the resource belongs. + * @param name Name of web app * @param slot Name of web app slot. If not specified then will default to production slot. - * @param siteEnvelope Details of web app if it exists already - * @return the observable to the SiteInner object + * @return the observable to the CustomHostnameAnalysisResultInner object */ - public Observable> beginCreateOrUpdateSlotWithServiceResponseAsync(String resourceGroupName, String name, String slot, SiteInner siteEnvelope) { + public Observable> analyzeCustomHostnameSlotWithServiceResponseAsync(String resourceGroupName, String name, String slot) { if (resourceGroupName == null) { throw new IllegalArgumentException("Parameter resourceGroupName is required and cannot be null."); } @@ -10697,21 +10989,14 @@ public Observable> beginCreateOrUpdateSlotWithService if (this.client.subscriptionId() == null) { throw new IllegalArgumentException("Parameter this.client.subscriptionId() is required and cannot be null."); } - if (siteEnvelope == null) { - throw new IllegalArgumentException("Parameter siteEnvelope is required and cannot be null."); - } - Validator.validate(siteEnvelope); final String apiVersion = "2016-08-01"; - final Boolean skipDnsRegistration = null; - final Boolean skipCustomDomainVerification = null; - final Boolean forceDnsRegistration = null; - final String ttlInSeconds = null; - return service.beginCreateOrUpdateSlot(resourceGroupName, name, slot, this.client.subscriptionId(), siteEnvelope, skipDnsRegistration, skipCustomDomainVerification, forceDnsRegistration, ttlInSeconds, apiVersion, this.client.acceptLanguage(), this.client.userAgent()) - .flatMap(new Func1, Observable>>() { + final String hostName = null; + return service.analyzeCustomHostnameSlot(resourceGroupName, name, slot, this.client.subscriptionId(), hostName, apiVersion, this.client.acceptLanguage(), this.client.userAgent()) + .flatMap(new Func1, Observable>>() { @Override - public Observable> call(Response response) { + public Observable> call(Response response) { try { - ServiceResponse clientResponse = beginCreateOrUpdateSlotDelegate(response); + ServiceResponse clientResponse = analyzeCustomHostnameSlotDelegate(response); return Observable.just(clientResponse); } catch (Throwable t) { return Observable.error(t); @@ -10721,84 +11006,64 @@ public Observable> call(Response respon } /** - * Creates a new web app or modifies an existing web app. - * Creates a new web app or modifies an existing web app. + * Analyze a custom hostname. + * Analyze a custom hostname. * - * @param resourceGroupName Name of the resource group - * @param name Name of the web app + * @param resourceGroupName Name of the resource group to which the resource belongs. + * @param name Name of web app * @param slot Name of web app slot. If not specified then will default to production slot. - * @param siteEnvelope Details of web app if it exists already - * @param skipDnsRegistration If true web app hostname is not registered with DNS on creation. This parameter is - only used for app creation - * @param skipCustomDomainVerification If true, custom (non *.azurewebsites.net) domains associated with web app are not verified. - * @param forceDnsRegistration If true, web app hostname is force registered with DNS - * @param ttlInSeconds Time to live in seconds for web app's default domain name - * @return the SiteInner object if successful. + * @param hostName Custom hostname + * @return the CustomHostnameAnalysisResultInner object if successful. */ - public SiteInner beginCreateOrUpdateSlot(String resourceGroupName, String name, String slot, SiteInner siteEnvelope, Boolean skipDnsRegistration, Boolean skipCustomDomainVerification, Boolean forceDnsRegistration, String ttlInSeconds) { - return beginCreateOrUpdateSlotWithServiceResponseAsync(resourceGroupName, name, slot, siteEnvelope, skipDnsRegistration, skipCustomDomainVerification, forceDnsRegistration, ttlInSeconds).toBlocking().single().getBody(); + public CustomHostnameAnalysisResultInner analyzeCustomHostnameSlot(String resourceGroupName, String name, String slot, String hostName) { + return analyzeCustomHostnameSlotWithServiceResponseAsync(resourceGroupName, name, slot, hostName).toBlocking().single().getBody(); } /** - * Creates a new web app or modifies an existing web app. - * Creates a new web app or modifies an existing web app. + * Analyze a custom hostname. + * Analyze a custom hostname. * - * @param resourceGroupName Name of the resource group - * @param name Name of the web app + * @param resourceGroupName Name of the resource group to which the resource belongs. + * @param name Name of web app * @param slot Name of web app slot. If not specified then will default to production slot. - * @param siteEnvelope Details of web app if it exists already - * @param skipDnsRegistration If true web app hostname is not registered with DNS on creation. This parameter is - only used for app creation - * @param skipCustomDomainVerification If true, custom (non *.azurewebsites.net) domains associated with web app are not verified. - * @param forceDnsRegistration If true, web app hostname is force registered with DNS - * @param ttlInSeconds Time to live in seconds for web app's default domain name + * @param hostName Custom hostname * @param serviceCallback the async ServiceCallback to handle successful and failed responses. * @return the {@link ServiceCall} object */ - public ServiceCall beginCreateOrUpdateSlotAsync(String resourceGroupName, String name, String slot, SiteInner siteEnvelope, Boolean skipDnsRegistration, Boolean skipCustomDomainVerification, Boolean forceDnsRegistration, String ttlInSeconds, final ServiceCallback serviceCallback) { - return ServiceCall.create(beginCreateOrUpdateSlotWithServiceResponseAsync(resourceGroupName, name, slot, siteEnvelope, skipDnsRegistration, skipCustomDomainVerification, forceDnsRegistration, ttlInSeconds), serviceCallback); + public ServiceCall analyzeCustomHostnameSlotAsync(String resourceGroupName, String name, String slot, String hostName, final ServiceCallback serviceCallback) { + return ServiceCall.create(analyzeCustomHostnameSlotWithServiceResponseAsync(resourceGroupName, name, slot, hostName), serviceCallback); } /** - * Creates a new web app or modifies an existing web app. - * Creates a new web app or modifies an existing web app. + * Analyze a custom hostname. + * Analyze a custom hostname. * - * @param resourceGroupName Name of the resource group - * @param name Name of the web app + * @param resourceGroupName Name of the resource group to which the resource belongs. + * @param name Name of web app * @param slot Name of web app slot. If not specified then will default to production slot. - * @param siteEnvelope Details of web app if it exists already - * @param skipDnsRegistration If true web app hostname is not registered with DNS on creation. This parameter is - only used for app creation - * @param skipCustomDomainVerification If true, custom (non *.azurewebsites.net) domains associated with web app are not verified. - * @param forceDnsRegistration If true, web app hostname is force registered with DNS - * @param ttlInSeconds Time to live in seconds for web app's default domain name - * @return the observable to the SiteInner object + * @param hostName Custom hostname + * @return the observable to the CustomHostnameAnalysisResultInner object */ - public Observable beginCreateOrUpdateSlotAsync(String resourceGroupName, String name, String slot, SiteInner siteEnvelope, Boolean skipDnsRegistration, Boolean skipCustomDomainVerification, Boolean forceDnsRegistration, String ttlInSeconds) { - return beginCreateOrUpdateSlotWithServiceResponseAsync(resourceGroupName, name, slot, siteEnvelope, skipDnsRegistration, skipCustomDomainVerification, forceDnsRegistration, ttlInSeconds).map(new Func1, SiteInner>() { + public Observable analyzeCustomHostnameSlotAsync(String resourceGroupName, String name, String slot, String hostName) { + return analyzeCustomHostnameSlotWithServiceResponseAsync(resourceGroupName, name, slot, hostName).map(new Func1, CustomHostnameAnalysisResultInner>() { @Override - public SiteInner call(ServiceResponse response) { + public CustomHostnameAnalysisResultInner call(ServiceResponse response) { return response.getBody(); } }); } /** - * Creates a new web app or modifies an existing web app. - * Creates a new web app or modifies an existing web app. + * Analyze a custom hostname. + * Analyze a custom hostname. * - * @param resourceGroupName Name of the resource group - * @param name Name of the web app + * @param resourceGroupName Name of the resource group to which the resource belongs. + * @param name Name of web app * @param slot Name of web app slot. If not specified then will default to production slot. - * @param siteEnvelope Details of web app if it exists already - * @param skipDnsRegistration If true web app hostname is not registered with DNS on creation. This parameter is - only used for app creation - * @param skipCustomDomainVerification If true, custom (non *.azurewebsites.net) domains associated with web app are not verified. - * @param forceDnsRegistration If true, web app hostname is force registered with DNS - * @param ttlInSeconds Time to live in seconds for web app's default domain name - * @return the observable to the SiteInner object + * @param hostName Custom hostname + * @return the observable to the CustomHostnameAnalysisResultInner object */ - public Observable> beginCreateOrUpdateSlotWithServiceResponseAsync(String resourceGroupName, String name, String slot, SiteInner siteEnvelope, Boolean skipDnsRegistration, Boolean skipCustomDomainVerification, Boolean forceDnsRegistration, String ttlInSeconds) { + public Observable> analyzeCustomHostnameSlotWithServiceResponseAsync(String resourceGroupName, String name, String slot, String hostName) { if (resourceGroupName == null) { throw new IllegalArgumentException("Parameter resourceGroupName is required and cannot be null."); } @@ -10811,17 +11076,13 @@ public Observable> beginCreateOrUpdateSlotWithService if (this.client.subscriptionId() == null) { throw new IllegalArgumentException("Parameter this.client.subscriptionId() is required and cannot be null."); } - if (siteEnvelope == null) { - throw new IllegalArgumentException("Parameter siteEnvelope is required and cannot be null."); - } - Validator.validate(siteEnvelope); final String apiVersion = "2016-08-01"; - return service.beginCreateOrUpdateSlot(resourceGroupName, name, slot, this.client.subscriptionId(), siteEnvelope, skipDnsRegistration, skipCustomDomainVerification, forceDnsRegistration, ttlInSeconds, apiVersion, this.client.acceptLanguage(), this.client.userAgent()) - .flatMap(new Func1, Observable>>() { + return service.analyzeCustomHostnameSlot(resourceGroupName, name, slot, this.client.subscriptionId(), hostName, apiVersion, this.client.acceptLanguage(), this.client.userAgent()) + .flatMap(new Func1, Observable>>() { @Override - public Observable> call(Response response) { + public Observable> call(Response response) { try { - ServiceResponse clientResponse = beginCreateOrUpdateSlotDelegate(response); + ServiceResponse clientResponse = analyzeCustomHostnameSlotDelegate(response); return Observable.just(clientResponse); } catch (Throwable t) { return Observable.error(t); @@ -10830,69 +11091,71 @@ public Observable> call(Response respon }); } - private ServiceResponse beginCreateOrUpdateSlotDelegate(Response response) throws CloudException, IOException, IllegalArgumentException { - return new AzureServiceResponseBuilder(this.client.mapperAdapter()) - .register(200, new TypeToken() { }.getType()) - .register(202, new TypeToken() { }.getType()) + private ServiceResponse analyzeCustomHostnameSlotDelegate(Response response) throws CloudException, IOException, IllegalArgumentException { + return new AzureServiceResponseBuilder(this.client.mapperAdapter()) + .register(200, new TypeToken() { }.getType()) .registerError(CloudException.class) .build(response); } /** - * Deletes a web app. - * Deletes a web app. + * Applies the configuration settings from the target slot onto the current slot. + * Applies the configuration settings from the target slot onto the current slot. * - * @param resourceGroupName Name of resource group - * @param name Name of web app - * @param slot Name of web app slot. If not specified then will default to production slot. - * @return the Object object if successful. + * @param resourceGroupName Name of the resource group to which the resource belongs. + * @param name Name of the app. + * @param slot Name of the source slot. If a slot is not specified, the production slot is used as the source slot. + * @param slotSwapEntity JSON object that contains the target slot name. See example. */ - public Object deleteSlot(String resourceGroupName, String name, String slot) { - return deleteSlotWithServiceResponseAsync(resourceGroupName, name, slot).toBlocking().single().getBody(); + public void applySlotConfigurationSlot(String resourceGroupName, String name, String slot, CsmSlotEntityInner slotSwapEntity) { + applySlotConfigurationSlotWithServiceResponseAsync(resourceGroupName, name, slot, slotSwapEntity).toBlocking().single().getBody(); } /** - * Deletes a web app. - * Deletes a web app. + * Applies the configuration settings from the target slot onto the current slot. + * Applies the configuration settings from the target slot onto the current slot. * - * @param resourceGroupName Name of resource group - * @param name Name of web app - * @param slot Name of web app slot. If not specified then will default to production slot. + * @param resourceGroupName Name of the resource group to which the resource belongs. + * @param name Name of the app. + * @param slot Name of the source slot. If a slot is not specified, the production slot is used as the source slot. + * @param slotSwapEntity JSON object that contains the target slot name. See example. * @param serviceCallback the async ServiceCallback to handle successful and failed responses. * @return the {@link ServiceCall} object */ - public ServiceCall deleteSlotAsync(String resourceGroupName, String name, String slot, final ServiceCallback serviceCallback) { - return ServiceCall.create(deleteSlotWithServiceResponseAsync(resourceGroupName, name, slot), serviceCallback); + public ServiceCall applySlotConfigurationSlotAsync(String resourceGroupName, String name, String slot, CsmSlotEntityInner slotSwapEntity, final ServiceCallback serviceCallback) { + return ServiceCall.create(applySlotConfigurationSlotWithServiceResponseAsync(resourceGroupName, name, slot, slotSwapEntity), serviceCallback); } /** - * Deletes a web app. - * Deletes a web app. + * Applies the configuration settings from the target slot onto the current slot. + * Applies the configuration settings from the target slot onto the current slot. * - * @param resourceGroupName Name of resource group - * @param name Name of web app - * @param slot Name of web app slot. If not specified then will default to production slot. - * @return the observable to the Object object + * @param resourceGroupName Name of the resource group to which the resource belongs. + * @param name Name of the app. + * @param slot Name of the source slot. If a slot is not specified, the production slot is used as the source slot. + * @param slotSwapEntity JSON object that contains the target slot name. See example. + * @return the {@link ServiceResponse} object if successful. */ - public Observable deleteSlotAsync(String resourceGroupName, String name, String slot) { - return deleteSlotWithServiceResponseAsync(resourceGroupName, name, slot).map(new Func1, Object>() { + public Observable applySlotConfigurationSlotAsync(String resourceGroupName, String name, String slot, CsmSlotEntityInner slotSwapEntity) { + return applySlotConfigurationSlotWithServiceResponseAsync(resourceGroupName, name, slot, slotSwapEntity).map(new Func1, Void>() { @Override - public Object call(ServiceResponse response) { + public Void call(ServiceResponse response) { return response.getBody(); } }); } /** - * Deletes a web app. - * Deletes a web app. + * Applies the configuration settings from the target slot onto the current slot. + * Applies the configuration settings from the target slot onto the current slot. * - * @param resourceGroupName Name of resource group - * @param name Name of web app - * @param slot Name of web app slot. If not specified then will default to production slot. - * @return the observable to the Object object + * @param resourceGroupName Name of the resource group to which the resource belongs. + * @param name Name of the app. + * @param slot Name of the source slot. If a slot is not specified, the production slot is used as the source slot. + * @param slotSwapEntity JSON object that contains the target slot name. See example. + * @return the {@link ServiceResponse} object if successful. */ - public Observable> deleteSlotWithServiceResponseAsync(String resourceGroupName, String name, String slot) { + public Observable> applySlotConfigurationSlotWithServiceResponseAsync(String resourceGroupName, String name, String slot, CsmSlotEntityInner slotSwapEntity) { if (resourceGroupName == null) { throw new IllegalArgumentException("Parameter resourceGroupName is required and cannot be null."); } @@ -10905,16 +11168,17 @@ public Observable> deleteSlotWithServiceResponseAsync(St if (this.client.subscriptionId() == null) { throw new IllegalArgumentException("Parameter this.client.subscriptionId() is required and cannot be null."); } + if (slotSwapEntity == null) { + throw new IllegalArgumentException("Parameter slotSwapEntity is required and cannot be null."); + } + Validator.validate(slotSwapEntity); final String apiVersion = "2016-08-01"; - final Boolean deleteMetrics = null; - final Boolean deleteEmptyServerFarm = null; - final Boolean skipDnsRegistration = null; - return service.deleteSlot(resourceGroupName, name, slot, this.client.subscriptionId(), deleteMetrics, deleteEmptyServerFarm, skipDnsRegistration, apiVersion, this.client.acceptLanguage(), this.client.userAgent()) - .flatMap(new Func1, Observable>>() { + return service.applySlotConfigurationSlot(resourceGroupName, name, slot, this.client.subscriptionId(), slotSwapEntity, apiVersion, this.client.acceptLanguage(), this.client.userAgent()) + .flatMap(new Func1, Observable>>() { @Override - public Observable> call(Response response) { + public Observable> call(Response response) { try { - ServiceResponse clientResponse = deleteSlotDelegate(response); + ServiceResponse clientResponse = applySlotConfigurationSlotDelegate(response); return Observable.just(clientResponse); } catch (Throwable t) { return Observable.error(t); @@ -10923,73 +11187,71 @@ public Observable> call(Response response) }); } + private ServiceResponse applySlotConfigurationSlotDelegate(Response response) throws CloudException, IOException, IllegalArgumentException { + return new AzureServiceResponseBuilder(this.client.mapperAdapter()) + .register(204, new TypeToken() { }.getType()) + .build(response); + } + /** - * Deletes a web app. - * Deletes a web app. + * Creates a backup of an app. + * Creates a backup of an app. * - * @param resourceGroupName Name of resource group - * @param name Name of web app - * @param slot Name of web app slot. If not specified then will default to production slot. - * @param deleteMetrics If true, web app metrics are also deleted - * @param deleteEmptyServerFarm If true and App Service Plan is empty after web app deletion, App Service Plan is also deleted - * @param skipDnsRegistration If true, DNS registration is skipped - * @return the Object object if successful. + * @param resourceGroupName Name of the resource group to which the resource belongs. + * @param name Name of the app. + * @param slot Name of the deployment slot. If a slot is not specified, the API will create a backup for the production slot. + * @param request Backup configuration. You can use the JSON response from the POST action as input here. + * @return the BackupItemInner object if successful. */ - public Object deleteSlot(String resourceGroupName, String name, String slot, Boolean deleteMetrics, Boolean deleteEmptyServerFarm, Boolean skipDnsRegistration) { - return deleteSlotWithServiceResponseAsync(resourceGroupName, name, slot, deleteMetrics, deleteEmptyServerFarm, skipDnsRegistration).toBlocking().single().getBody(); + public BackupItemInner backupSlot(String resourceGroupName, String name, String slot, BackupRequestInner request) { + return backupSlotWithServiceResponseAsync(resourceGroupName, name, slot, request).toBlocking().single().getBody(); } /** - * Deletes a web app. - * Deletes a web app. + * Creates a backup of an app. + * Creates a backup of an app. * - * @param resourceGroupName Name of resource group - * @param name Name of web app - * @param slot Name of web app slot. If not specified then will default to production slot. - * @param deleteMetrics If true, web app metrics are also deleted - * @param deleteEmptyServerFarm If true and App Service Plan is empty after web app deletion, App Service Plan is also deleted - * @param skipDnsRegistration If true, DNS registration is skipped + * @param resourceGroupName Name of the resource group to which the resource belongs. + * @param name Name of the app. + * @param slot Name of the deployment slot. If a slot is not specified, the API will create a backup for the production slot. + * @param request Backup configuration. You can use the JSON response from the POST action as input here. * @param serviceCallback the async ServiceCallback to handle successful and failed responses. * @return the {@link ServiceCall} object */ - public ServiceCall deleteSlotAsync(String resourceGroupName, String name, String slot, Boolean deleteMetrics, Boolean deleteEmptyServerFarm, Boolean skipDnsRegistration, final ServiceCallback serviceCallback) { - return ServiceCall.create(deleteSlotWithServiceResponseAsync(resourceGroupName, name, slot, deleteMetrics, deleteEmptyServerFarm, skipDnsRegistration), serviceCallback); + public ServiceCall backupSlotAsync(String resourceGroupName, String name, String slot, BackupRequestInner request, final ServiceCallback serviceCallback) { + return ServiceCall.create(backupSlotWithServiceResponseAsync(resourceGroupName, name, slot, request), serviceCallback); } /** - * Deletes a web app. - * Deletes a web app. + * Creates a backup of an app. + * Creates a backup of an app. * - * @param resourceGroupName Name of resource group - * @param name Name of web app - * @param slot Name of web app slot. If not specified then will default to production slot. - * @param deleteMetrics If true, web app metrics are also deleted - * @param deleteEmptyServerFarm If true and App Service Plan is empty after web app deletion, App Service Plan is also deleted - * @param skipDnsRegistration If true, DNS registration is skipped - * @return the observable to the Object object + * @param resourceGroupName Name of the resource group to which the resource belongs. + * @param name Name of the app. + * @param slot Name of the deployment slot. If a slot is not specified, the API will create a backup for the production slot. + * @param request Backup configuration. You can use the JSON response from the POST action as input here. + * @return the observable to the BackupItemInner object */ - public Observable deleteSlotAsync(String resourceGroupName, String name, String slot, Boolean deleteMetrics, Boolean deleteEmptyServerFarm, Boolean skipDnsRegistration) { - return deleteSlotWithServiceResponseAsync(resourceGroupName, name, slot, deleteMetrics, deleteEmptyServerFarm, skipDnsRegistration).map(new Func1, Object>() { + public Observable backupSlotAsync(String resourceGroupName, String name, String slot, BackupRequestInner request) { + return backupSlotWithServiceResponseAsync(resourceGroupName, name, slot, request).map(new Func1, BackupItemInner>() { @Override - public Object call(ServiceResponse response) { + public BackupItemInner call(ServiceResponse response) { return response.getBody(); } }); } /** - * Deletes a web app. - * Deletes a web app. + * Creates a backup of an app. + * Creates a backup of an app. * - * @param resourceGroupName Name of resource group - * @param name Name of web app - * @param slot Name of web app slot. If not specified then will default to production slot. - * @param deleteMetrics If true, web app metrics are also deleted - * @param deleteEmptyServerFarm If true and App Service Plan is empty after web app deletion, App Service Plan is also deleted - * @param skipDnsRegistration If true, DNS registration is skipped - * @return the observable to the Object object + * @param resourceGroupName Name of the resource group to which the resource belongs. + * @param name Name of the app. + * @param slot Name of the deployment slot. If a slot is not specified, the API will create a backup for the production slot. + * @param request Backup configuration. You can use the JSON response from the POST action as input here. + * @return the observable to the BackupItemInner object */ - public Observable> deleteSlotWithServiceResponseAsync(String resourceGroupName, String name, String slot, Boolean deleteMetrics, Boolean deleteEmptyServerFarm, Boolean skipDnsRegistration) { + public Observable> backupSlotWithServiceResponseAsync(String resourceGroupName, String name, String slot, BackupRequestInner request) { if (resourceGroupName == null) { throw new IllegalArgumentException("Parameter resourceGroupName is required and cannot be null."); } @@ -11002,13 +11264,17 @@ public Observable> deleteSlotWithServiceResponseAsync(St if (this.client.subscriptionId() == null) { throw new IllegalArgumentException("Parameter this.client.subscriptionId() is required and cannot be null."); } + if (request == null) { + throw new IllegalArgumentException("Parameter request is required and cannot be null."); + } + Validator.validate(request); final String apiVersion = "2016-08-01"; - return service.deleteSlot(resourceGroupName, name, slot, this.client.subscriptionId(), deleteMetrics, deleteEmptyServerFarm, skipDnsRegistration, apiVersion, this.client.acceptLanguage(), this.client.userAgent()) - .flatMap(new Func1, Observable>>() { + return service.backupSlot(resourceGroupName, name, slot, this.client.subscriptionId(), request, apiVersion, this.client.acceptLanguage(), this.client.userAgent()) + .flatMap(new Func1, Observable>>() { @Override - public Observable> call(Response response) { + public Observable> call(Response response) { try { - ServiceResponse clientResponse = deleteSlotDelegate(response); + ServiceResponse clientResponse = backupSlotDelegate(response); return Observable.just(clientResponse); } catch (Throwable t) { return Observable.error(t); @@ -11017,68 +11283,106 @@ public Observable> call(Response response) }); } - private ServiceResponse deleteSlotDelegate(Response response) throws CloudException, IOException, IllegalArgumentException { - return new AzureServiceResponseBuilder(this.client.mapperAdapter()) - .register(200, new TypeToken() { }.getType()) + private ServiceResponse backupSlotDelegate(Response response) throws CloudException, IOException, IllegalArgumentException { + return new AzureServiceResponseBuilder(this.client.mapperAdapter()) + .register(200, new TypeToken() { }.getType()) .registerError(CloudException.class) .build(response); } /** - * Analyze a custom hostname. - * Analyze a custom hostname. + * Gets existing backups of an app. + * Gets existing backups of an app. * - * @param resourceGroupName Name of resource group - * @param name Name of web app - * @param slot Name of web app slot. If not specified then will default to production slot. - * @return the CustomHostnameAnalysisResultInner object if successful. + * @param resourceGroupName Name of the resource group to which the resource belongs. + * @param name Name of the app. + * @param slot Name of the deployment slot. If a slot is not specified, the API will get backups of the production slot. + * @return the PagedList<BackupItemInner> object if successful. */ - public CustomHostnameAnalysisResultInner analyzeCustomHostnameSlot(String resourceGroupName, String name, String slot) { - return analyzeCustomHostnameSlotWithServiceResponseAsync(resourceGroupName, name, slot).toBlocking().single().getBody(); + public PagedList listBackupsSlot(final String resourceGroupName, final String name, final String slot) { + ServiceResponse> response = listBackupsSlotSinglePageAsync(resourceGroupName, name, slot).toBlocking().single(); + return new PagedList(response.getBody()) { + @Override + public Page nextPage(String nextPageLink) { + return listBackupsSlotNextSinglePageAsync(nextPageLink).toBlocking().single().getBody(); + } + }; } /** - * Analyze a custom hostname. - * Analyze a custom hostname. + * Gets existing backups of an app. + * Gets existing backups of an app. * - * @param resourceGroupName Name of resource group - * @param name Name of web app - * @param slot Name of web app slot. If not specified then will default to production slot. + * @param resourceGroupName Name of the resource group to which the resource belongs. + * @param name Name of the app. + * @param slot Name of the deployment slot. If a slot is not specified, the API will get backups of the production slot. * @param serviceCallback the async ServiceCallback to handle successful and failed responses. * @return the {@link ServiceCall} object */ - public ServiceCall analyzeCustomHostnameSlotAsync(String resourceGroupName, String name, String slot, final ServiceCallback serviceCallback) { - return ServiceCall.create(analyzeCustomHostnameSlotWithServiceResponseAsync(resourceGroupName, name, slot), serviceCallback); + public ServiceCall> listBackupsSlotAsync(final String resourceGroupName, final String name, final String slot, final ListOperationCallback serviceCallback) { + return AzureServiceCall.create( + listBackupsSlotSinglePageAsync(resourceGroupName, name, slot), + new Func1>>>() { + @Override + public Observable>> call(String nextPageLink) { + return listBackupsSlotNextSinglePageAsync(nextPageLink); + } + }, + serviceCallback); } /** - * Analyze a custom hostname. - * Analyze a custom hostname. + * Gets existing backups of an app. + * Gets existing backups of an app. * - * @param resourceGroupName Name of resource group - * @param name Name of web app - * @param slot Name of web app slot. If not specified then will default to production slot. - * @return the observable to the CustomHostnameAnalysisResultInner object + * @param resourceGroupName Name of the resource group to which the resource belongs. + * @param name Name of the app. + * @param slot Name of the deployment slot. If a slot is not specified, the API will get backups of the production slot. + * @return the observable to the PagedList<BackupItemInner> object */ - public Observable analyzeCustomHostnameSlotAsync(String resourceGroupName, String name, String slot) { - return analyzeCustomHostnameSlotWithServiceResponseAsync(resourceGroupName, name, slot).map(new Func1, CustomHostnameAnalysisResultInner>() { - @Override - public CustomHostnameAnalysisResultInner call(ServiceResponse response) { - return response.getBody(); - } - }); + public Observable> listBackupsSlotAsync(final String resourceGroupName, final String name, final String slot) { + return listBackupsSlotWithServiceResponseAsync(resourceGroupName, name, slot) + .map(new Func1>, Page>() { + @Override + public Page call(ServiceResponse> response) { + return response.getBody(); + } + }); } /** - * Analyze a custom hostname. - * Analyze a custom hostname. + * Gets existing backups of an app. + * Gets existing backups of an app. * - * @param resourceGroupName Name of resource group - * @param name Name of web app - * @param slot Name of web app slot. If not specified then will default to production slot. - * @return the observable to the CustomHostnameAnalysisResultInner object + * @param resourceGroupName Name of the resource group to which the resource belongs. + * @param name Name of the app. + * @param slot Name of the deployment slot. If a slot is not specified, the API will get backups of the production slot. + * @return the observable to the PagedList<BackupItemInner> object */ - public Observable> analyzeCustomHostnameSlotWithServiceResponseAsync(String resourceGroupName, String name, String slot) { + public Observable>> listBackupsSlotWithServiceResponseAsync(final String resourceGroupName, final String name, final String slot) { + return listBackupsSlotSinglePageAsync(resourceGroupName, name, slot) + .concatMap(new Func1>, Observable>>>() { + @Override + public Observable>> call(ServiceResponse> page) { + String nextPageLink = page.getBody().getNextPageLink(); + if (nextPageLink == null) { + return Observable.just(page); + } + return Observable.just(page).concatWith(listBackupsSlotNextWithServiceResponseAsync(nextPageLink)); + } + }); + } + + /** + * Gets existing backups of an app. + * Gets existing backups of an app. + * + ServiceResponse> * @param resourceGroupName Name of the resource group to which the resource belongs. + ServiceResponse> * @param name Name of the app. + ServiceResponse> * @param slot Name of the deployment slot. If a slot is not specified, the API will get backups of the production slot. + * @return the PagedList<BackupItemInner> object wrapped in {@link ServiceResponse} if successful. + */ + public Observable>> listBackupsSlotSinglePageAsync(final String resourceGroupName, final String name, final String slot) { if (resourceGroupName == null) { throw new IllegalArgumentException("Parameter resourceGroupName is required and cannot be null."); } @@ -11092,14 +11396,13 @@ public Observable> analyzeCus throw new IllegalArgumentException("Parameter this.client.subscriptionId() is required and cannot be null."); } final String apiVersion = "2016-08-01"; - final String hostName = null; - return service.analyzeCustomHostnameSlot(resourceGroupName, name, slot, this.client.subscriptionId(), hostName, apiVersion, this.client.acceptLanguage(), this.client.userAgent()) - .flatMap(new Func1, Observable>>() { + return service.listBackupsSlot(resourceGroupName, name, slot, this.client.subscriptionId(), apiVersion, this.client.acceptLanguage(), this.client.userAgent()) + .flatMap(new Func1, Observable>>>() { @Override - public Observable> call(Response response) { + public Observable>> call(Response response) { try { - ServiceResponse clientResponse = analyzeCustomHostnameSlotDelegate(response); - return Observable.just(clientResponse); + ServiceResponse> result = listBackupsSlotDelegate(response); + return Observable.just(new ServiceResponse>(result.getBody(), result.getResponse())); } catch (Throwable t) { return Observable.error(t); } @@ -11107,65 +11410,72 @@ public Observable> call(Respo }); } + private ServiceResponse> listBackupsSlotDelegate(Response response) throws CloudException, IOException, IllegalArgumentException { + return new AzureServiceResponseBuilder, CloudException>(this.client.mapperAdapter()) + .register(200, new TypeToken>() { }.getType()) + .registerError(CloudException.class) + .build(response); + } + /** - * Analyze a custom hostname. - * Analyze a custom hostname. + * Discovers an existing app backup that can be restored from a blob in Azure storage. + * Discovers an existing app backup that can be restored from a blob in Azure storage. * - * @param resourceGroupName Name of resource group - * @param name Name of web app - * @param slot Name of web app slot. If not specified then will default to production slot. - * @param hostName Custom hostname - * @return the CustomHostnameAnalysisResultInner object if successful. + * @param resourceGroupName Name of the resource group to which the resource belongs. + * @param name Name of the app. + * @param slot Name of the deployment slot. If a slot is not specified, the API will perform discovery for the production slot. + * @param request A RestoreRequest object that includes Azure storage URL and blog name for discovery of backup. + * @return the RestoreRequestInner object if successful. */ - public CustomHostnameAnalysisResultInner analyzeCustomHostnameSlot(String resourceGroupName, String name, String slot, String hostName) { - return analyzeCustomHostnameSlotWithServiceResponseAsync(resourceGroupName, name, slot, hostName).toBlocking().single().getBody(); + public RestoreRequestInner discoverRestoreSlot(String resourceGroupName, String name, String slot, RestoreRequestInner request) { + return discoverRestoreSlotWithServiceResponseAsync(resourceGroupName, name, slot, request).toBlocking().single().getBody(); } /** - * Analyze a custom hostname. - * Analyze a custom hostname. + * Discovers an existing app backup that can be restored from a blob in Azure storage. + * Discovers an existing app backup that can be restored from a blob in Azure storage. * - * @param resourceGroupName Name of resource group - * @param name Name of web app - * @param slot Name of web app slot. If not specified then will default to production slot. - * @param hostName Custom hostname + * @param resourceGroupName Name of the resource group to which the resource belongs. + * @param name Name of the app. + * @param slot Name of the deployment slot. If a slot is not specified, the API will perform discovery for the production slot. + * @param request A RestoreRequest object that includes Azure storage URL and blog name for discovery of backup. * @param serviceCallback the async ServiceCallback to handle successful and failed responses. * @return the {@link ServiceCall} object */ - public ServiceCall analyzeCustomHostnameSlotAsync(String resourceGroupName, String name, String slot, String hostName, final ServiceCallback serviceCallback) { - return ServiceCall.create(analyzeCustomHostnameSlotWithServiceResponseAsync(resourceGroupName, name, slot, hostName), serviceCallback); + public ServiceCall discoverRestoreSlotAsync(String resourceGroupName, String name, String slot, RestoreRequestInner request, final ServiceCallback serviceCallback) { + return ServiceCall.create(discoverRestoreSlotWithServiceResponseAsync(resourceGroupName, name, slot, request), serviceCallback); } /** - * Analyze a custom hostname. - * Analyze a custom hostname. + * Discovers an existing app backup that can be restored from a blob in Azure storage. + * Discovers an existing app backup that can be restored from a blob in Azure storage. * - * @param resourceGroupName Name of resource group - * @param name Name of web app - * @param slot Name of web app slot. If not specified then will default to production slot. - * @param hostName Custom hostname - * @return the observable to the CustomHostnameAnalysisResultInner object + * @param resourceGroupName Name of the resource group to which the resource belongs. + * @param name Name of the app. + * @param slot Name of the deployment slot. If a slot is not specified, the API will perform discovery for the production slot. + * @param request A RestoreRequest object that includes Azure storage URL and blog name for discovery of backup. + * @return the observable to the RestoreRequestInner object */ - public Observable analyzeCustomHostnameSlotAsync(String resourceGroupName, String name, String slot, String hostName) { - return analyzeCustomHostnameSlotWithServiceResponseAsync(resourceGroupName, name, slot, hostName).map(new Func1, CustomHostnameAnalysisResultInner>() { + public Observable discoverRestoreSlotAsync(String resourceGroupName, String name, String slot, RestoreRequestInner request) { + return discoverRestoreSlotWithServiceResponseAsync(resourceGroupName, name, slot, request).map(new Func1, RestoreRequestInner>() { @Override - public CustomHostnameAnalysisResultInner call(ServiceResponse response) { + public RestoreRequestInner call(ServiceResponse response) { return response.getBody(); } }); } /** - * Analyze a custom hostname. - * Analyze a custom hostname. + * Discovers an existing app backup that can be restored from a blob in Azure storage. + * Discovers an existing app backup that can be restored from a blob in Azure storage. * - * @param resourceGroupName Name of resource group - * @param name Name of web app - * @param slot Name of web app slot. If not specified then will default to production slot. - * @param hostName Custom hostname - * @return the observable to the CustomHostnameAnalysisResultInner object + * @param resourceGroupName Name of the resource group to which the resource belongs. + * @param name Name of the app. + * @param slot Name of the deployment slot. If a slot is not specified, the API will perform discovery for the production slot. + * @param request A RestoreRequest object that includes Azure storage URL and blog name for discovery of backup. + * @return the observable to the RestoreRequestInner object */ - public Observable> analyzeCustomHostnameSlotWithServiceResponseAsync(String resourceGroupName, String name, String slot, String hostName) { + public Observable> discoverRestoreSlotWithServiceResponseAsync(String resourceGroupName, String name, String slot, RestoreRequestInner request) { if (resourceGroupName == null) { throw new IllegalArgumentException("Parameter resourceGroupName is required and cannot be null."); } @@ -11178,13 +11488,17 @@ public Observable> analyzeCus if (this.client.subscriptionId() == null) { throw new IllegalArgumentException("Parameter this.client.subscriptionId() is required and cannot be null."); } + if (request == null) { + throw new IllegalArgumentException("Parameter request is required and cannot be null."); + } + Validator.validate(request); final String apiVersion = "2016-08-01"; - return service.analyzeCustomHostnameSlot(resourceGroupName, name, slot, this.client.subscriptionId(), hostName, apiVersion, this.client.acceptLanguage(), this.client.userAgent()) - .flatMap(new Func1, Observable>>() { + return service.discoverRestoreSlot(resourceGroupName, name, slot, this.client.subscriptionId(), request, apiVersion, this.client.acceptLanguage(), this.client.userAgent()) + .flatMap(new Func1, Observable>>() { @Override - public Observable> call(Response response) { + public Observable> call(Response response) { try { - ServiceResponse clientResponse = analyzeCustomHostnameSlotDelegate(response); + ServiceResponse clientResponse = discoverRestoreSlotDelegate(response); return Observable.just(clientResponse); } catch (Throwable t) { return Observable.error(t); @@ -11193,95 +11507,94 @@ public Observable> call(Respo }); } - private ServiceResponse analyzeCustomHostnameSlotDelegate(Response response) throws CloudException, IOException, IllegalArgumentException { - return new AzureServiceResponseBuilder(this.client.mapperAdapter()) - .register(200, new TypeToken() { }.getType()) + private ServiceResponse discoverRestoreSlotDelegate(Response response) throws CloudException, IOException, IllegalArgumentException { + return new AzureServiceResponseBuilder(this.client.mapperAdapter()) + .register(200, new TypeToken() { }.getType()) .registerError(CloudException.class) .build(response); } /** - * Applies the configuration settings from the target slot onto the current slot. - * Applies the configuration settings from the target slot onto the current slot. + * Gets a backup of an app by its ID. + * Gets a backup of an app by its ID. * - * @param resourceGroupName Name of resource group - * @param name Name of web app - * @param slot Name of the source slot. Settings from the target slot will be applied onto this slot - * @param slotSwapEntity Request body that contains the target slot name. Settings from that slot will be applied on the source slot - * @return the Object object if successful. + * @param resourceGroupName Name of the resource group to which the resource belongs. + * @param name Name of the app. + * @param backupId ID of the backup. + * @param slot Name of the deployment slot. If a slot is not specified, the API will get a backup of the production slot. + * @return the BackupItemInner object if successful. */ - public Object applySlotConfigurationSlot(String resourceGroupName, String name, String slot, CsmSlotEntityInner slotSwapEntity) { - return applySlotConfigurationSlotWithServiceResponseAsync(resourceGroupName, name, slot, slotSwapEntity).toBlocking().single().getBody(); + public BackupItemInner getBackupStatusSlot(String resourceGroupName, String name, String backupId, String slot) { + return getBackupStatusSlotWithServiceResponseAsync(resourceGroupName, name, backupId, slot).toBlocking().single().getBody(); } /** - * Applies the configuration settings from the target slot onto the current slot. - * Applies the configuration settings from the target slot onto the current slot. + * Gets a backup of an app by its ID. + * Gets a backup of an app by its ID. * - * @param resourceGroupName Name of resource group - * @param name Name of web app - * @param slot Name of the source slot. Settings from the target slot will be applied onto this slot - * @param slotSwapEntity Request body that contains the target slot name. Settings from that slot will be applied on the source slot + * @param resourceGroupName Name of the resource group to which the resource belongs. + * @param name Name of the app. + * @param backupId ID of the backup. + * @param slot Name of the deployment slot. If a slot is not specified, the API will get a backup of the production slot. * @param serviceCallback the async ServiceCallback to handle successful and failed responses. * @return the {@link ServiceCall} object */ - public ServiceCall applySlotConfigurationSlotAsync(String resourceGroupName, String name, String slot, CsmSlotEntityInner slotSwapEntity, final ServiceCallback serviceCallback) { - return ServiceCall.create(applySlotConfigurationSlotWithServiceResponseAsync(resourceGroupName, name, slot, slotSwapEntity), serviceCallback); + public ServiceCall getBackupStatusSlotAsync(String resourceGroupName, String name, String backupId, String slot, final ServiceCallback serviceCallback) { + return ServiceCall.create(getBackupStatusSlotWithServiceResponseAsync(resourceGroupName, name, backupId, slot), serviceCallback); } /** - * Applies the configuration settings from the target slot onto the current slot. - * Applies the configuration settings from the target slot onto the current slot. + * Gets a backup of an app by its ID. + * Gets a backup of an app by its ID. * - * @param resourceGroupName Name of resource group - * @param name Name of web app - * @param slot Name of the source slot. Settings from the target slot will be applied onto this slot - * @param slotSwapEntity Request body that contains the target slot name. Settings from that slot will be applied on the source slot - * @return the observable to the Object object + * @param resourceGroupName Name of the resource group to which the resource belongs. + * @param name Name of the app. + * @param backupId ID of the backup. + * @param slot Name of the deployment slot. If a slot is not specified, the API will get a backup of the production slot. + * @return the observable to the BackupItemInner object */ - public Observable applySlotConfigurationSlotAsync(String resourceGroupName, String name, String slot, CsmSlotEntityInner slotSwapEntity) { - return applySlotConfigurationSlotWithServiceResponseAsync(resourceGroupName, name, slot, slotSwapEntity).map(new Func1, Object>() { + public Observable getBackupStatusSlotAsync(String resourceGroupName, String name, String backupId, String slot) { + return getBackupStatusSlotWithServiceResponseAsync(resourceGroupName, name, backupId, slot).map(new Func1, BackupItemInner>() { @Override - public Object call(ServiceResponse response) { + public BackupItemInner call(ServiceResponse response) { return response.getBody(); } }); } /** - * Applies the configuration settings from the target slot onto the current slot. - * Applies the configuration settings from the target slot onto the current slot. + * Gets a backup of an app by its ID. + * Gets a backup of an app by its ID. * - * @param resourceGroupName Name of resource group - * @param name Name of web app - * @param slot Name of the source slot. Settings from the target slot will be applied onto this slot - * @param slotSwapEntity Request body that contains the target slot name. Settings from that slot will be applied on the source slot - * @return the observable to the Object object + * @param resourceGroupName Name of the resource group to which the resource belongs. + * @param name Name of the app. + * @param backupId ID of the backup. + * @param slot Name of the deployment slot. If a slot is not specified, the API will get a backup of the production slot. + * @return the observable to the BackupItemInner object */ - public Observable> applySlotConfigurationSlotWithServiceResponseAsync(String resourceGroupName, String name, String slot, CsmSlotEntityInner slotSwapEntity) { + public Observable> getBackupStatusSlotWithServiceResponseAsync(String resourceGroupName, String name, String backupId, String slot) { if (resourceGroupName == null) { throw new IllegalArgumentException("Parameter resourceGroupName is required and cannot be null."); } if (name == null) { throw new IllegalArgumentException("Parameter name is required and cannot be null."); } + if (backupId == null) { + throw new IllegalArgumentException("Parameter backupId is required and cannot be null."); + } if (slot == null) { throw new IllegalArgumentException("Parameter slot is required and cannot be null."); } if (this.client.subscriptionId() == null) { throw new IllegalArgumentException("Parameter this.client.subscriptionId() is required and cannot be null."); } - if (slotSwapEntity == null) { - throw new IllegalArgumentException("Parameter slotSwapEntity is required and cannot be null."); - } - Validator.validate(slotSwapEntity); final String apiVersion = "2016-08-01"; - return service.applySlotConfigurationSlot(resourceGroupName, name, slot, this.client.subscriptionId(), slotSwapEntity, apiVersion, this.client.acceptLanguage(), this.client.userAgent()) - .flatMap(new Func1, Observable>>() { + return service.getBackupStatusSlot(resourceGroupName, name, backupId, slot, this.client.subscriptionId(), apiVersion, this.client.acceptLanguage(), this.client.userAgent()) + .flatMap(new Func1, Observable>>() { @Override - public Observable> call(Response response) { + public Observable> call(Response response) { try { - ServiceResponse clientResponse = applySlotConfigurationSlotDelegate(response); + ServiceResponse clientResponse = getBackupStatusSlotDelegate(response); return Observable.just(clientResponse); } catch (Throwable t) { return Observable.error(t); @@ -11290,95 +11603,93 @@ public Observable> call(Response response) }); } - private ServiceResponse applySlotConfigurationSlotDelegate(Response response) throws CloudException, IOException, IllegalArgumentException { - return new AzureServiceResponseBuilder(this.client.mapperAdapter()) - .register(200, new TypeToken() { }.getType()) + private ServiceResponse getBackupStatusSlotDelegate(Response response) throws CloudException, IOException, IllegalArgumentException { + return new AzureServiceResponseBuilder(this.client.mapperAdapter()) + .register(200, new TypeToken() { }.getType()) .registerError(CloudException.class) .build(response); } /** - * Creates web app backup. - * Creates web app backup. + * Deletes a backup of an app by its ID. + * Deletes a backup of an app by its ID. * - * @param resourceGroupName Name of resource group - * @param name Name of web app - * @param slot Name of web app slot. If not specified then will default to production slot. - * @param request Information on backup request - * @return the BackupItemInner object if successful. + * @param resourceGroupName Name of the resource group to which the resource belongs. + * @param name Name of the app. + * @param backupId ID of the backup. + * @param slot Name of the deployment slot. If a slot is not specified, the API will delete a backup of the production slot. */ - public BackupItemInner backupSlot(String resourceGroupName, String name, String slot, BackupRequestInner request) { - return backupSlotWithServiceResponseAsync(resourceGroupName, name, slot, request).toBlocking().single().getBody(); + public void deleteBackupSlot(String resourceGroupName, String name, String backupId, String slot) { + deleteBackupSlotWithServiceResponseAsync(resourceGroupName, name, backupId, slot).toBlocking().single().getBody(); } /** - * Creates web app backup. - * Creates web app backup. + * Deletes a backup of an app by its ID. + * Deletes a backup of an app by its ID. * - * @param resourceGroupName Name of resource group - * @param name Name of web app - * @param slot Name of web app slot. If not specified then will default to production slot. - * @param request Information on backup request + * @param resourceGroupName Name of the resource group to which the resource belongs. + * @param name Name of the app. + * @param backupId ID of the backup. + * @param slot Name of the deployment slot. If a slot is not specified, the API will delete a backup of the production slot. * @param serviceCallback the async ServiceCallback to handle successful and failed responses. * @return the {@link ServiceCall} object */ - public ServiceCall backupSlotAsync(String resourceGroupName, String name, String slot, BackupRequestInner request, final ServiceCallback serviceCallback) { - return ServiceCall.create(backupSlotWithServiceResponseAsync(resourceGroupName, name, slot, request), serviceCallback); + public ServiceCall deleteBackupSlotAsync(String resourceGroupName, String name, String backupId, String slot, final ServiceCallback serviceCallback) { + return ServiceCall.create(deleteBackupSlotWithServiceResponseAsync(resourceGroupName, name, backupId, slot), serviceCallback); } /** - * Creates web app backup. - * Creates web app backup. + * Deletes a backup of an app by its ID. + * Deletes a backup of an app by its ID. * - * @param resourceGroupName Name of resource group - * @param name Name of web app - * @param slot Name of web app slot. If not specified then will default to production slot. - * @param request Information on backup request - * @return the observable to the BackupItemInner object + * @param resourceGroupName Name of the resource group to which the resource belongs. + * @param name Name of the app. + * @param backupId ID of the backup. + * @param slot Name of the deployment slot. If a slot is not specified, the API will delete a backup of the production slot. + * @return the {@link ServiceResponse} object if successful. */ - public Observable backupSlotAsync(String resourceGroupName, String name, String slot, BackupRequestInner request) { - return backupSlotWithServiceResponseAsync(resourceGroupName, name, slot, request).map(new Func1, BackupItemInner>() { + public Observable deleteBackupSlotAsync(String resourceGroupName, String name, String backupId, String slot) { + return deleteBackupSlotWithServiceResponseAsync(resourceGroupName, name, backupId, slot).map(new Func1, Void>() { @Override - public BackupItemInner call(ServiceResponse response) { + public Void call(ServiceResponse response) { return response.getBody(); } }); } /** - * Creates web app backup. - * Creates web app backup. + * Deletes a backup of an app by its ID. + * Deletes a backup of an app by its ID. * - * @param resourceGroupName Name of resource group - * @param name Name of web app - * @param slot Name of web app slot. If not specified then will default to production slot. - * @param request Information on backup request - * @return the observable to the BackupItemInner object + * @param resourceGroupName Name of the resource group to which the resource belongs. + * @param name Name of the app. + * @param backupId ID of the backup. + * @param slot Name of the deployment slot. If a slot is not specified, the API will delete a backup of the production slot. + * @return the {@link ServiceResponse} object if successful. */ - public Observable> backupSlotWithServiceResponseAsync(String resourceGroupName, String name, String slot, BackupRequestInner request) { + public Observable> deleteBackupSlotWithServiceResponseAsync(String resourceGroupName, String name, String backupId, String slot) { if (resourceGroupName == null) { throw new IllegalArgumentException("Parameter resourceGroupName is required and cannot be null."); } if (name == null) { throw new IllegalArgumentException("Parameter name is required and cannot be null."); } + if (backupId == null) { + throw new IllegalArgumentException("Parameter backupId is required and cannot be null."); + } if (slot == null) { throw new IllegalArgumentException("Parameter slot is required and cannot be null."); } if (this.client.subscriptionId() == null) { throw new IllegalArgumentException("Parameter this.client.subscriptionId() is required and cannot be null."); } - if (request == null) { - throw new IllegalArgumentException("Parameter request is required and cannot be null."); - } - Validator.validate(request); final String apiVersion = "2016-08-01"; - return service.backupSlot(resourceGroupName, name, slot, this.client.subscriptionId(), request, apiVersion, this.client.acceptLanguage(), this.client.userAgent()) - .flatMap(new Func1, Observable>>() { + return service.deleteBackupSlot(resourceGroupName, name, backupId, slot, this.client.subscriptionId(), apiVersion, this.client.acceptLanguage(), this.client.userAgent()) + .flatMap(new Func1, Observable>>() { @Override - public Observable> call(Response response) { + public Observable> call(Response response) { try { - ServiceResponse clientResponse = backupSlotDelegate(response); + ServiceResponse clientResponse = deleteBackupSlotDelegate(response); return Observable.just(clientResponse); } catch (Throwable t) { return Observable.error(t); @@ -11387,126 +11698,103 @@ public Observable> call(Response }); } - private ServiceResponse backupSlotDelegate(Response response) throws CloudException, IOException, IllegalArgumentException { - return new AzureServiceResponseBuilder(this.client.mapperAdapter()) - .register(200, new TypeToken() { }.getType()) - .registerError(CloudException.class) + private ServiceResponse deleteBackupSlotDelegate(Response response) throws CloudException, IOException, IllegalArgumentException { + return new AzureServiceResponseBuilder(this.client.mapperAdapter()) + .register(200, new TypeToken() { }.getType()) + .register(404, new TypeToken() { }.getType()) .build(response); } /** - * Lists all available backups for web app. - * Lists all available backups for web app. + * Gets status of a web app backup that may be in progress, including secrets associated with the backup, such as the Azure Storage SAS URL. Also can be used to update the SAS URL for the backup if a new URL is passed in the request body. + * Gets status of a web app backup that may be in progress, including secrets associated with the backup, such as the Azure Storage SAS URL. Also can be used to update the SAS URL for the backup if a new URL is passed in the request body. * - * @param resourceGroupName Name of resource group + * @param resourceGroupName Name of the resource group to which the resource belongs. * @param name Name of web app + * @param backupId Id of backup * @param slot Name of web app slot. If not specified then will default to production slot. - * @return the PagedList<BackupItemInner> object if successful. + * @param request Information on backup request + * @return the BackupItemInner object if successful. */ - public PagedList listBackupsSlot(final String resourceGroupName, final String name, final String slot) { - ServiceResponse> response = listBackupsSlotSinglePageAsync(resourceGroupName, name, slot).toBlocking().single(); - return new PagedList(response.getBody()) { - @Override - public Page nextPage(String nextPageLink) { - return listBackupsSlotNextSinglePageAsync(nextPageLink).toBlocking().single().getBody(); - } - }; + public BackupItemInner listBackupStatusSecretsSlot(String resourceGroupName, String name, String backupId, String slot, BackupRequestInner request) { + return listBackupStatusSecretsSlotWithServiceResponseAsync(resourceGroupName, name, backupId, slot, request).toBlocking().single().getBody(); } /** - * Lists all available backups for web app. - * Lists all available backups for web app. + * Gets status of a web app backup that may be in progress, including secrets associated with the backup, such as the Azure Storage SAS URL. Also can be used to update the SAS URL for the backup if a new URL is passed in the request body. + * Gets status of a web app backup that may be in progress, including secrets associated with the backup, such as the Azure Storage SAS URL. Also can be used to update the SAS URL for the backup if a new URL is passed in the request body. * - * @param resourceGroupName Name of resource group + * @param resourceGroupName Name of the resource group to which the resource belongs. * @param name Name of web app + * @param backupId Id of backup * @param slot Name of web app slot. If not specified then will default to production slot. + * @param request Information on backup request * @param serviceCallback the async ServiceCallback to handle successful and failed responses. * @return the {@link ServiceCall} object */ - public ServiceCall> listBackupsSlotAsync(final String resourceGroupName, final String name, final String slot, final ListOperationCallback serviceCallback) { - return AzureServiceCall.create( - listBackupsSlotSinglePageAsync(resourceGroupName, name, slot), - new Func1>>>() { - @Override - public Observable>> call(String nextPageLink) { - return listBackupsSlotNextSinglePageAsync(nextPageLink); - } - }, - serviceCallback); + public ServiceCall listBackupStatusSecretsSlotAsync(String resourceGroupName, String name, String backupId, String slot, BackupRequestInner request, final ServiceCallback serviceCallback) { + return ServiceCall.create(listBackupStatusSecretsSlotWithServiceResponseAsync(resourceGroupName, name, backupId, slot, request), serviceCallback); } /** - * Lists all available backups for web app. - * Lists all available backups for web app. + * Gets status of a web app backup that may be in progress, including secrets associated with the backup, such as the Azure Storage SAS URL. Also can be used to update the SAS URL for the backup if a new URL is passed in the request body. + * Gets status of a web app backup that may be in progress, including secrets associated with the backup, such as the Azure Storage SAS URL. Also can be used to update the SAS URL for the backup if a new URL is passed in the request body. * - * @param resourceGroupName Name of resource group + * @param resourceGroupName Name of the resource group to which the resource belongs. * @param name Name of web app + * @param backupId Id of backup * @param slot Name of web app slot. If not specified then will default to production slot. - * @return the observable to the PagedList<BackupItemInner> object + * @param request Information on backup request + * @return the observable to the BackupItemInner object */ - public Observable> listBackupsSlotAsync(final String resourceGroupName, final String name, final String slot) { - return listBackupsSlotWithServiceResponseAsync(resourceGroupName, name, slot) - .map(new Func1>, Page>() { - @Override - public Page call(ServiceResponse> response) { - return response.getBody(); - } - }); + public Observable listBackupStatusSecretsSlotAsync(String resourceGroupName, String name, String backupId, String slot, BackupRequestInner request) { + return listBackupStatusSecretsSlotWithServiceResponseAsync(resourceGroupName, name, backupId, slot, request).map(new Func1, BackupItemInner>() { + @Override + public BackupItemInner call(ServiceResponse response) { + return response.getBody(); + } + }); } /** - * Lists all available backups for web app. - * Lists all available backups for web app. + * Gets status of a web app backup that may be in progress, including secrets associated with the backup, such as the Azure Storage SAS URL. Also can be used to update the SAS URL for the backup if a new URL is passed in the request body. + * Gets status of a web app backup that may be in progress, including secrets associated with the backup, such as the Azure Storage SAS URL. Also can be used to update the SAS URL for the backup if a new URL is passed in the request body. * - * @param resourceGroupName Name of resource group + * @param resourceGroupName Name of the resource group to which the resource belongs. * @param name Name of web app + * @param backupId Id of backup * @param slot Name of web app slot. If not specified then will default to production slot. - * @return the observable to the PagedList<BackupItemInner> object - */ - public Observable>> listBackupsSlotWithServiceResponseAsync(final String resourceGroupName, final String name, final String slot) { - return listBackupsSlotSinglePageAsync(resourceGroupName, name, slot) - .concatMap(new Func1>, Observable>>>() { - @Override - public Observable>> call(ServiceResponse> page) { - String nextPageLink = page.getBody().getNextPageLink(); - if (nextPageLink == null) { - return Observable.just(page); - } - return Observable.just(page).concatWith(listBackupsSlotNextWithServiceResponseAsync(nextPageLink)); - } - }); - } - - /** - * Lists all available backups for web app. - * Lists all available backups for web app. - * - ServiceResponse> * @param resourceGroupName Name of resource group - ServiceResponse> * @param name Name of web app - ServiceResponse> * @param slot Name of web app slot. If not specified then will default to production slot. - * @return the PagedList<BackupItemInner> object wrapped in {@link ServiceResponse} if successful. + * @param request Information on backup request + * @return the observable to the BackupItemInner object */ - public Observable>> listBackupsSlotSinglePageAsync(final String resourceGroupName, final String name, final String slot) { + public Observable> listBackupStatusSecretsSlotWithServiceResponseAsync(String resourceGroupName, String name, String backupId, String slot, BackupRequestInner request) { if (resourceGroupName == null) { throw new IllegalArgumentException("Parameter resourceGroupName is required and cannot be null."); } if (name == null) { throw new IllegalArgumentException("Parameter name is required and cannot be null."); } + if (backupId == null) { + throw new IllegalArgumentException("Parameter backupId is required and cannot be null."); + } if (slot == null) { throw new IllegalArgumentException("Parameter slot is required and cannot be null."); } if (this.client.subscriptionId() == null) { throw new IllegalArgumentException("Parameter this.client.subscriptionId() is required and cannot be null."); } + if (request == null) { + throw new IllegalArgumentException("Parameter request is required and cannot be null."); + } + Validator.validate(request); final String apiVersion = "2016-08-01"; - return service.listBackupsSlot(resourceGroupName, name, slot, this.client.subscriptionId(), apiVersion, this.client.acceptLanguage(), this.client.userAgent()) - .flatMap(new Func1, Observable>>>() { + return service.listBackupStatusSecretsSlot(resourceGroupName, name, backupId, slot, this.client.subscriptionId(), request, apiVersion, this.client.acceptLanguage(), this.client.userAgent()) + .flatMap(new Func1, Observable>>() { @Override - public Observable>> call(Response response) { + public Observable> call(Response response) { try { - ServiceResponse> result = listBackupsSlotDelegate(response); - return Observable.just(new ServiceResponse>(result.getBody(), result.getResponse())); + ServiceResponse clientResponse = listBackupStatusSecretsSlotDelegate(response); + return Observable.just(clientResponse); } catch (Throwable t) { return Observable.error(t); } @@ -11514,78 +11802,85 @@ public Observable>> call(Response> listBackupsSlotDelegate(Response response) throws CloudException, IOException, IllegalArgumentException { - return new AzureServiceResponseBuilder, CloudException>(this.client.mapperAdapter()) - .register(200, new TypeToken>() { }.getType()) + private ServiceResponse listBackupStatusSecretsSlotDelegate(Response response) throws CloudException, IOException, IllegalArgumentException { + return new AzureServiceResponseBuilder(this.client.mapperAdapter()) + .register(200, new TypeToken() { }.getType()) .registerError(CloudException.class) .build(response); } /** - * Discovers existing web app backups that can be restored. - * Discovers existing web app backups that can be restored. + * Restores a specific backup to another app (or deployment slot, if specified). + * Restores a specific backup to another app (or deployment slot, if specified). * - * @param resourceGroupName Name of resource group - * @param name Name of web app - * @param slot Name of web app slot. If not specified then will default to production slot. + * @param resourceGroupName Name of the resource group to which the resource belongs. + * @param name Name of the app. + * @param backupId ID of the backup. + * @param slot Name of the deployment slot. If a slot is not specified, the API will restore a backup of the production slot. * @param request Information on restore request - * @return the RestoreRequestInner object if successful. + * @return the RestoreResponseInner object if successful. */ - public RestoreRequestInner discoverRestoreSlot(String resourceGroupName, String name, String slot, RestoreRequestInner request) { - return discoverRestoreSlotWithServiceResponseAsync(resourceGroupName, name, slot, request).toBlocking().single().getBody(); + public RestoreResponseInner restoreSlot(String resourceGroupName, String name, String backupId, String slot, RestoreRequestInner request) { + return restoreSlotWithServiceResponseAsync(resourceGroupName, name, backupId, slot, request).toBlocking().last().getBody(); } /** - * Discovers existing web app backups that can be restored. - * Discovers existing web app backups that can be restored. + * Restores a specific backup to another app (or deployment slot, if specified). + * Restores a specific backup to another app (or deployment slot, if specified). * - * @param resourceGroupName Name of resource group - * @param name Name of web app - * @param slot Name of web app slot. If not specified then will default to production slot. + * @param resourceGroupName Name of the resource group to which the resource belongs. + * @param name Name of the app. + * @param backupId ID of the backup. + * @param slot Name of the deployment slot. If a slot is not specified, the API will restore a backup of the production slot. * @param request Information on restore request * @param serviceCallback the async ServiceCallback to handle successful and failed responses. * @return the {@link ServiceCall} object */ - public ServiceCall discoverRestoreSlotAsync(String resourceGroupName, String name, String slot, RestoreRequestInner request, final ServiceCallback serviceCallback) { - return ServiceCall.create(discoverRestoreSlotWithServiceResponseAsync(resourceGroupName, name, slot, request), serviceCallback); + public ServiceCall restoreSlotAsync(String resourceGroupName, String name, String backupId, String slot, RestoreRequestInner request, final ServiceCallback serviceCallback) { + return ServiceCall.create(restoreSlotWithServiceResponseAsync(resourceGroupName, name, backupId, slot, request), serviceCallback); } /** - * Discovers existing web app backups that can be restored. - * Discovers existing web app backups that can be restored. + * Restores a specific backup to another app (or deployment slot, if specified). + * Restores a specific backup to another app (or deployment slot, if specified). * - * @param resourceGroupName Name of resource group - * @param name Name of web app - * @param slot Name of web app slot. If not specified then will default to production slot. + * @param resourceGroupName Name of the resource group to which the resource belongs. + * @param name Name of the app. + * @param backupId ID of the backup. + * @param slot Name of the deployment slot. If a slot is not specified, the API will restore a backup of the production slot. * @param request Information on restore request - * @return the observable to the RestoreRequestInner object + * @return the observable for the request */ - public Observable discoverRestoreSlotAsync(String resourceGroupName, String name, String slot, RestoreRequestInner request) { - return discoverRestoreSlotWithServiceResponseAsync(resourceGroupName, name, slot, request).map(new Func1, RestoreRequestInner>() { + public Observable restoreSlotAsync(String resourceGroupName, String name, String backupId, String slot, RestoreRequestInner request) { + return restoreSlotWithServiceResponseAsync(resourceGroupName, name, backupId, slot, request).map(new Func1, RestoreResponseInner>() { @Override - public RestoreRequestInner call(ServiceResponse response) { + public RestoreResponseInner call(ServiceResponse response) { return response.getBody(); } }); } /** - * Discovers existing web app backups that can be restored. - * Discovers existing web app backups that can be restored. + * Restores a specific backup to another app (or deployment slot, if specified). + * Restores a specific backup to another app (or deployment slot, if specified). * - * @param resourceGroupName Name of resource group - * @param name Name of web app - * @param slot Name of web app slot. If not specified then will default to production slot. + * @param resourceGroupName Name of the resource group to which the resource belongs. + * @param name Name of the app. + * @param backupId ID of the backup. + * @param slot Name of the deployment slot. If a slot is not specified, the API will restore a backup of the production slot. * @param request Information on restore request - * @return the observable to the RestoreRequestInner object + * @return the observable for the request */ - public Observable> discoverRestoreSlotWithServiceResponseAsync(String resourceGroupName, String name, String slot, RestoreRequestInner request) { + public Observable> restoreSlotWithServiceResponseAsync(String resourceGroupName, String name, String backupId, String slot, RestoreRequestInner request) { if (resourceGroupName == null) { throw new IllegalArgumentException("Parameter resourceGroupName is required and cannot be null."); } if (name == null) { throw new IllegalArgumentException("Parameter name is required and cannot be null."); } + if (backupId == null) { + throw new IllegalArgumentException("Parameter backupId is required and cannot be null."); + } if (slot == null) { throw new IllegalArgumentException("Parameter slot is required and cannot be null."); } @@ -11597,86 +11892,73 @@ public Observable> discoverRestoreSlotWithS } Validator.validate(request); final String apiVersion = "2016-08-01"; - return service.discoverRestoreSlot(resourceGroupName, name, slot, this.client.subscriptionId(), request, apiVersion, this.client.acceptLanguage(), this.client.userAgent()) - .flatMap(new Func1, Observable>>() { - @Override - public Observable> call(Response response) { - try { - ServiceResponse clientResponse = discoverRestoreSlotDelegate(response); - return Observable.just(clientResponse); - } catch (Throwable t) { - return Observable.error(t); - } - } - }); - } - - private ServiceResponse discoverRestoreSlotDelegate(Response response) throws CloudException, IOException, IllegalArgumentException { - return new AzureServiceResponseBuilder(this.client.mapperAdapter()) - .register(200, new TypeToken() { }.getType()) - .registerError(CloudException.class) - .build(response); + Observable> observable = service.restoreSlot(resourceGroupName, name, backupId, slot, this.client.subscriptionId(), request, apiVersion, this.client.acceptLanguage(), this.client.userAgent()); + return client.getAzureClient().getPostOrDeleteResultAsync(observable, new TypeToken() { }.getType()); } /** - * Gets status of a web app backup that may be in progress. - * Gets status of a web app backup that may be in progress. + * Restores a specific backup to another app (or deployment slot, if specified). + * Restores a specific backup to another app (or deployment slot, if specified). * - * @param resourceGroupName Name of resource group - * @param name Name of web app - * @param backupId Id of backup - * @param slot Name of web app slot. If not specified then will default to production slot. - * @return the BackupItemInner object if successful. + * @param resourceGroupName Name of the resource group to which the resource belongs. + * @param name Name of the app. + * @param backupId ID of the backup. + * @param slot Name of the deployment slot. If a slot is not specified, the API will restore a backup of the production slot. + * @param request Information on restore request + * @return the RestoreResponseInner object if successful. */ - public BackupItemInner getBackupStatusSlot(String resourceGroupName, String name, String backupId, String slot) { - return getBackupStatusSlotWithServiceResponseAsync(resourceGroupName, name, backupId, slot).toBlocking().single().getBody(); + public RestoreResponseInner beginRestoreSlot(String resourceGroupName, String name, String backupId, String slot, RestoreRequestInner request) { + return beginRestoreSlotWithServiceResponseAsync(resourceGroupName, name, backupId, slot, request).toBlocking().single().getBody(); } /** - * Gets status of a web app backup that may be in progress. - * Gets status of a web app backup that may be in progress. + * Restores a specific backup to another app (or deployment slot, if specified). + * Restores a specific backup to another app (or deployment slot, if specified). * - * @param resourceGroupName Name of resource group - * @param name Name of web app - * @param backupId Id of backup - * @param slot Name of web app slot. If not specified then will default to production slot. + * @param resourceGroupName Name of the resource group to which the resource belongs. + * @param name Name of the app. + * @param backupId ID of the backup. + * @param slot Name of the deployment slot. If a slot is not specified, the API will restore a backup of the production slot. + * @param request Information on restore request * @param serviceCallback the async ServiceCallback to handle successful and failed responses. * @return the {@link ServiceCall} object */ - public ServiceCall getBackupStatusSlotAsync(String resourceGroupName, String name, String backupId, String slot, final ServiceCallback serviceCallback) { - return ServiceCall.create(getBackupStatusSlotWithServiceResponseAsync(resourceGroupName, name, backupId, slot), serviceCallback); + public ServiceCall beginRestoreSlotAsync(String resourceGroupName, String name, String backupId, String slot, RestoreRequestInner request, final ServiceCallback serviceCallback) { + return ServiceCall.create(beginRestoreSlotWithServiceResponseAsync(resourceGroupName, name, backupId, slot, request), serviceCallback); } /** - * Gets status of a web app backup that may be in progress. - * Gets status of a web app backup that may be in progress. + * Restores a specific backup to another app (or deployment slot, if specified). + * Restores a specific backup to another app (or deployment slot, if specified). * - * @param resourceGroupName Name of resource group - * @param name Name of web app - * @param backupId Id of backup - * @param slot Name of web app slot. If not specified then will default to production slot. - * @return the observable to the BackupItemInner object + * @param resourceGroupName Name of the resource group to which the resource belongs. + * @param name Name of the app. + * @param backupId ID of the backup. + * @param slot Name of the deployment slot. If a slot is not specified, the API will restore a backup of the production slot. + * @param request Information on restore request + * @return the observable to the RestoreResponseInner object */ - public Observable getBackupStatusSlotAsync(String resourceGroupName, String name, String backupId, String slot) { - return getBackupStatusSlotWithServiceResponseAsync(resourceGroupName, name, backupId, slot).map(new Func1, BackupItemInner>() { + public Observable beginRestoreSlotAsync(String resourceGroupName, String name, String backupId, String slot, RestoreRequestInner request) { + return beginRestoreSlotWithServiceResponseAsync(resourceGroupName, name, backupId, slot, request).map(new Func1, RestoreResponseInner>() { @Override - public BackupItemInner call(ServiceResponse response) { + public RestoreResponseInner call(ServiceResponse response) { return response.getBody(); } }); } /** - * Gets status of a web app backup that may be in progress. - * Gets status of a web app backup that may be in progress. + * Restores a specific backup to another app (or deployment slot, if specified). + * Restores a specific backup to another app (or deployment slot, if specified). * - * @param resourceGroupName Name of resource group - * @param name Name of web app - * @param backupId Id of backup - * @param slot Name of web app slot. If not specified then will default to production slot. - * @return the observable to the BackupItemInner object + * @param resourceGroupName Name of the resource group to which the resource belongs. + * @param name Name of the app. + * @param backupId ID of the backup. + * @param slot Name of the deployment slot. If a slot is not specified, the API will restore a backup of the production slot. + * @param request Information on restore request + * @return the observable to the RestoreResponseInner object */ - public Observable> getBackupStatusSlotWithServiceResponseAsync(String resourceGroupName, String name, String backupId, String slot) { + public Observable> beginRestoreSlotWithServiceResponseAsync(String resourceGroupName, String name, String backupId, String slot, RestoreRequestInner request) { if (resourceGroupName == null) { throw new IllegalArgumentException("Parameter resourceGroupName is required and cannot be null."); } @@ -11692,13 +11974,17 @@ public Observable> getBackupStatusSlotWithServi if (this.client.subscriptionId() == null) { throw new IllegalArgumentException("Parameter this.client.subscriptionId() is required and cannot be null."); } + if (request == null) { + throw new IllegalArgumentException("Parameter request is required and cannot be null."); + } + Validator.validate(request); final String apiVersion = "2016-08-01"; - return service.getBackupStatusSlot(resourceGroupName, name, backupId, slot, this.client.subscriptionId(), apiVersion, this.client.acceptLanguage(), this.client.userAgent()) - .flatMap(new Func1, Observable>>() { + return service.beginRestoreSlot(resourceGroupName, name, backupId, slot, this.client.subscriptionId(), request, apiVersion, this.client.acceptLanguage(), this.client.userAgent()) + .flatMap(new Func1, Observable>>() { @Override - public Observable> call(Response response) { + public Observable> call(Response response) { try { - ServiceResponse clientResponse = getBackupStatusSlotDelegate(response); + ServiceResponse clientResponse = beginRestoreSlotDelegate(response); return Observable.just(clientResponse); } catch (Throwable t) { return Observable.error(t); @@ -11707,94 +11993,95 @@ public Observable> call(Response }); } - private ServiceResponse getBackupStatusSlotDelegate(Response response) throws CloudException, IOException, IllegalArgumentException { - return new AzureServiceResponseBuilder(this.client.mapperAdapter()) - .register(200, new TypeToken() { }.getType()) + private ServiceResponse beginRestoreSlotDelegate(Response response) throws CloudException, IOException, IllegalArgumentException { + return new AzureServiceResponseBuilder(this.client.mapperAdapter()) + .register(200, new TypeToken() { }.getType()) .registerError(CloudException.class) .build(response); } /** - * Deletes a backup from Azure Storage. - * Deletes a backup from Azure Storage. + * Replaces the application settings of an app. + * Replaces the application settings of an app. * - * @param resourceGroupName Name of resource group - * @param name Name of web app - * @param backupId Id of backup - * @param slot Name of web app slot. If not specified then will default to production slot. - * @return the BackupItemInner object if successful. + * @param resourceGroupName Name of the resource group to which the resource belongs. + * @param name Name of the app. + * @param slot Name of the deployment slot. If a slot is not specified, the API will update the application settings for the production slot. + * @param appSettings Application settings of the app. + * @return the StringDictionaryInner object if successful. */ - public BackupItemInner deleteBackupSlot(String resourceGroupName, String name, String backupId, String slot) { - return deleteBackupSlotWithServiceResponseAsync(resourceGroupName, name, backupId, slot).toBlocking().single().getBody(); + public StringDictionaryInner updateApplicationSettingsSlot(String resourceGroupName, String name, String slot, StringDictionaryInner appSettings) { + return updateApplicationSettingsSlotWithServiceResponseAsync(resourceGroupName, name, slot, appSettings).toBlocking().single().getBody(); } /** - * Deletes a backup from Azure Storage. - * Deletes a backup from Azure Storage. + * Replaces the application settings of an app. + * Replaces the application settings of an app. * - * @param resourceGroupName Name of resource group - * @param name Name of web app - * @param backupId Id of backup - * @param slot Name of web app slot. If not specified then will default to production slot. + * @param resourceGroupName Name of the resource group to which the resource belongs. + * @param name Name of the app. + * @param slot Name of the deployment slot. If a slot is not specified, the API will update the application settings for the production slot. + * @param appSettings Application settings of the app. * @param serviceCallback the async ServiceCallback to handle successful and failed responses. * @return the {@link ServiceCall} object */ - public ServiceCall deleteBackupSlotAsync(String resourceGroupName, String name, String backupId, String slot, final ServiceCallback serviceCallback) { - return ServiceCall.create(deleteBackupSlotWithServiceResponseAsync(resourceGroupName, name, backupId, slot), serviceCallback); + public ServiceCall updateApplicationSettingsSlotAsync(String resourceGroupName, String name, String slot, StringDictionaryInner appSettings, final ServiceCallback serviceCallback) { + return ServiceCall.create(updateApplicationSettingsSlotWithServiceResponseAsync(resourceGroupName, name, slot, appSettings), serviceCallback); } /** - * Deletes a backup from Azure Storage. - * Deletes a backup from Azure Storage. + * Replaces the application settings of an app. + * Replaces the application settings of an app. * - * @param resourceGroupName Name of resource group - * @param name Name of web app - * @param backupId Id of backup - * @param slot Name of web app slot. If not specified then will default to production slot. - * @return the observable to the BackupItemInner object + * @param resourceGroupName Name of the resource group to which the resource belongs. + * @param name Name of the app. + * @param slot Name of the deployment slot. If a slot is not specified, the API will update the application settings for the production slot. + * @param appSettings Application settings of the app. + * @return the observable to the StringDictionaryInner object */ - public Observable deleteBackupSlotAsync(String resourceGroupName, String name, String backupId, String slot) { - return deleteBackupSlotWithServiceResponseAsync(resourceGroupName, name, backupId, slot).map(new Func1, BackupItemInner>() { + public Observable updateApplicationSettingsSlotAsync(String resourceGroupName, String name, String slot, StringDictionaryInner appSettings) { + return updateApplicationSettingsSlotWithServiceResponseAsync(resourceGroupName, name, slot, appSettings).map(new Func1, StringDictionaryInner>() { @Override - public BackupItemInner call(ServiceResponse response) { + public StringDictionaryInner call(ServiceResponse response) { return response.getBody(); } }); } /** - * Deletes a backup from Azure Storage. - * Deletes a backup from Azure Storage. + * Replaces the application settings of an app. + * Replaces the application settings of an app. * - * @param resourceGroupName Name of resource group - * @param name Name of web app - * @param backupId Id of backup - * @param slot Name of web app slot. If not specified then will default to production slot. - * @return the observable to the BackupItemInner object + * @param resourceGroupName Name of the resource group to which the resource belongs. + * @param name Name of the app. + * @param slot Name of the deployment slot. If a slot is not specified, the API will update the application settings for the production slot. + * @param appSettings Application settings of the app. + * @return the observable to the StringDictionaryInner object */ - public Observable> deleteBackupSlotWithServiceResponseAsync(String resourceGroupName, String name, String backupId, String slot) { + public Observable> updateApplicationSettingsSlotWithServiceResponseAsync(String resourceGroupName, String name, String slot, StringDictionaryInner appSettings) { if (resourceGroupName == null) { throw new IllegalArgumentException("Parameter resourceGroupName is required and cannot be null."); } if (name == null) { throw new IllegalArgumentException("Parameter name is required and cannot be null."); } - if (backupId == null) { - throw new IllegalArgumentException("Parameter backupId is required and cannot be null."); - } if (slot == null) { throw new IllegalArgumentException("Parameter slot is required and cannot be null."); } if (this.client.subscriptionId() == null) { throw new IllegalArgumentException("Parameter this.client.subscriptionId() is required and cannot be null."); } + if (appSettings == null) { + throw new IllegalArgumentException("Parameter appSettings is required and cannot be null."); + } + Validator.validate(appSettings); final String apiVersion = "2016-08-01"; - return service.deleteBackupSlot(resourceGroupName, name, backupId, slot, this.client.subscriptionId(), apiVersion, this.client.acceptLanguage(), this.client.userAgent()) - .flatMap(new Func1, Observable>>() { + return service.updateApplicationSettingsSlot(resourceGroupName, name, slot, this.client.subscriptionId(), appSettings, apiVersion, this.client.acceptLanguage(), this.client.userAgent()) + .flatMap(new Func1, Observable>>() { @Override - public Observable> call(Response response) { + public Observable> call(Response response) { try { - ServiceResponse clientResponse = deleteBackupSlotDelegate(response); + ServiceResponse clientResponse = updateApplicationSettingsSlotDelegate(response); return Observable.just(clientResponse); } catch (Throwable t) { return Observable.error(t); @@ -11803,102 +12090,87 @@ public Observable> call(Response }); } - private ServiceResponse deleteBackupSlotDelegate(Response response) throws CloudException, IOException, IllegalArgumentException { - return new AzureServiceResponseBuilder(this.client.mapperAdapter()) - .register(200, new TypeToken() { }.getType()) + private ServiceResponse updateApplicationSettingsSlotDelegate(Response response) throws CloudException, IOException, IllegalArgumentException { + return new AzureServiceResponseBuilder(this.client.mapperAdapter()) + .register(200, new TypeToken() { }.getType()) .registerError(CloudException.class) .build(response); } /** - * Gets status of a web app backup that may be in progress, including secrets associated with the backup, such as the Azure Storage SAS URL. Also can be used to update the SAS URL for the backup if a new URL is passed in the request body. - * Gets status of a web app backup that may be in progress, including secrets associated with the backup, such as the Azure Storage SAS URL. Also can be used to update the SAS URL for the backup if a new URL is passed in the request body. + * Gets the application settings of an app. + * Gets the application settings of an app. * - * @param resourceGroupName Name of resource group - * @param name Name of web app - * @param backupId Id of backup - * @param slot Name of web app slot. If not specified then will default to production slot. - * @param request Information on backup request - * @return the BackupItemInner object if successful. + * @param resourceGroupName Name of the resource group to which the resource belongs. + * @param name Name of the app. + * @param slot Name of the deployment slot. If a slot is not specified, the API will get the application settings for the production slot. + * @return the StringDictionaryInner object if successful. */ - public BackupItemInner listBackupStatusSecretsSlot(String resourceGroupName, String name, String backupId, String slot, BackupRequestInner request) { - return listBackupStatusSecretsSlotWithServiceResponseAsync(resourceGroupName, name, backupId, slot, request).toBlocking().single().getBody(); + public StringDictionaryInner listApplicationSettingsSlot(String resourceGroupName, String name, String slot) { + return listApplicationSettingsSlotWithServiceResponseAsync(resourceGroupName, name, slot).toBlocking().single().getBody(); } /** - * Gets status of a web app backup that may be in progress, including secrets associated with the backup, such as the Azure Storage SAS URL. Also can be used to update the SAS URL for the backup if a new URL is passed in the request body. - * Gets status of a web app backup that may be in progress, including secrets associated with the backup, such as the Azure Storage SAS URL. Also can be used to update the SAS URL for the backup if a new URL is passed in the request body. + * Gets the application settings of an app. + * Gets the application settings of an app. * - * @param resourceGroupName Name of resource group - * @param name Name of web app - * @param backupId Id of backup - * @param slot Name of web app slot. If not specified then will default to production slot. - * @param request Information on backup request + * @param resourceGroupName Name of the resource group to which the resource belongs. + * @param name Name of the app. + * @param slot Name of the deployment slot. If a slot is not specified, the API will get the application settings for the production slot. * @param serviceCallback the async ServiceCallback to handle successful and failed responses. * @return the {@link ServiceCall} object */ - public ServiceCall listBackupStatusSecretsSlotAsync(String resourceGroupName, String name, String backupId, String slot, BackupRequestInner request, final ServiceCallback serviceCallback) { - return ServiceCall.create(listBackupStatusSecretsSlotWithServiceResponseAsync(resourceGroupName, name, backupId, slot, request), serviceCallback); + public ServiceCall listApplicationSettingsSlotAsync(String resourceGroupName, String name, String slot, final ServiceCallback serviceCallback) { + return ServiceCall.create(listApplicationSettingsSlotWithServiceResponseAsync(resourceGroupName, name, slot), serviceCallback); } /** - * Gets status of a web app backup that may be in progress, including secrets associated with the backup, such as the Azure Storage SAS URL. Also can be used to update the SAS URL for the backup if a new URL is passed in the request body. - * Gets status of a web app backup that may be in progress, including secrets associated with the backup, such as the Azure Storage SAS URL. Also can be used to update the SAS URL for the backup if a new URL is passed in the request body. + * Gets the application settings of an app. + * Gets the application settings of an app. * - * @param resourceGroupName Name of resource group - * @param name Name of web app - * @param backupId Id of backup - * @param slot Name of web app slot. If not specified then will default to production slot. - * @param request Information on backup request - * @return the observable to the BackupItemInner object + * @param resourceGroupName Name of the resource group to which the resource belongs. + * @param name Name of the app. + * @param slot Name of the deployment slot. If a slot is not specified, the API will get the application settings for the production slot. + * @return the observable to the StringDictionaryInner object */ - public Observable listBackupStatusSecretsSlotAsync(String resourceGroupName, String name, String backupId, String slot, BackupRequestInner request) { - return listBackupStatusSecretsSlotWithServiceResponseAsync(resourceGroupName, name, backupId, slot, request).map(new Func1, BackupItemInner>() { + public Observable listApplicationSettingsSlotAsync(String resourceGroupName, String name, String slot) { + return listApplicationSettingsSlotWithServiceResponseAsync(resourceGroupName, name, slot).map(new Func1, StringDictionaryInner>() { @Override - public BackupItemInner call(ServiceResponse response) { + public StringDictionaryInner call(ServiceResponse response) { return response.getBody(); } }); } /** - * Gets status of a web app backup that may be in progress, including secrets associated with the backup, such as the Azure Storage SAS URL. Also can be used to update the SAS URL for the backup if a new URL is passed in the request body. - * Gets status of a web app backup that may be in progress, including secrets associated with the backup, such as the Azure Storage SAS URL. Also can be used to update the SAS URL for the backup if a new URL is passed in the request body. + * Gets the application settings of an app. + * Gets the application settings of an app. * - * @param resourceGroupName Name of resource group - * @param name Name of web app - * @param backupId Id of backup - * @param slot Name of web app slot. If not specified then will default to production slot. - * @param request Information on backup request - * @return the observable to the BackupItemInner object + * @param resourceGroupName Name of the resource group to which the resource belongs. + * @param name Name of the app. + * @param slot Name of the deployment slot. If a slot is not specified, the API will get the application settings for the production slot. + * @return the observable to the StringDictionaryInner object */ - public Observable> listBackupStatusSecretsSlotWithServiceResponseAsync(String resourceGroupName, String name, String backupId, String slot, BackupRequestInner request) { + public Observable> listApplicationSettingsSlotWithServiceResponseAsync(String resourceGroupName, String name, String slot) { if (resourceGroupName == null) { throw new IllegalArgumentException("Parameter resourceGroupName is required and cannot be null."); } if (name == null) { throw new IllegalArgumentException("Parameter name is required and cannot be null."); } - if (backupId == null) { - throw new IllegalArgumentException("Parameter backupId is required and cannot be null."); - } if (slot == null) { throw new IllegalArgumentException("Parameter slot is required and cannot be null."); } if (this.client.subscriptionId() == null) { throw new IllegalArgumentException("Parameter this.client.subscriptionId() is required and cannot be null."); } - if (request == null) { - throw new IllegalArgumentException("Parameter request is required and cannot be null."); - } - Validator.validate(request); final String apiVersion = "2016-08-01"; - return service.listBackupStatusSecretsSlot(resourceGroupName, name, backupId, slot, this.client.subscriptionId(), request, apiVersion, this.client.acceptLanguage(), this.client.userAgent()) - .flatMap(new Func1, Observable>>() { + return service.listApplicationSettingsSlot(resourceGroupName, name, slot, this.client.subscriptionId(), apiVersion, this.client.acceptLanguage(), this.client.userAgent()) + .flatMap(new Func1, Observable>>() { @Override - public Observable> call(Response response) { + public Observable> call(Response response) { try { - ServiceResponse clientResponse = listBackupStatusSecretsSlotDelegate(response); + ServiceResponse clientResponse = listApplicationSettingsSlotDelegate(response); return Observable.just(clientResponse); } catch (Throwable t) { return Observable.error(t); @@ -11907,189 +12179,184 @@ public Observable> call(Response }); } - private ServiceResponse listBackupStatusSecretsSlotDelegate(Response response) throws CloudException, IOException, IllegalArgumentException { - return new AzureServiceResponseBuilder(this.client.mapperAdapter()) - .register(200, new TypeToken() { }.getType()) + private ServiceResponse listApplicationSettingsSlotDelegate(Response response) throws CloudException, IOException, IllegalArgumentException { + return new AzureServiceResponseBuilder(this.client.mapperAdapter()) + .register(200, new TypeToken() { }.getType()) .registerError(CloudException.class) .build(response); } /** - * Restores a web app. - * Restores a web app. + * Updates the Authentication / Authorization settings associated with web app. + * Updates the Authentication / Authorization settings associated with web app. * - * @param resourceGroupName Name of resource group + * @param resourceGroupName Name of the resource group to which the resource belongs. * @param name Name of web app - * @param backupId Id of backup to restore * @param slot Name of web app slot. If not specified then will default to production slot. - * @param request Information on restore request - * @return the RestoreResponseInner object if successful. + * @param siteAuthSettings Auth settings associated with web app + * @return the SiteAuthSettingsInner object if successful. */ - public RestoreResponseInner restoreSlot(String resourceGroupName, String name, String backupId, String slot, RestoreRequestInner request) { - return restoreSlotWithServiceResponseAsync(resourceGroupName, name, backupId, slot, request).toBlocking().last().getBody(); + public SiteAuthSettingsInner updateAuthSettingsSlot(String resourceGroupName, String name, String slot, SiteAuthSettingsInner siteAuthSettings) { + return updateAuthSettingsSlotWithServiceResponseAsync(resourceGroupName, name, slot, siteAuthSettings).toBlocking().single().getBody(); } /** - * Restores a web app. - * Restores a web app. + * Updates the Authentication / Authorization settings associated with web app. + * Updates the Authentication / Authorization settings associated with web app. * - * @param resourceGroupName Name of resource group + * @param resourceGroupName Name of the resource group to which the resource belongs. * @param name Name of web app - * @param backupId Id of backup to restore * @param slot Name of web app slot. If not specified then will default to production slot. - * @param request Information on restore request + * @param siteAuthSettings Auth settings associated with web app * @param serviceCallback the async ServiceCallback to handle successful and failed responses. * @return the {@link ServiceCall} object */ - public ServiceCall restoreSlotAsync(String resourceGroupName, String name, String backupId, String slot, RestoreRequestInner request, final ServiceCallback serviceCallback) { - return ServiceCall.create(restoreSlotWithServiceResponseAsync(resourceGroupName, name, backupId, slot, request), serviceCallback); + public ServiceCall updateAuthSettingsSlotAsync(String resourceGroupName, String name, String slot, SiteAuthSettingsInner siteAuthSettings, final ServiceCallback serviceCallback) { + return ServiceCall.create(updateAuthSettingsSlotWithServiceResponseAsync(resourceGroupName, name, slot, siteAuthSettings), serviceCallback); } /** - * Restores a web app. - * Restores a web app. + * Updates the Authentication / Authorization settings associated with web app. + * Updates the Authentication / Authorization settings associated with web app. * - * @param resourceGroupName Name of resource group + * @param resourceGroupName Name of the resource group to which the resource belongs. * @param name Name of web app - * @param backupId Id of backup to restore * @param slot Name of web app slot. If not specified then will default to production slot. - * @param request Information on restore request - * @return the observable for the request + * @param siteAuthSettings Auth settings associated with web app + * @return the observable to the SiteAuthSettingsInner object */ - public Observable restoreSlotAsync(String resourceGroupName, String name, String backupId, String slot, RestoreRequestInner request) { - return restoreSlotWithServiceResponseAsync(resourceGroupName, name, backupId, slot, request).map(new Func1, RestoreResponseInner>() { + public Observable updateAuthSettingsSlotAsync(String resourceGroupName, String name, String slot, SiteAuthSettingsInner siteAuthSettings) { + return updateAuthSettingsSlotWithServiceResponseAsync(resourceGroupName, name, slot, siteAuthSettings).map(new Func1, SiteAuthSettingsInner>() { @Override - public RestoreResponseInner call(ServiceResponse response) { + public SiteAuthSettingsInner call(ServiceResponse response) { return response.getBody(); } }); } /** - * Restores a web app. - * Restores a web app. + * Updates the Authentication / Authorization settings associated with web app. + * Updates the Authentication / Authorization settings associated with web app. * - * @param resourceGroupName Name of resource group + * @param resourceGroupName Name of the resource group to which the resource belongs. * @param name Name of web app - * @param backupId Id of backup to restore * @param slot Name of web app slot. If not specified then will default to production slot. - * @param request Information on restore request - * @return the observable for the request + * @param siteAuthSettings Auth settings associated with web app + * @return the observable to the SiteAuthSettingsInner object */ - public Observable> restoreSlotWithServiceResponseAsync(String resourceGroupName, String name, String backupId, String slot, RestoreRequestInner request) { + public Observable> updateAuthSettingsSlotWithServiceResponseAsync(String resourceGroupName, String name, String slot, SiteAuthSettingsInner siteAuthSettings) { if (resourceGroupName == null) { throw new IllegalArgumentException("Parameter resourceGroupName is required and cannot be null."); } if (name == null) { throw new IllegalArgumentException("Parameter name is required and cannot be null."); } - if (backupId == null) { - throw new IllegalArgumentException("Parameter backupId is required and cannot be null."); - } if (slot == null) { throw new IllegalArgumentException("Parameter slot is required and cannot be null."); } if (this.client.subscriptionId() == null) { throw new IllegalArgumentException("Parameter this.client.subscriptionId() is required and cannot be null."); } - if (request == null) { - throw new IllegalArgumentException("Parameter request is required and cannot be null."); + if (siteAuthSettings == null) { + throw new IllegalArgumentException("Parameter siteAuthSettings is required and cannot be null."); } - Validator.validate(request); + Validator.validate(siteAuthSettings); final String apiVersion = "2016-08-01"; - Observable> observable = service.restoreSlot(resourceGroupName, name, backupId, slot, this.client.subscriptionId(), request, apiVersion, this.client.acceptLanguage(), this.client.userAgent()); - return client.getAzureClient().getPostOrDeleteResultAsync(observable, new TypeToken() { }.getType()); + return service.updateAuthSettingsSlot(resourceGroupName, name, slot, this.client.subscriptionId(), siteAuthSettings, apiVersion, this.client.acceptLanguage(), this.client.userAgent()) + .flatMap(new Func1, Observable>>() { + @Override + public Observable> call(Response response) { + try { + ServiceResponse clientResponse = updateAuthSettingsSlotDelegate(response); + return Observable.just(clientResponse); + } catch (Throwable t) { + return Observable.error(t); + } + } + }); + } + + private ServiceResponse updateAuthSettingsSlotDelegate(Response response) throws CloudException, IOException, IllegalArgumentException { + return new AzureServiceResponseBuilder(this.client.mapperAdapter()) + .register(200, new TypeToken() { }.getType()) + .registerError(CloudException.class) + .build(response); } /** - * Restores a web app. - * Restores a web app. + * Gets the Authentication/Authorization settings of an app. + * Gets the Authentication/Authorization settings of an app. * - * @param resourceGroupName Name of resource group - * @param name Name of web app - * @param backupId Id of backup to restore - * @param slot Name of web app slot. If not specified then will default to production slot. - * @param request Information on restore request - * @return the RestoreResponseInner object if successful. + * @param resourceGroupName Name of the resource group to which the resource belongs. + * @param name Name of the app. + * @param slot Name of the deployment slot. If a slot is not specified, the API will get the settings for the production slot. + * @return the SiteAuthSettingsInner object if successful. */ - public RestoreResponseInner beginRestoreSlot(String resourceGroupName, String name, String backupId, String slot, RestoreRequestInner request) { - return beginRestoreSlotWithServiceResponseAsync(resourceGroupName, name, backupId, slot, request).toBlocking().single().getBody(); + public SiteAuthSettingsInner getAuthSettingsSlot(String resourceGroupName, String name, String slot) { + return getAuthSettingsSlotWithServiceResponseAsync(resourceGroupName, name, slot).toBlocking().single().getBody(); } - /** - * Restores a web app. - * Restores a web app. - * - * @param resourceGroupName Name of resource group - * @param name Name of web app - * @param backupId Id of backup to restore - * @param slot Name of web app slot. If not specified then will default to production slot. - * @param request Information on restore request + /** + * Gets the Authentication/Authorization settings of an app. + * Gets the Authentication/Authorization settings of an app. + * + * @param resourceGroupName Name of the resource group to which the resource belongs. + * @param name Name of the app. + * @param slot Name of the deployment slot. If a slot is not specified, the API will get the settings for the production slot. * @param serviceCallback the async ServiceCallback to handle successful and failed responses. * @return the {@link ServiceCall} object */ - public ServiceCall beginRestoreSlotAsync(String resourceGroupName, String name, String backupId, String slot, RestoreRequestInner request, final ServiceCallback serviceCallback) { - return ServiceCall.create(beginRestoreSlotWithServiceResponseAsync(resourceGroupName, name, backupId, slot, request), serviceCallback); + public ServiceCall getAuthSettingsSlotAsync(String resourceGroupName, String name, String slot, final ServiceCallback serviceCallback) { + return ServiceCall.create(getAuthSettingsSlotWithServiceResponseAsync(resourceGroupName, name, slot), serviceCallback); } /** - * Restores a web app. - * Restores a web app. + * Gets the Authentication/Authorization settings of an app. + * Gets the Authentication/Authorization settings of an app. * - * @param resourceGroupName Name of resource group - * @param name Name of web app - * @param backupId Id of backup to restore - * @param slot Name of web app slot. If not specified then will default to production slot. - * @param request Information on restore request - * @return the observable to the RestoreResponseInner object + * @param resourceGroupName Name of the resource group to which the resource belongs. + * @param name Name of the app. + * @param slot Name of the deployment slot. If a slot is not specified, the API will get the settings for the production slot. + * @return the observable to the SiteAuthSettingsInner object */ - public Observable beginRestoreSlotAsync(String resourceGroupName, String name, String backupId, String slot, RestoreRequestInner request) { - return beginRestoreSlotWithServiceResponseAsync(resourceGroupName, name, backupId, slot, request).map(new Func1, RestoreResponseInner>() { + public Observable getAuthSettingsSlotAsync(String resourceGroupName, String name, String slot) { + return getAuthSettingsSlotWithServiceResponseAsync(resourceGroupName, name, slot).map(new Func1, SiteAuthSettingsInner>() { @Override - public RestoreResponseInner call(ServiceResponse response) { + public SiteAuthSettingsInner call(ServiceResponse response) { return response.getBody(); } }); } /** - * Restores a web app. - * Restores a web app. + * Gets the Authentication/Authorization settings of an app. + * Gets the Authentication/Authorization settings of an app. * - * @param resourceGroupName Name of resource group - * @param name Name of web app - * @param backupId Id of backup to restore - * @param slot Name of web app slot. If not specified then will default to production slot. - * @param request Information on restore request - * @return the observable to the RestoreResponseInner object + * @param resourceGroupName Name of the resource group to which the resource belongs. + * @param name Name of the app. + * @param slot Name of the deployment slot. If a slot is not specified, the API will get the settings for the production slot. + * @return the observable to the SiteAuthSettingsInner object */ - public Observable> beginRestoreSlotWithServiceResponseAsync(String resourceGroupName, String name, String backupId, String slot, RestoreRequestInner request) { + public Observable> getAuthSettingsSlotWithServiceResponseAsync(String resourceGroupName, String name, String slot) { if (resourceGroupName == null) { throw new IllegalArgumentException("Parameter resourceGroupName is required and cannot be null."); } if (name == null) { throw new IllegalArgumentException("Parameter name is required and cannot be null."); } - if (backupId == null) { - throw new IllegalArgumentException("Parameter backupId is required and cannot be null."); - } if (slot == null) { throw new IllegalArgumentException("Parameter slot is required and cannot be null."); } if (this.client.subscriptionId() == null) { throw new IllegalArgumentException("Parameter this.client.subscriptionId() is required and cannot be null."); } - if (request == null) { - throw new IllegalArgumentException("Parameter request is required and cannot be null."); - } - Validator.validate(request); final String apiVersion = "2016-08-01"; - return service.beginRestoreSlot(resourceGroupName, name, backupId, slot, this.client.subscriptionId(), request, apiVersion, this.client.acceptLanguage(), this.client.userAgent()) - .flatMap(new Func1, Observable>>() { + return service.getAuthSettingsSlot(resourceGroupName, name, slot, this.client.subscriptionId(), apiVersion, this.client.acceptLanguage(), this.client.userAgent()) + .flatMap(new Func1, Observable>>() { @Override - public Observable> call(Response response) { + public Observable> call(Response response) { try { - ServiceResponse clientResponse = beginRestoreSlotDelegate(response); + ServiceResponse clientResponse = getAuthSettingsSlotDelegate(response); return Observable.just(clientResponse); } catch (Throwable t) { return Observable.error(t); @@ -12098,72 +12365,72 @@ public Observable> call(Response beginRestoreSlotDelegate(Response response) throws CloudException, IOException, IllegalArgumentException { - return new AzureServiceResponseBuilder(this.client.mapperAdapter()) - .register(200, new TypeToken() { }.getType()) + private ServiceResponse getAuthSettingsSlotDelegate(Response response) throws CloudException, IOException, IllegalArgumentException { + return new AzureServiceResponseBuilder(this.client.mapperAdapter()) + .register(200, new TypeToken() { }.getType()) .registerError(CloudException.class) .build(response); } /** - * Updates the application settings of web app. - * Updates the application settings of web app. + * Updates the backup configuration of an app. + * Updates the backup configuration of an app. * - * @param resourceGroupName Name of resource group - * @param name Name of web app - * @param slot Name of web app slot. If not specified then will default to production slot. - * @param appSettings Application settings of web app - * @return the StringDictionaryInner object if successful. + * @param resourceGroupName Name of the resource group to which the resource belongs. + * @param name Name of the app. + * @param slot Name of the deployment slot. If a slot is not specified, the API will update the backup configuration for the production slot. + * @param request Edited backup configuration. + * @return the BackupRequestInner object if successful. */ - public StringDictionaryInner updateApplicationSettingsSlot(String resourceGroupName, String name, String slot, StringDictionaryInner appSettings) { - return updateApplicationSettingsSlotWithServiceResponseAsync(resourceGroupName, name, slot, appSettings).toBlocking().single().getBody(); + public BackupRequestInner updateBackupConfigurationSlot(String resourceGroupName, String name, String slot, BackupRequestInner request) { + return updateBackupConfigurationSlotWithServiceResponseAsync(resourceGroupName, name, slot, request).toBlocking().single().getBody(); } /** - * Updates the application settings of web app. - * Updates the application settings of web app. + * Updates the backup configuration of an app. + * Updates the backup configuration of an app. * - * @param resourceGroupName Name of resource group - * @param name Name of web app - * @param slot Name of web app slot. If not specified then will default to production slot. - * @param appSettings Application settings of web app + * @param resourceGroupName Name of the resource group to which the resource belongs. + * @param name Name of the app. + * @param slot Name of the deployment slot. If a slot is not specified, the API will update the backup configuration for the production slot. + * @param request Edited backup configuration. * @param serviceCallback the async ServiceCallback to handle successful and failed responses. * @return the {@link ServiceCall} object */ - public ServiceCall updateApplicationSettingsSlotAsync(String resourceGroupName, String name, String slot, StringDictionaryInner appSettings, final ServiceCallback serviceCallback) { - return ServiceCall.create(updateApplicationSettingsSlotWithServiceResponseAsync(resourceGroupName, name, slot, appSettings), serviceCallback); + public ServiceCall updateBackupConfigurationSlotAsync(String resourceGroupName, String name, String slot, BackupRequestInner request, final ServiceCallback serviceCallback) { + return ServiceCall.create(updateBackupConfigurationSlotWithServiceResponseAsync(resourceGroupName, name, slot, request), serviceCallback); } /** - * Updates the application settings of web app. - * Updates the application settings of web app. + * Updates the backup configuration of an app. + * Updates the backup configuration of an app. * - * @param resourceGroupName Name of resource group - * @param name Name of web app - * @param slot Name of web app slot. If not specified then will default to production slot. - * @param appSettings Application settings of web app - * @return the observable to the StringDictionaryInner object + * @param resourceGroupName Name of the resource group to which the resource belongs. + * @param name Name of the app. + * @param slot Name of the deployment slot. If a slot is not specified, the API will update the backup configuration for the production slot. + * @param request Edited backup configuration. + * @return the observable to the BackupRequestInner object */ - public Observable updateApplicationSettingsSlotAsync(String resourceGroupName, String name, String slot, StringDictionaryInner appSettings) { - return updateApplicationSettingsSlotWithServiceResponseAsync(resourceGroupName, name, slot, appSettings).map(new Func1, StringDictionaryInner>() { + public Observable updateBackupConfigurationSlotAsync(String resourceGroupName, String name, String slot, BackupRequestInner request) { + return updateBackupConfigurationSlotWithServiceResponseAsync(resourceGroupName, name, slot, request).map(new Func1, BackupRequestInner>() { @Override - public StringDictionaryInner call(ServiceResponse response) { + public BackupRequestInner call(ServiceResponse response) { return response.getBody(); } }); } /** - * Updates the application settings of web app. - * Updates the application settings of web app. + * Updates the backup configuration of an app. + * Updates the backup configuration of an app. * - * @param resourceGroupName Name of resource group - * @param name Name of web app - * @param slot Name of web app slot. If not specified then will default to production slot. - * @param appSettings Application settings of web app - * @return the observable to the StringDictionaryInner object + * @param resourceGroupName Name of the resource group to which the resource belongs. + * @param name Name of the app. + * @param slot Name of the deployment slot. If a slot is not specified, the API will update the backup configuration for the production slot. + * @param request Edited backup configuration. + * @return the observable to the BackupRequestInner object */ - public Observable> updateApplicationSettingsSlotWithServiceResponseAsync(String resourceGroupName, String name, String slot, StringDictionaryInner appSettings) { + public Observable> updateBackupConfigurationSlotWithServiceResponseAsync(String resourceGroupName, String name, String slot, BackupRequestInner request) { if (resourceGroupName == null) { throw new IllegalArgumentException("Parameter resourceGroupName is required and cannot be null."); } @@ -12176,17 +12443,17 @@ public Observable> updateApplicationSetti if (this.client.subscriptionId() == null) { throw new IllegalArgumentException("Parameter this.client.subscriptionId() is required and cannot be null."); } - if (appSettings == null) { - throw new IllegalArgumentException("Parameter appSettings is required and cannot be null."); + if (request == null) { + throw new IllegalArgumentException("Parameter request is required and cannot be null."); } - Validator.validate(appSettings); + Validator.validate(request); final String apiVersion = "2016-08-01"; - return service.updateApplicationSettingsSlot(resourceGroupName, name, slot, this.client.subscriptionId(), appSettings, apiVersion, this.client.acceptLanguage(), this.client.userAgent()) - .flatMap(new Func1, Observable>>() { + return service.updateBackupConfigurationSlot(resourceGroupName, name, slot, this.client.subscriptionId(), request, apiVersion, this.client.acceptLanguage(), this.client.userAgent()) + .flatMap(new Func1, Observable>>() { @Override - public Observable> call(Response response) { + public Observable> call(Response response) { try { - ServiceResponse clientResponse = updateApplicationSettingsSlotDelegate(response); + ServiceResponse clientResponse = updateBackupConfigurationSlotDelegate(response); return Observable.just(clientResponse); } catch (Throwable t) { return Observable.error(t); @@ -12195,68 +12462,67 @@ public Observable> call(Response updateApplicationSettingsSlotDelegate(Response response) throws CloudException, IOException, IllegalArgumentException { - return new AzureServiceResponseBuilder(this.client.mapperAdapter()) - .register(200, new TypeToken() { }.getType()) + private ServiceResponse updateBackupConfigurationSlotDelegate(Response response) throws CloudException, IOException, IllegalArgumentException { + return new AzureServiceResponseBuilder(this.client.mapperAdapter()) + .register(200, new TypeToken() { }.getType()) .registerError(CloudException.class) .build(response); } /** - * Gets the application settings of web app. - * Gets the application settings of web app. + * Deletes the backup configuration of an app. + * Deletes the backup configuration of an app. * - * @param resourceGroupName Name of resource group - * @param name Name of web app - * @param slot Name of web app slot. If not specified then will default to production slot. - * @return the StringDictionaryInner object if successful. + * @param resourceGroupName Name of the resource group to which the resource belongs. + * @param name Name of the app. + * @param slot Name of the deployment slot. If a slot is not specified, the API will delete the backup configuration for the production slot. */ - public StringDictionaryInner listApplicationSettingsSlot(String resourceGroupName, String name, String slot) { - return listApplicationSettingsSlotWithServiceResponseAsync(resourceGroupName, name, slot).toBlocking().single().getBody(); + public void deleteBackupConfigurationSlot(String resourceGroupName, String name, String slot) { + deleteBackupConfigurationSlotWithServiceResponseAsync(resourceGroupName, name, slot).toBlocking().single().getBody(); } /** - * Gets the application settings of web app. - * Gets the application settings of web app. + * Deletes the backup configuration of an app. + * Deletes the backup configuration of an app. * - * @param resourceGroupName Name of resource group - * @param name Name of web app - * @param slot Name of web app slot. If not specified then will default to production slot. + * @param resourceGroupName Name of the resource group to which the resource belongs. + * @param name Name of the app. + * @param slot Name of the deployment slot. If a slot is not specified, the API will delete the backup configuration for the production slot. * @param serviceCallback the async ServiceCallback to handle successful and failed responses. * @return the {@link ServiceCall} object */ - public ServiceCall listApplicationSettingsSlotAsync(String resourceGroupName, String name, String slot, final ServiceCallback serviceCallback) { - return ServiceCall.create(listApplicationSettingsSlotWithServiceResponseAsync(resourceGroupName, name, slot), serviceCallback); + public ServiceCall deleteBackupConfigurationSlotAsync(String resourceGroupName, String name, String slot, final ServiceCallback serviceCallback) { + return ServiceCall.create(deleteBackupConfigurationSlotWithServiceResponseAsync(resourceGroupName, name, slot), serviceCallback); } /** - * Gets the application settings of web app. - * Gets the application settings of web app. + * Deletes the backup configuration of an app. + * Deletes the backup configuration of an app. * - * @param resourceGroupName Name of resource group - * @param name Name of web app - * @param slot Name of web app slot. If not specified then will default to production slot. - * @return the observable to the StringDictionaryInner object + * @param resourceGroupName Name of the resource group to which the resource belongs. + * @param name Name of the app. + * @param slot Name of the deployment slot. If a slot is not specified, the API will delete the backup configuration for the production slot. + * @return the {@link ServiceResponse} object if successful. */ - public Observable listApplicationSettingsSlotAsync(String resourceGroupName, String name, String slot) { - return listApplicationSettingsSlotWithServiceResponseAsync(resourceGroupName, name, slot).map(new Func1, StringDictionaryInner>() { + public Observable deleteBackupConfigurationSlotAsync(String resourceGroupName, String name, String slot) { + return deleteBackupConfigurationSlotWithServiceResponseAsync(resourceGroupName, name, slot).map(new Func1, Void>() { @Override - public StringDictionaryInner call(ServiceResponse response) { + public Void call(ServiceResponse response) { return response.getBody(); } }); } /** - * Gets the application settings of web app. - * Gets the application settings of web app. + * Deletes the backup configuration of an app. + * Deletes the backup configuration of an app. * - * @param resourceGroupName Name of resource group - * @param name Name of web app - * @param slot Name of web app slot. If not specified then will default to production slot. - * @return the observable to the StringDictionaryInner object + * @param resourceGroupName Name of the resource group to which the resource belongs. + * @param name Name of the app. + * @param slot Name of the deployment slot. If a slot is not specified, the API will delete the backup configuration for the production slot. + * @return the {@link ServiceResponse} object if successful. */ - public Observable> listApplicationSettingsSlotWithServiceResponseAsync(String resourceGroupName, String name, String slot) { + public Observable> deleteBackupConfigurationSlotWithServiceResponseAsync(String resourceGroupName, String name, String slot) { if (resourceGroupName == null) { throw new IllegalArgumentException("Parameter resourceGroupName is required and cannot be null."); } @@ -12270,12 +12536,12 @@ public Observable> listApplicationSetting throw new IllegalArgumentException("Parameter this.client.subscriptionId() is required and cannot be null."); } final String apiVersion = "2016-08-01"; - return service.listApplicationSettingsSlot(resourceGroupName, name, slot, this.client.subscriptionId(), apiVersion, this.client.acceptLanguage(), this.client.userAgent()) - .flatMap(new Func1, Observable>>() { + return service.deleteBackupConfigurationSlot(resourceGroupName, name, slot, this.client.subscriptionId(), apiVersion, this.client.acceptLanguage(), this.client.userAgent()) + .flatMap(new Func1, Observable>>() { @Override - public Observable> call(Response response) { + public Observable> call(Response response) { try { - ServiceResponse clientResponse = listApplicationSettingsSlotDelegate(response); + ServiceResponse clientResponse = deleteBackupConfigurationSlotDelegate(response); return Observable.just(clientResponse); } catch (Throwable t) { return Observable.error(t); @@ -12284,72 +12550,67 @@ public Observable> call(Response listApplicationSettingsSlotDelegate(Response response) throws CloudException, IOException, IllegalArgumentException { - return new AzureServiceResponseBuilder(this.client.mapperAdapter()) - .register(200, new TypeToken() { }.getType()) - .registerError(CloudException.class) + private ServiceResponse deleteBackupConfigurationSlotDelegate(Response response) throws CloudException, IOException, IllegalArgumentException { + return new AzureServiceResponseBuilder(this.client.mapperAdapter()) + .register(200, new TypeToken() { }.getType()) .build(response); } /** - * Updates the Authentication / Authorization settings associated with web app. - * Updates the Authentication / Authorization settings associated with web app. + * Gets the backup configuration of an app. + * Gets the backup configuration of an app. * - * @param resourceGroupName Name of resource group - * @param name Name of web app - * @param slot Name of web app slot. If not specified then will default to production slot. - * @param siteAuthSettings Auth settings associated with web app - * @return the SiteAuthSettingsInner object if successful. + * @param resourceGroupName Name of the resource group to which the resource belongs. + * @param name Name of the app. + * @param slot Name of the deployment slot. If a slot is not specified, the API will get the backup configuration for the production slot. + * @return the BackupRequestInner object if successful. */ - public SiteAuthSettingsInner updateAuthSettingsSlot(String resourceGroupName, String name, String slot, SiteAuthSettingsInner siteAuthSettings) { - return updateAuthSettingsSlotWithServiceResponseAsync(resourceGroupName, name, slot, siteAuthSettings).toBlocking().single().getBody(); + public BackupRequestInner getBackupConfigurationSlot(String resourceGroupName, String name, String slot) { + return getBackupConfigurationSlotWithServiceResponseAsync(resourceGroupName, name, slot).toBlocking().single().getBody(); } /** - * Updates the Authentication / Authorization settings associated with web app. - * Updates the Authentication / Authorization settings associated with web app. + * Gets the backup configuration of an app. + * Gets the backup configuration of an app. * - * @param resourceGroupName Name of resource group - * @param name Name of web app - * @param slot Name of web app slot. If not specified then will default to production slot. - * @param siteAuthSettings Auth settings associated with web app + * @param resourceGroupName Name of the resource group to which the resource belongs. + * @param name Name of the app. + * @param slot Name of the deployment slot. If a slot is not specified, the API will get the backup configuration for the production slot. * @param serviceCallback the async ServiceCallback to handle successful and failed responses. * @return the {@link ServiceCall} object */ - public ServiceCall updateAuthSettingsSlotAsync(String resourceGroupName, String name, String slot, SiteAuthSettingsInner siteAuthSettings, final ServiceCallback serviceCallback) { - return ServiceCall.create(updateAuthSettingsSlotWithServiceResponseAsync(resourceGroupName, name, slot, siteAuthSettings), serviceCallback); + public ServiceCall getBackupConfigurationSlotAsync(String resourceGroupName, String name, String slot, final ServiceCallback serviceCallback) { + return ServiceCall.create(getBackupConfigurationSlotWithServiceResponseAsync(resourceGroupName, name, slot), serviceCallback); } /** - * Updates the Authentication / Authorization settings associated with web app. - * Updates the Authentication / Authorization settings associated with web app. + * Gets the backup configuration of an app. + * Gets the backup configuration of an app. * - * @param resourceGroupName Name of resource group - * @param name Name of web app - * @param slot Name of web app slot. If not specified then will default to production slot. - * @param siteAuthSettings Auth settings associated with web app - * @return the observable to the SiteAuthSettingsInner object + * @param resourceGroupName Name of the resource group to which the resource belongs. + * @param name Name of the app. + * @param slot Name of the deployment slot. If a slot is not specified, the API will get the backup configuration for the production slot. + * @return the observable to the BackupRequestInner object */ - public Observable updateAuthSettingsSlotAsync(String resourceGroupName, String name, String slot, SiteAuthSettingsInner siteAuthSettings) { - return updateAuthSettingsSlotWithServiceResponseAsync(resourceGroupName, name, slot, siteAuthSettings).map(new Func1, SiteAuthSettingsInner>() { + public Observable getBackupConfigurationSlotAsync(String resourceGroupName, String name, String slot) { + return getBackupConfigurationSlotWithServiceResponseAsync(resourceGroupName, name, slot).map(new Func1, BackupRequestInner>() { @Override - public SiteAuthSettingsInner call(ServiceResponse response) { + public BackupRequestInner call(ServiceResponse response) { return response.getBody(); } }); } /** - * Updates the Authentication / Authorization settings associated with web app. - * Updates the Authentication / Authorization settings associated with web app. + * Gets the backup configuration of an app. + * Gets the backup configuration of an app. * - * @param resourceGroupName Name of resource group - * @param name Name of web app - * @param slot Name of web app slot. If not specified then will default to production slot. - * @param siteAuthSettings Auth settings associated with web app - * @return the observable to the SiteAuthSettingsInner object + * @param resourceGroupName Name of the resource group to which the resource belongs. + * @param name Name of the app. + * @param slot Name of the deployment slot. If a slot is not specified, the API will get the backup configuration for the production slot. + * @return the observable to the BackupRequestInner object */ - public Observable> updateAuthSettingsSlotWithServiceResponseAsync(String resourceGroupName, String name, String slot, SiteAuthSettingsInner siteAuthSettings) { + public Observable> getBackupConfigurationSlotWithServiceResponseAsync(String resourceGroupName, String name, String slot) { if (resourceGroupName == null) { throw new IllegalArgumentException("Parameter resourceGroupName is required and cannot be null."); } @@ -12362,17 +12623,13 @@ public Observable> updateAuthSettingsSlot if (this.client.subscriptionId() == null) { throw new IllegalArgumentException("Parameter this.client.subscriptionId() is required and cannot be null."); } - if (siteAuthSettings == null) { - throw new IllegalArgumentException("Parameter siteAuthSettings is required and cannot be null."); - } - Validator.validate(siteAuthSettings); final String apiVersion = "2016-08-01"; - return service.updateAuthSettingsSlot(resourceGroupName, name, slot, this.client.subscriptionId(), siteAuthSettings, apiVersion, this.client.acceptLanguage(), this.client.userAgent()) - .flatMap(new Func1, Observable>>() { + return service.getBackupConfigurationSlot(resourceGroupName, name, slot, this.client.subscriptionId(), apiVersion, this.client.acceptLanguage(), this.client.userAgent()) + .flatMap(new Func1, Observable>>() { @Override - public Observable> call(Response response) { + public Observable> call(Response response) { try { - ServiceResponse clientResponse = updateAuthSettingsSlotDelegate(response); + ServiceResponse clientResponse = getBackupConfigurationSlotDelegate(response); return Observable.just(clientResponse); } catch (Throwable t) { return Observable.error(t); @@ -12381,68 +12638,72 @@ public Observable> call(Response updateAuthSettingsSlotDelegate(Response response) throws CloudException, IOException, IllegalArgumentException { - return new AzureServiceResponseBuilder(this.client.mapperAdapter()) - .register(200, new TypeToken() { }.getType()) + private ServiceResponse getBackupConfigurationSlotDelegate(Response response) throws CloudException, IOException, IllegalArgumentException { + return new AzureServiceResponseBuilder(this.client.mapperAdapter()) + .register(200, new TypeToken() { }.getType()) .registerError(CloudException.class) .build(response); } /** - * Gets the Authentication / Authorization settings associated with web app. - * Gets the Authentication / Authorization settings associated with web app. + * Replaces the connection strings of an app. + * Replaces the connection strings of an app. * - * @param resourceGroupName Name of resource group - * @param name Name of web app - * @param slot Name of web app slot. If not specified then will default to production slot. - * @return the SiteAuthSettingsInner object if successful. + * @param resourceGroupName Name of the resource group to which the resource belongs. + * @param name Name of the app. + * @param slot Name of the deployment slot. If a slot is not specified, the API will update the connection settings for the production slot. + * @param connectionStrings Connection strings of the app or deployment slot. See example. + * @return the ConnectionStringDictionaryInner object if successful. */ - public SiteAuthSettingsInner listAuthSettingsSlot(String resourceGroupName, String name, String slot) { - return listAuthSettingsSlotWithServiceResponseAsync(resourceGroupName, name, slot).toBlocking().single().getBody(); + public ConnectionStringDictionaryInner updateConnectionStringsSlot(String resourceGroupName, String name, String slot, ConnectionStringDictionaryInner connectionStrings) { + return updateConnectionStringsSlotWithServiceResponseAsync(resourceGroupName, name, slot, connectionStrings).toBlocking().single().getBody(); } /** - * Gets the Authentication / Authorization settings associated with web app. - * Gets the Authentication / Authorization settings associated with web app. + * Replaces the connection strings of an app. + * Replaces the connection strings of an app. * - * @param resourceGroupName Name of resource group - * @param name Name of web app - * @param slot Name of web app slot. If not specified then will default to production slot. + * @param resourceGroupName Name of the resource group to which the resource belongs. + * @param name Name of the app. + * @param slot Name of the deployment slot. If a slot is not specified, the API will update the connection settings for the production slot. + * @param connectionStrings Connection strings of the app or deployment slot. See example. * @param serviceCallback the async ServiceCallback to handle successful and failed responses. * @return the {@link ServiceCall} object */ - public ServiceCall listAuthSettingsSlotAsync(String resourceGroupName, String name, String slot, final ServiceCallback serviceCallback) { - return ServiceCall.create(listAuthSettingsSlotWithServiceResponseAsync(resourceGroupName, name, slot), serviceCallback); + public ServiceCall updateConnectionStringsSlotAsync(String resourceGroupName, String name, String slot, ConnectionStringDictionaryInner connectionStrings, final ServiceCallback serviceCallback) { + return ServiceCall.create(updateConnectionStringsSlotWithServiceResponseAsync(resourceGroupName, name, slot, connectionStrings), serviceCallback); } /** - * Gets the Authentication / Authorization settings associated with web app. - * Gets the Authentication / Authorization settings associated with web app. + * Replaces the connection strings of an app. + * Replaces the connection strings of an app. * - * @param resourceGroupName Name of resource group - * @param name Name of web app - * @param slot Name of web app slot. If not specified then will default to production slot. - * @return the observable to the SiteAuthSettingsInner object + * @param resourceGroupName Name of the resource group to which the resource belongs. + * @param name Name of the app. + * @param slot Name of the deployment slot. If a slot is not specified, the API will update the connection settings for the production slot. + * @param connectionStrings Connection strings of the app or deployment slot. See example. + * @return the observable to the ConnectionStringDictionaryInner object */ - public Observable listAuthSettingsSlotAsync(String resourceGroupName, String name, String slot) { - return listAuthSettingsSlotWithServiceResponseAsync(resourceGroupName, name, slot).map(new Func1, SiteAuthSettingsInner>() { + public Observable updateConnectionStringsSlotAsync(String resourceGroupName, String name, String slot, ConnectionStringDictionaryInner connectionStrings) { + return updateConnectionStringsSlotWithServiceResponseAsync(resourceGroupName, name, slot, connectionStrings).map(new Func1, ConnectionStringDictionaryInner>() { @Override - public SiteAuthSettingsInner call(ServiceResponse response) { + public ConnectionStringDictionaryInner call(ServiceResponse response) { return response.getBody(); } }); } /** - * Gets the Authentication / Authorization settings associated with web app. - * Gets the Authentication / Authorization settings associated with web app. + * Replaces the connection strings of an app. + * Replaces the connection strings of an app. * - * @param resourceGroupName Name of resource group - * @param name Name of web app - * @param slot Name of web app slot. If not specified then will default to production slot. - * @return the observable to the SiteAuthSettingsInner object + * @param resourceGroupName Name of the resource group to which the resource belongs. + * @param name Name of the app. + * @param slot Name of the deployment slot. If a slot is not specified, the API will update the connection settings for the production slot. + * @param connectionStrings Connection strings of the app or deployment slot. See example. + * @return the observable to the ConnectionStringDictionaryInner object */ - public Observable> listAuthSettingsSlotWithServiceResponseAsync(String resourceGroupName, String name, String slot) { + public Observable> updateConnectionStringsSlotWithServiceResponseAsync(String resourceGroupName, String name, String slot, ConnectionStringDictionaryInner connectionStrings) { if (resourceGroupName == null) { throw new IllegalArgumentException("Parameter resourceGroupName is required and cannot be null."); } @@ -12455,13 +12716,17 @@ public Observable> listAuthSettingsSlotWi if (this.client.subscriptionId() == null) { throw new IllegalArgumentException("Parameter this.client.subscriptionId() is required and cannot be null."); } + if (connectionStrings == null) { + throw new IllegalArgumentException("Parameter connectionStrings is required and cannot be null."); + } + Validator.validate(connectionStrings); final String apiVersion = "2016-08-01"; - return service.listAuthSettingsSlot(resourceGroupName, name, slot, this.client.subscriptionId(), apiVersion, this.client.acceptLanguage(), this.client.userAgent()) - .flatMap(new Func1, Observable>>() { + return service.updateConnectionStringsSlot(resourceGroupName, name, slot, this.client.subscriptionId(), connectionStrings, apiVersion, this.client.acceptLanguage(), this.client.userAgent()) + .flatMap(new Func1, Observable>>() { @Override - public Observable> call(Response response) { + public Observable> call(Response response) { try { - ServiceResponse clientResponse = listAuthSettingsSlotDelegate(response); + ServiceResponse clientResponse = updateConnectionStringsSlotDelegate(response); return Observable.just(clientResponse); } catch (Throwable t) { return Observable.error(t); @@ -12470,72 +12735,68 @@ public Observable> call(Response listAuthSettingsSlotDelegate(Response response) throws CloudException, IOException, IllegalArgumentException { - return new AzureServiceResponseBuilder(this.client.mapperAdapter()) - .register(200, new TypeToken() { }.getType()) + private ServiceResponse updateConnectionStringsSlotDelegate(Response response) throws CloudException, IOException, IllegalArgumentException { + return new AzureServiceResponseBuilder(this.client.mapperAdapter()) + .register(200, new TypeToken() { }.getType()) .registerError(CloudException.class) .build(response); } /** - * Updates backup configuration of web app. - * Updates backup configuration of web app. + * Gets the connection strings of an app. + * Gets the connection strings of an app. * - * @param resourceGroupName Name of resource group - * @param name Name of web app - * @param slot Name of web app slot. If not specified then will default to production slot. - * @param request Information on backup request - * @return the BackupRequestInner object if successful. + * @param resourceGroupName Name of the resource group to which the resource belongs. + * @param name Name of the app. + * @param slot Name of the deployment slot. If a slot is not specified, the API will get the connection settings for the production slot. + * @return the ConnectionStringDictionaryInner object if successful. */ - public BackupRequestInner updateBackupConfigurationSlot(String resourceGroupName, String name, String slot, BackupRequestInner request) { - return updateBackupConfigurationSlotWithServiceResponseAsync(resourceGroupName, name, slot, request).toBlocking().single().getBody(); + public ConnectionStringDictionaryInner listConnectionStringsSlot(String resourceGroupName, String name, String slot) { + return listConnectionStringsSlotWithServiceResponseAsync(resourceGroupName, name, slot).toBlocking().single().getBody(); } /** - * Updates backup configuration of web app. - * Updates backup configuration of web app. + * Gets the connection strings of an app. + * Gets the connection strings of an app. * - * @param resourceGroupName Name of resource group - * @param name Name of web app - * @param slot Name of web app slot. If not specified then will default to production slot. - * @param request Information on backup request + * @param resourceGroupName Name of the resource group to which the resource belongs. + * @param name Name of the app. + * @param slot Name of the deployment slot. If a slot is not specified, the API will get the connection settings for the production slot. * @param serviceCallback the async ServiceCallback to handle successful and failed responses. * @return the {@link ServiceCall} object */ - public ServiceCall updateBackupConfigurationSlotAsync(String resourceGroupName, String name, String slot, BackupRequestInner request, final ServiceCallback serviceCallback) { - return ServiceCall.create(updateBackupConfigurationSlotWithServiceResponseAsync(resourceGroupName, name, slot, request), serviceCallback); + public ServiceCall listConnectionStringsSlotAsync(String resourceGroupName, String name, String slot, final ServiceCallback serviceCallback) { + return ServiceCall.create(listConnectionStringsSlotWithServiceResponseAsync(resourceGroupName, name, slot), serviceCallback); } /** - * Updates backup configuration of web app. - * Updates backup configuration of web app. + * Gets the connection strings of an app. + * Gets the connection strings of an app. * - * @param resourceGroupName Name of resource group - * @param name Name of web app - * @param slot Name of web app slot. If not specified then will default to production slot. - * @param request Information on backup request - * @return the observable to the BackupRequestInner object + * @param resourceGroupName Name of the resource group to which the resource belongs. + * @param name Name of the app. + * @param slot Name of the deployment slot. If a slot is not specified, the API will get the connection settings for the production slot. + * @return the observable to the ConnectionStringDictionaryInner object */ - public Observable updateBackupConfigurationSlotAsync(String resourceGroupName, String name, String slot, BackupRequestInner request) { - return updateBackupConfigurationSlotWithServiceResponseAsync(resourceGroupName, name, slot, request).map(new Func1, BackupRequestInner>() { + public Observable listConnectionStringsSlotAsync(String resourceGroupName, String name, String slot) { + return listConnectionStringsSlotWithServiceResponseAsync(resourceGroupName, name, slot).map(new Func1, ConnectionStringDictionaryInner>() { @Override - public BackupRequestInner call(ServiceResponse response) { + public ConnectionStringDictionaryInner call(ServiceResponse response) { return response.getBody(); } }); } /** - * Updates backup configuration of web app. - * Updates backup configuration of web app. + * Gets the connection strings of an app. + * Gets the connection strings of an app. * - * @param resourceGroupName Name of resource group - * @param name Name of web app - * @param slot Name of web app slot. If not specified then will default to production slot. - * @param request Information on backup request - * @return the observable to the BackupRequestInner object + * @param resourceGroupName Name of the resource group to which the resource belongs. + * @param name Name of the app. + * @param slot Name of the deployment slot. If a slot is not specified, the API will get the connection settings for the production slot. + * @return the observable to the ConnectionStringDictionaryInner object */ - public Observable> updateBackupConfigurationSlotWithServiceResponseAsync(String resourceGroupName, String name, String slot, BackupRequestInner request) { + public Observable> listConnectionStringsSlotWithServiceResponseAsync(String resourceGroupName, String name, String slot) { if (resourceGroupName == null) { throw new IllegalArgumentException("Parameter resourceGroupName is required and cannot be null."); } @@ -12548,17 +12809,13 @@ public Observable> updateBackupConfiguration if (this.client.subscriptionId() == null) { throw new IllegalArgumentException("Parameter this.client.subscriptionId() is required and cannot be null."); } - if (request == null) { - throw new IllegalArgumentException("Parameter request is required and cannot be null."); - } - Validator.validate(request); final String apiVersion = "2016-08-01"; - return service.updateBackupConfigurationSlot(resourceGroupName, name, slot, this.client.subscriptionId(), request, apiVersion, this.client.acceptLanguage(), this.client.userAgent()) - .flatMap(new Func1, Observable>>() { + return service.listConnectionStringsSlot(resourceGroupName, name, slot, this.client.subscriptionId(), apiVersion, this.client.acceptLanguage(), this.client.userAgent()) + .flatMap(new Func1, Observable>>() { @Override - public Observable> call(Response response) { + public Observable> call(Response response) { try { - ServiceResponse clientResponse = updateBackupConfigurationSlotDelegate(response); + ServiceResponse clientResponse = listConnectionStringsSlotDelegate(response); return Observable.just(clientResponse); } catch (Throwable t) { return Observable.error(t); @@ -12567,68 +12824,68 @@ public Observable> call(Response updateBackupConfigurationSlotDelegate(Response response) throws CloudException, IOException, IllegalArgumentException { - return new AzureServiceResponseBuilder(this.client.mapperAdapter()) - .register(200, new TypeToken() { }.getType()) + private ServiceResponse listConnectionStringsSlotDelegate(Response response) throws CloudException, IOException, IllegalArgumentException { + return new AzureServiceResponseBuilder(this.client.mapperAdapter()) + .register(200, new TypeToken() { }.getType()) .registerError(CloudException.class) .build(response); } /** - * Removes the backup configuration for a web app. - * Removes the backup configuration for a web app. + * Gets the logging configuration of an app. + * Gets the logging configuration of an app. * - * @param resourceGroupName Name of resource group - * @param name Name of web app - * @param slot Name of web app slot. If not specified then will default to production slot. - * @return the Object object if successful. + * @param resourceGroupName Name of the resource group to which the resource belongs. + * @param name Name of the app. + * @param slot Name of the deployment slot. If a slot is not specified, the API will get the logging configuration for the production slot. + * @return the SiteLogsConfigInner object if successful. */ - public Object deleteBackupConfigurationSlot(String resourceGroupName, String name, String slot) { - return deleteBackupConfigurationSlotWithServiceResponseAsync(resourceGroupName, name, slot).toBlocking().single().getBody(); + public SiteLogsConfigInner getDiagnosticLogsConfigurationSlot(String resourceGroupName, String name, String slot) { + return getDiagnosticLogsConfigurationSlotWithServiceResponseAsync(resourceGroupName, name, slot).toBlocking().single().getBody(); } /** - * Removes the backup configuration for a web app. - * Removes the backup configuration for a web app. + * Gets the logging configuration of an app. + * Gets the logging configuration of an app. * - * @param resourceGroupName Name of resource group - * @param name Name of web app - * @param slot Name of web app slot. If not specified then will default to production slot. + * @param resourceGroupName Name of the resource group to which the resource belongs. + * @param name Name of the app. + * @param slot Name of the deployment slot. If a slot is not specified, the API will get the logging configuration for the production slot. * @param serviceCallback the async ServiceCallback to handle successful and failed responses. * @return the {@link ServiceCall} object */ - public ServiceCall deleteBackupConfigurationSlotAsync(String resourceGroupName, String name, String slot, final ServiceCallback serviceCallback) { - return ServiceCall.create(deleteBackupConfigurationSlotWithServiceResponseAsync(resourceGroupName, name, slot), serviceCallback); + public ServiceCall getDiagnosticLogsConfigurationSlotAsync(String resourceGroupName, String name, String slot, final ServiceCallback serviceCallback) { + return ServiceCall.create(getDiagnosticLogsConfigurationSlotWithServiceResponseAsync(resourceGroupName, name, slot), serviceCallback); } /** - * Removes the backup configuration for a web app. - * Removes the backup configuration for a web app. + * Gets the logging configuration of an app. + * Gets the logging configuration of an app. * - * @param resourceGroupName Name of resource group - * @param name Name of web app - * @param slot Name of web app slot. If not specified then will default to production slot. - * @return the observable to the Object object + * @param resourceGroupName Name of the resource group to which the resource belongs. + * @param name Name of the app. + * @param slot Name of the deployment slot. If a slot is not specified, the API will get the logging configuration for the production slot. + * @return the observable to the SiteLogsConfigInner object */ - public Observable deleteBackupConfigurationSlotAsync(String resourceGroupName, String name, String slot) { - return deleteBackupConfigurationSlotWithServiceResponseAsync(resourceGroupName, name, slot).map(new Func1, Object>() { + public Observable getDiagnosticLogsConfigurationSlotAsync(String resourceGroupName, String name, String slot) { + return getDiagnosticLogsConfigurationSlotWithServiceResponseAsync(resourceGroupName, name, slot).map(new Func1, SiteLogsConfigInner>() { @Override - public Object call(ServiceResponse response) { + public SiteLogsConfigInner call(ServiceResponse response) { return response.getBody(); } }); } /** - * Removes the backup configuration for a web app. - * Removes the backup configuration for a web app. + * Gets the logging configuration of an app. + * Gets the logging configuration of an app. * - * @param resourceGroupName Name of resource group - * @param name Name of web app - * @param slot Name of web app slot. If not specified then will default to production slot. - * @return the observable to the Object object + * @param resourceGroupName Name of the resource group to which the resource belongs. + * @param name Name of the app. + * @param slot Name of the deployment slot. If a slot is not specified, the API will get the logging configuration for the production slot. + * @return the observable to the SiteLogsConfigInner object */ - public Observable> deleteBackupConfigurationSlotWithServiceResponseAsync(String resourceGroupName, String name, String slot) { + public Observable> getDiagnosticLogsConfigurationSlotWithServiceResponseAsync(String resourceGroupName, String name, String slot) { if (resourceGroupName == null) { throw new IllegalArgumentException("Parameter resourceGroupName is required and cannot be null."); } @@ -12642,12 +12899,12 @@ public Observable> deleteBackupConfigurationSlotWithServ throw new IllegalArgumentException("Parameter this.client.subscriptionId() is required and cannot be null."); } final String apiVersion = "2016-08-01"; - return service.deleteBackupConfigurationSlot(resourceGroupName, name, slot, this.client.subscriptionId(), apiVersion, this.client.acceptLanguage(), this.client.userAgent()) - .flatMap(new Func1, Observable>>() { + return service.getDiagnosticLogsConfigurationSlot(resourceGroupName, name, slot, this.client.subscriptionId(), apiVersion, this.client.acceptLanguage(), this.client.userAgent()) + .flatMap(new Func1, Observable>>() { @Override - public Observable> call(Response response) { + public Observable> call(Response response) { try { - ServiceResponse clientResponse = deleteBackupConfigurationSlotDelegate(response); + ServiceResponse clientResponse = getDiagnosticLogsConfigurationSlotDelegate(response); return Observable.just(clientResponse); } catch (Throwable t) { return Observable.error(t); @@ -12656,68 +12913,72 @@ public Observable> call(Response response) }); } - private ServiceResponse deleteBackupConfigurationSlotDelegate(Response response) throws CloudException, IOException, IllegalArgumentException { - return new AzureServiceResponseBuilder(this.client.mapperAdapter()) - .register(200, new TypeToken() { }.getType()) + private ServiceResponse getDiagnosticLogsConfigurationSlotDelegate(Response response) throws CloudException, IOException, IllegalArgumentException { + return new AzureServiceResponseBuilder(this.client.mapperAdapter()) + .register(200, new TypeToken() { }.getType()) .registerError(CloudException.class) .build(response); } /** - * Gets the backup configuration for a web app. - * Gets the backup configuration for a web app. + * Updates the logging configuration of an app. + * Updates the logging configuration of an app. * - * @param resourceGroupName Name of resource group - * @param name Name of web app - * @param slot Name of web app slot. If not specified then will default to production slot. - * @return the BackupRequestInner object if successful. + * @param resourceGroupName Name of the resource group to which the resource belongs. + * @param name Name of the app. + * @param slot Name of the deployment slot. If a slot is not specified, the API will update the logging configuration for the production slot. + * @param siteLogsConfig A SiteLogsConfig JSON object that contains the logging configuration to change in the "properties" property. + * @return the SiteLogsConfigInner object if successful. */ - public BackupRequestInner getBackupConfigurationSlot(String resourceGroupName, String name, String slot) { - return getBackupConfigurationSlotWithServiceResponseAsync(resourceGroupName, name, slot).toBlocking().single().getBody(); + public SiteLogsConfigInner updateDiagnosticLogsConfigSlot(String resourceGroupName, String name, String slot, SiteLogsConfigInner siteLogsConfig) { + return updateDiagnosticLogsConfigSlotWithServiceResponseAsync(resourceGroupName, name, slot, siteLogsConfig).toBlocking().single().getBody(); } /** - * Gets the backup configuration for a web app. - * Gets the backup configuration for a web app. + * Updates the logging configuration of an app. + * Updates the logging configuration of an app. * - * @param resourceGroupName Name of resource group - * @param name Name of web app - * @param slot Name of web app slot. If not specified then will default to production slot. + * @param resourceGroupName Name of the resource group to which the resource belongs. + * @param name Name of the app. + * @param slot Name of the deployment slot. If a slot is not specified, the API will update the logging configuration for the production slot. + * @param siteLogsConfig A SiteLogsConfig JSON object that contains the logging configuration to change in the "properties" property. * @param serviceCallback the async ServiceCallback to handle successful and failed responses. * @return the {@link ServiceCall} object */ - public ServiceCall getBackupConfigurationSlotAsync(String resourceGroupName, String name, String slot, final ServiceCallback serviceCallback) { - return ServiceCall.create(getBackupConfigurationSlotWithServiceResponseAsync(resourceGroupName, name, slot), serviceCallback); + public ServiceCall updateDiagnosticLogsConfigSlotAsync(String resourceGroupName, String name, String slot, SiteLogsConfigInner siteLogsConfig, final ServiceCallback serviceCallback) { + return ServiceCall.create(updateDiagnosticLogsConfigSlotWithServiceResponseAsync(resourceGroupName, name, slot, siteLogsConfig), serviceCallback); } /** - * Gets the backup configuration for a web app. - * Gets the backup configuration for a web app. + * Updates the logging configuration of an app. + * Updates the logging configuration of an app. * - * @param resourceGroupName Name of resource group - * @param name Name of web app - * @param slot Name of web app slot. If not specified then will default to production slot. - * @return the observable to the BackupRequestInner object + * @param resourceGroupName Name of the resource group to which the resource belongs. + * @param name Name of the app. + * @param slot Name of the deployment slot. If a slot is not specified, the API will update the logging configuration for the production slot. + * @param siteLogsConfig A SiteLogsConfig JSON object that contains the logging configuration to change in the "properties" property. + * @return the observable to the SiteLogsConfigInner object */ - public Observable getBackupConfigurationSlotAsync(String resourceGroupName, String name, String slot) { - return getBackupConfigurationSlotWithServiceResponseAsync(resourceGroupName, name, slot).map(new Func1, BackupRequestInner>() { + public Observable updateDiagnosticLogsConfigSlotAsync(String resourceGroupName, String name, String slot, SiteLogsConfigInner siteLogsConfig) { + return updateDiagnosticLogsConfigSlotWithServiceResponseAsync(resourceGroupName, name, slot, siteLogsConfig).map(new Func1, SiteLogsConfigInner>() { @Override - public BackupRequestInner call(ServiceResponse response) { + public SiteLogsConfigInner call(ServiceResponse response) { return response.getBody(); } }); } /** - * Gets the backup configuration for a web app. - * Gets the backup configuration for a web app. + * Updates the logging configuration of an app. + * Updates the logging configuration of an app. * - * @param resourceGroupName Name of resource group - * @param name Name of web app - * @param slot Name of web app slot. If not specified then will default to production slot. - * @return the observable to the BackupRequestInner object + * @param resourceGroupName Name of the resource group to which the resource belongs. + * @param name Name of the app. + * @param slot Name of the deployment slot. If a slot is not specified, the API will update the logging configuration for the production slot. + * @param siteLogsConfig A SiteLogsConfig JSON object that contains the logging configuration to change in the "properties" property. + * @return the observable to the SiteLogsConfigInner object */ - public Observable> getBackupConfigurationSlotWithServiceResponseAsync(String resourceGroupName, String name, String slot) { + public Observable> updateDiagnosticLogsConfigSlotWithServiceResponseAsync(String resourceGroupName, String name, String slot, SiteLogsConfigInner siteLogsConfig) { if (resourceGroupName == null) { throw new IllegalArgumentException("Parameter resourceGroupName is required and cannot be null."); } @@ -12730,13 +12991,17 @@ public Observable> getBackupConfigurationSlo if (this.client.subscriptionId() == null) { throw new IllegalArgumentException("Parameter this.client.subscriptionId() is required and cannot be null."); } + if (siteLogsConfig == null) { + throw new IllegalArgumentException("Parameter siteLogsConfig is required and cannot be null."); + } + Validator.validate(siteLogsConfig); final String apiVersion = "2016-08-01"; - return service.getBackupConfigurationSlot(resourceGroupName, name, slot, this.client.subscriptionId(), apiVersion, this.client.acceptLanguage(), this.client.userAgent()) - .flatMap(new Func1, Observable>>() { + return service.updateDiagnosticLogsConfigSlot(resourceGroupName, name, slot, this.client.subscriptionId(), siteLogsConfig, apiVersion, this.client.acceptLanguage(), this.client.userAgent()) + .flatMap(new Func1, Observable>>() { @Override - public Observable> call(Response response) { + public Observable> call(Response response) { try { - ServiceResponse clientResponse = getBackupConfigurationSlotDelegate(response); + ServiceResponse clientResponse = updateDiagnosticLogsConfigSlotDelegate(response); return Observable.just(clientResponse); } catch (Throwable t) { return Observable.error(t); @@ -12745,72 +13010,72 @@ public Observable> call(Response getBackupConfigurationSlotDelegate(Response response) throws CloudException, IOException, IllegalArgumentException { - return new AzureServiceResponseBuilder(this.client.mapperAdapter()) - .register(200, new TypeToken() { }.getType()) + private ServiceResponse updateDiagnosticLogsConfigSlotDelegate(Response response) throws CloudException, IOException, IllegalArgumentException { + return new AzureServiceResponseBuilder(this.client.mapperAdapter()) + .register(200, new TypeToken() { }.getType()) .registerError(CloudException.class) .build(response); } /** - * Updates the connection strings associated with web app. - * Updates the connection strings associated with web app. + * Replaces the metadata of an app. + * Replaces the metadata of an app. * - * @param resourceGroupName Name of resource group - * @param name Name of web app - * @param slot Name of web app slot. If not specified then will default to production slot. - * @param connectionStrings Connection strings associated with web app - * @return the ConnectionStringDictionaryInner object if successful. + * @param resourceGroupName Name of the resource group to which the resource belongs. + * @param name Name of the app. + * @param slot Name of the deployment slot. If a slot is not specified, the API will update the metadata for the production slot. + * @param metadata Edited metadata of the app or deployment slot. See example. + * @return the StringDictionaryInner object if successful. */ - public ConnectionStringDictionaryInner updateConnectionStringsSlot(String resourceGroupName, String name, String slot, ConnectionStringDictionaryInner connectionStrings) { - return updateConnectionStringsSlotWithServiceResponseAsync(resourceGroupName, name, slot, connectionStrings).toBlocking().single().getBody(); + public StringDictionaryInner updateMetadataSlot(String resourceGroupName, String name, String slot, StringDictionaryInner metadata) { + return updateMetadataSlotWithServiceResponseAsync(resourceGroupName, name, slot, metadata).toBlocking().single().getBody(); } /** - * Updates the connection strings associated with web app. - * Updates the connection strings associated with web app. + * Replaces the metadata of an app. + * Replaces the metadata of an app. * - * @param resourceGroupName Name of resource group - * @param name Name of web app - * @param slot Name of web app slot. If not specified then will default to production slot. - * @param connectionStrings Connection strings associated with web app + * @param resourceGroupName Name of the resource group to which the resource belongs. + * @param name Name of the app. + * @param slot Name of the deployment slot. If a slot is not specified, the API will update the metadata for the production slot. + * @param metadata Edited metadata of the app or deployment slot. See example. * @param serviceCallback the async ServiceCallback to handle successful and failed responses. * @return the {@link ServiceCall} object */ - public ServiceCall updateConnectionStringsSlotAsync(String resourceGroupName, String name, String slot, ConnectionStringDictionaryInner connectionStrings, final ServiceCallback serviceCallback) { - return ServiceCall.create(updateConnectionStringsSlotWithServiceResponseAsync(resourceGroupName, name, slot, connectionStrings), serviceCallback); + public ServiceCall updateMetadataSlotAsync(String resourceGroupName, String name, String slot, StringDictionaryInner metadata, final ServiceCallback serviceCallback) { + return ServiceCall.create(updateMetadataSlotWithServiceResponseAsync(resourceGroupName, name, slot, metadata), serviceCallback); } /** - * Updates the connection strings associated with web app. - * Updates the connection strings associated with web app. + * Replaces the metadata of an app. + * Replaces the metadata of an app. * - * @param resourceGroupName Name of resource group - * @param name Name of web app - * @param slot Name of web app slot. If not specified then will default to production slot. - * @param connectionStrings Connection strings associated with web app - * @return the observable to the ConnectionStringDictionaryInner object + * @param resourceGroupName Name of the resource group to which the resource belongs. + * @param name Name of the app. + * @param slot Name of the deployment slot. If a slot is not specified, the API will update the metadata for the production slot. + * @param metadata Edited metadata of the app or deployment slot. See example. + * @return the observable to the StringDictionaryInner object */ - public Observable updateConnectionStringsSlotAsync(String resourceGroupName, String name, String slot, ConnectionStringDictionaryInner connectionStrings) { - return updateConnectionStringsSlotWithServiceResponseAsync(resourceGroupName, name, slot, connectionStrings).map(new Func1, ConnectionStringDictionaryInner>() { + public Observable updateMetadataSlotAsync(String resourceGroupName, String name, String slot, StringDictionaryInner metadata) { + return updateMetadataSlotWithServiceResponseAsync(resourceGroupName, name, slot, metadata).map(new Func1, StringDictionaryInner>() { @Override - public ConnectionStringDictionaryInner call(ServiceResponse response) { + public StringDictionaryInner call(ServiceResponse response) { return response.getBody(); } }); } /** - * Updates the connection strings associated with web app. - * Updates the connection strings associated with web app. + * Replaces the metadata of an app. + * Replaces the metadata of an app. * - * @param resourceGroupName Name of resource group - * @param name Name of web app - * @param slot Name of web app slot. If not specified then will default to production slot. - * @param connectionStrings Connection strings associated with web app - * @return the observable to the ConnectionStringDictionaryInner object + * @param resourceGroupName Name of the resource group to which the resource belongs. + * @param name Name of the app. + * @param slot Name of the deployment slot. If a slot is not specified, the API will update the metadata for the production slot. + * @param metadata Edited metadata of the app or deployment slot. See example. + * @return the observable to the StringDictionaryInner object */ - public Observable> updateConnectionStringsSlotWithServiceResponseAsync(String resourceGroupName, String name, String slot, ConnectionStringDictionaryInner connectionStrings) { + public Observable> updateMetadataSlotWithServiceResponseAsync(String resourceGroupName, String name, String slot, StringDictionaryInner metadata) { if (resourceGroupName == null) { throw new IllegalArgumentException("Parameter resourceGroupName is required and cannot be null."); } @@ -12823,17 +13088,17 @@ public Observable> updateConnec if (this.client.subscriptionId() == null) { throw new IllegalArgumentException("Parameter this.client.subscriptionId() is required and cannot be null."); } - if (connectionStrings == null) { - throw new IllegalArgumentException("Parameter connectionStrings is required and cannot be null."); + if (metadata == null) { + throw new IllegalArgumentException("Parameter metadata is required and cannot be null."); } - Validator.validate(connectionStrings); + Validator.validate(metadata); final String apiVersion = "2016-08-01"; - return service.updateConnectionStringsSlot(resourceGroupName, name, slot, this.client.subscriptionId(), connectionStrings, apiVersion, this.client.acceptLanguage(), this.client.userAgent()) - .flatMap(new Func1, Observable>>() { + return service.updateMetadataSlot(resourceGroupName, name, slot, this.client.subscriptionId(), metadata, apiVersion, this.client.acceptLanguage(), this.client.userAgent()) + .flatMap(new Func1, Observable>>() { @Override - public Observable> call(Response response) { + public Observable> call(Response response) { try { - ServiceResponse clientResponse = updateConnectionStringsSlotDelegate(response); + ServiceResponse clientResponse = updateMetadataSlotDelegate(response); return Observable.just(clientResponse); } catch (Throwable t) { return Observable.error(t); @@ -12842,68 +13107,68 @@ public Observable> call(Respons }); } - private ServiceResponse updateConnectionStringsSlotDelegate(Response response) throws CloudException, IOException, IllegalArgumentException { - return new AzureServiceResponseBuilder(this.client.mapperAdapter()) - .register(200, new TypeToken() { }.getType()) + private ServiceResponse updateMetadataSlotDelegate(Response response) throws CloudException, IOException, IllegalArgumentException { + return new AzureServiceResponseBuilder(this.client.mapperAdapter()) + .register(200, new TypeToken() { }.getType()) .registerError(CloudException.class) .build(response); } /** - * Gets the connection strings associated with web app. - * Gets the connection strings associated with web app. + * Gets the metadata of an app. + * Gets the metadata of an app. * - * @param resourceGroupName Name of resource group - * @param name Name of web app - * @param slot Name of web app slot. If not specified then will default to production slot. - * @return the ConnectionStringDictionaryInner object if successful. + * @param resourceGroupName Name of the resource group to which the resource belongs. + * @param name Name of the app. + * @param slot Name of the deployment slot. If a slot is not specified, the API will get the metadata for the production slot. + * @return the StringDictionaryInner object if successful. */ - public ConnectionStringDictionaryInner listConnectionStringsSlot(String resourceGroupName, String name, String slot) { - return listConnectionStringsSlotWithServiceResponseAsync(resourceGroupName, name, slot).toBlocking().single().getBody(); + public StringDictionaryInner listMetadataSlot(String resourceGroupName, String name, String slot) { + return listMetadataSlotWithServiceResponseAsync(resourceGroupName, name, slot).toBlocking().single().getBody(); } /** - * Gets the connection strings associated with web app. - * Gets the connection strings associated with web app. + * Gets the metadata of an app. + * Gets the metadata of an app. * - * @param resourceGroupName Name of resource group - * @param name Name of web app - * @param slot Name of web app slot. If not specified then will default to production slot. + * @param resourceGroupName Name of the resource group to which the resource belongs. + * @param name Name of the app. + * @param slot Name of the deployment slot. If a slot is not specified, the API will get the metadata for the production slot. * @param serviceCallback the async ServiceCallback to handle successful and failed responses. * @return the {@link ServiceCall} object */ - public ServiceCall listConnectionStringsSlotAsync(String resourceGroupName, String name, String slot, final ServiceCallback serviceCallback) { - return ServiceCall.create(listConnectionStringsSlotWithServiceResponseAsync(resourceGroupName, name, slot), serviceCallback); + public ServiceCall listMetadataSlotAsync(String resourceGroupName, String name, String slot, final ServiceCallback serviceCallback) { + return ServiceCall.create(listMetadataSlotWithServiceResponseAsync(resourceGroupName, name, slot), serviceCallback); } /** - * Gets the connection strings associated with web app. - * Gets the connection strings associated with web app. + * Gets the metadata of an app. + * Gets the metadata of an app. * - * @param resourceGroupName Name of resource group - * @param name Name of web app - * @param slot Name of web app slot. If not specified then will default to production slot. - * @return the observable to the ConnectionStringDictionaryInner object + * @param resourceGroupName Name of the resource group to which the resource belongs. + * @param name Name of the app. + * @param slot Name of the deployment slot. If a slot is not specified, the API will get the metadata for the production slot. + * @return the observable to the StringDictionaryInner object */ - public Observable listConnectionStringsSlotAsync(String resourceGroupName, String name, String slot) { - return listConnectionStringsSlotWithServiceResponseAsync(resourceGroupName, name, slot).map(new Func1, ConnectionStringDictionaryInner>() { + public Observable listMetadataSlotAsync(String resourceGroupName, String name, String slot) { + return listMetadataSlotWithServiceResponseAsync(resourceGroupName, name, slot).map(new Func1, StringDictionaryInner>() { @Override - public ConnectionStringDictionaryInner call(ServiceResponse response) { + public StringDictionaryInner call(ServiceResponse response) { return response.getBody(); } }); } /** - * Gets the connection strings associated with web app. - * Gets the connection strings associated with web app. + * Gets the metadata of an app. + * Gets the metadata of an app. * - * @param resourceGroupName Name of resource group - * @param name Name of web app - * @param slot Name of web app slot. If not specified then will default to production slot. - * @return the observable to the ConnectionStringDictionaryInner object + * @param resourceGroupName Name of the resource group to which the resource belongs. + * @param name Name of the app. + * @param slot Name of the deployment slot. If a slot is not specified, the API will get the metadata for the production slot. + * @return the observable to the StringDictionaryInner object */ - public Observable> listConnectionStringsSlotWithServiceResponseAsync(String resourceGroupName, String name, String slot) { + public Observable> listMetadataSlotWithServiceResponseAsync(String resourceGroupName, String name, String slot) { if (resourceGroupName == null) { throw new IllegalArgumentException("Parameter resourceGroupName is required and cannot be null."); } @@ -12917,12 +13182,12 @@ public Observable> listConnecti throw new IllegalArgumentException("Parameter this.client.subscriptionId() is required and cannot be null."); } final String apiVersion = "2016-08-01"; - return service.listConnectionStringsSlot(resourceGroupName, name, slot, this.client.subscriptionId(), apiVersion, this.client.acceptLanguage(), this.client.userAgent()) - .flatMap(new Func1, Observable>>() { + return service.listMetadataSlot(resourceGroupName, name, slot, this.client.subscriptionId(), apiVersion, this.client.acceptLanguage(), this.client.userAgent()) + .flatMap(new Func1, Observable>>() { @Override - public Observable> call(Response response) { + public Observable> call(Response response) { try { - ServiceResponse clientResponse = listConnectionStringsSlotDelegate(response); + ServiceResponse clientResponse = listMetadataSlotDelegate(response); return Observable.just(clientResponse); } catch (Throwable t) { return Observable.error(t); @@ -12931,68 +13196,68 @@ public Observable> call(Respons }); } - private ServiceResponse listConnectionStringsSlotDelegate(Response response) throws CloudException, IOException, IllegalArgumentException { - return new AzureServiceResponseBuilder(this.client.mapperAdapter()) - .register(200, new TypeToken() { }.getType()) + private ServiceResponse listMetadataSlotDelegate(Response response) throws CloudException, IOException, IllegalArgumentException { + return new AzureServiceResponseBuilder(this.client.mapperAdapter()) + .register(200, new TypeToken() { }.getType()) .registerError(CloudException.class) .build(response); } /** - * Gets the web app logs configuration. - * Gets the web app logs configuration. + * Gets the Git/FTP publishing credentials of an app. + * Gets the Git/FTP publishing credentials of an app. * - * @param resourceGroupName Name of resource group - * @param name Name of web app - * @param slot Name of web app slot. If not specified then will default to production slot. - * @return the SiteLogsConfigInner object if successful. + * @param resourceGroupName Name of the resource group to which the resource belongs. + * @param name Name of the app. + * @param slot Name of the deployment slot. If a slot is not specified, the API will get the publishing credentials for the production slot. + * @return the UserInner object if successful. */ - public SiteLogsConfigInner getDiagnosticLogsConfigurationSlot(String resourceGroupName, String name, String slot) { - return getDiagnosticLogsConfigurationSlotWithServiceResponseAsync(resourceGroupName, name, slot).toBlocking().single().getBody(); + public UserInner listPublishingCredentialsSlot(String resourceGroupName, String name, String slot) { + return listPublishingCredentialsSlotWithServiceResponseAsync(resourceGroupName, name, slot).toBlocking().last().getBody(); } /** - * Gets the web app logs configuration. - * Gets the web app logs configuration. + * Gets the Git/FTP publishing credentials of an app. + * Gets the Git/FTP publishing credentials of an app. * - * @param resourceGroupName Name of resource group - * @param name Name of web app - * @param slot Name of web app slot. If not specified then will default to production slot. + * @param resourceGroupName Name of the resource group to which the resource belongs. + * @param name Name of the app. + * @param slot Name of the deployment slot. If a slot is not specified, the API will get the publishing credentials for the production slot. * @param serviceCallback the async ServiceCallback to handle successful and failed responses. * @return the {@link ServiceCall} object */ - public ServiceCall getDiagnosticLogsConfigurationSlotAsync(String resourceGroupName, String name, String slot, final ServiceCallback serviceCallback) { - return ServiceCall.create(getDiagnosticLogsConfigurationSlotWithServiceResponseAsync(resourceGroupName, name, slot), serviceCallback); + public ServiceCall listPublishingCredentialsSlotAsync(String resourceGroupName, String name, String slot, final ServiceCallback serviceCallback) { + return ServiceCall.create(listPublishingCredentialsSlotWithServiceResponseAsync(resourceGroupName, name, slot), serviceCallback); } /** - * Gets the web app logs configuration. - * Gets the web app logs configuration. + * Gets the Git/FTP publishing credentials of an app. + * Gets the Git/FTP publishing credentials of an app. * - * @param resourceGroupName Name of resource group - * @param name Name of web app - * @param slot Name of web app slot. If not specified then will default to production slot. - * @return the observable to the SiteLogsConfigInner object + * @param resourceGroupName Name of the resource group to which the resource belongs. + * @param name Name of the app. + * @param slot Name of the deployment slot. If a slot is not specified, the API will get the publishing credentials for the production slot. + * @return the observable for the request */ - public Observable getDiagnosticLogsConfigurationSlotAsync(String resourceGroupName, String name, String slot) { - return getDiagnosticLogsConfigurationSlotWithServiceResponseAsync(resourceGroupName, name, slot).map(new Func1, SiteLogsConfigInner>() { + public Observable listPublishingCredentialsSlotAsync(String resourceGroupName, String name, String slot) { + return listPublishingCredentialsSlotWithServiceResponseAsync(resourceGroupName, name, slot).map(new Func1, UserInner>() { @Override - public SiteLogsConfigInner call(ServiceResponse response) { + public UserInner call(ServiceResponse response) { return response.getBody(); } }); } /** - * Gets the web app logs configuration. - * Gets the web app logs configuration. + * Gets the Git/FTP publishing credentials of an app. + * Gets the Git/FTP publishing credentials of an app. * - * @param resourceGroupName Name of resource group - * @param name Name of web app - * @param slot Name of web app slot. If not specified then will default to production slot. - * @return the observable to the SiteLogsConfigInner object + * @param resourceGroupName Name of the resource group to which the resource belongs. + * @param name Name of the app. + * @param slot Name of the deployment slot. If a slot is not specified, the API will get the publishing credentials for the production slot. + * @return the observable for the request */ - public Observable> getDiagnosticLogsConfigurationSlotWithServiceResponseAsync(String resourceGroupName, String name, String slot) { + public Observable> listPublishingCredentialsSlotWithServiceResponseAsync(String resourceGroupName, String name, String slot) { if (resourceGroupName == null) { throw new IllegalArgumentException("Parameter resourceGroupName is required and cannot be null."); } @@ -13006,86 +13271,65 @@ public Observable> getDiagnosticLogsConfigu throw new IllegalArgumentException("Parameter this.client.subscriptionId() is required and cannot be null."); } final String apiVersion = "2016-08-01"; - return service.getDiagnosticLogsConfigurationSlot(resourceGroupName, name, slot, this.client.subscriptionId(), apiVersion, this.client.acceptLanguage(), this.client.userAgent()) - .flatMap(new Func1, Observable>>() { - @Override - public Observable> call(Response response) { - try { - ServiceResponse clientResponse = getDiagnosticLogsConfigurationSlotDelegate(response); - return Observable.just(clientResponse); - } catch (Throwable t) { - return Observable.error(t); - } - } - }); - } - - private ServiceResponse getDiagnosticLogsConfigurationSlotDelegate(Response response) throws CloudException, IOException, IllegalArgumentException { - return new AzureServiceResponseBuilder(this.client.mapperAdapter()) - .register(200, new TypeToken() { }.getType()) - .registerError(CloudException.class) - .build(response); + Observable> observable = service.listPublishingCredentialsSlot(resourceGroupName, name, slot, this.client.subscriptionId(), apiVersion, this.client.acceptLanguage(), this.client.userAgent()); + return client.getAzureClient().getPostOrDeleteResultAsync(observable, new TypeToken() { }.getType()); } /** - * Updates the meta data for web app. - * Updates the meta data for web app. + * Gets the Git/FTP publishing credentials of an app. + * Gets the Git/FTP publishing credentials of an app. * - * @param resourceGroupName Name of resource group - * @param name Name of web app - * @param slot Name of web app slot. If not specified then will default to production slot. - * @param siteLogsConfig Site logs configuration - * @return the SiteLogsConfigInner object if successful. + * @param resourceGroupName Name of the resource group to which the resource belongs. + * @param name Name of the app. + * @param slot Name of the deployment slot. If a slot is not specified, the API will get the publishing credentials for the production slot. + * @return the UserInner object if successful. */ - public SiteLogsConfigInner updateDiagnosticLogsConfigSlot(String resourceGroupName, String name, String slot, SiteLogsConfigInner siteLogsConfig) { - return updateDiagnosticLogsConfigSlotWithServiceResponseAsync(resourceGroupName, name, slot, siteLogsConfig).toBlocking().single().getBody(); + public UserInner beginListPublishingCredentialsSlot(String resourceGroupName, String name, String slot) { + return beginListPublishingCredentialsSlotWithServiceResponseAsync(resourceGroupName, name, slot).toBlocking().single().getBody(); } /** - * Updates the meta data for web app. - * Updates the meta data for web app. + * Gets the Git/FTP publishing credentials of an app. + * Gets the Git/FTP publishing credentials of an app. * - * @param resourceGroupName Name of resource group - * @param name Name of web app - * @param slot Name of web app slot. If not specified then will default to production slot. - * @param siteLogsConfig Site logs configuration + * @param resourceGroupName Name of the resource group to which the resource belongs. + * @param name Name of the app. + * @param slot Name of the deployment slot. If a slot is not specified, the API will get the publishing credentials for the production slot. * @param serviceCallback the async ServiceCallback to handle successful and failed responses. * @return the {@link ServiceCall} object - */ - public ServiceCall updateDiagnosticLogsConfigSlotAsync(String resourceGroupName, String name, String slot, SiteLogsConfigInner siteLogsConfig, final ServiceCallback serviceCallback) { - return ServiceCall.create(updateDiagnosticLogsConfigSlotWithServiceResponseAsync(resourceGroupName, name, slot, siteLogsConfig), serviceCallback); + */ + public ServiceCall beginListPublishingCredentialsSlotAsync(String resourceGroupName, String name, String slot, final ServiceCallback serviceCallback) { + return ServiceCall.create(beginListPublishingCredentialsSlotWithServiceResponseAsync(resourceGroupName, name, slot), serviceCallback); } /** - * Updates the meta data for web app. - * Updates the meta data for web app. + * Gets the Git/FTP publishing credentials of an app. + * Gets the Git/FTP publishing credentials of an app. * - * @param resourceGroupName Name of resource group - * @param name Name of web app - * @param slot Name of web app slot. If not specified then will default to production slot. - * @param siteLogsConfig Site logs configuration - * @return the observable to the SiteLogsConfigInner object + * @param resourceGroupName Name of the resource group to which the resource belongs. + * @param name Name of the app. + * @param slot Name of the deployment slot. If a slot is not specified, the API will get the publishing credentials for the production slot. + * @return the observable to the UserInner object */ - public Observable updateDiagnosticLogsConfigSlotAsync(String resourceGroupName, String name, String slot, SiteLogsConfigInner siteLogsConfig) { - return updateDiagnosticLogsConfigSlotWithServiceResponseAsync(resourceGroupName, name, slot, siteLogsConfig).map(new Func1, SiteLogsConfigInner>() { + public Observable beginListPublishingCredentialsSlotAsync(String resourceGroupName, String name, String slot) { + return beginListPublishingCredentialsSlotWithServiceResponseAsync(resourceGroupName, name, slot).map(new Func1, UserInner>() { @Override - public SiteLogsConfigInner call(ServiceResponse response) { + public UserInner call(ServiceResponse response) { return response.getBody(); } }); } /** - * Updates the meta data for web app. - * Updates the meta data for web app. + * Gets the Git/FTP publishing credentials of an app. + * Gets the Git/FTP publishing credentials of an app. * - * @param resourceGroupName Name of resource group - * @param name Name of web app - * @param slot Name of web app slot. If not specified then will default to production slot. - * @param siteLogsConfig Site logs configuration - * @return the observable to the SiteLogsConfigInner object + * @param resourceGroupName Name of the resource group to which the resource belongs. + * @param name Name of the app. + * @param slot Name of the deployment slot. If a slot is not specified, the API will get the publishing credentials for the production slot. + * @return the observable to the UserInner object */ - public Observable> updateDiagnosticLogsConfigSlotWithServiceResponseAsync(String resourceGroupName, String name, String slot, SiteLogsConfigInner siteLogsConfig) { + public Observable> beginListPublishingCredentialsSlotWithServiceResponseAsync(String resourceGroupName, String name, String slot) { if (resourceGroupName == null) { throw new IllegalArgumentException("Parameter resourceGroupName is required and cannot be null."); } @@ -13098,17 +13342,13 @@ public Observable> updateDiagnosticLogsConf if (this.client.subscriptionId() == null) { throw new IllegalArgumentException("Parameter this.client.subscriptionId() is required and cannot be null."); } - if (siteLogsConfig == null) { - throw new IllegalArgumentException("Parameter siteLogsConfig is required and cannot be null."); - } - Validator.validate(siteLogsConfig); final String apiVersion = "2016-08-01"; - return service.updateDiagnosticLogsConfigSlot(resourceGroupName, name, slot, this.client.subscriptionId(), siteLogsConfig, apiVersion, this.client.acceptLanguage(), this.client.userAgent()) - .flatMap(new Func1, Observable>>() { + return service.beginListPublishingCredentialsSlot(resourceGroupName, name, slot, this.client.subscriptionId(), apiVersion, this.client.acceptLanguage(), this.client.userAgent()) + .flatMap(new Func1, Observable>>() { @Override - public Observable> call(Response response) { + public Observable> call(Response response) { try { - ServiceResponse clientResponse = updateDiagnosticLogsConfigSlotDelegate(response); + ServiceResponse clientResponse = beginListPublishingCredentialsSlotDelegate(response); return Observable.just(clientResponse); } catch (Throwable t) { return Observable.error(t); @@ -13117,72 +13357,72 @@ public Observable> call(Response updateDiagnosticLogsConfigSlotDelegate(Response response) throws CloudException, IOException, IllegalArgumentException { - return new AzureServiceResponseBuilder(this.client.mapperAdapter()) - .register(200, new TypeToken() { }.getType()) + private ServiceResponse beginListPublishingCredentialsSlotDelegate(Response response) throws CloudException, IOException, IllegalArgumentException { + return new AzureServiceResponseBuilder(this.client.mapperAdapter()) + .register(200, new TypeToken() { }.getType()) .registerError(CloudException.class) .build(response); } /** - * Updates the meta data for web app. - * Updates the meta data for web app. + * Updates the Push settings associated with web app. + * Updates the Push settings associated with web app. * - * @param resourceGroupName Name of resource group + * @param resourceGroupName Name of the resource group to which the resource belongs. * @param name Name of web app * @param slot Name of web app slot. If not specified then will default to production slot. - * @param metadata Meta data of web app - * @return the StringDictionaryInner object if successful. + * @param pushSettings Push settings associated with web app + * @return the PushSettingsInner object if successful. */ - public StringDictionaryInner updateMetadataSlot(String resourceGroupName, String name, String slot, StringDictionaryInner metadata) { - return updateMetadataSlotWithServiceResponseAsync(resourceGroupName, name, slot, metadata).toBlocking().single().getBody(); + public PushSettingsInner updateSitePushSettingsSlot(String resourceGroupName, String name, String slot, PushSettingsInner pushSettings) { + return updateSitePushSettingsSlotWithServiceResponseAsync(resourceGroupName, name, slot, pushSettings).toBlocking().single().getBody(); } /** - * Updates the meta data for web app. - * Updates the meta data for web app. + * Updates the Push settings associated with web app. + * Updates the Push settings associated with web app. * - * @param resourceGroupName Name of resource group + * @param resourceGroupName Name of the resource group to which the resource belongs. * @param name Name of web app * @param slot Name of web app slot. If not specified then will default to production slot. - * @param metadata Meta data of web app + * @param pushSettings Push settings associated with web app * @param serviceCallback the async ServiceCallback to handle successful and failed responses. * @return the {@link ServiceCall} object */ - public ServiceCall updateMetadataSlotAsync(String resourceGroupName, String name, String slot, StringDictionaryInner metadata, final ServiceCallback serviceCallback) { - return ServiceCall.create(updateMetadataSlotWithServiceResponseAsync(resourceGroupName, name, slot, metadata), serviceCallback); + public ServiceCall updateSitePushSettingsSlotAsync(String resourceGroupName, String name, String slot, PushSettingsInner pushSettings, final ServiceCallback serviceCallback) { + return ServiceCall.create(updateSitePushSettingsSlotWithServiceResponseAsync(resourceGroupName, name, slot, pushSettings), serviceCallback); } /** - * Updates the meta data for web app. - * Updates the meta data for web app. + * Updates the Push settings associated with web app. + * Updates the Push settings associated with web app. * - * @param resourceGroupName Name of resource group + * @param resourceGroupName Name of the resource group to which the resource belongs. * @param name Name of web app * @param slot Name of web app slot. If not specified then will default to production slot. - * @param metadata Meta data of web app - * @return the observable to the StringDictionaryInner object + * @param pushSettings Push settings associated with web app + * @return the observable to the PushSettingsInner object */ - public Observable updateMetadataSlotAsync(String resourceGroupName, String name, String slot, StringDictionaryInner metadata) { - return updateMetadataSlotWithServiceResponseAsync(resourceGroupName, name, slot, metadata).map(new Func1, StringDictionaryInner>() { + public Observable updateSitePushSettingsSlotAsync(String resourceGroupName, String name, String slot, PushSettingsInner pushSettings) { + return updateSitePushSettingsSlotWithServiceResponseAsync(resourceGroupName, name, slot, pushSettings).map(new Func1, PushSettingsInner>() { @Override - public StringDictionaryInner call(ServiceResponse response) { + public PushSettingsInner call(ServiceResponse response) { return response.getBody(); } }); } /** - * Updates the meta data for web app. - * Updates the meta data for web app. + * Updates the Push settings associated with web app. + * Updates the Push settings associated with web app. * - * @param resourceGroupName Name of resource group + * @param resourceGroupName Name of the resource group to which the resource belongs. * @param name Name of web app * @param slot Name of web app slot. If not specified then will default to production slot. - * @param metadata Meta data of web app - * @return the observable to the StringDictionaryInner object + * @param pushSettings Push settings associated with web app + * @return the observable to the PushSettingsInner object */ - public Observable> updateMetadataSlotWithServiceResponseAsync(String resourceGroupName, String name, String slot, StringDictionaryInner metadata) { + public Observable> updateSitePushSettingsSlotWithServiceResponseAsync(String resourceGroupName, String name, String slot, PushSettingsInner pushSettings) { if (resourceGroupName == null) { throw new IllegalArgumentException("Parameter resourceGroupName is required and cannot be null."); } @@ -13195,17 +13435,17 @@ public Observable> updateMetadataSlotWith if (this.client.subscriptionId() == null) { throw new IllegalArgumentException("Parameter this.client.subscriptionId() is required and cannot be null."); } - if (metadata == null) { - throw new IllegalArgumentException("Parameter metadata is required and cannot be null."); + if (pushSettings == null) { + throw new IllegalArgumentException("Parameter pushSettings is required and cannot be null."); } - Validator.validate(metadata); + Validator.validate(pushSettings); final String apiVersion = "2016-08-01"; - return service.updateMetadataSlot(resourceGroupName, name, slot, this.client.subscriptionId(), metadata, apiVersion, this.client.acceptLanguage(), this.client.userAgent()) - .flatMap(new Func1, Observable>>() { + return service.updateSitePushSettingsSlot(resourceGroupName, name, slot, this.client.subscriptionId(), pushSettings, apiVersion, this.client.acceptLanguage(), this.client.userAgent()) + .flatMap(new Func1, Observable>>() { @Override - public Observable> call(Response response) { + public Observable> call(Response response) { try { - ServiceResponse clientResponse = updateMetadataSlotDelegate(response); + ServiceResponse clientResponse = updateSitePushSettingsSlotDelegate(response); return Observable.just(clientResponse); } catch (Throwable t) { return Observable.error(t); @@ -13214,68 +13454,68 @@ public Observable> call(Response updateMetadataSlotDelegate(Response response) throws CloudException, IOException, IllegalArgumentException { - return new AzureServiceResponseBuilder(this.client.mapperAdapter()) - .register(200, new TypeToken() { }.getType()) + private ServiceResponse updateSitePushSettingsSlotDelegate(Response response) throws CloudException, IOException, IllegalArgumentException { + return new AzureServiceResponseBuilder(this.client.mapperAdapter()) + .register(200, new TypeToken() { }.getType()) .registerError(CloudException.class) .build(response); } /** - * Gets the web app meta data. - * Gets the web app meta data. + * Gets the Push settings associated with web app. + * Gets the Push settings associated with web app. * - * @param resourceGroupName Name of resource group + * @param resourceGroupName Name of the resource group to which the resource belongs. * @param name Name of web app * @param slot Name of web app slot. If not specified then will default to production slot. - * @return the StringDictionaryInner object if successful. + * @return the PushSettingsInner object if successful. */ - public StringDictionaryInner listMetadataSlot(String resourceGroupName, String name, String slot) { - return listMetadataSlotWithServiceResponseAsync(resourceGroupName, name, slot).toBlocking().single().getBody(); + public PushSettingsInner listSitePushSettingsSlot(String resourceGroupName, String name, String slot) { + return listSitePushSettingsSlotWithServiceResponseAsync(resourceGroupName, name, slot).toBlocking().single().getBody(); } /** - * Gets the web app meta data. - * Gets the web app meta data. + * Gets the Push settings associated with web app. + * Gets the Push settings associated with web app. * - * @param resourceGroupName Name of resource group + * @param resourceGroupName Name of the resource group to which the resource belongs. * @param name Name of web app * @param slot Name of web app slot. If not specified then will default to production slot. * @param serviceCallback the async ServiceCallback to handle successful and failed responses. * @return the {@link ServiceCall} object */ - public ServiceCall listMetadataSlotAsync(String resourceGroupName, String name, String slot, final ServiceCallback serviceCallback) { - return ServiceCall.create(listMetadataSlotWithServiceResponseAsync(resourceGroupName, name, slot), serviceCallback); + public ServiceCall listSitePushSettingsSlotAsync(String resourceGroupName, String name, String slot, final ServiceCallback serviceCallback) { + return ServiceCall.create(listSitePushSettingsSlotWithServiceResponseAsync(resourceGroupName, name, slot), serviceCallback); } /** - * Gets the web app meta data. - * Gets the web app meta data. + * Gets the Push settings associated with web app. + * Gets the Push settings associated with web app. * - * @param resourceGroupName Name of resource group + * @param resourceGroupName Name of the resource group to which the resource belongs. * @param name Name of web app * @param slot Name of web app slot. If not specified then will default to production slot. - * @return the observable to the StringDictionaryInner object + * @return the observable to the PushSettingsInner object */ - public Observable listMetadataSlotAsync(String resourceGroupName, String name, String slot) { - return listMetadataSlotWithServiceResponseAsync(resourceGroupName, name, slot).map(new Func1, StringDictionaryInner>() { + public Observable listSitePushSettingsSlotAsync(String resourceGroupName, String name, String slot) { + return listSitePushSettingsSlotWithServiceResponseAsync(resourceGroupName, name, slot).map(new Func1, PushSettingsInner>() { @Override - public StringDictionaryInner call(ServiceResponse response) { + public PushSettingsInner call(ServiceResponse response) { return response.getBody(); } }); } /** - * Gets the web app meta data. - * Gets the web app meta data. + * Gets the Push settings associated with web app. + * Gets the Push settings associated with web app. * - * @param resourceGroupName Name of resource group + * @param resourceGroupName Name of the resource group to which the resource belongs. * @param name Name of web app * @param slot Name of web app slot. If not specified then will default to production slot. - * @return the observable to the StringDictionaryInner object + * @return the observable to the PushSettingsInner object */ - public Observable> listMetadataSlotWithServiceResponseAsync(String resourceGroupName, String name, String slot) { + public Observable> listSitePushSettingsSlotWithServiceResponseAsync(String resourceGroupName, String name, String slot) { if (resourceGroupName == null) { throw new IllegalArgumentException("Parameter resourceGroupName is required and cannot be null."); } @@ -13289,12 +13529,12 @@ public Observable> listMetadataSlotWithSe throw new IllegalArgumentException("Parameter this.client.subscriptionId() is required and cannot be null."); } final String apiVersion = "2016-08-01"; - return service.listMetadataSlot(resourceGroupName, name, slot, this.client.subscriptionId(), apiVersion, this.client.acceptLanguage(), this.client.userAgent()) - .flatMap(new Func1, Observable>>() { + return service.listSitePushSettingsSlot(resourceGroupName, name, slot, this.client.subscriptionId(), apiVersion, this.client.acceptLanguage(), this.client.userAgent()) + .flatMap(new Func1, Observable>>() { @Override - public Observable> call(Response response) { + public Observable> call(Response response) { try { - ServiceResponse clientResponse = listMetadataSlotDelegate(response); + ServiceResponse clientResponse = listSitePushSettingsSlotDelegate(response); return Observable.just(clientResponse); } catch (Throwable t) { return Observable.error(t); @@ -13303,68 +13543,68 @@ public Observable> call(Response listMetadataSlotDelegate(Response response) throws CloudException, IOException, IllegalArgumentException { - return new AzureServiceResponseBuilder(this.client.mapperAdapter()) - .register(200, new TypeToken() { }.getType()) + private ServiceResponse listSitePushSettingsSlotDelegate(Response response) throws CloudException, IOException, IllegalArgumentException { + return new AzureServiceResponseBuilder(this.client.mapperAdapter()) + .register(200, new TypeToken() { }.getType()) .registerError(CloudException.class) .build(response); } /** - * Gets the web app publishing credentials. - * Gets the web app publishing credentials. + * Gets the configuration of an app, such as platform version and bitness, default documents, virtual applications, Always On, etc. + * Gets the configuration of an app, such as platform version and bitness, default documents, virtual applications, Always On, etc. * - * @param resourceGroupName Name of resource group - * @param name Name of web app - * @param slot Name of web app slot. If not specified then will default to production slot. - * @return the UserInner object if successful. + * @param resourceGroupName Name of the resource group to which the resource belongs. + * @param name Name of the app. + * @param slot Name of the deployment slot. If a slot is not specified, the API will return configuration for the production slot. + * @return the SiteConfigInner object if successful. */ - public UserInner listPublishingCredentialsSlot(String resourceGroupName, String name, String slot) { - return listPublishingCredentialsSlotWithServiceResponseAsync(resourceGroupName, name, slot).toBlocking().last().getBody(); + public SiteConfigInner getConfigurationSlot(String resourceGroupName, String name, String slot) { + return getConfigurationSlotWithServiceResponseAsync(resourceGroupName, name, slot).toBlocking().single().getBody(); } /** - * Gets the web app publishing credentials. - * Gets the web app publishing credentials. + * Gets the configuration of an app, such as platform version and bitness, default documents, virtual applications, Always On, etc. + * Gets the configuration of an app, such as platform version and bitness, default documents, virtual applications, Always On, etc. * - * @param resourceGroupName Name of resource group - * @param name Name of web app - * @param slot Name of web app slot. If not specified then will default to production slot. + * @param resourceGroupName Name of the resource group to which the resource belongs. + * @param name Name of the app. + * @param slot Name of the deployment slot. If a slot is not specified, the API will return configuration for the production slot. * @param serviceCallback the async ServiceCallback to handle successful and failed responses. * @return the {@link ServiceCall} object */ - public ServiceCall listPublishingCredentialsSlotAsync(String resourceGroupName, String name, String slot, final ServiceCallback serviceCallback) { - return ServiceCall.create(listPublishingCredentialsSlotWithServiceResponseAsync(resourceGroupName, name, slot), serviceCallback); + public ServiceCall getConfigurationSlotAsync(String resourceGroupName, String name, String slot, final ServiceCallback serviceCallback) { + return ServiceCall.create(getConfigurationSlotWithServiceResponseAsync(resourceGroupName, name, slot), serviceCallback); } /** - * Gets the web app publishing credentials. - * Gets the web app publishing credentials. + * Gets the configuration of an app, such as platform version and bitness, default documents, virtual applications, Always On, etc. + * Gets the configuration of an app, such as platform version and bitness, default documents, virtual applications, Always On, etc. * - * @param resourceGroupName Name of resource group - * @param name Name of web app - * @param slot Name of web app slot. If not specified then will default to production slot. - * @return the observable for the request + * @param resourceGroupName Name of the resource group to which the resource belongs. + * @param name Name of the app. + * @param slot Name of the deployment slot. If a slot is not specified, the API will return configuration for the production slot. + * @return the observable to the SiteConfigInner object */ - public Observable listPublishingCredentialsSlotAsync(String resourceGroupName, String name, String slot) { - return listPublishingCredentialsSlotWithServiceResponseAsync(resourceGroupName, name, slot).map(new Func1, UserInner>() { + public Observable getConfigurationSlotAsync(String resourceGroupName, String name, String slot) { + return getConfigurationSlotWithServiceResponseAsync(resourceGroupName, name, slot).map(new Func1, SiteConfigInner>() { @Override - public UserInner call(ServiceResponse response) { + public SiteConfigInner call(ServiceResponse response) { return response.getBody(); } }); } /** - * Gets the web app publishing credentials. - * Gets the web app publishing credentials. + * Gets the configuration of an app, such as platform version and bitness, default documents, virtual applications, Always On, etc. + * Gets the configuration of an app, such as platform version and bitness, default documents, virtual applications, Always On, etc. * - * @param resourceGroupName Name of resource group - * @param name Name of web app - * @param slot Name of web app slot. If not specified then will default to production slot. - * @return the observable for the request + * @param resourceGroupName Name of the resource group to which the resource belongs. + * @param name Name of the app. + * @param slot Name of the deployment slot. If a slot is not specified, the API will return configuration for the production slot. + * @return the observable to the SiteConfigInner object */ - public Observable> listPublishingCredentialsSlotWithServiceResponseAsync(String resourceGroupName, String name, String slot) { + public Observable> getConfigurationSlotWithServiceResponseAsync(String resourceGroupName, String name, String slot) { if (resourceGroupName == null) { throw new IllegalArgumentException("Parameter resourceGroupName is required and cannot be null."); } @@ -13378,65 +13618,86 @@ public Observable> listPublishingCredentialsSlotWithS throw new IllegalArgumentException("Parameter this.client.subscriptionId() is required and cannot be null."); } final String apiVersion = "2016-08-01"; - Observable> observable = service.listPublishingCredentialsSlot(resourceGroupName, name, slot, this.client.subscriptionId(), apiVersion, this.client.acceptLanguage(), this.client.userAgent()); - return client.getAzureClient().getPostOrDeleteResultAsync(observable, new TypeToken() { }.getType()); + return service.getConfigurationSlot(resourceGroupName, name, slot, this.client.subscriptionId(), apiVersion, this.client.acceptLanguage(), this.client.userAgent()) + .flatMap(new Func1, Observable>>() { + @Override + public Observable> call(Response response) { + try { + ServiceResponse clientResponse = getConfigurationSlotDelegate(response); + return Observable.just(clientResponse); + } catch (Throwable t) { + return Observable.error(t); + } + } + }); + } + + private ServiceResponse getConfigurationSlotDelegate(Response response) throws CloudException, IOException, IllegalArgumentException { + return new AzureServiceResponseBuilder(this.client.mapperAdapter()) + .register(200, new TypeToken() { }.getType()) + .registerError(CloudException.class) + .build(response); } /** - * Gets the web app publishing credentials. - * Gets the web app publishing credentials. + * Updates the configuration of an app. + * Updates the configuration of an app. * - * @param resourceGroupName Name of resource group - * @param name Name of web app - * @param slot Name of web app slot. If not specified then will default to production slot. - * @return the UserInner object if successful. + * @param resourceGroupName Name of the resource group to which the resource belongs. + * @param name Name of the app. + * @param slot Name of the deployment slot. If a slot is not specified, the API will update configuration for the production slot. + * @param siteConfig JSON representation of a SiteConfig object. See example. + * @return the SiteConfigInner object if successful. */ - public UserInner beginListPublishingCredentialsSlot(String resourceGroupName, String name, String slot) { - return beginListPublishingCredentialsSlotWithServiceResponseAsync(resourceGroupName, name, slot).toBlocking().single().getBody(); + public SiteConfigInner createOrUpdateConfigurationSlot(String resourceGroupName, String name, String slot, SiteConfigInner siteConfig) { + return createOrUpdateConfigurationSlotWithServiceResponseAsync(resourceGroupName, name, slot, siteConfig).toBlocking().single().getBody(); } /** - * Gets the web app publishing credentials. - * Gets the web app publishing credentials. + * Updates the configuration of an app. + * Updates the configuration of an app. * - * @param resourceGroupName Name of resource group - * @param name Name of web app - * @param slot Name of web app slot. If not specified then will default to production slot. + * @param resourceGroupName Name of the resource group to which the resource belongs. + * @param name Name of the app. + * @param slot Name of the deployment slot. If a slot is not specified, the API will update configuration for the production slot. + * @param siteConfig JSON representation of a SiteConfig object. See example. * @param serviceCallback the async ServiceCallback to handle successful and failed responses. * @return the {@link ServiceCall} object */ - public ServiceCall beginListPublishingCredentialsSlotAsync(String resourceGroupName, String name, String slot, final ServiceCallback serviceCallback) { - return ServiceCall.create(beginListPublishingCredentialsSlotWithServiceResponseAsync(resourceGroupName, name, slot), serviceCallback); + public ServiceCall createOrUpdateConfigurationSlotAsync(String resourceGroupName, String name, String slot, SiteConfigInner siteConfig, final ServiceCallback serviceCallback) { + return ServiceCall.create(createOrUpdateConfigurationSlotWithServiceResponseAsync(resourceGroupName, name, slot, siteConfig), serviceCallback); } /** - * Gets the web app publishing credentials. - * Gets the web app publishing credentials. + * Updates the configuration of an app. + * Updates the configuration of an app. * - * @param resourceGroupName Name of resource group - * @param name Name of web app - * @param slot Name of web app slot. If not specified then will default to production slot. - * @return the observable to the UserInner object + * @param resourceGroupName Name of the resource group to which the resource belongs. + * @param name Name of the app. + * @param slot Name of the deployment slot. If a slot is not specified, the API will update configuration for the production slot. + * @param siteConfig JSON representation of a SiteConfig object. See example. + * @return the observable to the SiteConfigInner object */ - public Observable beginListPublishingCredentialsSlotAsync(String resourceGroupName, String name, String slot) { - return beginListPublishingCredentialsSlotWithServiceResponseAsync(resourceGroupName, name, slot).map(new Func1, UserInner>() { + public Observable createOrUpdateConfigurationSlotAsync(String resourceGroupName, String name, String slot, SiteConfigInner siteConfig) { + return createOrUpdateConfigurationSlotWithServiceResponseAsync(resourceGroupName, name, slot, siteConfig).map(new Func1, SiteConfigInner>() { @Override - public UserInner call(ServiceResponse response) { + public SiteConfigInner call(ServiceResponse response) { return response.getBody(); } }); } /** - * Gets the web app publishing credentials. - * Gets the web app publishing credentials. + * Updates the configuration of an app. + * Updates the configuration of an app. * - * @param resourceGroupName Name of resource group - * @param name Name of web app - * @param slot Name of web app slot. If not specified then will default to production slot. - * @return the observable to the UserInner object + * @param resourceGroupName Name of the resource group to which the resource belongs. + * @param name Name of the app. + * @param slot Name of the deployment slot. If a slot is not specified, the API will update configuration for the production slot. + * @param siteConfig JSON representation of a SiteConfig object. See example. + * @return the observable to the SiteConfigInner object */ - public Observable> beginListPublishingCredentialsSlotWithServiceResponseAsync(String resourceGroupName, String name, String slot) { + public Observable> createOrUpdateConfigurationSlotWithServiceResponseAsync(String resourceGroupName, String name, String slot, SiteConfigInner siteConfig) { if (resourceGroupName == null) { throw new IllegalArgumentException("Parameter resourceGroupName is required and cannot be null."); } @@ -13449,13 +13710,17 @@ public Observable> beginListPublishingCredentialsSlot if (this.client.subscriptionId() == null) { throw new IllegalArgumentException("Parameter this.client.subscriptionId() is required and cannot be null."); } + if (siteConfig == null) { + throw new IllegalArgumentException("Parameter siteConfig is required and cannot be null."); + } + Validator.validate(siteConfig); final String apiVersion = "2016-08-01"; - return service.beginListPublishingCredentialsSlot(resourceGroupName, name, slot, this.client.subscriptionId(), apiVersion, this.client.acceptLanguage(), this.client.userAgent()) - .flatMap(new Func1, Observable>>() { + return service.createOrUpdateConfigurationSlot(resourceGroupName, name, slot, this.client.subscriptionId(), siteConfig, apiVersion, this.client.acceptLanguage(), this.client.userAgent()) + .flatMap(new Func1, Observable>>() { @Override - public Observable> call(Response response) { + public Observable> call(Response response) { try { - ServiceResponse clientResponse = beginListPublishingCredentialsSlotDelegate(response); + ServiceResponse clientResponse = createOrUpdateConfigurationSlotDelegate(response); return Observable.just(clientResponse); } catch (Throwable t) { return Observable.error(t); @@ -13464,72 +13729,72 @@ public Observable> call(Response respon }); } - private ServiceResponse beginListPublishingCredentialsSlotDelegate(Response response) throws CloudException, IOException, IllegalArgumentException { - return new AzureServiceResponseBuilder(this.client.mapperAdapter()) - .register(200, new TypeToken() { }.getType()) + private ServiceResponse createOrUpdateConfigurationSlotDelegate(Response response) throws CloudException, IOException, IllegalArgumentException { + return new AzureServiceResponseBuilder(this.client.mapperAdapter()) + .register(200, new TypeToken() { }.getType()) .registerError(CloudException.class) .build(response); } /** - * Updates the Push settings associated with web app. - * Updates the Push settings associated with web app. + * Updates the configuration of an app. + * Updates the configuration of an app. * - * @param resourceGroupName Name of resource group - * @param name Name of web app - * @param slot Name of web app slot. If not specified then will default to production slot. - * @param pushSettings Push settings associated with web app - * @return the PushSettingsInner object if successful. + * @param resourceGroupName Name of the resource group to which the resource belongs. + * @param name Name of the app. + * @param slot Name of the deployment slot. If a slot is not specified, the API will update configuration for the production slot. + * @param siteConfig JSON representation of a SiteConfig object. See example. + * @return the SiteConfigInner object if successful. */ - public PushSettingsInner updateSitePushSettingsSlot(String resourceGroupName, String name, String slot, PushSettingsInner pushSettings) { - return updateSitePushSettingsSlotWithServiceResponseAsync(resourceGroupName, name, slot, pushSettings).toBlocking().single().getBody(); + public SiteConfigInner updateConfigurationSlot(String resourceGroupName, String name, String slot, SiteConfigInner siteConfig) { + return updateConfigurationSlotWithServiceResponseAsync(resourceGroupName, name, slot, siteConfig).toBlocking().single().getBody(); } /** - * Updates the Push settings associated with web app. - * Updates the Push settings associated with web app. + * Updates the configuration of an app. + * Updates the configuration of an app. * - * @param resourceGroupName Name of resource group - * @param name Name of web app - * @param slot Name of web app slot. If not specified then will default to production slot. - * @param pushSettings Push settings associated with web app + * @param resourceGroupName Name of the resource group to which the resource belongs. + * @param name Name of the app. + * @param slot Name of the deployment slot. If a slot is not specified, the API will update configuration for the production slot. + * @param siteConfig JSON representation of a SiteConfig object. See example. * @param serviceCallback the async ServiceCallback to handle successful and failed responses. * @return the {@link ServiceCall} object */ - public ServiceCall updateSitePushSettingsSlotAsync(String resourceGroupName, String name, String slot, PushSettingsInner pushSettings, final ServiceCallback serviceCallback) { - return ServiceCall.create(updateSitePushSettingsSlotWithServiceResponseAsync(resourceGroupName, name, slot, pushSettings), serviceCallback); + public ServiceCall updateConfigurationSlotAsync(String resourceGroupName, String name, String slot, SiteConfigInner siteConfig, final ServiceCallback serviceCallback) { + return ServiceCall.create(updateConfigurationSlotWithServiceResponseAsync(resourceGroupName, name, slot, siteConfig), serviceCallback); } /** - * Updates the Push settings associated with web app. - * Updates the Push settings associated with web app. + * Updates the configuration of an app. + * Updates the configuration of an app. * - * @param resourceGroupName Name of resource group - * @param name Name of web app - * @param slot Name of web app slot. If not specified then will default to production slot. - * @param pushSettings Push settings associated with web app - * @return the observable to the PushSettingsInner object + * @param resourceGroupName Name of the resource group to which the resource belongs. + * @param name Name of the app. + * @param slot Name of the deployment slot. If a slot is not specified, the API will update configuration for the production slot. + * @param siteConfig JSON representation of a SiteConfig object. See example. + * @return the observable to the SiteConfigInner object */ - public Observable updateSitePushSettingsSlotAsync(String resourceGroupName, String name, String slot, PushSettingsInner pushSettings) { - return updateSitePushSettingsSlotWithServiceResponseAsync(resourceGroupName, name, slot, pushSettings).map(new Func1, PushSettingsInner>() { + public Observable updateConfigurationSlotAsync(String resourceGroupName, String name, String slot, SiteConfigInner siteConfig) { + return updateConfigurationSlotWithServiceResponseAsync(resourceGroupName, name, slot, siteConfig).map(new Func1, SiteConfigInner>() { @Override - public PushSettingsInner call(ServiceResponse response) { + public SiteConfigInner call(ServiceResponse response) { return response.getBody(); } }); } /** - * Updates the Push settings associated with web app. - * Updates the Push settings associated with web app. + * Updates the configuration of an app. + * Updates the configuration of an app. * - * @param resourceGroupName Name of resource group - * @param name Name of web app - * @param slot Name of web app slot. If not specified then will default to production slot. - * @param pushSettings Push settings associated with web app - * @return the observable to the PushSettingsInner object + * @param resourceGroupName Name of the resource group to which the resource belongs. + * @param name Name of the app. + * @param slot Name of the deployment slot. If a slot is not specified, the API will update configuration for the production slot. + * @param siteConfig JSON representation of a SiteConfig object. See example. + * @return the observable to the SiteConfigInner object */ - public Observable> updateSitePushSettingsSlotWithServiceResponseAsync(String resourceGroupName, String name, String slot, PushSettingsInner pushSettings) { + public Observable> updateConfigurationSlotWithServiceResponseAsync(String resourceGroupName, String name, String slot, SiteConfigInner siteConfig) { if (resourceGroupName == null) { throw new IllegalArgumentException("Parameter resourceGroupName is required and cannot be null."); } @@ -13542,17 +13807,17 @@ public Observable> updateSitePushSettingsSlot if (this.client.subscriptionId() == null) { throw new IllegalArgumentException("Parameter this.client.subscriptionId() is required and cannot be null."); } - if (pushSettings == null) { - throw new IllegalArgumentException("Parameter pushSettings is required and cannot be null."); + if (siteConfig == null) { + throw new IllegalArgumentException("Parameter siteConfig is required and cannot be null."); } - Validator.validate(pushSettings); + Validator.validate(siteConfig); final String apiVersion = "2016-08-01"; - return service.updateSitePushSettingsSlot(resourceGroupName, name, slot, this.client.subscriptionId(), pushSettings, apiVersion, this.client.acceptLanguage(), this.client.userAgent()) - .flatMap(new Func1, Observable>>() { + return service.updateConfigurationSlot(resourceGroupName, name, slot, this.client.subscriptionId(), siteConfig, apiVersion, this.client.acceptLanguage(), this.client.userAgent()) + .flatMap(new Func1, Observable>>() { @Override - public Observable> call(Response response) { + public Observable> call(Response response) { try { - ServiceResponse clientResponse = updateSitePushSettingsSlotDelegate(response); + ServiceResponse clientResponse = updateConfigurationSlotDelegate(response); return Observable.just(clientResponse); } catch (Throwable t) { return Observable.error(t); @@ -13561,68 +13826,106 @@ public Observable> call(Response updateSitePushSettingsSlotDelegate(Response response) throws CloudException, IOException, IllegalArgumentException { - return new AzureServiceResponseBuilder(this.client.mapperAdapter()) - .register(200, new TypeToken() { }.getType()) + private ServiceResponse updateConfigurationSlotDelegate(Response response) throws CloudException, IOException, IllegalArgumentException { + return new AzureServiceResponseBuilder(this.client.mapperAdapter()) + .register(200, new TypeToken() { }.getType()) .registerError(CloudException.class) .build(response); } /** - * Gets the Push settings associated with web app. - * Gets the Push settings associated with web app. + * List deployments for an app, or a deployment slot, or for an instance of a scaled-out app. + * List deployments for an app, or a deployment slot, or for an instance of a scaled-out app. * - * @param resourceGroupName Name of resource group - * @param name Name of web app - * @param slot Name of web app slot. If not specified then will default to production slot. - * @return the PushSettingsInner object if successful. + * @param resourceGroupName Name of the resource group to which the resource belongs. + * @param name Name of the app. + * @param slot Name of the deployment slot. If a slot is not specified, the API returns deployments for the production slot. + * @return the PagedList<DeploymentInner> object if successful. */ - public PushSettingsInner listSitePushSettingsSlot(String resourceGroupName, String name, String slot) { - return listSitePushSettingsSlotWithServiceResponseAsync(resourceGroupName, name, slot).toBlocking().single().getBody(); + public PagedList listDeploymentsSlot(final String resourceGroupName, final String name, final String slot) { + ServiceResponse> response = listDeploymentsSlotSinglePageAsync(resourceGroupName, name, slot).toBlocking().single(); + return new PagedList(response.getBody()) { + @Override + public Page nextPage(String nextPageLink) { + return listDeploymentsSlotNextSinglePageAsync(nextPageLink).toBlocking().single().getBody(); + } + }; } /** - * Gets the Push settings associated with web app. - * Gets the Push settings associated with web app. + * List deployments for an app, or a deployment slot, or for an instance of a scaled-out app. + * List deployments for an app, or a deployment slot, or for an instance of a scaled-out app. * - * @param resourceGroupName Name of resource group - * @param name Name of web app - * @param slot Name of web app slot. If not specified then will default to production slot. + * @param resourceGroupName Name of the resource group to which the resource belongs. + * @param name Name of the app. + * @param slot Name of the deployment slot. If a slot is not specified, the API returns deployments for the production slot. * @param serviceCallback the async ServiceCallback to handle successful and failed responses. * @return the {@link ServiceCall} object */ - public ServiceCall listSitePushSettingsSlotAsync(String resourceGroupName, String name, String slot, final ServiceCallback serviceCallback) { - return ServiceCall.create(listSitePushSettingsSlotWithServiceResponseAsync(resourceGroupName, name, slot), serviceCallback); + public ServiceCall> listDeploymentsSlotAsync(final String resourceGroupName, final String name, final String slot, final ListOperationCallback serviceCallback) { + return AzureServiceCall.create( + listDeploymentsSlotSinglePageAsync(resourceGroupName, name, slot), + new Func1>>>() { + @Override + public Observable>> call(String nextPageLink) { + return listDeploymentsSlotNextSinglePageAsync(nextPageLink); + } + }, + serviceCallback); } /** - * Gets the Push settings associated with web app. - * Gets the Push settings associated with web app. + * List deployments for an app, or a deployment slot, or for an instance of a scaled-out app. + * List deployments for an app, or a deployment slot, or for an instance of a scaled-out app. * - * @param resourceGroupName Name of resource group - * @param name Name of web app - * @param slot Name of web app slot. If not specified then will default to production slot. - * @return the observable to the PushSettingsInner object + * @param resourceGroupName Name of the resource group to which the resource belongs. + * @param name Name of the app. + * @param slot Name of the deployment slot. If a slot is not specified, the API returns deployments for the production slot. + * @return the observable to the PagedList<DeploymentInner> object */ - public Observable listSitePushSettingsSlotAsync(String resourceGroupName, String name, String slot) { - return listSitePushSettingsSlotWithServiceResponseAsync(resourceGroupName, name, slot).map(new Func1, PushSettingsInner>() { - @Override - public PushSettingsInner call(ServiceResponse response) { - return response.getBody(); - } - }); + public Observable> listDeploymentsSlotAsync(final String resourceGroupName, final String name, final String slot) { + return listDeploymentsSlotWithServiceResponseAsync(resourceGroupName, name, slot) + .map(new Func1>, Page>() { + @Override + public Page call(ServiceResponse> response) { + return response.getBody(); + } + }); } /** - * Gets the Push settings associated with web app. - * Gets the Push settings associated with web app. + * List deployments for an app, or a deployment slot, or for an instance of a scaled-out app. + * List deployments for an app, or a deployment slot, or for an instance of a scaled-out app. * - * @param resourceGroupName Name of resource group - * @param name Name of web app - * @param slot Name of web app slot. If not specified then will default to production slot. - * @return the observable to the PushSettingsInner object + * @param resourceGroupName Name of the resource group to which the resource belongs. + * @param name Name of the app. + * @param slot Name of the deployment slot. If a slot is not specified, the API returns deployments for the production slot. + * @return the observable to the PagedList<DeploymentInner> object */ - public Observable> listSitePushSettingsSlotWithServiceResponseAsync(String resourceGroupName, String name, String slot) { + public Observable>> listDeploymentsSlotWithServiceResponseAsync(final String resourceGroupName, final String name, final String slot) { + return listDeploymentsSlotSinglePageAsync(resourceGroupName, name, slot) + .concatMap(new Func1>, Observable>>>() { + @Override + public Observable>> call(ServiceResponse> page) { + String nextPageLink = page.getBody().getNextPageLink(); + if (nextPageLink == null) { + return Observable.just(page); + } + return Observable.just(page).concatWith(listDeploymentsSlotNextWithServiceResponseAsync(nextPageLink)); + } + }); + } + + /** + * List deployments for an app, or a deployment slot, or for an instance of a scaled-out app. + * List deployments for an app, or a deployment slot, or for an instance of a scaled-out app. + * + ServiceResponse> * @param resourceGroupName Name of the resource group to which the resource belongs. + ServiceResponse> * @param name Name of the app. + ServiceResponse> * @param slot Name of the deployment slot. If a slot is not specified, the API returns deployments for the production slot. + * @return the PagedList<DeploymentInner> object wrapped in {@link ServiceResponse} if successful. + */ + public Observable>> listDeploymentsSlotSinglePageAsync(final String resourceGroupName, final String name, final String slot) { if (resourceGroupName == null) { throw new IllegalArgumentException("Parameter resourceGroupName is required and cannot be null."); } @@ -13636,13 +13939,13 @@ public Observable> listSitePushSettingsSlotWi throw new IllegalArgumentException("Parameter this.client.subscriptionId() is required and cannot be null."); } final String apiVersion = "2016-08-01"; - return service.listSitePushSettingsSlot(resourceGroupName, name, slot, this.client.subscriptionId(), apiVersion, this.client.acceptLanguage(), this.client.userAgent()) - .flatMap(new Func1, Observable>>() { + return service.listDeploymentsSlot(resourceGroupName, name, slot, this.client.subscriptionId(), apiVersion, this.client.acceptLanguage(), this.client.userAgent()) + .flatMap(new Func1, Observable>>>() { @Override - public Observable> call(Response response) { + public Observable>> call(Response response) { try { - ServiceResponse clientResponse = listSitePushSettingsSlotDelegate(response); - return Observable.just(clientResponse); + ServiceResponse> result = listDeploymentsSlotDelegate(response); + return Observable.just(new ServiceResponse>(result.getBody(), result.getResponse())); } catch (Throwable t) { return Observable.error(t); } @@ -13650,74 +13953,81 @@ public Observable> call(Response listSitePushSettingsSlotDelegate(Response response) throws CloudException, IOException, IllegalArgumentException { - return new AzureServiceResponseBuilder(this.client.mapperAdapter()) - .register(200, new TypeToken() { }.getType()) + private ServiceResponse> listDeploymentsSlotDelegate(Response response) throws CloudException, IOException, IllegalArgumentException { + return new AzureServiceResponseBuilder, CloudException>(this.client.mapperAdapter()) + .register(200, new TypeToken>() { }.getType()) .registerError(CloudException.class) .build(response); } /** - * Gets the configuration of the web app. - * Gets the configuration of the web app. + * Get a deployment by its ID for an app, a specific deployment slot, and/or a specific scaled-out instance. + * Get a deployment by its ID for an app, a specific deployment slot, and/or a specific scaled-out instance. * - * @param resourceGroupName Name of resource group - * @param name Name of web app - * @param slot Name of web app slot. If not specified then will default to production slot. - * @return the SiteConfigInner object if successful. + * @param resourceGroupName Name of the resource group to which the resource belongs. + * @param name Name of the app. + * @param id Deployment ID. + * @param slot Name of the deployment slot. If a slot is not specified, the API gets a deployment for the production slot. + * @return the DeploymentInner object if successful. */ - public SiteConfigInner getConfigurationSlot(String resourceGroupName, String name, String slot) { - return getConfigurationSlotWithServiceResponseAsync(resourceGroupName, name, slot).toBlocking().single().getBody(); + public DeploymentInner getDeploymentSlot(String resourceGroupName, String name, String id, String slot) { + return getDeploymentSlotWithServiceResponseAsync(resourceGroupName, name, id, slot).toBlocking().single().getBody(); } /** - * Gets the configuration of the web app. - * Gets the configuration of the web app. + * Get a deployment by its ID for an app, a specific deployment slot, and/or a specific scaled-out instance. + * Get a deployment by its ID for an app, a specific deployment slot, and/or a specific scaled-out instance. * - * @param resourceGroupName Name of resource group - * @param name Name of web app - * @param slot Name of web app slot. If not specified then will default to production slot. + * @param resourceGroupName Name of the resource group to which the resource belongs. + * @param name Name of the app. + * @param id Deployment ID. + * @param slot Name of the deployment slot. If a slot is not specified, the API gets a deployment for the production slot. * @param serviceCallback the async ServiceCallback to handle successful and failed responses. * @return the {@link ServiceCall} object */ - public ServiceCall getConfigurationSlotAsync(String resourceGroupName, String name, String slot, final ServiceCallback serviceCallback) { - return ServiceCall.create(getConfigurationSlotWithServiceResponseAsync(resourceGroupName, name, slot), serviceCallback); + public ServiceCall getDeploymentSlotAsync(String resourceGroupName, String name, String id, String slot, final ServiceCallback serviceCallback) { + return ServiceCall.create(getDeploymentSlotWithServiceResponseAsync(resourceGroupName, name, id, slot), serviceCallback); } /** - * Gets the configuration of the web app. - * Gets the configuration of the web app. + * Get a deployment by its ID for an app, a specific deployment slot, and/or a specific scaled-out instance. + * Get a deployment by its ID for an app, a specific deployment slot, and/or a specific scaled-out instance. * - * @param resourceGroupName Name of resource group - * @param name Name of web app - * @param slot Name of web app slot. If not specified then will default to production slot. - * @return the observable to the SiteConfigInner object + * @param resourceGroupName Name of the resource group to which the resource belongs. + * @param name Name of the app. + * @param id Deployment ID. + * @param slot Name of the deployment slot. If a slot is not specified, the API gets a deployment for the production slot. + * @return the observable to the DeploymentInner object */ - public Observable getConfigurationSlotAsync(String resourceGroupName, String name, String slot) { - return getConfigurationSlotWithServiceResponseAsync(resourceGroupName, name, slot).map(new Func1, SiteConfigInner>() { + public Observable getDeploymentSlotAsync(String resourceGroupName, String name, String id, String slot) { + return getDeploymentSlotWithServiceResponseAsync(resourceGroupName, name, id, slot).map(new Func1, DeploymentInner>() { @Override - public SiteConfigInner call(ServiceResponse response) { + public DeploymentInner call(ServiceResponse response) { return response.getBody(); } }); } /** - * Gets the configuration of the web app. - * Gets the configuration of the web app. + * Get a deployment by its ID for an app, a specific deployment slot, and/or a specific scaled-out instance. + * Get a deployment by its ID for an app, a specific deployment slot, and/or a specific scaled-out instance. * - * @param resourceGroupName Name of resource group - * @param name Name of web app - * @param slot Name of web app slot. If not specified then will default to production slot. - * @return the observable to the SiteConfigInner object + * @param resourceGroupName Name of the resource group to which the resource belongs. + * @param name Name of the app. + * @param id Deployment ID. + * @param slot Name of the deployment slot. If a slot is not specified, the API gets a deployment for the production slot. + * @return the observable to the DeploymentInner object */ - public Observable> getConfigurationSlotWithServiceResponseAsync(String resourceGroupName, String name, String slot) { + public Observable> getDeploymentSlotWithServiceResponseAsync(String resourceGroupName, String name, String id, String slot) { if (resourceGroupName == null) { throw new IllegalArgumentException("Parameter resourceGroupName is required and cannot be null."); } if (name == null) { throw new IllegalArgumentException("Parameter name is required and cannot be null."); } + if (id == null) { + throw new IllegalArgumentException("Parameter id is required and cannot be null."); + } if (slot == null) { throw new IllegalArgumentException("Parameter slot is required and cannot be null."); } @@ -13725,12 +14035,12 @@ public Observable> getConfigurationSlotWithServ throw new IllegalArgumentException("Parameter this.client.subscriptionId() is required and cannot be null."); } final String apiVersion = "2016-08-01"; - return service.getConfigurationSlot(resourceGroupName, name, slot, this.client.subscriptionId(), apiVersion, this.client.acceptLanguage(), this.client.userAgent()) - .flatMap(new Func1, Observable>>() { + return service.getDeploymentSlot(resourceGroupName, name, id, slot, this.client.subscriptionId(), apiVersion, this.client.acceptLanguage(), this.client.userAgent()) + .flatMap(new Func1, Observable>>() { @Override - public Observable> call(Response response) { + public Observable> call(Response response) { try { - ServiceResponse clientResponse = getConfigurationSlotDelegate(response); + ServiceResponse clientResponse = getDeploymentSlotDelegate(response); return Observable.just(clientResponse); } catch (Throwable t) { return Observable.error(t); @@ -13739,95 +14049,102 @@ public Observable> call(Response }); } - private ServiceResponse getConfigurationSlotDelegate(Response response) throws CloudException, IOException, IllegalArgumentException { - return new AzureServiceResponseBuilder(this.client.mapperAdapter()) - .register(200, new TypeToken() { }.getType()) + private ServiceResponse getDeploymentSlotDelegate(Response response) throws CloudException, IOException, IllegalArgumentException { + return new AzureServiceResponseBuilder(this.client.mapperAdapter()) + .register(200, new TypeToken() { }.getType()) .registerError(CloudException.class) .build(response); } /** - * Update the configuration of web app. - * Update the configuration of web app. + * Create a deployment for an app, a specific deployment slot, and/or a specific scaled-out instance. + * Create a deployment for an app, a specific deployment slot, and/or a specific scaled-out instance. * - * @param resourceGroupName Name of resource group - * @param name Name of web app - * @param slot Name of web app slot. If not specified then will default to production slot. - * @param siteConfig Request body that contains the configuraiton setting for the web app - * @return the SiteConfigInner object if successful. + * @param resourceGroupName Name of the resource group to which the resource belongs. + * @param name Name of the app. + * @param id ID of an existing deployment. + * @param slot Name of the deployment slot. If a slot is not specified, the API creates a deployment for the production slot. + * @param deployment Deployment details. + * @return the DeploymentInner object if successful. */ - public SiteConfigInner createOrUpdateConfigurationSlot(String resourceGroupName, String name, String slot, SiteConfigInner siteConfig) { - return createOrUpdateConfigurationSlotWithServiceResponseAsync(resourceGroupName, name, slot, siteConfig).toBlocking().single().getBody(); + public DeploymentInner createDeploymentSlot(String resourceGroupName, String name, String id, String slot, DeploymentInner deployment) { + return createDeploymentSlotWithServiceResponseAsync(resourceGroupName, name, id, slot, deployment).toBlocking().single().getBody(); } /** - * Update the configuration of web app. - * Update the configuration of web app. + * Create a deployment for an app, a specific deployment slot, and/or a specific scaled-out instance. + * Create a deployment for an app, a specific deployment slot, and/or a specific scaled-out instance. * - * @param resourceGroupName Name of resource group - * @param name Name of web app - * @param slot Name of web app slot. If not specified then will default to production slot. - * @param siteConfig Request body that contains the configuraiton setting for the web app + * @param resourceGroupName Name of the resource group to which the resource belongs. + * @param name Name of the app. + * @param id ID of an existing deployment. + * @param slot Name of the deployment slot. If a slot is not specified, the API creates a deployment for the production slot. + * @param deployment Deployment details. * @param serviceCallback the async ServiceCallback to handle successful and failed responses. * @return the {@link ServiceCall} object */ - public ServiceCall createOrUpdateConfigurationSlotAsync(String resourceGroupName, String name, String slot, SiteConfigInner siteConfig, final ServiceCallback serviceCallback) { - return ServiceCall.create(createOrUpdateConfigurationSlotWithServiceResponseAsync(resourceGroupName, name, slot, siteConfig), serviceCallback); + public ServiceCall createDeploymentSlotAsync(String resourceGroupName, String name, String id, String slot, DeploymentInner deployment, final ServiceCallback serviceCallback) { + return ServiceCall.create(createDeploymentSlotWithServiceResponseAsync(resourceGroupName, name, id, slot, deployment), serviceCallback); } /** - * Update the configuration of web app. - * Update the configuration of web app. + * Create a deployment for an app, a specific deployment slot, and/or a specific scaled-out instance. + * Create a deployment for an app, a specific deployment slot, and/or a specific scaled-out instance. * - * @param resourceGroupName Name of resource group - * @param name Name of web app - * @param slot Name of web app slot. If not specified then will default to production slot. - * @param siteConfig Request body that contains the configuraiton setting for the web app - * @return the observable to the SiteConfigInner object + * @param resourceGroupName Name of the resource group to which the resource belongs. + * @param name Name of the app. + * @param id ID of an existing deployment. + * @param slot Name of the deployment slot. If a slot is not specified, the API creates a deployment for the production slot. + * @param deployment Deployment details. + * @return the observable to the DeploymentInner object */ - public Observable createOrUpdateConfigurationSlotAsync(String resourceGroupName, String name, String slot, SiteConfigInner siteConfig) { - return createOrUpdateConfigurationSlotWithServiceResponseAsync(resourceGroupName, name, slot, siteConfig).map(new Func1, SiteConfigInner>() { + public Observable createDeploymentSlotAsync(String resourceGroupName, String name, String id, String slot, DeploymentInner deployment) { + return createDeploymentSlotWithServiceResponseAsync(resourceGroupName, name, id, slot, deployment).map(new Func1, DeploymentInner>() { @Override - public SiteConfigInner call(ServiceResponse response) { + public DeploymentInner call(ServiceResponse response) { return response.getBody(); } }); } /** - * Update the configuration of web app. - * Update the configuration of web app. + * Create a deployment for an app, a specific deployment slot, and/or a specific scaled-out instance. + * Create a deployment for an app, a specific deployment slot, and/or a specific scaled-out instance. * - * @param resourceGroupName Name of resource group - * @param name Name of web app - * @param slot Name of web app slot. If not specified then will default to production slot. - * @param siteConfig Request body that contains the configuraiton setting for the web app - * @return the observable to the SiteConfigInner object + * @param resourceGroupName Name of the resource group to which the resource belongs. + * @param name Name of the app. + * @param id ID of an existing deployment. + * @param slot Name of the deployment slot. If a slot is not specified, the API creates a deployment for the production slot. + * @param deployment Deployment details. + * @return the observable to the DeploymentInner object */ - public Observable> createOrUpdateConfigurationSlotWithServiceResponseAsync(String resourceGroupName, String name, String slot, SiteConfigInner siteConfig) { + public Observable> createDeploymentSlotWithServiceResponseAsync(String resourceGroupName, String name, String id, String slot, DeploymentInner deployment) { if (resourceGroupName == null) { throw new IllegalArgumentException("Parameter resourceGroupName is required and cannot be null."); } if (name == null) { throw new IllegalArgumentException("Parameter name is required and cannot be null."); } + if (id == null) { + throw new IllegalArgumentException("Parameter id is required and cannot be null."); + } if (slot == null) { throw new IllegalArgumentException("Parameter slot is required and cannot be null."); } if (this.client.subscriptionId() == null) { throw new IllegalArgumentException("Parameter this.client.subscriptionId() is required and cannot be null."); } - if (siteConfig == null) { - throw new IllegalArgumentException("Parameter siteConfig is required and cannot be null."); + if (deployment == null) { + throw new IllegalArgumentException("Parameter deployment is required and cannot be null."); } - Validator.validate(siteConfig); + Validator.validate(deployment); final String apiVersion = "2016-08-01"; - return service.createOrUpdateConfigurationSlot(resourceGroupName, name, slot, this.client.subscriptionId(), siteConfig, apiVersion, this.client.acceptLanguage(), this.client.userAgent()) - .flatMap(new Func1, Observable>>() { + return service.createDeploymentSlot(resourceGroupName, name, id, slot, this.client.subscriptionId(), deployment, apiVersion, this.client.acceptLanguage(), this.client.userAgent()) + .flatMap(new Func1, Observable>>() { @Override - public Observable> call(Response response) { + public Observable> call(Response response) { try { - ServiceResponse clientResponse = createOrUpdateConfigurationSlotDelegate(response); + ServiceResponse clientResponse = createDeploymentSlotDelegate(response); return Observable.just(clientResponse); } catch (Throwable t) { return Observable.error(t); @@ -13836,95 +14153,93 @@ public Observable> call(Response }); } - private ServiceResponse createOrUpdateConfigurationSlotDelegate(Response response) throws CloudException, IOException, IllegalArgumentException { - return new AzureServiceResponseBuilder(this.client.mapperAdapter()) - .register(200, new TypeToken() { }.getType()) + private ServiceResponse createDeploymentSlotDelegate(Response response) throws CloudException, IOException, IllegalArgumentException { + return new AzureServiceResponseBuilder(this.client.mapperAdapter()) + .register(200, new TypeToken() { }.getType()) .registerError(CloudException.class) .build(response); } /** - * Update the configuration of web app. - * Update the configuration of web app. + * Delete a deployment by its ID for an app, a specific deployment slot, and/or a specific scaled-out instance. + * Delete a deployment by its ID for an app, a specific deployment slot, and/or a specific scaled-out instance. * - * @param resourceGroupName Name of resource group - * @param name Name of web app - * @param slot Name of web app slot. If not specified then will default to production slot. - * @param siteConfig Request body that contains the configuraiton setting for the web app - * @return the SiteConfigInner object if successful. + * @param resourceGroupName Name of the resource group to which the resource belongs. + * @param name Name of the app. + * @param id Deployment ID. + * @param slot Name of the deployment slot. If a slot is not specified, the API deletes a deployment for the production slot. */ - public SiteConfigInner updateConfigurationSlot(String resourceGroupName, String name, String slot, SiteConfigInner siteConfig) { - return updateConfigurationSlotWithServiceResponseAsync(resourceGroupName, name, slot, siteConfig).toBlocking().single().getBody(); + public void deleteDeploymentSlot(String resourceGroupName, String name, String id, String slot) { + deleteDeploymentSlotWithServiceResponseAsync(resourceGroupName, name, id, slot).toBlocking().single().getBody(); } /** - * Update the configuration of web app. - * Update the configuration of web app. + * Delete a deployment by its ID for an app, a specific deployment slot, and/or a specific scaled-out instance. + * Delete a deployment by its ID for an app, a specific deployment slot, and/or a specific scaled-out instance. * - * @param resourceGroupName Name of resource group - * @param name Name of web app - * @param slot Name of web app slot. If not specified then will default to production slot. - * @param siteConfig Request body that contains the configuraiton setting for the web app + * @param resourceGroupName Name of the resource group to which the resource belongs. + * @param name Name of the app. + * @param id Deployment ID. + * @param slot Name of the deployment slot. If a slot is not specified, the API deletes a deployment for the production slot. * @param serviceCallback the async ServiceCallback to handle successful and failed responses. * @return the {@link ServiceCall} object */ - public ServiceCall updateConfigurationSlotAsync(String resourceGroupName, String name, String slot, SiteConfigInner siteConfig, final ServiceCallback serviceCallback) { - return ServiceCall.create(updateConfigurationSlotWithServiceResponseAsync(resourceGroupName, name, slot, siteConfig), serviceCallback); + public ServiceCall deleteDeploymentSlotAsync(String resourceGroupName, String name, String id, String slot, final ServiceCallback serviceCallback) { + return ServiceCall.create(deleteDeploymentSlotWithServiceResponseAsync(resourceGroupName, name, id, slot), serviceCallback); } /** - * Update the configuration of web app. - * Update the configuration of web app. + * Delete a deployment by its ID for an app, a specific deployment slot, and/or a specific scaled-out instance. + * Delete a deployment by its ID for an app, a specific deployment slot, and/or a specific scaled-out instance. * - * @param resourceGroupName Name of resource group - * @param name Name of web app - * @param slot Name of web app slot. If not specified then will default to production slot. - * @param siteConfig Request body that contains the configuraiton setting for the web app - * @return the observable to the SiteConfigInner object + * @param resourceGroupName Name of the resource group to which the resource belongs. + * @param name Name of the app. + * @param id Deployment ID. + * @param slot Name of the deployment slot. If a slot is not specified, the API deletes a deployment for the production slot. + * @return the {@link ServiceResponse} object if successful. */ - public Observable updateConfigurationSlotAsync(String resourceGroupName, String name, String slot, SiteConfigInner siteConfig) { - return updateConfigurationSlotWithServiceResponseAsync(resourceGroupName, name, slot, siteConfig).map(new Func1, SiteConfigInner>() { + public Observable deleteDeploymentSlotAsync(String resourceGroupName, String name, String id, String slot) { + return deleteDeploymentSlotWithServiceResponseAsync(resourceGroupName, name, id, slot).map(new Func1, Void>() { @Override - public SiteConfigInner call(ServiceResponse response) { + public Void call(ServiceResponse response) { return response.getBody(); } }); } - /** - * Update the configuration of web app. - * Update the configuration of web app. - * - * @param resourceGroupName Name of resource group - * @param name Name of web app - * @param slot Name of web app slot. If not specified then will default to production slot. - * @param siteConfig Request body that contains the configuraiton setting for the web app - * @return the observable to the SiteConfigInner object + /** + * Delete a deployment by its ID for an app, a specific deployment slot, and/or a specific scaled-out instance. + * Delete a deployment by its ID for an app, a specific deployment slot, and/or a specific scaled-out instance. + * + * @param resourceGroupName Name of the resource group to which the resource belongs. + * @param name Name of the app. + * @param id Deployment ID. + * @param slot Name of the deployment slot. If a slot is not specified, the API deletes a deployment for the production slot. + * @return the {@link ServiceResponse} object if successful. */ - public Observable> updateConfigurationSlotWithServiceResponseAsync(String resourceGroupName, String name, String slot, SiteConfigInner siteConfig) { + public Observable> deleteDeploymentSlotWithServiceResponseAsync(String resourceGroupName, String name, String id, String slot) { if (resourceGroupName == null) { throw new IllegalArgumentException("Parameter resourceGroupName is required and cannot be null."); } if (name == null) { throw new IllegalArgumentException("Parameter name is required and cannot be null."); } + if (id == null) { + throw new IllegalArgumentException("Parameter id is required and cannot be null."); + } if (slot == null) { throw new IllegalArgumentException("Parameter slot is required and cannot be null."); } if (this.client.subscriptionId() == null) { throw new IllegalArgumentException("Parameter this.client.subscriptionId() is required and cannot be null."); } - if (siteConfig == null) { - throw new IllegalArgumentException("Parameter siteConfig is required and cannot be null."); - } - Validator.validate(siteConfig); final String apiVersion = "2016-08-01"; - return service.updateConfigurationSlot(resourceGroupName, name, slot, this.client.subscriptionId(), siteConfig, apiVersion, this.client.acceptLanguage(), this.client.userAgent()) - .flatMap(new Func1, Observable>>() { + return service.deleteDeploymentSlot(resourceGroupName, name, id, slot, this.client.subscriptionId(), apiVersion, this.client.acceptLanguage(), this.client.userAgent()) + .flatMap(new Func1, Observable>>() { @Override - public Observable> call(Response response) { + public Observable> call(Response response) { try { - ServiceResponse clientResponse = updateConfigurationSlotDelegate(response); + ServiceResponse clientResponse = deleteDeploymentSlotDelegate(response); return Observable.just(clientResponse); } catch (Throwable t) { return Observable.error(t); @@ -13933,106 +14248,106 @@ public Observable> call(Response }); } - private ServiceResponse updateConfigurationSlotDelegate(Response response) throws CloudException, IOException, IllegalArgumentException { - return new AzureServiceResponseBuilder(this.client.mapperAdapter()) - .register(200, new TypeToken() { }.getType()) - .registerError(CloudException.class) + private ServiceResponse deleteDeploymentSlotDelegate(Response response) throws CloudException, IOException, IllegalArgumentException { + return new AzureServiceResponseBuilder(this.client.mapperAdapter()) + .register(200, new TypeToken() { }.getType()) + .register(204, new TypeToken() { }.getType()) .build(response); } /** - * List deployments. - * List deployments. + * Lists ownership identifiers for domain associated with web app. + * Lists ownership identifiers for domain associated with web app. * - * @param resourceGroupName Name of resource group - * @param name Name of web app - * @param slot Name of web app slot. If not specified then will default to production slot. - * @return the PagedList<DeploymentInner> object if successful. + * @param resourceGroupName Name of the resource group to which the resource belongs. + * @param name Name of the app. + * @param slot Name of the deployment slot. If a slot is not specified, the API will delete the binding for the production slot. + * @return the PagedList<IdentifierInner> object if successful. */ - public PagedList listDeploymentsSlot(final String resourceGroupName, final String name, final String slot) { - ServiceResponse> response = listDeploymentsSlotSinglePageAsync(resourceGroupName, name, slot).toBlocking().single(); - return new PagedList(response.getBody()) { + public PagedList listDomainOwnershipIdentifiersSlot(final String resourceGroupName, final String name, final String slot) { + ServiceResponse> response = listDomainOwnershipIdentifiersSlotSinglePageAsync(resourceGroupName, name, slot).toBlocking().single(); + return new PagedList(response.getBody()) { @Override - public Page nextPage(String nextPageLink) { - return listDeploymentsSlotNextSinglePageAsync(nextPageLink).toBlocking().single().getBody(); + public Page nextPage(String nextPageLink) { + return listDomainOwnershipIdentifiersSlotNextSinglePageAsync(nextPageLink).toBlocking().single().getBody(); } }; } /** - * List deployments. - * List deployments. + * Lists ownership identifiers for domain associated with web app. + * Lists ownership identifiers for domain associated with web app. * - * @param resourceGroupName Name of resource group - * @param name Name of web app - * @param slot Name of web app slot. If not specified then will default to production slot. + * @param resourceGroupName Name of the resource group to which the resource belongs. + * @param name Name of the app. + * @param slot Name of the deployment slot. If a slot is not specified, the API will delete the binding for the production slot. * @param serviceCallback the async ServiceCallback to handle successful and failed responses. * @return the {@link ServiceCall} object */ - public ServiceCall> listDeploymentsSlotAsync(final String resourceGroupName, final String name, final String slot, final ListOperationCallback serviceCallback) { + public ServiceCall> listDomainOwnershipIdentifiersSlotAsync(final String resourceGroupName, final String name, final String slot, final ListOperationCallback serviceCallback) { return AzureServiceCall.create( - listDeploymentsSlotSinglePageAsync(resourceGroupName, name, slot), - new Func1>>>() { + listDomainOwnershipIdentifiersSlotSinglePageAsync(resourceGroupName, name, slot), + new Func1>>>() { @Override - public Observable>> call(String nextPageLink) { - return listDeploymentsSlotNextSinglePageAsync(nextPageLink); + public Observable>> call(String nextPageLink) { + return listDomainOwnershipIdentifiersSlotNextSinglePageAsync(nextPageLink); } }, serviceCallback); } /** - * List deployments. - * List deployments. + * Lists ownership identifiers for domain associated with web app. + * Lists ownership identifiers for domain associated with web app. * - * @param resourceGroupName Name of resource group - * @param name Name of web app - * @param slot Name of web app slot. If not specified then will default to production slot. - * @return the observable to the PagedList<DeploymentInner> object + * @param resourceGroupName Name of the resource group to which the resource belongs. + * @param name Name of the app. + * @param slot Name of the deployment slot. If a slot is not specified, the API will delete the binding for the production slot. + * @return the observable to the PagedList<IdentifierInner> object */ - public Observable> listDeploymentsSlotAsync(final String resourceGroupName, final String name, final String slot) { - return listDeploymentsSlotWithServiceResponseAsync(resourceGroupName, name, slot) - .map(new Func1>, Page>() { + public Observable> listDomainOwnershipIdentifiersSlotAsync(final String resourceGroupName, final String name, final String slot) { + return listDomainOwnershipIdentifiersSlotWithServiceResponseAsync(resourceGroupName, name, slot) + .map(new Func1>, Page>() { @Override - public Page call(ServiceResponse> response) { + public Page call(ServiceResponse> response) { return response.getBody(); } }); } /** - * List deployments. - * List deployments. + * Lists ownership identifiers for domain associated with web app. + * Lists ownership identifiers for domain associated with web app. * - * @param resourceGroupName Name of resource group - * @param name Name of web app - * @param slot Name of web app slot. If not specified then will default to production slot. - * @return the observable to the PagedList<DeploymentInner> object + * @param resourceGroupName Name of the resource group to which the resource belongs. + * @param name Name of the app. + * @param slot Name of the deployment slot. If a slot is not specified, the API will delete the binding for the production slot. + * @return the observable to the PagedList<IdentifierInner> object */ - public Observable>> listDeploymentsSlotWithServiceResponseAsync(final String resourceGroupName, final String name, final String slot) { - return listDeploymentsSlotSinglePageAsync(resourceGroupName, name, slot) - .concatMap(new Func1>, Observable>>>() { + public Observable>> listDomainOwnershipIdentifiersSlotWithServiceResponseAsync(final String resourceGroupName, final String name, final String slot) { + return listDomainOwnershipIdentifiersSlotSinglePageAsync(resourceGroupName, name, slot) + .concatMap(new Func1>, Observable>>>() { @Override - public Observable>> call(ServiceResponse> page) { + public Observable>> call(ServiceResponse> page) { String nextPageLink = page.getBody().getNextPageLink(); if (nextPageLink == null) { return Observable.just(page); } - return Observable.just(page).concatWith(listDeploymentsSlotNextWithServiceResponseAsync(nextPageLink)); + return Observable.just(page).concatWith(listDomainOwnershipIdentifiersSlotNextWithServiceResponseAsync(nextPageLink)); } }); } /** - * List deployments. - * List deployments. + * Lists ownership identifiers for domain associated with web app. + * Lists ownership identifiers for domain associated with web app. * - ServiceResponse> * @param resourceGroupName Name of resource group - ServiceResponse> * @param name Name of web app - ServiceResponse> * @param slot Name of web app slot. If not specified then will default to production slot. - * @return the PagedList<DeploymentInner> object wrapped in {@link ServiceResponse} if successful. + ServiceResponse> * @param resourceGroupName Name of the resource group to which the resource belongs. + ServiceResponse> * @param name Name of the app. + ServiceResponse> * @param slot Name of the deployment slot. If a slot is not specified, the API will delete the binding for the production slot. + * @return the PagedList<IdentifierInner> object wrapped in {@link ServiceResponse} if successful. */ - public Observable>> listDeploymentsSlotSinglePageAsync(final String resourceGroupName, final String name, final String slot) { + public Observable>> listDomainOwnershipIdentifiersSlotSinglePageAsync(final String resourceGroupName, final String name, final String slot) { if (resourceGroupName == null) { throw new IllegalArgumentException("Parameter resourceGroupName is required and cannot be null."); } @@ -14046,13 +14361,13 @@ public Observable>> listDeploymentsSlotSin throw new IllegalArgumentException("Parameter this.client.subscriptionId() is required and cannot be null."); } final String apiVersion = "2016-08-01"; - return service.listDeploymentsSlot(resourceGroupName, name, slot, this.client.subscriptionId(), apiVersion, this.client.acceptLanguage(), this.client.userAgent()) - .flatMap(new Func1, Observable>>>() { + return service.listDomainOwnershipIdentifiersSlot(resourceGroupName, name, slot, this.client.subscriptionId(), apiVersion, this.client.acceptLanguage(), this.client.userAgent()) + .flatMap(new Func1, Observable>>>() { @Override - public Observable>> call(Response response) { + public Observable>> call(Response response) { try { - ServiceResponse> result = listDeploymentsSlotDelegate(response); - return Observable.just(new ServiceResponse>(result.getBody(), result.getResponse())); + ServiceResponse> result = listDomainOwnershipIdentifiersSlotDelegate(response); + return Observable.just(new ServiceResponse>(result.getBody(), result.getResponse())); } catch (Throwable t) { return Observable.error(t); } @@ -14060,80 +14375,80 @@ public Observable>> call(Response> listDeploymentsSlotDelegate(Response response) throws CloudException, IOException, IllegalArgumentException { - return new AzureServiceResponseBuilder, CloudException>(this.client.mapperAdapter()) - .register(200, new TypeToken>() { }.getType()) + private ServiceResponse> listDomainOwnershipIdentifiersSlotDelegate(Response response) throws CloudException, IOException, IllegalArgumentException { + return new AzureServiceResponseBuilder, CloudException>(this.client.mapperAdapter()) + .register(200, new TypeToken>() { }.getType()) .registerError(CloudException.class) .build(response); } /** - * Get the deployment. - * Get the deployment. + * Get domain ownership identifier for web app. + * Get domain ownership identifier for web app. * - * @param resourceGroupName Name of resource group - * @param name Name of web app - * @param id Id of the deployment - * @param slot Name of web app slot. If not specified then will default to production slot. - * @return the DeploymentInner object if successful. + * @param resourceGroupName Name of the resource group to which the resource belongs. + * @param name Name of the app. + * @param domainOwnershipIdentifierName Name of domain ownership identifier. + * @param slot Name of the deployment slot. If a slot is not specified, the API will delete the binding for the production slot. + * @return the IdentifierInner object if successful. */ - public DeploymentInner getDeploymentSlot(String resourceGroupName, String name, String id, String slot) { - return getDeploymentSlotWithServiceResponseAsync(resourceGroupName, name, id, slot).toBlocking().single().getBody(); + public IdentifierInner getDomainOwnershipIdentifierSlot(String resourceGroupName, String name, String domainOwnershipIdentifierName, String slot) { + return getDomainOwnershipIdentifierSlotWithServiceResponseAsync(resourceGroupName, name, domainOwnershipIdentifierName, slot).toBlocking().single().getBody(); } /** - * Get the deployment. - * Get the deployment. + * Get domain ownership identifier for web app. + * Get domain ownership identifier for web app. * - * @param resourceGroupName Name of resource group - * @param name Name of web app - * @param id Id of the deployment - * @param slot Name of web app slot. If not specified then will default to production slot. + * @param resourceGroupName Name of the resource group to which the resource belongs. + * @param name Name of the app. + * @param domainOwnershipIdentifierName Name of domain ownership identifier. + * @param slot Name of the deployment slot. If a slot is not specified, the API will delete the binding for the production slot. * @param serviceCallback the async ServiceCallback to handle successful and failed responses. * @return the {@link ServiceCall} object */ - public ServiceCall getDeploymentSlotAsync(String resourceGroupName, String name, String id, String slot, final ServiceCallback serviceCallback) { - return ServiceCall.create(getDeploymentSlotWithServiceResponseAsync(resourceGroupName, name, id, slot), serviceCallback); + public ServiceCall getDomainOwnershipIdentifierSlotAsync(String resourceGroupName, String name, String domainOwnershipIdentifierName, String slot, final ServiceCallback serviceCallback) { + return ServiceCall.create(getDomainOwnershipIdentifierSlotWithServiceResponseAsync(resourceGroupName, name, domainOwnershipIdentifierName, slot), serviceCallback); } /** - * Get the deployment. - * Get the deployment. + * Get domain ownership identifier for web app. + * Get domain ownership identifier for web app. * - * @param resourceGroupName Name of resource group - * @param name Name of web app - * @param id Id of the deployment - * @param slot Name of web app slot. If not specified then will default to production slot. - * @return the observable to the DeploymentInner object + * @param resourceGroupName Name of the resource group to which the resource belongs. + * @param name Name of the app. + * @param domainOwnershipIdentifierName Name of domain ownership identifier. + * @param slot Name of the deployment slot. If a slot is not specified, the API will delete the binding for the production slot. + * @return the observable to the IdentifierInner object */ - public Observable getDeploymentSlotAsync(String resourceGroupName, String name, String id, String slot) { - return getDeploymentSlotWithServiceResponseAsync(resourceGroupName, name, id, slot).map(new Func1, DeploymentInner>() { + public Observable getDomainOwnershipIdentifierSlotAsync(String resourceGroupName, String name, String domainOwnershipIdentifierName, String slot) { + return getDomainOwnershipIdentifierSlotWithServiceResponseAsync(resourceGroupName, name, domainOwnershipIdentifierName, slot).map(new Func1, IdentifierInner>() { @Override - public DeploymentInner call(ServiceResponse response) { + public IdentifierInner call(ServiceResponse response) { return response.getBody(); } }); } /** - * Get the deployment. - * Get the deployment. + * Get domain ownership identifier for web app. + * Get domain ownership identifier for web app. * - * @param resourceGroupName Name of resource group - * @param name Name of web app - * @param id Id of the deployment - * @param slot Name of web app slot. If not specified then will default to production slot. - * @return the observable to the DeploymentInner object + * @param resourceGroupName Name of the resource group to which the resource belongs. + * @param name Name of the app. + * @param domainOwnershipIdentifierName Name of domain ownership identifier. + * @param slot Name of the deployment slot. If a slot is not specified, the API will delete the binding for the production slot. + * @return the observable to the IdentifierInner object */ - public Observable> getDeploymentSlotWithServiceResponseAsync(String resourceGroupName, String name, String id, String slot) { + public Observable> getDomainOwnershipIdentifierSlotWithServiceResponseAsync(String resourceGroupName, String name, String domainOwnershipIdentifierName, String slot) { if (resourceGroupName == null) { throw new IllegalArgumentException("Parameter resourceGroupName is required and cannot be null."); } if (name == null) { throw new IllegalArgumentException("Parameter name is required and cannot be null."); } - if (id == null) { - throw new IllegalArgumentException("Parameter id is required and cannot be null."); + if (domainOwnershipIdentifierName == null) { + throw new IllegalArgumentException("Parameter domainOwnershipIdentifierName is required and cannot be null."); } if (slot == null) { throw new IllegalArgumentException("Parameter slot is required and cannot be null."); @@ -14142,12 +14457,12 @@ public Observable> getDeploymentSlotWithService throw new IllegalArgumentException("Parameter this.client.subscriptionId() is required and cannot be null."); } final String apiVersion = "2016-08-01"; - return service.getDeploymentSlot(resourceGroupName, name, id, slot, this.client.subscriptionId(), apiVersion, this.client.acceptLanguage(), this.client.userAgent()) - .flatMap(new Func1, Observable>>() { + return service.getDomainOwnershipIdentifierSlot(resourceGroupName, name, domainOwnershipIdentifierName, slot, this.client.subscriptionId(), apiVersion, this.client.acceptLanguage(), this.client.userAgent()) + .flatMap(new Func1, Observable>>() { @Override - public Observable> call(Response response) { + public Observable> call(Response response) { try { - ServiceResponse clientResponse = getDeploymentSlotDelegate(response); + ServiceResponse clientResponse = getDomainOwnershipIdentifierSlotDelegate(response); return Observable.just(clientResponse); } catch (Throwable t) { return Observable.error(t); @@ -14156,84 +14471,84 @@ public Observable> call(Response }); } - private ServiceResponse getDeploymentSlotDelegate(Response response) throws CloudException, IOException, IllegalArgumentException { - return new AzureServiceResponseBuilder(this.client.mapperAdapter()) - .register(200, new TypeToken() { }.getType()) + private ServiceResponse getDomainOwnershipIdentifierSlotDelegate(Response response) throws CloudException, IOException, IllegalArgumentException { + return new AzureServiceResponseBuilder(this.client.mapperAdapter()) + .register(200, new TypeToken() { }.getType()) .registerError(CloudException.class) .build(response); } /** - * Create a deployment. - * Create a deployment. + * Creates a domain ownership identifier for web app, or updates an existing ownership identifier. + * Creates a domain ownership identifier for web app, or updates an existing ownership identifier. * - * @param resourceGroupName Name of resource group - * @param name Name of web app - * @param id Id of the deployment - * @param slot Name of web app slot. If not specified then will default to production slot. - * @param deployment Details of deployment - * @return the DeploymentInner object if successful. + * @param resourceGroupName Name of the resource group to which the resource belongs. + * @param name Name of the app. + * @param domainOwnershipIdentifierName Name of domain ownership identifier. + * @param slot Name of the deployment slot. If a slot is not specified, the API will delete the binding for the production slot. + * @param domainOwnershipIdentifier A JSON representation of the domain ownership properties. + * @return the IdentifierInner object if successful. */ - public DeploymentInner createDeploymentSlot(String resourceGroupName, String name, String id, String slot, DeploymentInner deployment) { - return createDeploymentSlotWithServiceResponseAsync(resourceGroupName, name, id, slot, deployment).toBlocking().single().getBody(); + public IdentifierInner createOrUpdateDomainOwnershipIdentifierSlot(String resourceGroupName, String name, String domainOwnershipIdentifierName, String slot, IdentifierInner domainOwnershipIdentifier) { + return createOrUpdateDomainOwnershipIdentifierSlotWithServiceResponseAsync(resourceGroupName, name, domainOwnershipIdentifierName, slot, domainOwnershipIdentifier).toBlocking().single().getBody(); } /** - * Create a deployment. - * Create a deployment. + * Creates a domain ownership identifier for web app, or updates an existing ownership identifier. + * Creates a domain ownership identifier for web app, or updates an existing ownership identifier. * - * @param resourceGroupName Name of resource group - * @param name Name of web app - * @param id Id of the deployment - * @param slot Name of web app slot. If not specified then will default to production slot. - * @param deployment Details of deployment + * @param resourceGroupName Name of the resource group to which the resource belongs. + * @param name Name of the app. + * @param domainOwnershipIdentifierName Name of domain ownership identifier. + * @param slot Name of the deployment slot. If a slot is not specified, the API will delete the binding for the production slot. + * @param domainOwnershipIdentifier A JSON representation of the domain ownership properties. * @param serviceCallback the async ServiceCallback to handle successful and failed responses. * @return the {@link ServiceCall} object */ - public ServiceCall createDeploymentSlotAsync(String resourceGroupName, String name, String id, String slot, DeploymentInner deployment, final ServiceCallback serviceCallback) { - return ServiceCall.create(createDeploymentSlotWithServiceResponseAsync(resourceGroupName, name, id, slot, deployment), serviceCallback); + public ServiceCall createOrUpdateDomainOwnershipIdentifierSlotAsync(String resourceGroupName, String name, String domainOwnershipIdentifierName, String slot, IdentifierInner domainOwnershipIdentifier, final ServiceCallback serviceCallback) { + return ServiceCall.create(createOrUpdateDomainOwnershipIdentifierSlotWithServiceResponseAsync(resourceGroupName, name, domainOwnershipIdentifierName, slot, domainOwnershipIdentifier), serviceCallback); } /** - * Create a deployment. - * Create a deployment. + * Creates a domain ownership identifier for web app, or updates an existing ownership identifier. + * Creates a domain ownership identifier for web app, or updates an existing ownership identifier. * - * @param resourceGroupName Name of resource group - * @param name Name of web app - * @param id Id of the deployment - * @param slot Name of web app slot. If not specified then will default to production slot. - * @param deployment Details of deployment - * @return the observable to the DeploymentInner object + * @param resourceGroupName Name of the resource group to which the resource belongs. + * @param name Name of the app. + * @param domainOwnershipIdentifierName Name of domain ownership identifier. + * @param slot Name of the deployment slot. If a slot is not specified, the API will delete the binding for the production slot. + * @param domainOwnershipIdentifier A JSON representation of the domain ownership properties. + * @return the observable to the IdentifierInner object */ - public Observable createDeploymentSlotAsync(String resourceGroupName, String name, String id, String slot, DeploymentInner deployment) { - return createDeploymentSlotWithServiceResponseAsync(resourceGroupName, name, id, slot, deployment).map(new Func1, DeploymentInner>() { + public Observable createOrUpdateDomainOwnershipIdentifierSlotAsync(String resourceGroupName, String name, String domainOwnershipIdentifierName, String slot, IdentifierInner domainOwnershipIdentifier) { + return createOrUpdateDomainOwnershipIdentifierSlotWithServiceResponseAsync(resourceGroupName, name, domainOwnershipIdentifierName, slot, domainOwnershipIdentifier).map(new Func1, IdentifierInner>() { @Override - public DeploymentInner call(ServiceResponse response) { + public IdentifierInner call(ServiceResponse response) { return response.getBody(); } }); } /** - * Create a deployment. - * Create a deployment. + * Creates a domain ownership identifier for web app, or updates an existing ownership identifier. + * Creates a domain ownership identifier for web app, or updates an existing ownership identifier. * - * @param resourceGroupName Name of resource group - * @param name Name of web app - * @param id Id of the deployment - * @param slot Name of web app slot. If not specified then will default to production slot. - * @param deployment Details of deployment - * @return the observable to the DeploymentInner object + * @param resourceGroupName Name of the resource group to which the resource belongs. + * @param name Name of the app. + * @param domainOwnershipIdentifierName Name of domain ownership identifier. + * @param slot Name of the deployment slot. If a slot is not specified, the API will delete the binding for the production slot. + * @param domainOwnershipIdentifier A JSON representation of the domain ownership properties. + * @return the observable to the IdentifierInner object */ - public Observable> createDeploymentSlotWithServiceResponseAsync(String resourceGroupName, String name, String id, String slot, DeploymentInner deployment) { + public Observable> createOrUpdateDomainOwnershipIdentifierSlotWithServiceResponseAsync(String resourceGroupName, String name, String domainOwnershipIdentifierName, String slot, IdentifierInner domainOwnershipIdentifier) { if (resourceGroupName == null) { throw new IllegalArgumentException("Parameter resourceGroupName is required and cannot be null."); } if (name == null) { throw new IllegalArgumentException("Parameter name is required and cannot be null."); } - if (id == null) { - throw new IllegalArgumentException("Parameter id is required and cannot be null."); + if (domainOwnershipIdentifierName == null) { + throw new IllegalArgumentException("Parameter domainOwnershipIdentifierName is required and cannot be null."); } if (slot == null) { throw new IllegalArgumentException("Parameter slot is required and cannot be null."); @@ -14241,17 +14556,17 @@ public Observable> createDeploymentSlotWithServ if (this.client.subscriptionId() == null) { throw new IllegalArgumentException("Parameter this.client.subscriptionId() is required and cannot be null."); } - if (deployment == null) { - throw new IllegalArgumentException("Parameter deployment is required and cannot be null."); + if (domainOwnershipIdentifier == null) { + throw new IllegalArgumentException("Parameter domainOwnershipIdentifier is required and cannot be null."); } - Validator.validate(deployment); + Validator.validate(domainOwnershipIdentifier); final String apiVersion = "2016-08-01"; - return service.createDeploymentSlot(resourceGroupName, name, id, slot, this.client.subscriptionId(), deployment, apiVersion, this.client.acceptLanguage(), this.client.userAgent()) - .flatMap(new Func1, Observable>>() { + return service.createOrUpdateDomainOwnershipIdentifierSlot(resourceGroupName, name, domainOwnershipIdentifierName, slot, this.client.subscriptionId(), domainOwnershipIdentifier, apiVersion, this.client.acceptLanguage(), this.client.userAgent()) + .flatMap(new Func1, Observable>>() { @Override - public Observable> call(Response response) { + public Observable> call(Response response) { try { - ServiceResponse clientResponse = createDeploymentSlotDelegate(response); + ServiceResponse clientResponse = createOrUpdateDomainOwnershipIdentifierSlotDelegate(response); return Observable.just(clientResponse); } catch (Throwable t) { return Observable.error(t); @@ -14260,80 +14575,79 @@ public Observable> call(Response }); } - private ServiceResponse createDeploymentSlotDelegate(Response response) throws CloudException, IOException, IllegalArgumentException { - return new AzureServiceResponseBuilder(this.client.mapperAdapter()) - .register(200, new TypeToken() { }.getType()) + private ServiceResponse createOrUpdateDomainOwnershipIdentifierSlotDelegate(Response response) throws CloudException, IOException, IllegalArgumentException { + return new AzureServiceResponseBuilder(this.client.mapperAdapter()) + .register(200, new TypeToken() { }.getType()) .registerError(CloudException.class) .build(response); } /** - * Delete the deployment. - * Delete the deployment. + * Deletes a domain ownership identifier for a web app. + * Deletes a domain ownership identifier for a web app. * - * @param resourceGroupName Name of resource group - * @param name Name of web app - * @param id Id of the deployment - * @param slot Name of web app slot. If not specified then will default to production slot. - * @return the Object object if successful. + * @param resourceGroupName Name of the resource group to which the resource belongs. + * @param name Name of the app. + * @param domainOwnershipIdentifierName Name of domain ownership identifier. + * @param slot Name of the deployment slot. If a slot is not specified, the API will delete the binding for the production slot. */ - public Object deleteDeploymentSlot(String resourceGroupName, String name, String id, String slot) { - return deleteDeploymentSlotWithServiceResponseAsync(resourceGroupName, name, id, slot).toBlocking().single().getBody(); + public void deleteDomainOwnershipIdentifierSlot(String resourceGroupName, String name, String domainOwnershipIdentifierName, String slot) { + deleteDomainOwnershipIdentifierSlotWithServiceResponseAsync(resourceGroupName, name, domainOwnershipIdentifierName, slot).toBlocking().single().getBody(); } /** - * Delete the deployment. - * Delete the deployment. + * Deletes a domain ownership identifier for a web app. + * Deletes a domain ownership identifier for a web app. * - * @param resourceGroupName Name of resource group - * @param name Name of web app - * @param id Id of the deployment - * @param slot Name of web app slot. If not specified then will default to production slot. + * @param resourceGroupName Name of the resource group to which the resource belongs. + * @param name Name of the app. + * @param domainOwnershipIdentifierName Name of domain ownership identifier. + * @param slot Name of the deployment slot. If a slot is not specified, the API will delete the binding for the production slot. * @param serviceCallback the async ServiceCallback to handle successful and failed responses. * @return the {@link ServiceCall} object */ - public ServiceCall deleteDeploymentSlotAsync(String resourceGroupName, String name, String id, String slot, final ServiceCallback serviceCallback) { - return ServiceCall.create(deleteDeploymentSlotWithServiceResponseAsync(resourceGroupName, name, id, slot), serviceCallback); + public ServiceCall deleteDomainOwnershipIdentifierSlotAsync(String resourceGroupName, String name, String domainOwnershipIdentifierName, String slot, final ServiceCallback serviceCallback) { + return ServiceCall.create(deleteDomainOwnershipIdentifierSlotWithServiceResponseAsync(resourceGroupName, name, domainOwnershipIdentifierName, slot), serviceCallback); } /** - * Delete the deployment. - * Delete the deployment. + * Deletes a domain ownership identifier for a web app. + * Deletes a domain ownership identifier for a web app. * - * @param resourceGroupName Name of resource group - * @param name Name of web app - * @param id Id of the deployment - * @param slot Name of web app slot. If not specified then will default to production slot. - * @return the observable to the Object object + * @param resourceGroupName Name of the resource group to which the resource belongs. + * @param name Name of the app. + * @param domainOwnershipIdentifierName Name of domain ownership identifier. + * @param slot Name of the deployment slot. If a slot is not specified, the API will delete the binding for the production slot. + * @return the {@link ServiceResponse} object if successful. */ - public Observable deleteDeploymentSlotAsync(String resourceGroupName, String name, String id, String slot) { - return deleteDeploymentSlotWithServiceResponseAsync(resourceGroupName, name, id, slot).map(new Func1, Object>() { + public Observable deleteDomainOwnershipIdentifierSlotAsync(String resourceGroupName, String name, String domainOwnershipIdentifierName, String slot) { + return deleteDomainOwnershipIdentifierSlotWithServiceResponseAsync(resourceGroupName, name, domainOwnershipIdentifierName, slot).map(new Func1, Void>() { @Override - public Object call(ServiceResponse response) { + public Void call(ServiceResponse response) { return response.getBody(); } }); } /** - * Delete the deployment. - * Delete the deployment. + * Deletes a domain ownership identifier for a web app. + * Deletes a domain ownership identifier for a web app. * - * @param resourceGroupName Name of resource group - * @param name Name of web app - * @param id Id of the deployment - * @param slot Name of web app slot. If not specified then will default to production slot. - * @return the observable to the Object object + * @param resourceGroupName Name of the resource group to which the resource belongs. + * @param name Name of the app. + * @param domainOwnershipIdentifierName Name of domain ownership identifier. + * @param slot Name of the deployment slot. If a slot is not specified, the API will delete the binding for the production slot. + * @return the {@link ServiceResponse} object if successful. */ - public Observable> deleteDeploymentSlotWithServiceResponseAsync(String resourceGroupName, String name, String id, String slot) { + public Observable> deleteDomainOwnershipIdentifierSlotWithServiceResponseAsync(String resourceGroupName, String name, String domainOwnershipIdentifierName, String slot) { if (resourceGroupName == null) { throw new IllegalArgumentException("Parameter resourceGroupName is required and cannot be null."); } if (name == null) { throw new IllegalArgumentException("Parameter name is required and cannot be null."); } - if (id == null) { - throw new IllegalArgumentException("Parameter id is required and cannot be null."); + if (domainOwnershipIdentifierName == null) { + throw new IllegalArgumentException("Parameter domainOwnershipIdentifierName is required and cannot be null."); } if (slot == null) { throw new IllegalArgumentException("Parameter slot is required and cannot be null."); @@ -14342,12 +14656,12 @@ public Observable> deleteDeploymentSlotWithServiceRespon throw new IllegalArgumentException("Parameter this.client.subscriptionId() is required and cannot be null."); } final String apiVersion = "2016-08-01"; - return service.deleteDeploymentSlot(resourceGroupName, name, id, slot, this.client.subscriptionId(), apiVersion, this.client.acceptLanguage(), this.client.userAgent()) - .flatMap(new Func1, Observable>>() { + return service.deleteDomainOwnershipIdentifierSlot(resourceGroupName, name, domainOwnershipIdentifierName, slot, this.client.subscriptionId(), apiVersion, this.client.acceptLanguage(), this.client.userAgent()) + .flatMap(new Func1, Observable>>() { @Override - public Observable> call(Response response) { + public Observable> call(Response response) { try { - ServiceResponse clientResponse = deleteDeploymentSlotDelegate(response); + ServiceResponse clientResponse = deleteDomainOwnershipIdentifierSlotDelegate(response); return Observable.just(clientResponse); } catch (Throwable t) { return Observable.error(t); @@ -14356,20 +14670,124 @@ public Observable> call(Response response) }); } - private ServiceResponse deleteDeploymentSlotDelegate(Response response) throws CloudException, IOException, IllegalArgumentException { - return new AzureServiceResponseBuilder(this.client.mapperAdapter()) - .register(200, new TypeToken() { }.getType()) + private ServiceResponse deleteDomainOwnershipIdentifierSlotDelegate(Response response) throws CloudException, IOException, IllegalArgumentException { + return new AzureServiceResponseBuilder(this.client.mapperAdapter()) + .register(200, new TypeToken() { }.getType()) + .register(204, new TypeToken() { }.getType()) + .build(response); + } + + /** + * Creates a domain ownership identifier for web app, or updates an existing ownership identifier. + * Creates a domain ownership identifier for web app, or updates an existing ownership identifier. + * + * @param resourceGroupName Name of the resource group to which the resource belongs. + * @param name Name of the app. + * @param domainOwnershipIdentifierName Name of domain ownership identifier. + * @param slot Name of the deployment slot. If a slot is not specified, the API will delete the binding for the production slot. + * @param domainOwnershipIdentifier A JSON representation of the domain ownership properties. + * @return the IdentifierInner object if successful. + */ + public IdentifierInner updateDomainOwnershipIdentifierSlot(String resourceGroupName, String name, String domainOwnershipIdentifierName, String slot, IdentifierInner domainOwnershipIdentifier) { + return updateDomainOwnershipIdentifierSlotWithServiceResponseAsync(resourceGroupName, name, domainOwnershipIdentifierName, slot, domainOwnershipIdentifier).toBlocking().single().getBody(); + } + + /** + * Creates a domain ownership identifier for web app, or updates an existing ownership identifier. + * Creates a domain ownership identifier for web app, or updates an existing ownership identifier. + * + * @param resourceGroupName Name of the resource group to which the resource belongs. + * @param name Name of the app. + * @param domainOwnershipIdentifierName Name of domain ownership identifier. + * @param slot Name of the deployment slot. If a slot is not specified, the API will delete the binding for the production slot. + * @param domainOwnershipIdentifier A JSON representation of the domain ownership properties. + * @param serviceCallback the async ServiceCallback to handle successful and failed responses. + * @return the {@link ServiceCall} object + */ + public ServiceCall updateDomainOwnershipIdentifierSlotAsync(String resourceGroupName, String name, String domainOwnershipIdentifierName, String slot, IdentifierInner domainOwnershipIdentifier, final ServiceCallback serviceCallback) { + return ServiceCall.create(updateDomainOwnershipIdentifierSlotWithServiceResponseAsync(resourceGroupName, name, domainOwnershipIdentifierName, slot, domainOwnershipIdentifier), serviceCallback); + } + + /** + * Creates a domain ownership identifier for web app, or updates an existing ownership identifier. + * Creates a domain ownership identifier for web app, or updates an existing ownership identifier. + * + * @param resourceGroupName Name of the resource group to which the resource belongs. + * @param name Name of the app. + * @param domainOwnershipIdentifierName Name of domain ownership identifier. + * @param slot Name of the deployment slot. If a slot is not specified, the API will delete the binding for the production slot. + * @param domainOwnershipIdentifier A JSON representation of the domain ownership properties. + * @return the observable to the IdentifierInner object + */ + public Observable updateDomainOwnershipIdentifierSlotAsync(String resourceGroupName, String name, String domainOwnershipIdentifierName, String slot, IdentifierInner domainOwnershipIdentifier) { + return updateDomainOwnershipIdentifierSlotWithServiceResponseAsync(resourceGroupName, name, domainOwnershipIdentifierName, slot, domainOwnershipIdentifier).map(new Func1, IdentifierInner>() { + @Override + public IdentifierInner call(ServiceResponse response) { + return response.getBody(); + } + }); + } + + /** + * Creates a domain ownership identifier for web app, or updates an existing ownership identifier. + * Creates a domain ownership identifier for web app, or updates an existing ownership identifier. + * + * @param resourceGroupName Name of the resource group to which the resource belongs. + * @param name Name of the app. + * @param domainOwnershipIdentifierName Name of domain ownership identifier. + * @param slot Name of the deployment slot. If a slot is not specified, the API will delete the binding for the production slot. + * @param domainOwnershipIdentifier A JSON representation of the domain ownership properties. + * @return the observable to the IdentifierInner object + */ + public Observable> updateDomainOwnershipIdentifierSlotWithServiceResponseAsync(String resourceGroupName, String name, String domainOwnershipIdentifierName, String slot, IdentifierInner domainOwnershipIdentifier) { + if (resourceGroupName == null) { + throw new IllegalArgumentException("Parameter resourceGroupName is required and cannot be null."); + } + if (name == null) { + throw new IllegalArgumentException("Parameter name is required and cannot be null."); + } + if (domainOwnershipIdentifierName == null) { + throw new IllegalArgumentException("Parameter domainOwnershipIdentifierName is required and cannot be null."); + } + if (slot == null) { + throw new IllegalArgumentException("Parameter slot is required and cannot be null."); + } + if (this.client.subscriptionId() == null) { + throw new IllegalArgumentException("Parameter this.client.subscriptionId() is required and cannot be null."); + } + if (domainOwnershipIdentifier == null) { + throw new IllegalArgumentException("Parameter domainOwnershipIdentifier is required and cannot be null."); + } + Validator.validate(domainOwnershipIdentifier); + final String apiVersion = "2016-08-01"; + return service.updateDomainOwnershipIdentifierSlot(resourceGroupName, name, domainOwnershipIdentifierName, slot, this.client.subscriptionId(), domainOwnershipIdentifier, apiVersion, this.client.acceptLanguage(), this.client.userAgent()) + .flatMap(new Func1, Observable>>() { + @Override + public Observable> call(Response response) { + try { + ServiceResponse clientResponse = updateDomainOwnershipIdentifierSlotDelegate(response); + return Observable.just(clientResponse); + } catch (Throwable t) { + return Observable.error(t); + } + } + }); + } + + private ServiceResponse updateDomainOwnershipIdentifierSlotDelegate(Response response) throws CloudException, IOException, IllegalArgumentException { + return new AzureServiceResponseBuilder(this.client.mapperAdapter()) + .register(200, new TypeToken() { }.getType()) .registerError(CloudException.class) .build(response); } /** - * Get web app hostname bindings. - * Get web app hostname bindings. + * Get hostname bindings for an app or a deployment slot. + * Get hostname bindings for an app or a deployment slot. * - * @param resourceGroupName Name of resource group - * @param name Name of web app - * @param slot Name of web app slot. If not specified then will default to production slot. + * @param resourceGroupName Name of the resource group to which the resource belongs. + * @param name Name of the app. + * @param slot Name of the deployment slot. If a slot is not specified, the API gets hostname bindings for the production slot. * @return the PagedList<HostNameBindingInner> object if successful. */ public PagedList listHostNameBindingsSlot(final String resourceGroupName, final String name, final String slot) { @@ -14383,12 +14801,12 @@ public Page nextPage(String nextPageLink) { } /** - * Get web app hostname bindings. - * Get web app hostname bindings. + * Get hostname bindings for an app or a deployment slot. + * Get hostname bindings for an app or a deployment slot. * - * @param resourceGroupName Name of resource group - * @param name Name of web app - * @param slot Name of web app slot. If not specified then will default to production slot. + * @param resourceGroupName Name of the resource group to which the resource belongs. + * @param name Name of the app. + * @param slot Name of the deployment slot. If a slot is not specified, the API gets hostname bindings for the production slot. * @param serviceCallback the async ServiceCallback to handle successful and failed responses. * @return the {@link ServiceCall} object */ @@ -14405,12 +14823,12 @@ public Observable>> call(String nextP } /** - * Get web app hostname bindings. - * Get web app hostname bindings. + * Get hostname bindings for an app or a deployment slot. + * Get hostname bindings for an app or a deployment slot. * - * @param resourceGroupName Name of resource group - * @param name Name of web app - * @param slot Name of web app slot. If not specified then will default to production slot. + * @param resourceGroupName Name of the resource group to which the resource belongs. + * @param name Name of the app. + * @param slot Name of the deployment slot. If a slot is not specified, the API gets hostname bindings for the production slot. * @return the observable to the PagedList<HostNameBindingInner> object */ public Observable> listHostNameBindingsSlotAsync(final String resourceGroupName, final String name, final String slot) { @@ -14424,12 +14842,12 @@ public Page call(ServiceResponse>> listHostNameBindingsSlotWithServiceResponseAsync(final String resourceGroupName, final String name, final String slot) { @@ -14447,12 +14865,12 @@ public Observable>> call(ServiceRespo } /** - * Get web app hostname bindings. - * Get web app hostname bindings. + * Get hostname bindings for an app or a deployment slot. + * Get hostname bindings for an app or a deployment slot. * - ServiceResponse> * @param resourceGroupName Name of resource group - ServiceResponse> * @param name Name of web app - ServiceResponse> * @param slot Name of web app slot. If not specified then will default to production slot. + ServiceResponse> * @param resourceGroupName Name of the resource group to which the resource belongs. + ServiceResponse> * @param name Name of the app. + ServiceResponse> * @param slot Name of the deployment slot. If a slot is not specified, the API gets hostname bindings for the production slot. * @return the PagedList<HostNameBindingInner> object wrapped in {@link ServiceResponse} if successful. */ public Observable>> listHostNameBindingsSlotSinglePageAsync(final String resourceGroupName, final String name, final String slot) { @@ -14491,13 +14909,13 @@ private ServiceResponse> listHostNameBindingsSlot } /** - * Get web app binding for a hostname. - * Get web app binding for a hostname. + * Get the named hostname binding for an app (or deployment slot, if specified). + * Get the named hostname binding for an app (or deployment slot, if specified). * - * @param resourceGroupName Name of resource group - * @param name Name of web app - * @param slot Name of web app slot. If not specified then will default to production slot. - * @param hostName Name of host + * @param resourceGroupName Name of the resource group to which the resource belongs. + * @param name Name of the app. + * @param slot Name of the deployment slot. If a slot is not specified, the API the named binding for the production slot. + * @param hostName Hostname in the hostname binding. * @return the HostNameBindingInner object if successful. */ public HostNameBindingInner getHostNameBindingSlot(String resourceGroupName, String name, String slot, String hostName) { @@ -14505,13 +14923,13 @@ public HostNameBindingInner getHostNameBindingSlot(String resourceGroupName, Str } /** - * Get web app binding for a hostname. - * Get web app binding for a hostname. + * Get the named hostname binding for an app (or deployment slot, if specified). + * Get the named hostname binding for an app (or deployment slot, if specified). * - * @param resourceGroupName Name of resource group - * @param name Name of web app - * @param slot Name of web app slot. If not specified then will default to production slot. - * @param hostName Name of host + * @param resourceGroupName Name of the resource group to which the resource belongs. + * @param name Name of the app. + * @param slot Name of the deployment slot. If a slot is not specified, the API the named binding for the production slot. + * @param hostName Hostname in the hostname binding. * @param serviceCallback the async ServiceCallback to handle successful and failed responses. * @return the {@link ServiceCall} object */ @@ -14520,13 +14938,13 @@ public ServiceCall getHostNameBindingSlotAsync(String reso } /** - * Get web app binding for a hostname. - * Get web app binding for a hostname. + * Get the named hostname binding for an app (or deployment slot, if specified). + * Get the named hostname binding for an app (or deployment slot, if specified). * - * @param resourceGroupName Name of resource group - * @param name Name of web app - * @param slot Name of web app slot. If not specified then will default to production slot. - * @param hostName Name of host + * @param resourceGroupName Name of the resource group to which the resource belongs. + * @param name Name of the app. + * @param slot Name of the deployment slot. If a slot is not specified, the API the named binding for the production slot. + * @param hostName Hostname in the hostname binding. * @return the observable to the HostNameBindingInner object */ public Observable getHostNameBindingSlotAsync(String resourceGroupName, String name, String slot, String hostName) { @@ -14539,13 +14957,13 @@ public HostNameBindingInner call(ServiceResponse response) } /** - * Get web app binding for a hostname. - * Get web app binding for a hostname. + * Get the named hostname binding for an app (or deployment slot, if specified). + * Get the named hostname binding for an app (or deployment slot, if specified). * - * @param resourceGroupName Name of resource group - * @param name Name of web app - * @param slot Name of web app slot. If not specified then will default to production slot. - * @param hostName Name of host + * @param resourceGroupName Name of the resource group to which the resource belongs. + * @param name Name of the app. + * @param slot Name of the deployment slot. If a slot is not specified, the API the named binding for the production slot. + * @param hostName Hostname in the hostname binding. * @return the observable to the HostNameBindingInner object */ public Observable> getHostNameBindingSlotWithServiceResponseAsync(String resourceGroupName, String name, String slot, String hostName) { @@ -14587,14 +15005,14 @@ private ServiceResponse getHostNameBindingSlotDelegate(Res } /** - * Creates a web app hostname binding. - * Creates a web app hostname binding. + * Creates a hostname binding for an app. + * Creates a hostname binding for an app. * - * @param resourceGroupName Name of resource group - * @param name Name of web app - * @param hostName Name of host - * @param slot Name of web app slot. If not specified then will default to production slot. - * @param hostNameBinding Host name binding information + * @param resourceGroupName Name of the resource group to which the resource belongs. + * @param name Name of the app. + * @param hostName Hostname in the hostname binding. + * @param slot Name of the deployment slot. If a slot is not specified, the API will create a binding for the production slot. + * @param hostNameBinding Binding details. This is the JSON representation of a HostNameBinding object. * @return the HostNameBindingInner object if successful. */ public HostNameBindingInner createOrUpdateHostNameBindingSlot(String resourceGroupName, String name, String hostName, String slot, HostNameBindingInner hostNameBinding) { @@ -14602,14 +15020,14 @@ public HostNameBindingInner createOrUpdateHostNameBindingSlot(String resourceGro } /** - * Creates a web app hostname binding. - * Creates a web app hostname binding. + * Creates a hostname binding for an app. + * Creates a hostname binding for an app. * - * @param resourceGroupName Name of resource group - * @param name Name of web app - * @param hostName Name of host - * @param slot Name of web app slot. If not specified then will default to production slot. - * @param hostNameBinding Host name binding information + * @param resourceGroupName Name of the resource group to which the resource belongs. + * @param name Name of the app. + * @param hostName Hostname in the hostname binding. + * @param slot Name of the deployment slot. If a slot is not specified, the API will create a binding for the production slot. + * @param hostNameBinding Binding details. This is the JSON representation of a HostNameBinding object. * @param serviceCallback the async ServiceCallback to handle successful and failed responses. * @return the {@link ServiceCall} object */ @@ -14618,14 +15036,14 @@ public ServiceCall createOrUpdateHostNameBindingSlotAsync( } /** - * Creates a web app hostname binding. - * Creates a web app hostname binding. + * Creates a hostname binding for an app. + * Creates a hostname binding for an app. * - * @param resourceGroupName Name of resource group - * @param name Name of web app - * @param hostName Name of host - * @param slot Name of web app slot. If not specified then will default to production slot. - * @param hostNameBinding Host name binding information + * @param resourceGroupName Name of the resource group to which the resource belongs. + * @param name Name of the app. + * @param hostName Hostname in the hostname binding. + * @param slot Name of the deployment slot. If a slot is not specified, the API will create a binding for the production slot. + * @param hostNameBinding Binding details. This is the JSON representation of a HostNameBinding object. * @return the observable to the HostNameBindingInner object */ public Observable createOrUpdateHostNameBindingSlotAsync(String resourceGroupName, String name, String hostName, String slot, HostNameBindingInner hostNameBinding) { @@ -14638,14 +15056,14 @@ public HostNameBindingInner call(ServiceResponse response) } /** - * Creates a web app hostname binding. - * Creates a web app hostname binding. + * Creates a hostname binding for an app. + * Creates a hostname binding for an app. * - * @param resourceGroupName Name of resource group - * @param name Name of web app - * @param hostName Name of host - * @param slot Name of web app slot. If not specified then will default to production slot. - * @param hostNameBinding Host name binding information + * @param resourceGroupName Name of the resource group to which the resource belongs. + * @param name Name of the app. + * @param hostName Hostname in the hostname binding. + * @param slot Name of the deployment slot. If a slot is not specified, the API will create a binding for the production slot. + * @param hostNameBinding Binding details. This is the JSON representation of a HostNameBinding object. * @return the observable to the HostNameBindingInner object */ public Observable> createOrUpdateHostNameBindingSlotWithServiceResponseAsync(String resourceGroupName, String name, String hostName, String slot, HostNameBindingInner hostNameBinding) { @@ -14691,64 +15109,63 @@ private ServiceResponse createOrUpdateHostNameBindingSlotD } /** - * Deletes a host name binding. - * Deletes a host name binding. + * Deletes a hostname binding for an app. + * Deletes a hostname binding for an app. * - * @param resourceGroupName Name of resource group - * @param name Name of web app - * @param slot Name of web app slot. If not specified then will default to production slot. - * @param hostName Name of host - * @return the Object object if successful. + * @param resourceGroupName Name of the resource group to which the resource belongs. + * @param name Name of the app. + * @param slot Name of the deployment slot. If a slot is not specified, the API will delete the binding for the production slot. + * @param hostName Hostname in the hostname binding. */ - public Object deleteHostNameBindingSlot(String resourceGroupName, String name, String slot, String hostName) { - return deleteHostNameBindingSlotWithServiceResponseAsync(resourceGroupName, name, slot, hostName).toBlocking().single().getBody(); + public void deleteHostNameBindingSlot(String resourceGroupName, String name, String slot, String hostName) { + deleteHostNameBindingSlotWithServiceResponseAsync(resourceGroupName, name, slot, hostName).toBlocking().single().getBody(); } /** - * Deletes a host name binding. - * Deletes a host name binding. + * Deletes a hostname binding for an app. + * Deletes a hostname binding for an app. * - * @param resourceGroupName Name of resource group - * @param name Name of web app - * @param slot Name of web app slot. If not specified then will default to production slot. - * @param hostName Name of host + * @param resourceGroupName Name of the resource group to which the resource belongs. + * @param name Name of the app. + * @param slot Name of the deployment slot. If a slot is not specified, the API will delete the binding for the production slot. + * @param hostName Hostname in the hostname binding. * @param serviceCallback the async ServiceCallback to handle successful and failed responses. * @return the {@link ServiceCall} object */ - public ServiceCall deleteHostNameBindingSlotAsync(String resourceGroupName, String name, String slot, String hostName, final ServiceCallback serviceCallback) { + public ServiceCall deleteHostNameBindingSlotAsync(String resourceGroupName, String name, String slot, String hostName, final ServiceCallback serviceCallback) { return ServiceCall.create(deleteHostNameBindingSlotWithServiceResponseAsync(resourceGroupName, name, slot, hostName), serviceCallback); } /** - * Deletes a host name binding. - * Deletes a host name binding. + * Deletes a hostname binding for an app. + * Deletes a hostname binding for an app. * - * @param resourceGroupName Name of resource group - * @param name Name of web app - * @param slot Name of web app slot. If not specified then will default to production slot. - * @param hostName Name of host - * @return the observable to the Object object + * @param resourceGroupName Name of the resource group to which the resource belongs. + * @param name Name of the app. + * @param slot Name of the deployment slot. If a slot is not specified, the API will delete the binding for the production slot. + * @param hostName Hostname in the hostname binding. + * @return the {@link ServiceResponse} object if successful. */ - public Observable deleteHostNameBindingSlotAsync(String resourceGroupName, String name, String slot, String hostName) { - return deleteHostNameBindingSlotWithServiceResponseAsync(resourceGroupName, name, slot, hostName).map(new Func1, Object>() { + public Observable deleteHostNameBindingSlotAsync(String resourceGroupName, String name, String slot, String hostName) { + return deleteHostNameBindingSlotWithServiceResponseAsync(resourceGroupName, name, slot, hostName).map(new Func1, Void>() { @Override - public Object call(ServiceResponse response) { + public Void call(ServiceResponse response) { return response.getBody(); } }); } /** - * Deletes a host name binding. - * Deletes a host name binding. + * Deletes a hostname binding for an app. + * Deletes a hostname binding for an app. * - * @param resourceGroupName Name of resource group - * @param name Name of web app - * @param slot Name of web app slot. If not specified then will default to production slot. - * @param hostName Name of host - * @return the observable to the Object object + * @param resourceGroupName Name of the resource group to which the resource belongs. + * @param name Name of the app. + * @param slot Name of the deployment slot. If a slot is not specified, the API will delete the binding for the production slot. + * @param hostName Hostname in the hostname binding. + * @return the {@link ServiceResponse} object if successful. */ - public Observable> deleteHostNameBindingSlotWithServiceResponseAsync(String resourceGroupName, String name, String slot, String hostName) { + public Observable> deleteHostNameBindingSlotWithServiceResponseAsync(String resourceGroupName, String name, String slot, String hostName) { if (resourceGroupName == null) { throw new IllegalArgumentException("Parameter resourceGroupName is required and cannot be null."); } @@ -14766,11 +15183,11 @@ public Observable> deleteHostNameBindingSlotWithServiceR } final String apiVersion = "2016-08-01"; return service.deleteHostNameBindingSlot(resourceGroupName, name, slot, hostName, this.client.subscriptionId(), apiVersion, this.client.acceptLanguage(), this.client.userAgent()) - .flatMap(new Func1, Observable>>() { + .flatMap(new Func1, Observable>>() { @Override - public Observable> call(Response response) { + public Observable> call(Response response) { try { - ServiceResponse clientResponse = deleteHostNameBindingSlotDelegate(response); + ServiceResponse clientResponse = deleteHostNameBindingSlotDelegate(response); return Observable.just(clientResponse); } catch (Throwable t) { return Observable.error(t); @@ -14779,10 +15196,10 @@ public Observable> call(Response response) }); } - private ServiceResponse deleteHostNameBindingSlotDelegate(Response response) throws CloudException, IOException, IllegalArgumentException { - return new AzureServiceResponseBuilder(this.client.mapperAdapter()) - .register(200, new TypeToken() { }.getType()) - .registerError(CloudException.class) + private ServiceResponse deleteHostNameBindingSlotDelegate(Response response) throws CloudException, IOException, IllegalArgumentException { + return new AzureServiceResponseBuilder(this.client.mapperAdapter()) + .register(200, new TypeToken() { }.getType()) + .register(204, new TypeToken() { }.getType()) .build(response); } @@ -14790,7 +15207,7 @@ private ServiceResponse deleteHostNameBindingSlotDelegate(Response getHybridConnectionSlotAsync(String re * Retrieves a specific Service Bus Hybrid Connection used by this Web App. * Retrieves a specific Service Bus Hybrid Connection used by this Web App. * - * @param resourceGroupName The resource group name + * @param resourceGroupName Name of the resource group to which the resource belongs. * @param name The name of the web app * @param namespaceName The namespace for this hybrid connection * @param relayName The relay name for this hybrid connection @@ -14841,7 +15258,7 @@ public HybridConnectionInner call(ServiceResponse respons * Retrieves a specific Service Bus Hybrid Connection used by this Web App. * Retrieves a specific Service Bus Hybrid Connection used by this Web App. * - * @param resourceGroupName The resource group name + * @param resourceGroupName Name of the resource group to which the resource belongs. * @param name The name of the web app * @param namespaceName The namespace for this hybrid connection * @param relayName The relay name for this hybrid connection @@ -14893,7 +15310,7 @@ private ServiceResponse getHybridConnectionSlotDelegate(R * Creates a new Hybrid Connection using a Service Bus relay. * Creates a new Hybrid Connection using a Service Bus relay. * - * @param resourceGroupName The resource group name + * @param resourceGroupName Name of the resource group to which the resource belongs. * @param name The name of the web app * @param namespaceName The namespace for this hybrid connection * @param relayName The relay name for this hybrid connection @@ -14909,7 +15326,7 @@ public HybridConnectionInner createOrUpdateHybridConnectionSlot(String resourceG * Creates a new Hybrid Connection using a Service Bus relay. * Creates a new Hybrid Connection using a Service Bus relay. * - * @param resourceGroupName The resource group name + * @param resourceGroupName Name of the resource group to which the resource belongs. * @param name The name of the web app * @param namespaceName The namespace for this hybrid connection * @param relayName The relay name for this hybrid connection @@ -14926,7 +15343,7 @@ public ServiceCall createOrUpdateHybridConnectionSlotAsyn * Creates a new Hybrid Connection using a Service Bus relay. * Creates a new Hybrid Connection using a Service Bus relay. * - * @param resourceGroupName The resource group name + * @param resourceGroupName Name of the resource group to which the resource belongs. * @param name The name of the web app * @param namespaceName The namespace for this hybrid connection * @param relayName The relay name for this hybrid connection @@ -14947,7 +15364,7 @@ public HybridConnectionInner call(ServiceResponse respons * Creates a new Hybrid Connection using a Service Bus relay. * Creates a new Hybrid Connection using a Service Bus relay. * - * @param resourceGroupName The resource group name + * @param resourceGroupName Name of the resource group to which the resource belongs. * @param name The name of the web app * @param namespaceName The namespace for this hybrid connection * @param relayName The relay name for this hybrid connection @@ -15004,22 +15421,21 @@ private ServiceResponse createOrUpdateHybridConnectionSlo * Removes a Hybrid Connection from this site. * Removes a Hybrid Connection from this site. * - * @param resourceGroupName The resource group name + * @param resourceGroupName Name of the resource group to which the resource belongs. * @param name The name of the web app * @param namespaceName The namespace for this hybrid connection * @param relayName The relay name for this hybrid connection * @param slot The name of the slot for the web app. - * @return the Object object if successful. */ - public Object deleteHybridConnectionSlot(String resourceGroupName, String name, String namespaceName, String relayName, String slot) { - return deleteHybridConnectionSlotWithServiceResponseAsync(resourceGroupName, name, namespaceName, relayName, slot).toBlocking().single().getBody(); + public void deleteHybridConnectionSlot(String resourceGroupName, String name, String namespaceName, String relayName, String slot) { + deleteHybridConnectionSlotWithServiceResponseAsync(resourceGroupName, name, namespaceName, relayName, slot).toBlocking().single().getBody(); } /** * Removes a Hybrid Connection from this site. * Removes a Hybrid Connection from this site. * - * @param resourceGroupName The resource group name + * @param resourceGroupName Name of the resource group to which the resource belongs. * @param name The name of the web app * @param namespaceName The namespace for this hybrid connection * @param relayName The relay name for this hybrid connection @@ -15027,7 +15443,7 @@ public Object deleteHybridConnectionSlot(String resourceGroupName, String name, * @param serviceCallback the async ServiceCallback to handle successful and failed responses. * @return the {@link ServiceCall} object */ - public ServiceCall deleteHybridConnectionSlotAsync(String resourceGroupName, String name, String namespaceName, String relayName, String slot, final ServiceCallback serviceCallback) { + public ServiceCall deleteHybridConnectionSlotAsync(String resourceGroupName, String name, String namespaceName, String relayName, String slot, final ServiceCallback serviceCallback) { return ServiceCall.create(deleteHybridConnectionSlotWithServiceResponseAsync(resourceGroupName, name, namespaceName, relayName, slot), serviceCallback); } @@ -15035,17 +15451,17 @@ public ServiceCall deleteHybridConnectionSlotAsync(String resourceGroupN * Removes a Hybrid Connection from this site. * Removes a Hybrid Connection from this site. * - * @param resourceGroupName The resource group name + * @param resourceGroupName Name of the resource group to which the resource belongs. * @param name The name of the web app * @param namespaceName The namespace for this hybrid connection * @param relayName The relay name for this hybrid connection * @param slot The name of the slot for the web app. - * @return the observable to the Object object + * @return the {@link ServiceResponse} object if successful. */ - public Observable deleteHybridConnectionSlotAsync(String resourceGroupName, String name, String namespaceName, String relayName, String slot) { - return deleteHybridConnectionSlotWithServiceResponseAsync(resourceGroupName, name, namespaceName, relayName, slot).map(new Func1, Object>() { + public Observable deleteHybridConnectionSlotAsync(String resourceGroupName, String name, String namespaceName, String relayName, String slot) { + return deleteHybridConnectionSlotWithServiceResponseAsync(resourceGroupName, name, namespaceName, relayName, slot).map(new Func1, Void>() { @Override - public Object call(ServiceResponse response) { + public Void call(ServiceResponse response) { return response.getBody(); } }); @@ -15055,14 +15471,14 @@ public Object call(ServiceResponse response) { * Removes a Hybrid Connection from this site. * Removes a Hybrid Connection from this site. * - * @param resourceGroupName The resource group name + * @param resourceGroupName Name of the resource group to which the resource belongs. * @param name The name of the web app * @param namespaceName The namespace for this hybrid connection * @param relayName The relay name for this hybrid connection * @param slot The name of the slot for the web app. - * @return the observable to the Object object + * @return the {@link ServiceResponse} object if successful. */ - public Observable> deleteHybridConnectionSlotWithServiceResponseAsync(String resourceGroupName, String name, String namespaceName, String relayName, String slot) { + public Observable> deleteHybridConnectionSlotWithServiceResponseAsync(String resourceGroupName, String name, String namespaceName, String relayName, String slot) { if (resourceGroupName == null) { throw new IllegalArgumentException("Parameter resourceGroupName is required and cannot be null."); } @@ -15083,11 +15499,11 @@ public Observable> deleteHybridConnectionSlotWithService } final String apiVersion = "2016-08-01"; return service.deleteHybridConnectionSlot(resourceGroupName, name, namespaceName, relayName, slot, this.client.subscriptionId(), apiVersion, this.client.acceptLanguage(), this.client.userAgent()) - .flatMap(new Func1, Observable>>() { + .flatMap(new Func1, Observable>>() { @Override - public Observable> call(Response response) { + public Observable> call(Response response) { try { - ServiceResponse clientResponse = deleteHybridConnectionSlotDelegate(response); + ServiceResponse clientResponse = deleteHybridConnectionSlotDelegate(response); return Observable.just(clientResponse); } catch (Throwable t) { return Observable.error(t); @@ -15096,10 +15512,10 @@ public Observable> call(Response response) }); } - private ServiceResponse deleteHybridConnectionSlotDelegate(Response response) throws CloudException, IOException, IllegalArgumentException { - return new AzureServiceResponseBuilder(this.client.mapperAdapter()) - .register(200, new TypeToken() { }.getType()) - .registerError(CloudException.class) + private ServiceResponse deleteHybridConnectionSlotDelegate(Response response) throws CloudException, IOException, IllegalArgumentException { + return new AzureServiceResponseBuilder(this.client.mapperAdapter()) + .register(200, new TypeToken() { }.getType()) + .register(404, new TypeToken() { }.getType()) .build(response); } @@ -15107,7 +15523,7 @@ private ServiceResponse deleteHybridConnectionSlotDelegate(Response updateHybridConnectionSlotAsync(String * Creates a new Hybrid Connection using a Service Bus relay. * Creates a new Hybrid Connection using a Service Bus relay. * - * @param resourceGroupName The resource group name + * @param resourceGroupName Name of the resource group to which the resource belongs. * @param name The name of the web app * @param namespaceName The namespace for this hybrid connection * @param relayName The relay name for this hybrid connection @@ -15161,7 +15577,7 @@ public HybridConnectionInner call(ServiceResponse respons * Creates a new Hybrid Connection using a Service Bus relay. * Creates a new Hybrid Connection using a Service Bus relay. * - * @param resourceGroupName The resource group name + * @param resourceGroupName Name of the resource group to which the resource belongs. * @param name The name of the web app * @param namespaceName The namespace for this hybrid connection * @param relayName The relay name for this hybrid connection @@ -15218,14 +15634,14 @@ private ServiceResponse updateHybridConnectionSlotDelegat * Gets the send key name and value for a Hybrid Connection. * Gets the send key name and value for a Hybrid Connection. * - * @param resourceGroupName The resource group name + * @param resourceGroupName Name of the resource group to which the resource belongs. * @param name The name of the web app * @param namespaceName The namespace for this hybrid connection * @param relayName The relay name for this hybrid connection * @param slot The name of the slot for the web app. - * @return the Object object if successful. + * @return the HybridConnectionKeyInner object if successful. */ - public Object listHybridConnectionKeysSlot(String resourceGroupName, String name, String namespaceName, String relayName, String slot) { + public HybridConnectionKeyInner listHybridConnectionKeysSlot(String resourceGroupName, String name, String namespaceName, String relayName, String slot) { return listHybridConnectionKeysSlotWithServiceResponseAsync(resourceGroupName, name, namespaceName, relayName, slot).toBlocking().single().getBody(); } @@ -15233,7 +15649,7 @@ public Object listHybridConnectionKeysSlot(String resourceGroupName, String name * Gets the send key name and value for a Hybrid Connection. * Gets the send key name and value for a Hybrid Connection. * - * @param resourceGroupName The resource group name + * @param resourceGroupName Name of the resource group to which the resource belongs. * @param name The name of the web app * @param namespaceName The namespace for this hybrid connection * @param relayName The relay name for this hybrid connection @@ -15241,7 +15657,7 @@ public Object listHybridConnectionKeysSlot(String resourceGroupName, String name * @param serviceCallback the async ServiceCallback to handle successful and failed responses. * @return the {@link ServiceCall} object */ - public ServiceCall listHybridConnectionKeysSlotAsync(String resourceGroupName, String name, String namespaceName, String relayName, String slot, final ServiceCallback serviceCallback) { + public ServiceCall listHybridConnectionKeysSlotAsync(String resourceGroupName, String name, String namespaceName, String relayName, String slot, final ServiceCallback serviceCallback) { return ServiceCall.create(listHybridConnectionKeysSlotWithServiceResponseAsync(resourceGroupName, name, namespaceName, relayName, slot), serviceCallback); } @@ -15249,17 +15665,17 @@ public ServiceCall listHybridConnectionKeysSlotAsync(String resourceGrou * Gets the send key name and value for a Hybrid Connection. * Gets the send key name and value for a Hybrid Connection. * - * @param resourceGroupName The resource group name + * @param resourceGroupName Name of the resource group to which the resource belongs. * @param name The name of the web app * @param namespaceName The namespace for this hybrid connection * @param relayName The relay name for this hybrid connection * @param slot The name of the slot for the web app. - * @return the observable to the Object object + * @return the observable to the HybridConnectionKeyInner object */ - public Observable listHybridConnectionKeysSlotAsync(String resourceGroupName, String name, String namespaceName, String relayName, String slot) { - return listHybridConnectionKeysSlotWithServiceResponseAsync(resourceGroupName, name, namespaceName, relayName, slot).map(new Func1, Object>() { + public Observable listHybridConnectionKeysSlotAsync(String resourceGroupName, String name, String namespaceName, String relayName, String slot) { + return listHybridConnectionKeysSlotWithServiceResponseAsync(resourceGroupName, name, namespaceName, relayName, slot).map(new Func1, HybridConnectionKeyInner>() { @Override - public Object call(ServiceResponse response) { + public HybridConnectionKeyInner call(ServiceResponse response) { return response.getBody(); } }); @@ -15269,14 +15685,14 @@ public Object call(ServiceResponse response) { * Gets the send key name and value for a Hybrid Connection. * Gets the send key name and value for a Hybrid Connection. * - * @param resourceGroupName The resource group name + * @param resourceGroupName Name of the resource group to which the resource belongs. * @param name The name of the web app * @param namespaceName The namespace for this hybrid connection * @param relayName The relay name for this hybrid connection * @param slot The name of the slot for the web app. - * @return the observable to the Object object + * @return the observable to the HybridConnectionKeyInner object */ - public Observable> listHybridConnectionKeysSlotWithServiceResponseAsync(String resourceGroupName, String name, String namespaceName, String relayName, String slot) { + public Observable> listHybridConnectionKeysSlotWithServiceResponseAsync(String resourceGroupName, String name, String namespaceName, String relayName, String slot) { if (resourceGroupName == null) { throw new IllegalArgumentException("Parameter resourceGroupName is required and cannot be null."); } @@ -15297,11 +15713,11 @@ public Observable> listHybridConnectionKeysSlotWithServi } final String apiVersion = "2016-08-01"; return service.listHybridConnectionKeysSlot(resourceGroupName, name, namespaceName, relayName, slot, this.client.subscriptionId(), apiVersion, this.client.acceptLanguage(), this.client.userAgent()) - .flatMap(new Func1, Observable>>() { + .flatMap(new Func1, Observable>>() { @Override - public Observable> call(Response response) { + public Observable> call(Response response) { try { - ServiceResponse clientResponse = listHybridConnectionKeysSlotDelegate(response); + ServiceResponse clientResponse = listHybridConnectionKeysSlotDelegate(response); return Observable.just(clientResponse); } catch (Throwable t) { return Observable.error(t); @@ -15310,9 +15726,9 @@ public Observable> call(Response response) }); } - private ServiceResponse listHybridConnectionKeysSlotDelegate(Response response) throws CloudException, IOException, IllegalArgumentException { - return new AzureServiceResponseBuilder(this.client.mapperAdapter()) - .register(200, new TypeToken() { }.getType()) + private ServiceResponse listHybridConnectionKeysSlotDelegate(Response response) throws CloudException, IOException, IllegalArgumentException { + return new AzureServiceResponseBuilder(this.client.mapperAdapter()) + .register(200, new TypeToken() { }.getType()) .registerError(CloudException.class) .build(response); } @@ -15321,7 +15737,7 @@ private ServiceResponse listHybridConnectionKeysSlotDelegate(Response listHybridConnectionsSlotAsync(String * Retrieves all Service Bus Hybrid Connections used by this Web App. * Retrieves all Service Bus Hybrid Connections used by this Web App. * - * @param resourceGroupName The resource group name + * @param resourceGroupName Name of the resource group to which the resource belongs. * @param name The name of the web app * @param slot The name of the slot for the web app. * @return the observable to the HybridConnectionInner object @@ -15366,7 +15782,7 @@ public HybridConnectionInner call(ServiceResponse respons * Retrieves all Service Bus Hybrid Connections used by this Web App. * Retrieves all Service Bus Hybrid Connections used by this Web App. * - * @param resourceGroupName The resource group name + * @param resourceGroupName Name of the resource group to which the resource belongs. * @param name The name of the web app * @param slot The name of the slot for the web app. * @return the observable to the HybridConnectionInner object @@ -15407,12 +15823,12 @@ private ServiceResponse listHybridConnectionsSlotDelegate } /** - * Retrieves all Biztalk Hybrid Connections associated with this web app. - * Retrieves all Biztalk Hybrid Connections associated with this web app. + * Gets hybrid connections configured for an app (or deployment slot, if specified). + * Gets hybrid connections configured for an app (or deployment slot, if specified). * - * @param resourceGroupName The resource group name - * @param name The name of the web app - * @param slot The name of the slot for the web app. + * @param resourceGroupName Name of the resource group to which the resource belongs. + * @param name Name of the app. + * @param slot Name of the deployment slot. If a slot is not specified, the API will get hybrid connections for the production slot. * @return the RelayServiceConnectionEntityInner object if successful. */ public RelayServiceConnectionEntityInner listRelayServiceConnectionsSlot(String resourceGroupName, String name, String slot) { @@ -15420,12 +15836,12 @@ public RelayServiceConnectionEntityInner listRelayServiceConnectionsSlot(String } /** - * Retrieves all Biztalk Hybrid Connections associated with this web app. - * Retrieves all Biztalk Hybrid Connections associated with this web app. + * Gets hybrid connections configured for an app (or deployment slot, if specified). + * Gets hybrid connections configured for an app (or deployment slot, if specified). * - * @param resourceGroupName The resource group name - * @param name The name of the web app - * @param slot The name of the slot for the web app. + * @param resourceGroupName Name of the resource group to which the resource belongs. + * @param name Name of the app. + * @param slot Name of the deployment slot. If a slot is not specified, the API will get hybrid connections for the production slot. * @param serviceCallback the async ServiceCallback to handle successful and failed responses. * @return the {@link ServiceCall} object */ @@ -15434,12 +15850,12 @@ public ServiceCall listRelayServiceConnection } /** - * Retrieves all Biztalk Hybrid Connections associated with this web app. - * Retrieves all Biztalk Hybrid Connections associated with this web app. - * - * @param resourceGroupName The resource group name - * @param name The name of the web app - * @param slot The name of the slot for the web app. + * Gets hybrid connections configured for an app (or deployment slot, if specified). + * Gets hybrid connections configured for an app (or deployment slot, if specified). + * + * @param resourceGroupName Name of the resource group to which the resource belongs. + * @param name Name of the app. + * @param slot Name of the deployment slot. If a slot is not specified, the API will get hybrid connections for the production slot. * @return the observable to the RelayServiceConnectionEntityInner object */ public Observable listRelayServiceConnectionsSlotAsync(String resourceGroupName, String name, String slot) { @@ -15452,12 +15868,12 @@ public RelayServiceConnectionEntityInner call(ServiceResponse> listRelayServiceConnectionsSlotWithServiceResponseAsync(String resourceGroupName, String name, String slot) { @@ -15496,13 +15912,13 @@ private ServiceResponse listRelayServiceConne } /** - * Retrieves a Biztalk Hybrid Connection identified by its entity name. - * Retrieves a Biztalk Hybrid Connection identified by its entity name. + * Gets a hybrid connection configuration by its name. + * Gets a hybrid connection configuration by its name. * - * @param resourceGroupName The resource group name - * @param name The name of the web app - * @param entityName The name by which the Hybrid Connection is identified - * @param slot The name of the slot for the web app. + * @param resourceGroupName Name of the resource group to which the resource belongs. + * @param name Name of the app. + * @param entityName Name of the hybrid connection. + * @param slot Name of the deployment slot. If a slot is not specified, the API will get a hybrid connection for the production slot. * @return the RelayServiceConnectionEntityInner object if successful. */ public RelayServiceConnectionEntityInner getRelayServiceConnectionSlot(String resourceGroupName, String name, String entityName, String slot) { @@ -15510,13 +15926,13 @@ public RelayServiceConnectionEntityInner getRelayServiceConnectionSlot(String re } /** - * Retrieves a Biztalk Hybrid Connection identified by its entity name. - * Retrieves a Biztalk Hybrid Connection identified by its entity name. + * Gets a hybrid connection configuration by its name. + * Gets a hybrid connection configuration by its name. * - * @param resourceGroupName The resource group name - * @param name The name of the web app - * @param entityName The name by which the Hybrid Connection is identified - * @param slot The name of the slot for the web app. + * @param resourceGroupName Name of the resource group to which the resource belongs. + * @param name Name of the app. + * @param entityName Name of the hybrid connection. + * @param slot Name of the deployment slot. If a slot is not specified, the API will get a hybrid connection for the production slot. * @param serviceCallback the async ServiceCallback to handle successful and failed responses. * @return the {@link ServiceCall} object */ @@ -15525,13 +15941,13 @@ public ServiceCall getRelayServiceConnectionS } /** - * Retrieves a Biztalk Hybrid Connection identified by its entity name. - * Retrieves a Biztalk Hybrid Connection identified by its entity name. + * Gets a hybrid connection configuration by its name. + * Gets a hybrid connection configuration by its name. * - * @param resourceGroupName The resource group name - * @param name The name of the web app - * @param entityName The name by which the Hybrid Connection is identified - * @param slot The name of the slot for the web app. + * @param resourceGroupName Name of the resource group to which the resource belongs. + * @param name Name of the app. + * @param entityName Name of the hybrid connection. + * @param slot Name of the deployment slot. If a slot is not specified, the API will get a hybrid connection for the production slot. * @return the observable to the RelayServiceConnectionEntityInner object */ public Observable getRelayServiceConnectionSlotAsync(String resourceGroupName, String name, String entityName, String slot) { @@ -15544,13 +15960,13 @@ public RelayServiceConnectionEntityInner call(ServiceResponse> getRelayServiceConnectionSlotWithServiceResponseAsync(String resourceGroupName, String name, String entityName, String slot) { @@ -15592,14 +16008,14 @@ private ServiceResponse getRelayServiceConnec } /** - * Creates a new association to a Biztalk Hybrid Connection, or updates an existing one. - * Creates a new association to a Biztalk Hybrid Connection, or updates an existing one. + * Creates a new hybrid connection configuration (PUT), or updates an existing one (PATCH). + * Creates a new hybrid connection configuration (PUT), or updates an existing one (PATCH). * - * @param resourceGroupName The resource group name - * @param name The name of the web app - * @param entityName The name by which the Hybrid Connection is identified - * @param slot The name of the slot for the web app. - * @param connectionEnvelope The details of the Hybrid Connection + * @param resourceGroupName Name of the resource group to which the resource belongs. + * @param name Name of the app. + * @param entityName Name of the hybrid connection configuration. + * @param slot Name of the deployment slot. If a slot is not specified, the API will create or update a hybrid connection for the production slot. + * @param connectionEnvelope Details of the hybrid connection configuration. * @return the RelayServiceConnectionEntityInner object if successful. */ public RelayServiceConnectionEntityInner createOrUpdateRelayServiceConnectionSlot(String resourceGroupName, String name, String entityName, String slot, RelayServiceConnectionEntityInner connectionEnvelope) { @@ -15607,14 +16023,14 @@ public RelayServiceConnectionEntityInner createOrUpdateRelayServiceConnectionSlo } /** - * Creates a new association to a Biztalk Hybrid Connection, or updates an existing one. - * Creates a new association to a Biztalk Hybrid Connection, or updates an existing one. + * Creates a new hybrid connection configuration (PUT), or updates an existing one (PATCH). + * Creates a new hybrid connection configuration (PUT), or updates an existing one (PATCH). * - * @param resourceGroupName The resource group name - * @param name The name of the web app - * @param entityName The name by which the Hybrid Connection is identified - * @param slot The name of the slot for the web app. - * @param connectionEnvelope The details of the Hybrid Connection + * @param resourceGroupName Name of the resource group to which the resource belongs. + * @param name Name of the app. + * @param entityName Name of the hybrid connection configuration. + * @param slot Name of the deployment slot. If a slot is not specified, the API will create or update a hybrid connection for the production slot. + * @param connectionEnvelope Details of the hybrid connection configuration. * @param serviceCallback the async ServiceCallback to handle successful and failed responses. * @return the {@link ServiceCall} object */ @@ -15623,14 +16039,14 @@ public ServiceCall createOrUpdateRelayService } /** - * Creates a new association to a Biztalk Hybrid Connection, or updates an existing one. - * Creates a new association to a Biztalk Hybrid Connection, or updates an existing one. + * Creates a new hybrid connection configuration (PUT), or updates an existing one (PATCH). + * Creates a new hybrid connection configuration (PUT), or updates an existing one (PATCH). * - * @param resourceGroupName The resource group name - * @param name The name of the web app - * @param entityName The name by which the Hybrid Connection is identified - * @param slot The name of the slot for the web app. - * @param connectionEnvelope The details of the Hybrid Connection + * @param resourceGroupName Name of the resource group to which the resource belongs. + * @param name Name of the app. + * @param entityName Name of the hybrid connection configuration. + * @param slot Name of the deployment slot. If a slot is not specified, the API will create or update a hybrid connection for the production slot. + * @param connectionEnvelope Details of the hybrid connection configuration. * @return the observable to the RelayServiceConnectionEntityInner object */ public Observable createOrUpdateRelayServiceConnectionSlotAsync(String resourceGroupName, String name, String entityName, String slot, RelayServiceConnectionEntityInner connectionEnvelope) { @@ -15643,14 +16059,14 @@ public RelayServiceConnectionEntityInner call(ServiceResponse> createOrUpdateRelayServiceConnectionSlotWithServiceResponseAsync(String resourceGroupName, String name, String entityName, String slot, RelayServiceConnectionEntityInner connectionEnvelope) { @@ -15696,64 +16112,63 @@ private ServiceResponse createOrUpdateRelaySe } /** - * Removes the association to a Biztalk Hybrid Connection, identified by its entity name. - * Removes the association to a Biztalk Hybrid Connection, identified by its entity name. + * Deletes a relay service connection by its name. + * Deletes a relay service connection by its name. * - * @param resourceGroupName The resource group name - * @param name The name of the web app - * @param entityName The name by which the Hybrid Connection is identified - * @param slot The name of the slot for the web app. - * @return the Object object if successful. + * @param resourceGroupName Name of the resource group to which the resource belongs. + * @param name Name of the app. + * @param entityName Name of the hybrid connection configuration. + * @param slot Name of the deployment slot. If a slot is not specified, the API will delete a hybrid connection for the production slot. */ - public Object deleteRelayServiceConnectionSlot(String resourceGroupName, String name, String entityName, String slot) { - return deleteRelayServiceConnectionSlotWithServiceResponseAsync(resourceGroupName, name, entityName, slot).toBlocking().single().getBody(); + public void deleteRelayServiceConnectionSlot(String resourceGroupName, String name, String entityName, String slot) { + deleteRelayServiceConnectionSlotWithServiceResponseAsync(resourceGroupName, name, entityName, slot).toBlocking().single().getBody(); } /** - * Removes the association to a Biztalk Hybrid Connection, identified by its entity name. - * Removes the association to a Biztalk Hybrid Connection, identified by its entity name. + * Deletes a relay service connection by its name. + * Deletes a relay service connection by its name. * - * @param resourceGroupName The resource group name - * @param name The name of the web app - * @param entityName The name by which the Hybrid Connection is identified - * @param slot The name of the slot for the web app. + * @param resourceGroupName Name of the resource group to which the resource belongs. + * @param name Name of the app. + * @param entityName Name of the hybrid connection configuration. + * @param slot Name of the deployment slot. If a slot is not specified, the API will delete a hybrid connection for the production slot. * @param serviceCallback the async ServiceCallback to handle successful and failed responses. * @return the {@link ServiceCall} object */ - public ServiceCall deleteRelayServiceConnectionSlotAsync(String resourceGroupName, String name, String entityName, String slot, final ServiceCallback serviceCallback) { + public ServiceCall deleteRelayServiceConnectionSlotAsync(String resourceGroupName, String name, String entityName, String slot, final ServiceCallback serviceCallback) { return ServiceCall.create(deleteRelayServiceConnectionSlotWithServiceResponseAsync(resourceGroupName, name, entityName, slot), serviceCallback); } /** - * Removes the association to a Biztalk Hybrid Connection, identified by its entity name. - * Removes the association to a Biztalk Hybrid Connection, identified by its entity name. + * Deletes a relay service connection by its name. + * Deletes a relay service connection by its name. * - * @param resourceGroupName The resource group name - * @param name The name of the web app - * @param entityName The name by which the Hybrid Connection is identified - * @param slot The name of the slot for the web app. - * @return the observable to the Object object + * @param resourceGroupName Name of the resource group to which the resource belongs. + * @param name Name of the app. + * @param entityName Name of the hybrid connection configuration. + * @param slot Name of the deployment slot. If a slot is not specified, the API will delete a hybrid connection for the production slot. + * @return the {@link ServiceResponse} object if successful. */ - public Observable deleteRelayServiceConnectionSlotAsync(String resourceGroupName, String name, String entityName, String slot) { - return deleteRelayServiceConnectionSlotWithServiceResponseAsync(resourceGroupName, name, entityName, slot).map(new Func1, Object>() { + public Observable deleteRelayServiceConnectionSlotAsync(String resourceGroupName, String name, String entityName, String slot) { + return deleteRelayServiceConnectionSlotWithServiceResponseAsync(resourceGroupName, name, entityName, slot).map(new Func1, Void>() { @Override - public Object call(ServiceResponse response) { + public Void call(ServiceResponse response) { return response.getBody(); } }); } /** - * Removes the association to a Biztalk Hybrid Connection, identified by its entity name. - * Removes the association to a Biztalk Hybrid Connection, identified by its entity name. + * Deletes a relay service connection by its name. + * Deletes a relay service connection by its name. * - * @param resourceGroupName The resource group name - * @param name The name of the web app - * @param entityName The name by which the Hybrid Connection is identified - * @param slot The name of the slot for the web app. - * @return the observable to the Object object + * @param resourceGroupName Name of the resource group to which the resource belongs. + * @param name Name of the app. + * @param entityName Name of the hybrid connection configuration. + * @param slot Name of the deployment slot. If a slot is not specified, the API will delete a hybrid connection for the production slot. + * @return the {@link ServiceResponse} object if successful. */ - public Observable> deleteRelayServiceConnectionSlotWithServiceResponseAsync(String resourceGroupName, String name, String entityName, String slot) { + public Observable> deleteRelayServiceConnectionSlotWithServiceResponseAsync(String resourceGroupName, String name, String entityName, String slot) { if (resourceGroupName == null) { throw new IllegalArgumentException("Parameter resourceGroupName is required and cannot be null."); } @@ -15771,11 +16186,11 @@ public Observable> deleteRelayServiceConnectionSlotWithS } final String apiVersion = "2016-08-01"; return service.deleteRelayServiceConnectionSlot(resourceGroupName, name, entityName, slot, this.client.subscriptionId(), apiVersion, this.client.acceptLanguage(), this.client.userAgent()) - .flatMap(new Func1, Observable>>() { + .flatMap(new Func1, Observable>>() { @Override - public Observable> call(Response response) { + public Observable> call(Response response) { try { - ServiceResponse clientResponse = deleteRelayServiceConnectionSlotDelegate(response); + ServiceResponse clientResponse = deleteRelayServiceConnectionSlotDelegate(response); return Observable.just(clientResponse); } catch (Throwable t) { return Observable.error(t); @@ -15784,22 +16199,22 @@ public Observable> call(Response response) }); } - private ServiceResponse deleteRelayServiceConnectionSlotDelegate(Response response) throws CloudException, IOException, IllegalArgumentException { - return new AzureServiceResponseBuilder(this.client.mapperAdapter()) - .register(200, new TypeToken() { }.getType()) - .registerError(CloudException.class) + private ServiceResponse deleteRelayServiceConnectionSlotDelegate(Response response) throws CloudException, IOException, IllegalArgumentException { + return new AzureServiceResponseBuilder(this.client.mapperAdapter()) + .register(200, new TypeToken() { }.getType()) + .register(404, new TypeToken() { }.getType()) .build(response); } /** - * Creates a new association to a Biztalk Hybrid Connection, or updates an existing one. - * Creates a new association to a Biztalk Hybrid Connection, or updates an existing one. + * Creates a new hybrid connection configuration (PUT), or updates an existing one (PATCH). + * Creates a new hybrid connection configuration (PUT), or updates an existing one (PATCH). * - * @param resourceGroupName The resource group name - * @param name The name of the web app - * @param entityName The name by which the Hybrid Connection is identified - * @param slot The name of the slot for the web app. - * @param connectionEnvelope The details of the Hybrid Connection + * @param resourceGroupName Name of the resource group to which the resource belongs. + * @param name Name of the app. + * @param entityName Name of the hybrid connection configuration. + * @param slot Name of the deployment slot. If a slot is not specified, the API will create or update a hybrid connection for the production slot. + * @param connectionEnvelope Details of the hybrid connection configuration. * @return the RelayServiceConnectionEntityInner object if successful. */ public RelayServiceConnectionEntityInner updateRelayServiceConnectionSlot(String resourceGroupName, String name, String entityName, String slot, RelayServiceConnectionEntityInner connectionEnvelope) { @@ -15807,14 +16222,14 @@ public RelayServiceConnectionEntityInner updateRelayServiceConnectionSlot(String } /** - * Creates a new association to a Biztalk Hybrid Connection, or updates an existing one. - * Creates a new association to a Biztalk Hybrid Connection, or updates an existing one. + * Creates a new hybrid connection configuration (PUT), or updates an existing one (PATCH). + * Creates a new hybrid connection configuration (PUT), or updates an existing one (PATCH). * - * @param resourceGroupName The resource group name - * @param name The name of the web app - * @param entityName The name by which the Hybrid Connection is identified - * @param slot The name of the slot for the web app. - * @param connectionEnvelope The details of the Hybrid Connection + * @param resourceGroupName Name of the resource group to which the resource belongs. + * @param name Name of the app. + * @param entityName Name of the hybrid connection configuration. + * @param slot Name of the deployment slot. If a slot is not specified, the API will create or update a hybrid connection for the production slot. + * @param connectionEnvelope Details of the hybrid connection configuration. * @param serviceCallback the async ServiceCallback to handle successful and failed responses. * @return the {@link ServiceCall} object */ @@ -15823,14 +16238,14 @@ public ServiceCall updateRelayServiceConnecti } /** - * Creates a new association to a Biztalk Hybrid Connection, or updates an existing one. - * Creates a new association to a Biztalk Hybrid Connection, or updates an existing one. + * Creates a new hybrid connection configuration (PUT), or updates an existing one (PATCH). + * Creates a new hybrid connection configuration (PUT), or updates an existing one (PATCH). * - * @param resourceGroupName The resource group name - * @param name The name of the web app - * @param entityName The name by which the Hybrid Connection is identified - * @param slot The name of the slot for the web app. - * @param connectionEnvelope The details of the Hybrid Connection + * @param resourceGroupName Name of the resource group to which the resource belongs. + * @param name Name of the app. + * @param entityName Name of the hybrid connection configuration. + * @param slot Name of the deployment slot. If a slot is not specified, the API will create or update a hybrid connection for the production slot. + * @param connectionEnvelope Details of the hybrid connection configuration. * @return the observable to the RelayServiceConnectionEntityInner object */ public Observable updateRelayServiceConnectionSlotAsync(String resourceGroupName, String name, String entityName, String slot, RelayServiceConnectionEntityInner connectionEnvelope) { @@ -15843,14 +16258,14 @@ public RelayServiceConnectionEntityInner call(ServiceResponse> updateRelayServiceConnectionSlotWithServiceResponseAsync(String resourceGroupName, String name, String entityName, String slot, RelayServiceConnectionEntityInner connectionEnvelope) { @@ -15896,12 +16311,12 @@ private ServiceResponse updateRelayServiceCon } /** - * Gets all instance of a web app. - * Gets all instance of a web app. + * Gets all scale-out instances of an app. + * Gets all scale-out instances of an app. * - * @param resourceGroupName Name of resource group - * @param name Name of web app - * @param slot Name of web app slot. If not specified then will default to production slot. + * @param resourceGroupName Name of the resource group to which the resource belongs. + * @param name Name of the app. + * @param slot Name of the deployment slot. If a slot is not specified, the API gets the production slot instances. * @return the PagedList<SiteInstanceInner> object if successful. */ public PagedList listInstanceIdentifiersSlot(final String resourceGroupName, final String name, final String slot) { @@ -15915,12 +16330,12 @@ public Page nextPage(String nextPageLink) { } /** - * Gets all instance of a web app. - * Gets all instance of a web app. + * Gets all scale-out instances of an app. + * Gets all scale-out instances of an app. * - * @param resourceGroupName Name of resource group - * @param name Name of web app - * @param slot Name of web app slot. If not specified then will default to production slot. + * @param resourceGroupName Name of the resource group to which the resource belongs. + * @param name Name of the app. + * @param slot Name of the deployment slot. If a slot is not specified, the API gets the production slot instances. * @param serviceCallback the async ServiceCallback to handle successful and failed responses. * @return the {@link ServiceCall} object */ @@ -15937,12 +16352,12 @@ public Observable>> call(String nextPage } /** - * Gets all instance of a web app. - * Gets all instance of a web app. + * Gets all scale-out instances of an app. + * Gets all scale-out instances of an app. * - * @param resourceGroupName Name of resource group - * @param name Name of web app - * @param slot Name of web app slot. If not specified then will default to production slot. + * @param resourceGroupName Name of the resource group to which the resource belongs. + * @param name Name of the app. + * @param slot Name of the deployment slot. If a slot is not specified, the API gets the production slot instances. * @return the observable to the PagedList<SiteInstanceInner> object */ public Observable> listInstanceIdentifiersSlotAsync(final String resourceGroupName, final String name, final String slot) { @@ -15956,12 +16371,12 @@ public Page call(ServiceResponse> res } /** - * Gets all instance of a web app. - * Gets all instance of a web app. + * Gets all scale-out instances of an app. + * Gets all scale-out instances of an app. * - * @param resourceGroupName Name of resource group - * @param name Name of web app - * @param slot Name of web app slot. If not specified then will default to production slot. + * @param resourceGroupName Name of the resource group to which the resource belongs. + * @param name Name of the app. + * @param slot Name of the deployment slot. If a slot is not specified, the API gets the production slot instances. * @return the observable to the PagedList<SiteInstanceInner> object */ public Observable>> listInstanceIdentifiersSlotWithServiceResponseAsync(final String resourceGroupName, final String name, final String slot) { @@ -15979,12 +16394,12 @@ public Observable>> call(ServiceResponse } /** - * Gets all instance of a web app. - * Gets all instance of a web app. + * Gets all scale-out instances of an app. + * Gets all scale-out instances of an app. * - ServiceResponse> * @param resourceGroupName Name of resource group - ServiceResponse> * @param name Name of web app - ServiceResponse> * @param slot Name of web app slot. If not specified then will default to production slot. + ServiceResponse> * @param resourceGroupName Name of the resource group to which the resource belongs. + ServiceResponse> * @param name Name of the app. + ServiceResponse> * @param slot Name of the deployment slot. If a slot is not specified, the API gets the production slot instances. * @return the PagedList<SiteInstanceInner> object wrapped in {@link ServiceResponse} if successful. */ public Observable>> listInstanceIdentifiersSlotSinglePageAsync(final String resourceGroupName, final String name, final String slot) { @@ -16023,13 +16438,13 @@ private ServiceResponse> listInstanceIdentifiersSlot } /** - * List deployments. - * List deployments. + * List deployments for an app, or a deployment slot, or for an instance of a scaled-out app. + * List deployments for an app, or a deployment slot, or for an instance of a scaled-out app. * - * @param resourceGroupName Name of resource group - * @param name Name of web app - * @param slot Name of web app slot. If not specified then will default to production slot. - * @param instanceId Id of web app instance + * @param resourceGroupName Name of the resource group to which the resource belongs. + * @param name Name of the app. + * @param slot Name of the deployment slot. If a slot is not specified, the API returns deployments for the production slot. + * @param instanceId The ID of a specific scaled-out instance. This is the value of the name property in the JSON response from "GET api/sites/{siteName}/instances" * @return the PagedList<DeploymentInner> object if successful. */ public PagedList listInstanceDeploymentsSlot(final String resourceGroupName, final String name, final String slot, final String instanceId) { @@ -16043,13 +16458,13 @@ public Page nextPage(String nextPageLink) { } /** - * List deployments. - * List deployments. + * List deployments for an app, or a deployment slot, or for an instance of a scaled-out app. + * List deployments for an app, or a deployment slot, or for an instance of a scaled-out app. * - * @param resourceGroupName Name of resource group - * @param name Name of web app - * @param slot Name of web app slot. If not specified then will default to production slot. - * @param instanceId Id of web app instance + * @param resourceGroupName Name of the resource group to which the resource belongs. + * @param name Name of the app. + * @param slot Name of the deployment slot. If a slot is not specified, the API returns deployments for the production slot. + * @param instanceId The ID of a specific scaled-out instance. This is the value of the name property in the JSON response from "GET api/sites/{siteName}/instances" * @param serviceCallback the async ServiceCallback to handle successful and failed responses. * @return the {@link ServiceCall} object */ @@ -16066,13 +16481,13 @@ public Observable>> call(String nextPageLi } /** - * List deployments. - * List deployments. + * List deployments for an app, or a deployment slot, or for an instance of a scaled-out app. + * List deployments for an app, or a deployment slot, or for an instance of a scaled-out app. * - * @param resourceGroupName Name of resource group - * @param name Name of web app - * @param slot Name of web app slot. If not specified then will default to production slot. - * @param instanceId Id of web app instance + * @param resourceGroupName Name of the resource group to which the resource belongs. + * @param name Name of the app. + * @param slot Name of the deployment slot. If a slot is not specified, the API returns deployments for the production slot. + * @param instanceId The ID of a specific scaled-out instance. This is the value of the name property in the JSON response from "GET api/sites/{siteName}/instances" * @return the observable to the PagedList<DeploymentInner> object */ public Observable> listInstanceDeploymentsSlotAsync(final String resourceGroupName, final String name, final String slot, final String instanceId) { @@ -16086,13 +16501,13 @@ public Page call(ServiceResponse> respons } /** - * List deployments. - * List deployments. + * List deployments for an app, or a deployment slot, or for an instance of a scaled-out app. + * List deployments for an app, or a deployment slot, or for an instance of a scaled-out app. * - * @param resourceGroupName Name of resource group - * @param name Name of web app - * @param slot Name of web app slot. If not specified then will default to production slot. - * @param instanceId Id of web app instance + * @param resourceGroupName Name of the resource group to which the resource belongs. + * @param name Name of the app. + * @param slot Name of the deployment slot. If a slot is not specified, the API returns deployments for the production slot. + * @param instanceId The ID of a specific scaled-out instance. This is the value of the name property in the JSON response from "GET api/sites/{siteName}/instances" * @return the observable to the PagedList<DeploymentInner> object */ public Observable>> listInstanceDeploymentsSlotWithServiceResponseAsync(final String resourceGroupName, final String name, final String slot, final String instanceId) { @@ -16110,13 +16525,13 @@ public Observable>> call(ServiceResponse

> * @param resourceGroupName Name of resource group - ServiceResponse> * @param name Name of web app - ServiceResponse> * @param slot Name of web app slot. If not specified then will default to production slot. - ServiceResponse> * @param instanceId Id of web app instance + ServiceResponse> * @param resourceGroupName Name of the resource group to which the resource belongs. + ServiceResponse> * @param name Name of the app. + ServiceResponse> * @param slot Name of the deployment slot. If a slot is not specified, the API returns deployments for the production slot. + ServiceResponse> * @param instanceId The ID of a specific scaled-out instance. This is the value of the name property in the JSON response from "GET api/sites/{siteName}/instances" * @return the PagedList<DeploymentInner> object wrapped in {@link ServiceResponse} if successful. */ public Observable>> listInstanceDeploymentsSlotSinglePageAsync(final String resourceGroupName, final String name, final String slot, final String instanceId) { @@ -16158,14 +16573,14 @@ private ServiceResponse> listInstanceDeploymentsSlotDe } /** - * Get the deployment. - * Get the deployment. + * Get a deployment by its ID for an app, a specific deployment slot, and/or a specific scaled-out instance. + * Get a deployment by its ID for an app, a specific deployment slot, and/or a specific scaled-out instance. * - * @param resourceGroupName Name of resource group - * @param name Name of web app - * @param id Id of the deployment - * @param slot Name of web app slot. If not specified then will default to production slot. - * @param instanceId Id of web app instance + * @param resourceGroupName Name of the resource group to which the resource belongs. + * @param name Name of the app. + * @param id Deployment ID. + * @param slot Name of the deployment slot. If a slot is not specified, the API gets a deployment for the production slot. + * @param instanceId ID of a specific scaled-out instance. This is the value of the name property in the JSON response from "GET api/sites/{siteName}/instances" * @return the DeploymentInner object if successful. */ public DeploymentInner getInstanceDeploymentSlot(String resourceGroupName, String name, String id, String slot, String instanceId) { @@ -16173,14 +16588,14 @@ public DeploymentInner getInstanceDeploymentSlot(String resourceGroupName, Strin } /** - * Get the deployment. - * Get the deployment. + * Get a deployment by its ID for an app, a specific deployment slot, and/or a specific scaled-out instance. + * Get a deployment by its ID for an app, a specific deployment slot, and/or a specific scaled-out instance. * - * @param resourceGroupName Name of resource group - * @param name Name of web app - * @param id Id of the deployment - * @param slot Name of web app slot. If not specified then will default to production slot. - * @param instanceId Id of web app instance + * @param resourceGroupName Name of the resource group to which the resource belongs. + * @param name Name of the app. + * @param id Deployment ID. + * @param slot Name of the deployment slot. If a slot is not specified, the API gets a deployment for the production slot. + * @param instanceId ID of a specific scaled-out instance. This is the value of the name property in the JSON response from "GET api/sites/{siteName}/instances" * @param serviceCallback the async ServiceCallback to handle successful and failed responses. * @return the {@link ServiceCall} object */ @@ -16189,14 +16604,14 @@ public ServiceCall getInstanceDeploymentSlotAsync(String resour } /** - * Get the deployment. - * Get the deployment. + * Get a deployment by its ID for an app, a specific deployment slot, and/or a specific scaled-out instance. + * Get a deployment by its ID for an app, a specific deployment slot, and/or a specific scaled-out instance. * - * @param resourceGroupName Name of resource group - * @param name Name of web app - * @param id Id of the deployment - * @param slot Name of web app slot. If not specified then will default to production slot. - * @param instanceId Id of web app instance + * @param resourceGroupName Name of the resource group to which the resource belongs. + * @param name Name of the app. + * @param id Deployment ID. + * @param slot Name of the deployment slot. If a slot is not specified, the API gets a deployment for the production slot. + * @param instanceId ID of a specific scaled-out instance. This is the value of the name property in the JSON response from "GET api/sites/{siteName}/instances" * @return the observable to the DeploymentInner object */ public Observable getInstanceDeploymentSlotAsync(String resourceGroupName, String name, String id, String slot, String instanceId) { @@ -16209,14 +16624,14 @@ public DeploymentInner call(ServiceResponse response) { } /** - * Get the deployment. - * Get the deployment. + * Get a deployment by its ID for an app, a specific deployment slot, and/or a specific scaled-out instance. + * Get a deployment by its ID for an app, a specific deployment slot, and/or a specific scaled-out instance. * - * @param resourceGroupName Name of resource group - * @param name Name of web app - * @param id Id of the deployment - * @param slot Name of web app slot. If not specified then will default to production slot. - * @param instanceId Id of web app instance + * @param resourceGroupName Name of the resource group to which the resource belongs. + * @param name Name of the app. + * @param id Deployment ID. + * @param slot Name of the deployment slot. If a slot is not specified, the API gets a deployment for the production slot. + * @param instanceId ID of a specific scaled-out instance. This is the value of the name property in the JSON response from "GET api/sites/{siteName}/instances" * @return the observable to the DeploymentInner object */ public Observable> getInstanceDeploymentSlotWithServiceResponseAsync(String resourceGroupName, String name, String id, String slot, String instanceId) { @@ -16261,15 +16676,15 @@ private ServiceResponse getInstanceDeploymentSlotDelegate(Respo } /** - * Create a deployment. - * Create a deployment. + * Create a deployment for an app, a specific deployment slot, and/or a specific scaled-out instance. + * Create a deployment for an app, a specific deployment slot, and/or a specific scaled-out instance. * - * @param resourceGroupName Name of resource group - * @param name Name of web app - * @param id Id of the deployment - * @param slot Name of web app slot. If not specified then will default to production slot. - * @param instanceId Id of web app instance - * @param deployment Details of deployment + * @param resourceGroupName Name of the resource group to which the resource belongs. + * @param name Name of the app. + * @param id ID of an existing deployment. + * @param slot Name of the deployment slot. If a slot is not specified, the API creates a deployment for the production slot. + * @param instanceId ID of a specific scaled-out instance. This is the value of the name property in the JSON response from "GET api/sites/{siteName}/instances" + * @param deployment Deployment details. * @return the DeploymentInner object if successful. */ public DeploymentInner createInstanceDeploymentSlot(String resourceGroupName, String name, String id, String slot, String instanceId, DeploymentInner deployment) { @@ -16277,15 +16692,15 @@ public DeploymentInner createInstanceDeploymentSlot(String resourceGroupName, St } /** - * Create a deployment. - * Create a deployment. + * Create a deployment for an app, a specific deployment slot, and/or a specific scaled-out instance. + * Create a deployment for an app, a specific deployment slot, and/or a specific scaled-out instance. * - * @param resourceGroupName Name of resource group - * @param name Name of web app - * @param id Id of the deployment - * @param slot Name of web app slot. If not specified then will default to production slot. - * @param instanceId Id of web app instance - * @param deployment Details of deployment + * @param resourceGroupName Name of the resource group to which the resource belongs. + * @param name Name of the app. + * @param id ID of an existing deployment. + * @param slot Name of the deployment slot. If a slot is not specified, the API creates a deployment for the production slot. + * @param instanceId ID of a specific scaled-out instance. This is the value of the name property in the JSON response from "GET api/sites/{siteName}/instances" + * @param deployment Deployment details. * @param serviceCallback the async ServiceCallback to handle successful and failed responses. * @return the {@link ServiceCall} object */ @@ -16294,15 +16709,15 @@ public ServiceCall createInstanceDeploymentSlotAsync(String res } /** - * Create a deployment. - * Create a deployment. + * Create a deployment for an app, a specific deployment slot, and/or a specific scaled-out instance. + * Create a deployment for an app, a specific deployment slot, and/or a specific scaled-out instance. * - * @param resourceGroupName Name of resource group - * @param name Name of web app - * @param id Id of the deployment - * @param slot Name of web app slot. If not specified then will default to production slot. - * @param instanceId Id of web app instance - * @param deployment Details of deployment + * @param resourceGroupName Name of the resource group to which the resource belongs. + * @param name Name of the app. + * @param id ID of an existing deployment. + * @param slot Name of the deployment slot. If a slot is not specified, the API creates a deployment for the production slot. + * @param instanceId ID of a specific scaled-out instance. This is the value of the name property in the JSON response from "GET api/sites/{siteName}/instances" + * @param deployment Deployment details. * @return the observable to the DeploymentInner object */ public Observable createInstanceDeploymentSlotAsync(String resourceGroupName, String name, String id, String slot, String instanceId, DeploymentInner deployment) { @@ -16315,15 +16730,15 @@ public DeploymentInner call(ServiceResponse response) { } /** - * Create a deployment. - * Create a deployment. + * Create a deployment for an app, a specific deployment slot, and/or a specific scaled-out instance. + * Create a deployment for an app, a specific deployment slot, and/or a specific scaled-out instance. * - * @param resourceGroupName Name of resource group - * @param name Name of web app - * @param id Id of the deployment - * @param slot Name of web app slot. If not specified then will default to production slot. - * @param instanceId Id of web app instance - * @param deployment Details of deployment + * @param resourceGroupName Name of the resource group to which the resource belongs. + * @param name Name of the app. + * @param id ID of an existing deployment. + * @param slot Name of the deployment slot. If a slot is not specified, the API creates a deployment for the production slot. + * @param instanceId ID of a specific scaled-out instance. This is the value of the name property in the JSON response from "GET api/sites/{siteName}/instances" + * @param deployment Deployment details. * @return the observable to the DeploymentInner object */ public Observable> createInstanceDeploymentSlotWithServiceResponseAsync(String resourceGroupName, String name, String id, String slot, String instanceId, DeploymentInner deployment) { @@ -16372,68 +16787,67 @@ private ServiceResponse createInstanceDeploymentSlotDelegate(Re } /** - * Delete the deployment. - * Delete the deployment. + * Delete a deployment by its ID for an app, a specific deployment slot, and/or a specific scaled-out instance. + * Delete a deployment by its ID for an app, a specific deployment slot, and/or a specific scaled-out instance. * - * @param resourceGroupName Name of resource group - * @param name Name of web app - * @param id Id of the deployment - * @param slot Name of web app slot. If not specified then will default to production slot. - * @param instanceId Id of web app instance - * @return the Object object if successful. + * @param resourceGroupName Name of the resource group to which the resource belongs. + * @param name Name of the app. + * @param id Deployment ID. + * @param slot Name of the deployment slot. If a slot is not specified, the API deletes a deployment for the production slot. + * @param instanceId ID of a specific scaled-out instance. This is the value of the name property in the JSON response from "GET api/sites/{siteName}/instances" */ - public Object deleteInstanceDeploymentSlot(String resourceGroupName, String name, String id, String slot, String instanceId) { - return deleteInstanceDeploymentSlotWithServiceResponseAsync(resourceGroupName, name, id, slot, instanceId).toBlocking().single().getBody(); + public void deleteInstanceDeploymentSlot(String resourceGroupName, String name, String id, String slot, String instanceId) { + deleteInstanceDeploymentSlotWithServiceResponseAsync(resourceGroupName, name, id, slot, instanceId).toBlocking().single().getBody(); } /** - * Delete the deployment. - * Delete the deployment. + * Delete a deployment by its ID for an app, a specific deployment slot, and/or a specific scaled-out instance. + * Delete a deployment by its ID for an app, a specific deployment slot, and/or a specific scaled-out instance. * - * @param resourceGroupName Name of resource group - * @param name Name of web app - * @param id Id of the deployment - * @param slot Name of web app slot. If not specified then will default to production slot. - * @param instanceId Id of web app instance + * @param resourceGroupName Name of the resource group to which the resource belongs. + * @param name Name of the app. + * @param id Deployment ID. + * @param slot Name of the deployment slot. If a slot is not specified, the API deletes a deployment for the production slot. + * @param instanceId ID of a specific scaled-out instance. This is the value of the name property in the JSON response from "GET api/sites/{siteName}/instances" * @param serviceCallback the async ServiceCallback to handle successful and failed responses. * @return the {@link ServiceCall} object */ - public ServiceCall deleteInstanceDeploymentSlotAsync(String resourceGroupName, String name, String id, String slot, String instanceId, final ServiceCallback serviceCallback) { + public ServiceCall deleteInstanceDeploymentSlotAsync(String resourceGroupName, String name, String id, String slot, String instanceId, final ServiceCallback serviceCallback) { return ServiceCall.create(deleteInstanceDeploymentSlotWithServiceResponseAsync(resourceGroupName, name, id, slot, instanceId), serviceCallback); } /** - * Delete the deployment. - * Delete the deployment. + * Delete a deployment by its ID for an app, a specific deployment slot, and/or a specific scaled-out instance. + * Delete a deployment by its ID for an app, a specific deployment slot, and/or a specific scaled-out instance. * - * @param resourceGroupName Name of resource group - * @param name Name of web app - * @param id Id of the deployment - * @param slot Name of web app slot. If not specified then will default to production slot. - * @param instanceId Id of web app instance - * @return the observable to the Object object + * @param resourceGroupName Name of the resource group to which the resource belongs. + * @param name Name of the app. + * @param id Deployment ID. + * @param slot Name of the deployment slot. If a slot is not specified, the API deletes a deployment for the production slot. + * @param instanceId ID of a specific scaled-out instance. This is the value of the name property in the JSON response from "GET api/sites/{siteName}/instances" + * @return the {@link ServiceResponse} object if successful. */ - public Observable deleteInstanceDeploymentSlotAsync(String resourceGroupName, String name, String id, String slot, String instanceId) { - return deleteInstanceDeploymentSlotWithServiceResponseAsync(resourceGroupName, name, id, slot, instanceId).map(new Func1, Object>() { + public Observable deleteInstanceDeploymentSlotAsync(String resourceGroupName, String name, String id, String slot, String instanceId) { + return deleteInstanceDeploymentSlotWithServiceResponseAsync(resourceGroupName, name, id, slot, instanceId).map(new Func1, Void>() { @Override - public Object call(ServiceResponse response) { + public Void call(ServiceResponse response) { return response.getBody(); } }); } /** - * Delete the deployment. - * Delete the deployment. + * Delete a deployment by its ID for an app, a specific deployment slot, and/or a specific scaled-out instance. + * Delete a deployment by its ID for an app, a specific deployment slot, and/or a specific scaled-out instance. * - * @param resourceGroupName Name of resource group - * @param name Name of web app - * @param id Id of the deployment - * @param slot Name of web app slot. If not specified then will default to production slot. - * @param instanceId Id of web app instance - * @return the observable to the Object object + * @param resourceGroupName Name of the resource group to which the resource belongs. + * @param name Name of the app. + * @param id Deployment ID. + * @param slot Name of the deployment slot. If a slot is not specified, the API deletes a deployment for the production slot. + * @param instanceId ID of a specific scaled-out instance. This is the value of the name property in the JSON response from "GET api/sites/{siteName}/instances" + * @return the {@link ServiceResponse} object if successful. */ - public Observable> deleteInstanceDeploymentSlotWithServiceResponseAsync(String resourceGroupName, String name, String id, String slot, String instanceId) { + public Observable> deleteInstanceDeploymentSlotWithServiceResponseAsync(String resourceGroupName, String name, String id, String slot, String instanceId) { if (resourceGroupName == null) { throw new IllegalArgumentException("Parameter resourceGroupName is required and cannot be null."); } @@ -16454,11 +16868,11 @@ public Observable> deleteInstanceDeploymentSlotWithServi } final String apiVersion = "2016-08-01"; return service.deleteInstanceDeploymentSlot(resourceGroupName, name, id, slot, instanceId, this.client.subscriptionId(), apiVersion, this.client.acceptLanguage(), this.client.userAgent()) - .flatMap(new Func1, Observable>>() { + .flatMap(new Func1, Observable>>() { @Override - public Observable> call(Response response) { + public Observable> call(Response response) { try { - ServiceResponse clientResponse = deleteInstanceDeploymentSlotDelegate(response); + ServiceResponse clientResponse = deleteInstanceDeploymentSlotDelegate(response); return Observable.just(clientResponse); } catch (Throwable t) { return Observable.error(t); @@ -16467,20 +16881,20 @@ public Observable> call(Response response) }); } - private ServiceResponse deleteInstanceDeploymentSlotDelegate(Response response) throws CloudException, IOException, IllegalArgumentException { - return new AzureServiceResponseBuilder(this.client.mapperAdapter()) - .register(200, new TypeToken() { }.getType()) - .registerError(CloudException.class) + private ServiceResponse deleteInstanceDeploymentSlotDelegate(Response response) throws CloudException, IOException, IllegalArgumentException { + return new AzureServiceResponseBuilder(this.client.mapperAdapter()) + .register(200, new TypeToken() { }.getType()) + .register(204, new TypeToken() { }.getType()) .build(response); } /** - * Creates a new web app or modifies an existing web app. - * Creates a new web app or modifies an existing web app. + * Shows whether an app can be cloned to another resource group or subscription. + * Shows whether an app can be cloned to another resource group or subscription. * - * @param resourceGroupName Name of the resource group - * @param name Name of the web app - * @param slot Name of web app slot. If not specified then will default to production slot. + * @param resourceGroupName Name of the resource group to which the resource belongs. + * @param name Name of the app. + * @param slot Name of the deployment slot. By default, this API returns information on the production slot. * @return the SiteCloneabilityInner object if successful. */ public SiteCloneabilityInner isCloneableSlot(String resourceGroupName, String name, String slot) { @@ -16488,12 +16902,12 @@ public SiteCloneabilityInner isCloneableSlot(String resourceGroupName, String na } /** - * Creates a new web app or modifies an existing web app. - * Creates a new web app or modifies an existing web app. + * Shows whether an app can be cloned to another resource group or subscription. + * Shows whether an app can be cloned to another resource group or subscription. * - * @param resourceGroupName Name of the resource group - * @param name Name of the web app - * @param slot Name of web app slot. If not specified then will default to production slot. + * @param resourceGroupName Name of the resource group to which the resource belongs. + * @param name Name of the app. + * @param slot Name of the deployment slot. By default, this API returns information on the production slot. * @param serviceCallback the async ServiceCallback to handle successful and failed responses. * @return the {@link ServiceCall} object */ @@ -16502,12 +16916,12 @@ public ServiceCall isCloneableSlotAsync(String resourceGr } /** - * Creates a new web app or modifies an existing web app. - * Creates a new web app or modifies an existing web app. + * Shows whether an app can be cloned to another resource group or subscription. + * Shows whether an app can be cloned to another resource group or subscription. * - * @param resourceGroupName Name of the resource group - * @param name Name of the web app - * @param slot Name of web app slot. If not specified then will default to production slot. + * @param resourceGroupName Name of the resource group to which the resource belongs. + * @param name Name of the app. + * @param slot Name of the deployment slot. By default, this API returns information on the production slot. * @return the observable to the SiteCloneabilityInner object */ public Observable isCloneableSlotAsync(String resourceGroupName, String name, String slot) { @@ -16520,12 +16934,12 @@ public SiteCloneabilityInner call(ServiceResponse respons } /** - * Creates a new web app or modifies an existing web app. - * Creates a new web app or modifies an existing web app. + * Shows whether an app can be cloned to another resource group or subscription. + * Shows whether an app can be cloned to another resource group or subscription. * - * @param resourceGroupName Name of the resource group - * @param name Name of the web app - * @param slot Name of web app slot. If not specified then will default to production slot. + * @param resourceGroupName Name of the resource group to which the resource belongs. + * @param name Name of the app. + * @param slot Name of the deployment slot. By default, this API returns information on the production slot. * @return the observable to the SiteCloneabilityInner object */ public Observable> isCloneableSlotWithServiceResponseAsync(String resourceGroupName, String name, String slot) { @@ -16564,40 +16978,40 @@ private ServiceResponse isCloneableSlotDelegate(Response< } /** - * Gets metric definitions for web app. - * Gets metric definitions for web app. + * Gets all metric definitions of an app (or deployment slot, if specified). + * Gets all metric definitions of an app (or deployment slot, if specified). * - * @param resourceGroupName Name of resource group - * @param name Name of web app - * @param slot Name of web app slot. If not specified then will default to production slot. - * @return the PagedList<MetricDefinitionInner> object if successful. + * @param resourceGroupName Name of the resource group to which the resource belongs. + * @param name Name of the app. + * @param slot Name of the deployment slot. If a slot is not specified, the API will get metric definitions of the production slot. + * @return the PagedList<ResourceMetricDefinitionInner> object if successful. */ - public PagedList listMetricDefinitionsSlot(final String resourceGroupName, final String name, final String slot) { - ServiceResponse> response = listMetricDefinitionsSlotSinglePageAsync(resourceGroupName, name, slot).toBlocking().single(); - return new PagedList(response.getBody()) { + public PagedList listMetricDefinitionsSlot(final String resourceGroupName, final String name, final String slot) { + ServiceResponse> response = listMetricDefinitionsSlotSinglePageAsync(resourceGroupName, name, slot).toBlocking().single(); + return new PagedList(response.getBody()) { @Override - public Page nextPage(String nextPageLink) { + public Page nextPage(String nextPageLink) { return listMetricDefinitionsSlotNextSinglePageAsync(nextPageLink).toBlocking().single().getBody(); } }; } /** - * Gets metric definitions for web app. - * Gets metric definitions for web app. + * Gets all metric definitions of an app (or deployment slot, if specified). + * Gets all metric definitions of an app (or deployment slot, if specified). * - * @param resourceGroupName Name of resource group - * @param name Name of web app - * @param slot Name of web app slot. If not specified then will default to production slot. + * @param resourceGroupName Name of the resource group to which the resource belongs. + * @param name Name of the app. + * @param slot Name of the deployment slot. If a slot is not specified, the API will get metric definitions of the production slot. * @param serviceCallback the async ServiceCallback to handle successful and failed responses. * @return the {@link ServiceCall} object */ - public ServiceCall> listMetricDefinitionsSlotAsync(final String resourceGroupName, final String name, final String slot, final ListOperationCallback serviceCallback) { + public ServiceCall> listMetricDefinitionsSlotAsync(final String resourceGroupName, final String name, final String slot, final ListOperationCallback serviceCallback) { return AzureServiceCall.create( listMetricDefinitionsSlotSinglePageAsync(resourceGroupName, name, slot), - new Func1>>>() { + new Func1>>>() { @Override - public Observable>> call(String nextPageLink) { + public Observable>> call(String nextPageLink) { return listMetricDefinitionsSlotNextSinglePageAsync(nextPageLink); } }, @@ -16605,38 +17019,38 @@ public Observable>> call(String next } /** - * Gets metric definitions for web app. - * Gets metric definitions for web app. + * Gets all metric definitions of an app (or deployment slot, if specified). + * Gets all metric definitions of an app (or deployment slot, if specified). * - * @param resourceGroupName Name of resource group - * @param name Name of web app - * @param slot Name of web app slot. If not specified then will default to production slot. - * @return the observable to the PagedList<MetricDefinitionInner> object + * @param resourceGroupName Name of the resource group to which the resource belongs. + * @param name Name of the app. + * @param slot Name of the deployment slot. If a slot is not specified, the API will get metric definitions of the production slot. + * @return the observable to the PagedList<ResourceMetricDefinitionInner> object */ - public Observable> listMetricDefinitionsSlotAsync(final String resourceGroupName, final String name, final String slot) { + public Observable> listMetricDefinitionsSlotAsync(final String resourceGroupName, final String name, final String slot) { return listMetricDefinitionsSlotWithServiceResponseAsync(resourceGroupName, name, slot) - .map(new Func1>, Page>() { + .map(new Func1>, Page>() { @Override - public Page call(ServiceResponse> response) { + public Page call(ServiceResponse> response) { return response.getBody(); } }); } /** - * Gets metric definitions for web app. - * Gets metric definitions for web app. + * Gets all metric definitions of an app (or deployment slot, if specified). + * Gets all metric definitions of an app (or deployment slot, if specified). * - * @param resourceGroupName Name of resource group - * @param name Name of web app - * @param slot Name of web app slot. If not specified then will default to production slot. - * @return the observable to the PagedList<MetricDefinitionInner> object + * @param resourceGroupName Name of the resource group to which the resource belongs. + * @param name Name of the app. + * @param slot Name of the deployment slot. If a slot is not specified, the API will get metric definitions of the production slot. + * @return the observable to the PagedList<ResourceMetricDefinitionInner> object */ - public Observable>> listMetricDefinitionsSlotWithServiceResponseAsync(final String resourceGroupName, final String name, final String slot) { + public Observable>> listMetricDefinitionsSlotWithServiceResponseAsync(final String resourceGroupName, final String name, final String slot) { return listMetricDefinitionsSlotSinglePageAsync(resourceGroupName, name, slot) - .concatMap(new Func1>, Observable>>>() { + .concatMap(new Func1>, Observable>>>() { @Override - public Observable>> call(ServiceResponse> page) { + public Observable>> call(ServiceResponse> page) { String nextPageLink = page.getBody().getNextPageLink(); if (nextPageLink == null) { return Observable.just(page); @@ -16647,15 +17061,15 @@ public Observable>> call(ServiceResp } /** - * Gets metric definitions for web app. - * Gets metric definitions for web app. + * Gets all metric definitions of an app (or deployment slot, if specified). + * Gets all metric definitions of an app (or deployment slot, if specified). * - ServiceResponse> * @param resourceGroupName Name of resource group - ServiceResponse> * @param name Name of web app - ServiceResponse> * @param slot Name of web app slot. If not specified then will default to production slot. - * @return the PagedList<MetricDefinitionInner> object wrapped in {@link ServiceResponse} if successful. + ServiceResponse> * @param resourceGroupName Name of the resource group to which the resource belongs. + ServiceResponse> * @param name Name of the app. + ServiceResponse> * @param slot Name of the deployment slot. If a slot is not specified, the API will get metric definitions of the production slot. + * @return the PagedList<ResourceMetricDefinitionInner> object wrapped in {@link ServiceResponse} if successful. */ - public Observable>> listMetricDefinitionsSlotSinglePageAsync(final String resourceGroupName, final String name, final String slot) { + public Observable>> listMetricDefinitionsSlotSinglePageAsync(final String resourceGroupName, final String name, final String slot) { if (resourceGroupName == null) { throw new IllegalArgumentException("Parameter resourceGroupName is required and cannot be null."); } @@ -16670,12 +17084,12 @@ public Observable>> listMetricDefini } final String apiVersion = "2016-08-01"; return service.listMetricDefinitionsSlot(resourceGroupName, name, slot, this.client.subscriptionId(), apiVersion, this.client.acceptLanguage(), this.client.userAgent()) - .flatMap(new Func1, Observable>>>() { + .flatMap(new Func1, Observable>>>() { @Override - public Observable>> call(Response response) { + public Observable>> call(Response response) { try { - ServiceResponse> result = listMetricDefinitionsSlotDelegate(response); - return Observable.just(new ServiceResponse>(result.getBody(), result.getResponse())); + ServiceResponse> result = listMetricDefinitionsSlotDelegate(response); + return Observable.just(new ServiceResponse>(result.getBody(), result.getResponse())); } catch (Throwable t) { return Observable.error(t); } @@ -16683,20 +17097,20 @@ public Observable>> call(Response> listMetricDefinitionsSlotDelegate(Response response) throws CloudException, IOException, IllegalArgumentException { - return new AzureServiceResponseBuilder, CloudException>(this.client.mapperAdapter()) - .register(200, new TypeToken>() { }.getType()) + private ServiceResponse> listMetricDefinitionsSlotDelegate(Response response) throws CloudException, IOException, IllegalArgumentException { + return new AzureServiceResponseBuilder, CloudException>(this.client.mapperAdapter()) + .register(200, new TypeToken>() { }.getType()) .registerError(CloudException.class) .build(response); } /** - * Gets metrics for web app. - * Gets metrics for web app. + * Gets performance metrics of an app (or deployment slot, if specified). + * Gets performance metrics of an app (or deployment slot, if specified). * - * @param resourceGroupName Name of resource group - * @param name Name of web app - * @param slot Name of web app slot. If not specified then will default to production slot. + * @param resourceGroupName Name of the resource group to which the resource belongs. + * @param name Name of the app. + * @param slot Name of the deployment slot. If a slot is not specified, the API will get metrics of the production slot. * @return the PagedList<ResourceMetricInner> object if successful. */ public PagedList listMetricsSlot(final String resourceGroupName, final String name, final String slot) { @@ -16710,12 +17124,12 @@ public Page nextPage(String nextPageLink) { } /** - * Gets metrics for web app. - * Gets metrics for web app. + * Gets performance metrics of an app (or deployment slot, if specified). + * Gets performance metrics of an app (or deployment slot, if specified). * - * @param resourceGroupName Name of resource group - * @param name Name of web app - * @param slot Name of web app slot. If not specified then will default to production slot. + * @param resourceGroupName Name of the resource group to which the resource belongs. + * @param name Name of the app. + * @param slot Name of the deployment slot. If a slot is not specified, the API will get metrics of the production slot. * @param serviceCallback the async ServiceCallback to handle successful and failed responses. * @return the {@link ServiceCall} object */ @@ -16732,12 +17146,12 @@ public Observable>> call(String nextPa } /** - * Gets metrics for web app. - * Gets metrics for web app. + * Gets performance metrics of an app (or deployment slot, if specified). + * Gets performance metrics of an app (or deployment slot, if specified). * - * @param resourceGroupName Name of resource group - * @param name Name of web app - * @param slot Name of web app slot. If not specified then will default to production slot. + * @param resourceGroupName Name of the resource group to which the resource belongs. + * @param name Name of the app. + * @param slot Name of the deployment slot. If a slot is not specified, the API will get metrics of the production slot. * @return the observable to the PagedList<ResourceMetricInner> object */ public Observable> listMetricsSlotAsync(final String resourceGroupName, final String name, final String slot) { @@ -16751,12 +17165,12 @@ public Page call(ServiceResponse> } /** - * Gets metrics for web app. - * Gets metrics for web app. + * Gets performance metrics of an app (or deployment slot, if specified). + * Gets performance metrics of an app (or deployment slot, if specified). * - * @param resourceGroupName Name of resource group - * @param name Name of web app - * @param slot Name of web app slot. If not specified then will default to production slot. + * @param resourceGroupName Name of the resource group to which the resource belongs. + * @param name Name of the app. + * @param slot Name of the deployment slot. If a slot is not specified, the API will get metrics of the production slot. * @return the observable to the PagedList<ResourceMetricInner> object */ public Observable>> listMetricsSlotWithServiceResponseAsync(final String resourceGroupName, final String name, final String slot) { @@ -16774,12 +17188,12 @@ public Observable>> call(ServiceRespon } /** - * Gets metrics for web app. - * Gets metrics for web app. + * Gets performance metrics of an app (or deployment slot, if specified). + * Gets performance metrics of an app (or deployment slot, if specified). * - * @param resourceGroupName Name of resource group - * @param name Name of web app - * @param slot Name of web app slot. If not specified then will default to production slot. + * @param resourceGroupName Name of the resource group to which the resource belongs. + * @param name Name of the app. + * @param slot Name of the deployment slot. If a slot is not specified, the API will get metrics of the production slot. * @return the PagedList<ResourceMetricInner> object wrapped in {@link ServiceResponse} if successful. */ public Observable>> listMetricsSlotSinglePageAsync(final String resourceGroupName, final String name, final String slot) { @@ -16813,14 +17227,14 @@ public Observable>> call(Response listMetricsSlot(final String resourceGroupName, final String name, final String slot, final Boolean details, final String filter) { @@ -16834,14 +17248,14 @@ public Page nextPage(String nextPageLink) { } /** - * Gets metrics for web app. - * Gets metrics for web app. + * Gets performance metrics of an app (or deployment slot, if specified). + * Gets performance metrics of an app (or deployment slot, if specified). * - * @param resourceGroupName Name of resource group - * @param name Name of web app - * @param slot Name of web app slot. If not specified then will default to production slot. - * @param details If true, metric details are included in response - * @param filter Return only usages/metrics specified in the filter. Filter conforms to odata syntax. Example: $filter=(name.value eq 'Metric1' or name.value eq 'Metric2') and startTime eq '2014-01-01T00:00:00Z' and endTime eq '2014-12-31T23:59:59Z' and timeGrain eq duration'[Hour|Minute|Day]'. + * @param resourceGroupName Name of the resource group to which the resource belongs. + * @param name Name of the app. + * @param slot Name of the deployment slot. If a slot is not specified, the API will get metrics of the production slot. + * @param details Specify "true" to include metric details in the response. It is "false" by default. + * @param filter Return only metrics specified in the filter (using OData syntax). For example: $filter=(name.value eq 'Metric1' or name.value eq 'Metric2') and startTime eq '2014-01-01T00:00:00Z' and endTime eq '2014-12-31T23:59:59Z' and timeGrain eq duration'[Hour|Minute|Day]'. * @param serviceCallback the async ServiceCallback to handle successful and failed responses. * @return the {@link ServiceCall} object */ @@ -16858,14 +17272,14 @@ public Observable>> call(String nextPa } /** - * Gets metrics for web app. - * Gets metrics for web app. + * Gets performance metrics of an app (or deployment slot, if specified). + * Gets performance metrics of an app (or deployment slot, if specified). * - * @param resourceGroupName Name of resource group - * @param name Name of web app - * @param slot Name of web app slot. If not specified then will default to production slot. - * @param details If true, metric details are included in response - * @param filter Return only usages/metrics specified in the filter. Filter conforms to odata syntax. Example: $filter=(name.value eq 'Metric1' or name.value eq 'Metric2') and startTime eq '2014-01-01T00:00:00Z' and endTime eq '2014-12-31T23:59:59Z' and timeGrain eq duration'[Hour|Minute|Day]'. + * @param resourceGroupName Name of the resource group to which the resource belongs. + * @param name Name of the app. + * @param slot Name of the deployment slot. If a slot is not specified, the API will get metrics of the production slot. + * @param details Specify "true" to include metric details in the response. It is "false" by default. + * @param filter Return only metrics specified in the filter (using OData syntax). For example: $filter=(name.value eq 'Metric1' or name.value eq 'Metric2') and startTime eq '2014-01-01T00:00:00Z' and endTime eq '2014-12-31T23:59:59Z' and timeGrain eq duration'[Hour|Minute|Day]'. * @return the observable to the PagedList<ResourceMetricInner> object */ public Observable> listMetricsSlotAsync(final String resourceGroupName, final String name, final String slot, final Boolean details, final String filter) { @@ -16879,14 +17293,14 @@ public Page call(ServiceResponse> } /** - * Gets metrics for web app. - * Gets metrics for web app. + * Gets performance metrics of an app (or deployment slot, if specified). + * Gets performance metrics of an app (or deployment slot, if specified). * - * @param resourceGroupName Name of resource group - * @param name Name of web app - * @param slot Name of web app slot. If not specified then will default to production slot. - * @param details If true, metric details are included in response - * @param filter Return only usages/metrics specified in the filter. Filter conforms to odata syntax. Example: $filter=(name.value eq 'Metric1' or name.value eq 'Metric2') and startTime eq '2014-01-01T00:00:00Z' and endTime eq '2014-12-31T23:59:59Z' and timeGrain eq duration'[Hour|Minute|Day]'. + * @param resourceGroupName Name of the resource group to which the resource belongs. + * @param name Name of the app. + * @param slot Name of the deployment slot. If a slot is not specified, the API will get metrics of the production slot. + * @param details Specify "true" to include metric details in the response. It is "false" by default. + * @param filter Return only metrics specified in the filter (using OData syntax). For example: $filter=(name.value eq 'Metric1' or name.value eq 'Metric2') and startTime eq '2014-01-01T00:00:00Z' and endTime eq '2014-12-31T23:59:59Z' and timeGrain eq duration'[Hour|Minute|Day]'. * @return the observable to the PagedList<ResourceMetricInner> object */ public Observable>> listMetricsSlotWithServiceResponseAsync(final String resourceGroupName, final String name, final String slot, final Boolean details, final String filter) { @@ -16904,14 +17318,14 @@ public Observable>> call(ServiceRespon } /** - * Gets metrics for web app. - * Gets metrics for web app. + * Gets performance metrics of an app (or deployment slot, if specified). + * Gets performance metrics of an app (or deployment slot, if specified). * - ServiceResponse> * @param resourceGroupName Name of resource group - ServiceResponse> * @param name Name of web app - ServiceResponse> * @param slot Name of web app slot. If not specified then will default to production slot. - ServiceResponse> * @param details If true, metric details are included in response - ServiceResponse> * @param filter Return only usages/metrics specified in the filter. Filter conforms to odata syntax. Example: $filter=(name.value eq 'Metric1' or name.value eq 'Metric2') and startTime eq '2014-01-01T00:00:00Z' and endTime eq '2014-12-31T23:59:59Z' and timeGrain eq duration'[Hour|Minute|Day]'. + ServiceResponse> * @param resourceGroupName Name of the resource group to which the resource belongs. + ServiceResponse> * @param name Name of the app. + ServiceResponse> * @param slot Name of the deployment slot. If a slot is not specified, the API will get metrics of the production slot. + ServiceResponse> * @param details Specify "true" to include metric details in the response. It is "false" by default. + ServiceResponse> * @param filter Return only metrics specified in the filter (using OData syntax). For example: $filter=(name.value eq 'Metric1' or name.value eq 'Metric2') and startTime eq '2014-01-01T00:00:00Z' and endTime eq '2014-12-31T23:59:59Z' and timeGrain eq duration'[Hour|Minute|Day]'. * @return the PagedList<ResourceMetricInner> object wrapped in {@link ServiceResponse} if successful. */ public Observable>> listMetricsSlotSinglePageAsync(final String resourceGroupName, final String name, final String slot, final Boolean details, final String filter) { @@ -16950,13 +17364,13 @@ private ServiceResponse> listMetricsSlotDelegate(R } /** - * Retrieves a view of all network features in use on this web app. - * Retrieves a view of all network features in use on this web app. + * Gets all network features used by the app (or deployment slot, if specified). + * Gets all network features used by the app (or deployment slot, if specified). * - * @param resourceGroupName The resource group name - * @param name The name of the web app + * @param resourceGroupName Name of the resource group to which the resource belongs. + * @param name Name of the app. * @param view The type of view. This can either be "summary" or "detailed". - * @param slot The name of the slot for this web app. + * @param slot Name of the deployment slot. If a slot is not specified, the API will get network features for the production slot. * @return the NetworkFeaturesInner object if successful. */ public NetworkFeaturesInner listNetworkFeaturesSlot(String resourceGroupName, String name, String view, String slot) { @@ -16964,13 +17378,13 @@ public NetworkFeaturesInner listNetworkFeaturesSlot(String resourceGroupName, St } /** - * Retrieves a view of all network features in use on this web app. - * Retrieves a view of all network features in use on this web app. + * Gets all network features used by the app (or deployment slot, if specified). + * Gets all network features used by the app (or deployment slot, if specified). * - * @param resourceGroupName The resource group name - * @param name The name of the web app + * @param resourceGroupName Name of the resource group to which the resource belongs. + * @param name Name of the app. * @param view The type of view. This can either be "summary" or "detailed". - * @param slot The name of the slot for this web app. + * @param slot Name of the deployment slot. If a slot is not specified, the API will get network features for the production slot. * @param serviceCallback the async ServiceCallback to handle successful and failed responses. * @return the {@link ServiceCall} object */ @@ -16979,13 +17393,13 @@ public ServiceCall listNetworkFeaturesSlotAsync(String res } /** - * Retrieves a view of all network features in use on this web app. - * Retrieves a view of all network features in use on this web app. + * Gets all network features used by the app (or deployment slot, if specified). + * Gets all network features used by the app (or deployment slot, if specified). * - * @param resourceGroupName The resource group name - * @param name The name of the web app + * @param resourceGroupName Name of the resource group to which the resource belongs. + * @param name Name of the app. * @param view The type of view. This can either be "summary" or "detailed". - * @param slot The name of the slot for this web app. + * @param slot Name of the deployment slot. If a slot is not specified, the API will get network features for the production slot. * @return the observable to the NetworkFeaturesInner object */ public Observable listNetworkFeaturesSlotAsync(String resourceGroupName, String name, String view, String slot) { @@ -16998,13 +17412,13 @@ public NetworkFeaturesInner call(ServiceResponse response) } /** - * Retrieves a view of all network features in use on this web app. - * Retrieves a view of all network features in use on this web app. + * Gets all network features used by the app (or deployment slot, if specified). + * Gets all network features used by the app (or deployment slot, if specified). * - * @param resourceGroupName The resource group name - * @param name The name of the web app + * @param resourceGroupName Name of the resource group to which the resource belongs. + * @param name Name of the app. * @param view The type of view. This can either be "summary" or "detailed". - * @param slot The name of the slot for this web app. + * @param slot Name of the deployment slot. If a slot is not specified, the API will get network features for the production slot. * @return the observable to the NetworkFeaturesInner object */ public Observable> listNetworkFeaturesSlotWithServiceResponseAsync(String resourceGroupName, String name, String view, String slot) { @@ -17050,7 +17464,7 @@ private ServiceResponse listNetworkFeaturesSlotDelegate(Re * Start capturing network packets for the site. * Start capturing network packets for the site. * - * @param resourceGroupName The resource group name + * @param resourceGroupName Name of the resource group to which the resource belongs. * @param name The name of the web app * @param slot The name of the slot for this web app. * @return the String object if successful. @@ -17063,7 +17477,7 @@ public String startWebSiteNetworkTraceSlot(String resourceGroupName, String name * Start capturing network packets for the site. * Start capturing network packets for the site. * - * @param resourceGroupName The resource group name + * @param resourceGroupName Name of the resource group to which the resource belongs. * @param name The name of the web app * @param slot The name of the slot for this web app. * @param serviceCallback the async ServiceCallback to handle successful and failed responses. @@ -17077,7 +17491,7 @@ public ServiceCall startWebSiteNetworkTraceSlotAsync(String resourceGrou * Start capturing network packets for the site. * Start capturing network packets for the site. * - * @param resourceGroupName The resource group name + * @param resourceGroupName Name of the resource group to which the resource belongs. * @param name The name of the web app * @param slot The name of the slot for this web app. * @return the observable to the String object @@ -17095,7 +17509,7 @@ public String call(ServiceResponse response) { * Start capturing network packets for the site. * Start capturing network packets for the site. * - * @param resourceGroupName The resource group name + * @param resourceGroupName Name of the resource group to which the resource belongs. * @param name The name of the web app * @param slot The name of the slot for this web app. * @return the observable to the String object @@ -17133,7 +17547,7 @@ public Observable> call(Response response) * Start capturing network packets for the site. * Start capturing network packets for the site. * - * @param resourceGroupName The resource group name + * @param resourceGroupName Name of the resource group to which the resource belongs. * @param name The name of the web app * @param slot The name of the slot for this web app. * @param durationInSeconds The duration to keep capturing in seconds @@ -17147,7 +17561,7 @@ public String startWebSiteNetworkTraceSlot(String resourceGroupName, String name * Start capturing network packets for the site. * Start capturing network packets for the site. * - * @param resourceGroupName The resource group name + * @param resourceGroupName Name of the resource group to which the resource belongs. * @param name The name of the web app * @param slot The name of the slot for this web app. * @param durationInSeconds The duration to keep capturing in seconds @@ -17162,7 +17576,7 @@ public ServiceCall startWebSiteNetworkTraceSlotAsync(String resourceGrou * Start capturing network packets for the site. * Start capturing network packets for the site. * - * @param resourceGroupName The resource group name + * @param resourceGroupName Name of the resource group to which the resource belongs. * @param name The name of the web app * @param slot The name of the slot for this web app. * @param durationInSeconds The duration to keep capturing in seconds @@ -17181,7 +17595,7 @@ public String call(ServiceResponse response) { * Start capturing network packets for the site. * Start capturing network packets for the site. * - * @param resourceGroupName The resource group name + * @param resourceGroupName Name of the resource group to which the resource belongs. * @param name The name of the web app * @param slot The name of the slot for this web app. * @param durationInSeconds The duration to keep capturing in seconds @@ -17226,7 +17640,7 @@ private ServiceResponse startWebSiteNetworkTraceSlotDelegate(Response stopWebSiteNetworkTraceSlotAsync(String resourceGroup * Stop ongoing capturing network packets for the site. * Stop ongoing capturing network packets for the site. * - * @param resourceGroupName The resource group name + * @param resourceGroupName Name of the resource group to which the resource belongs. * @param name The name of the web app * @param slot The name of the slot for this web app. * @return the observable to the String object @@ -17271,7 +17685,7 @@ public String call(ServiceResponse response) { * Stop ongoing capturing network packets for the site. * Stop ongoing capturing network packets for the site. * - * @param resourceGroupName The resource group name + * @param resourceGroupName Name of the resource group to which the resource belongs. * @param name The name of the web app * @param slot The name of the slot for this web app. * @return the observable to the String object @@ -17312,60 +17726,59 @@ private ServiceResponse stopWebSiteNetworkTraceSlotDelegate(Response generateNewSitePublishingPasswordSlotAsync(String resourceGroupName, String name, String slot, final ServiceCallback serviceCallback) { + public ServiceCall generateNewSitePublishingPasswordSlotAsync(String resourceGroupName, String name, String slot, final ServiceCallback serviceCallback) { return ServiceCall.create(generateNewSitePublishingPasswordSlotWithServiceResponseAsync(resourceGroupName, name, slot), serviceCallback); } /** - * Generates new random app publishing password. - * Generates new random app publishing password. + * Generates a new publishing password for an app (or deployment slot, if specified). + * Generates a new publishing password for an app (or deployment slot, if specified). * - * @param resourceGroupName Name of resource group - * @param name Name of web app - * @param slot Name of web app slot. If not specified then will default to production slot. - * @return the observable to the Object object + * @param resourceGroupName Name of the resource group to which the resource belongs. + * @param name Name of the app. + * @param slot Name of the deployment slot. If a slot is not specified, the API generate a new publishing password for the production slot. + * @return the {@link ServiceResponse} object if successful. */ - public Observable generateNewSitePublishingPasswordSlotAsync(String resourceGroupName, String name, String slot) { - return generateNewSitePublishingPasswordSlotWithServiceResponseAsync(resourceGroupName, name, slot).map(new Func1, Object>() { + public Observable generateNewSitePublishingPasswordSlotAsync(String resourceGroupName, String name, String slot) { + return generateNewSitePublishingPasswordSlotWithServiceResponseAsync(resourceGroupName, name, slot).map(new Func1, Void>() { @Override - public Object call(ServiceResponse response) { + public Void call(ServiceResponse response) { return response.getBody(); } }); } /** - * Generates new random app publishing password. - * Generates new random app publishing password. + * Generates a new publishing password for an app (or deployment slot, if specified). + * Generates a new publishing password for an app (or deployment slot, if specified). * - * @param resourceGroupName Name of resource group - * @param name Name of web app - * @param slot Name of web app slot. If not specified then will default to production slot. - * @return the observable to the Object object + * @param resourceGroupName Name of the resource group to which the resource belongs. + * @param name Name of the app. + * @param slot Name of the deployment slot. If a slot is not specified, the API generate a new publishing password for the production slot. + * @return the {@link ServiceResponse} object if successful. */ - public Observable> generateNewSitePublishingPasswordSlotWithServiceResponseAsync(String resourceGroupName, String name, String slot) { + public Observable> generateNewSitePublishingPasswordSlotWithServiceResponseAsync(String resourceGroupName, String name, String slot) { if (resourceGroupName == null) { throw new IllegalArgumentException("Parameter resourceGroupName is required and cannot be null."); } @@ -17380,107 +17793,11 @@ public Observable> generateNewSitePublishingPasswordSlot } final String apiVersion = "2016-08-01"; return service.generateNewSitePublishingPasswordSlot(resourceGroupName, name, slot, this.client.subscriptionId(), apiVersion, this.client.acceptLanguage(), this.client.userAgent()) - .flatMap(new Func1, Observable>>() { - @Override - public Observable> call(Response response) { - try { - ServiceResponse clientResponse = generateNewSitePublishingPasswordSlotDelegate(response); - return Observable.just(clientResponse); - } catch (Throwable t) { - return Observable.error(t); - } - } - }); - } - - private ServiceResponse generateNewSitePublishingPasswordSlotDelegate(Response response) throws CloudException, IOException, IllegalArgumentException { - return new AzureServiceResponseBuilder(this.client.mapperAdapter()) - .register(200, new TypeToken() { }.getType()) - .registerError(CloudException.class) - .build(response); - } - - /** - * Gets the operation for a web app. - * Gets the operation for a web app. - * - * @param resourceGroupName Name of resource group - * @param name Name of web app - * @param operationId Id of an operation - * @param slot Name of web app slot. If not specified then will default to production slot. - * @return the Object object if successful. - */ - public Object getOperationSlot(String resourceGroupName, String name, String operationId, String slot) { - return getOperationSlotWithServiceResponseAsync(resourceGroupName, name, operationId, slot).toBlocking().single().getBody(); - } - - /** - * Gets the operation for a web app. - * Gets the operation for a web app. - * - * @param resourceGroupName Name of resource group - * @param name Name of web app - * @param operationId Id of an operation - * @param slot Name of web app slot. If not specified then will default to production slot. - * @param serviceCallback the async ServiceCallback to handle successful and failed responses. - * @return the {@link ServiceCall} object - */ - public ServiceCall getOperationSlotAsync(String resourceGroupName, String name, String operationId, String slot, final ServiceCallback serviceCallback) { - return ServiceCall.create(getOperationSlotWithServiceResponseAsync(resourceGroupName, name, operationId, slot), serviceCallback); - } - - /** - * Gets the operation for a web app. - * Gets the operation for a web app. - * - * @param resourceGroupName Name of resource group - * @param name Name of web app - * @param operationId Id of an operation - * @param slot Name of web app slot. If not specified then will default to production slot. - * @return the observable to the Object object - */ - public Observable getOperationSlotAsync(String resourceGroupName, String name, String operationId, String slot) { - return getOperationSlotWithServiceResponseAsync(resourceGroupName, name, operationId, slot).map(new Func1, Object>() { - @Override - public Object call(ServiceResponse response) { - return response.getBody(); - } - }); - } - - /** - * Gets the operation for a web app. - * Gets the operation for a web app. - * - * @param resourceGroupName Name of resource group - * @param name Name of web app - * @param operationId Id of an operation - * @param slot Name of web app slot. If not specified then will default to production slot. - * @return the observable to the Object object - */ - public Observable> getOperationSlotWithServiceResponseAsync(String resourceGroupName, String name, String operationId, String slot) { - if (resourceGroupName == null) { - throw new IllegalArgumentException("Parameter resourceGroupName is required and cannot be null."); - } - if (name == null) { - throw new IllegalArgumentException("Parameter name is required and cannot be null."); - } - if (operationId == null) { - throw new IllegalArgumentException("Parameter operationId is required and cannot be null."); - } - if (slot == null) { - throw new IllegalArgumentException("Parameter slot is required and cannot be null."); - } - if (this.client.subscriptionId() == null) { - throw new IllegalArgumentException("Parameter this.client.subscriptionId() is required and cannot be null."); - } - final String apiVersion = "2016-08-01"; - return service.getOperationSlot(resourceGroupName, name, operationId, slot, this.client.subscriptionId(), apiVersion, this.client.acceptLanguage(), this.client.userAgent()) - .flatMap(new Func1, Observable>>() { + .flatMap(new Func1, Observable>>() { @Override - public Observable> call(Response response) { + public Observable> call(Response response) { try { - ServiceResponse clientResponse = getOperationSlotDelegate(response); + ServiceResponse clientResponse = generateNewSitePublishingPasswordSlotDelegate(response); return Observable.just(clientResponse); } catch (Throwable t) { return Observable.error(t); @@ -17489,10 +17806,9 @@ public Observable> call(Response response) }); } - private ServiceResponse getOperationSlotDelegate(Response response) throws CloudException, IOException, IllegalArgumentException { - return new AzureServiceResponseBuilder(this.client.mapperAdapter()) - .register(200, new TypeToken() { }.getType()) - .registerError(CloudException.class) + private ServiceResponse generateNewSitePublishingPasswordSlotDelegate(Response response) throws CloudException, IOException, IllegalArgumentException { + return new AzureServiceResponseBuilder(this.client.mapperAdapter()) + .register(204, new TypeToken() { }.getType()) .build(response); } @@ -17500,7 +17816,7 @@ private ServiceResponse getOperationSlotDelegate(Response * Gets perfmon counters for web app. * Gets perfmon counters for web app. * - * @param resourceGroupName Name of resource group + * @param resourceGroupName Name of the resource group to which the resource belongs. * @param name Name of web app * @param slot Name of web app slot. If not specified then will default to production slot. **** CURRENTLY UNUSED ***** * @return the PagedList<PerfMonResponseInner> object if successful. @@ -17519,7 +17835,7 @@ public Page nextPage(String nextPageLink) { * Gets perfmon counters for web app. * Gets perfmon counters for web app. * - * @param resourceGroupName Name of resource group + * @param resourceGroupName Name of the resource group to which the resource belongs. * @param name Name of web app * @param slot Name of web app slot. If not specified then will default to production slot. **** CURRENTLY UNUSED ***** * @param serviceCallback the async ServiceCallback to handle successful and failed responses. @@ -17541,7 +17857,7 @@ public Observable>> call(String nextP * Gets perfmon counters for web app. * Gets perfmon counters for web app. * - * @param resourceGroupName Name of resource group + * @param resourceGroupName Name of the resource group to which the resource belongs. * @param name Name of web app * @param slot Name of web app slot. If not specified then will default to production slot. **** CURRENTLY UNUSED ***** * @return the observable to the PagedList<PerfMonResponseInner> object @@ -17560,7 +17876,7 @@ public Page call(ServiceResponse>> call(ServiceRespo * Gets perfmon counters for web app. * Gets perfmon counters for web app. * - * @param resourceGroupName Name of resource group + * @param resourceGroupName Name of the resource group to which the resource belongs. * @param name Name of web app * @param slot Name of web app slot. If not specified then will default to production slot. **** CURRENTLY UNUSED ***** * @return the PagedList<PerfMonResponseInner> object wrapped in {@link ServiceResponse} if successful. @@ -17621,7 +17937,7 @@ public Observable>> call(Response nextPage(String nextPageLink) { * Gets perfmon counters for web app. * Gets perfmon counters for web app. * - * @param resourceGroupName Name of resource group + * @param resourceGroupName Name of the resource group to which the resource belongs. * @param name Name of web app * @param slot Name of web app slot. If not specified then will default to production slot. **** CURRENTLY UNUSED ***** * @param filter Return only usages/metrics specified in the filter. Filter conforms to odata syntax. Example: $filter=(startTime eq '2014-01-01T00:00:00Z' and endTime eq '2014-12-31T23:59:59Z' and timeGrain eq duration'[Hour|Minute|Day]'. @@ -17664,7 +17980,7 @@ public Observable>> call(String nextP * Gets perfmon counters for web app. * Gets perfmon counters for web app. * - * @param resourceGroupName Name of resource group + * @param resourceGroupName Name of the resource group to which the resource belongs. * @param name Name of web app * @param slot Name of web app slot. If not specified then will default to production slot. **** CURRENTLY UNUSED ***** * @param filter Return only usages/metrics specified in the filter. Filter conforms to odata syntax. Example: $filter=(startTime eq '2014-01-01T00:00:00Z' and endTime eq '2014-12-31T23:59:59Z' and timeGrain eq duration'[Hour|Minute|Day]'. @@ -17684,7 +18000,7 @@ public Page call(ServiceResponse>> call(ServiceRespo * Gets perfmon counters for web app. * Gets perfmon counters for web app. * - ServiceResponse> * @param resourceGroupName Name of resource group + ServiceResponse> * @param resourceGroupName Name of the resource group to which the resource belongs. ServiceResponse> * @param name Name of web app ServiceResponse> * @param slot Name of web app slot. If not specified then will default to production slot. **** CURRENTLY UNUSED ***** ServiceResponse> * @param filter Return only usages/metrics specified in the filter. Filter conforms to odata syntax. Example: $filter=(startTime eq '2014-01-01T00:00:00Z' and endTime eq '2014-12-31T23:59:59Z' and timeGrain eq duration'[Hour|Minute|Day]'. @@ -17750,60 +18066,60 @@ private ServiceResponse> listPerfMonCountersSlotD } /** - * Gets sites's event logs. - * Gets sites's event logs. + * Gets web app's event logs. + * Gets web app's event logs. * - * @param resourceGroupName Name of resource group + * @param resourceGroupName Name of the resource group to which the resource belongs. * @param name Name of web app * @param slot Name of web app slot. If not specified then will default to production slot. - * @return the List<Object> object if successful. + * @return the SitePhpErrorLogFlagInner object if successful. */ - public List getSitePhpErrorLogFlagSlot(String resourceGroupName, String name, String slot) { + public SitePhpErrorLogFlagInner getSitePhpErrorLogFlagSlot(String resourceGroupName, String name, String slot) { return getSitePhpErrorLogFlagSlotWithServiceResponseAsync(resourceGroupName, name, slot).toBlocking().single().getBody(); } /** - * Gets sites's event logs. - * Gets sites's event logs. + * Gets web app's event logs. + * Gets web app's event logs. * - * @param resourceGroupName Name of resource group + * @param resourceGroupName Name of the resource group to which the resource belongs. * @param name Name of web app * @param slot Name of web app slot. If not specified then will default to production slot. * @param serviceCallback the async ServiceCallback to handle successful and failed responses. * @return the {@link ServiceCall} object */ - public ServiceCall> getSitePhpErrorLogFlagSlotAsync(String resourceGroupName, String name, String slot, final ServiceCallback> serviceCallback) { + public ServiceCall getSitePhpErrorLogFlagSlotAsync(String resourceGroupName, String name, String slot, final ServiceCallback serviceCallback) { return ServiceCall.create(getSitePhpErrorLogFlagSlotWithServiceResponseAsync(resourceGroupName, name, slot), serviceCallback); } /** - * Gets sites's event logs. - * Gets sites's event logs. + * Gets web app's event logs. + * Gets web app's event logs. * - * @param resourceGroupName Name of resource group + * @param resourceGroupName Name of the resource group to which the resource belongs. * @param name Name of web app * @param slot Name of web app slot. If not specified then will default to production slot. - * @return the observable to the List<Object> object + * @return the observable to the SitePhpErrorLogFlagInner object */ - public Observable> getSitePhpErrorLogFlagSlotAsync(String resourceGroupName, String name, String slot) { - return getSitePhpErrorLogFlagSlotWithServiceResponseAsync(resourceGroupName, name, slot).map(new Func1>, List>() { + public Observable getSitePhpErrorLogFlagSlotAsync(String resourceGroupName, String name, String slot) { + return getSitePhpErrorLogFlagSlotWithServiceResponseAsync(resourceGroupName, name, slot).map(new Func1, SitePhpErrorLogFlagInner>() { @Override - public List call(ServiceResponse> response) { + public SitePhpErrorLogFlagInner call(ServiceResponse response) { return response.getBody(); } }); } /** - * Gets sites's event logs. - * Gets sites's event logs. + * Gets web app's event logs. + * Gets web app's event logs. * - * @param resourceGroupName Name of resource group + * @param resourceGroupName Name of the resource group to which the resource belongs. * @param name Name of web app * @param slot Name of web app slot. If not specified then will default to production slot. - * @return the observable to the List<Object> object + * @return the observable to the SitePhpErrorLogFlagInner object */ - public Observable>> getSitePhpErrorLogFlagSlotWithServiceResponseAsync(String resourceGroupName, String name, String slot) { + public Observable> getSitePhpErrorLogFlagSlotWithServiceResponseAsync(String resourceGroupName, String name, String slot) { if (resourceGroupName == null) { throw new IllegalArgumentException("Parameter resourceGroupName is required and cannot be null."); } @@ -17818,11 +18134,11 @@ public Observable>> getSitePhpErrorLogFlagSlotWithS } final String apiVersion = "2016-08-01"; return service.getSitePhpErrorLogFlagSlot(resourceGroupName, name, slot, this.client.subscriptionId(), apiVersion, this.client.acceptLanguage(), this.client.userAgent()) - .flatMap(new Func1, Observable>>>() { + .flatMap(new Func1, Observable>>() { @Override - public Observable>> call(Response response) { + public Observable> call(Response response) { try { - ServiceResponse> clientResponse = getSitePhpErrorLogFlagSlotDelegate(response); + ServiceResponse clientResponse = getSitePhpErrorLogFlagSlotDelegate(response); return Observable.just(clientResponse); } catch (Throwable t) { return Observable.error(t); @@ -17831,68 +18147,68 @@ public Observable>> call(Response res }); } - private ServiceResponse> getSitePhpErrorLogFlagSlotDelegate(Response response) throws CloudException, IOException, IllegalArgumentException { - return new AzureServiceResponseBuilder, CloudException>(this.client.mapperAdapter()) - .register(200, new TypeToken>() { }.getType()) + private ServiceResponse getSitePhpErrorLogFlagSlotDelegate(Response response) throws CloudException, IOException, IllegalArgumentException { + return new AzureServiceResponseBuilder(this.client.mapperAdapter()) + .register(200, new TypeToken() { }.getType()) .registerError(CloudException.class) .build(response); } /** - * List premier add ons for web app. - * List premier add ons for web app. + * Gets the premier add-ons of an app. + * Gets the premier add-ons of an app. * - * @param resourceGroupName Resource group - * @param name web app name - * @param slot web app slot name - * @return the Object object if successful. + * @param resourceGroupName Name of the resource group to which the resource belongs. + * @param name Name of the app. + * @param slot Name of the deployment slot. If a slot is not specified, the API will get the premier add-ons for the production slot. + * @return the PremierAddOnInner object if successful. */ - public Object listPremierAddOnsSlot(String resourceGroupName, String name, String slot) { + public PremierAddOnInner listPremierAddOnsSlot(String resourceGroupName, String name, String slot) { return listPremierAddOnsSlotWithServiceResponseAsync(resourceGroupName, name, slot).toBlocking().single().getBody(); } /** - * List premier add ons for web app. - * List premier add ons for web app. + * Gets the premier add-ons of an app. + * Gets the premier add-ons of an app. * - * @param resourceGroupName Resource group - * @param name web app name - * @param slot web app slot name + * @param resourceGroupName Name of the resource group to which the resource belongs. + * @param name Name of the app. + * @param slot Name of the deployment slot. If a slot is not specified, the API will get the premier add-ons for the production slot. * @param serviceCallback the async ServiceCallback to handle successful and failed responses. * @return the {@link ServiceCall} object */ - public ServiceCall listPremierAddOnsSlotAsync(String resourceGroupName, String name, String slot, final ServiceCallback serviceCallback) { + public ServiceCall listPremierAddOnsSlotAsync(String resourceGroupName, String name, String slot, final ServiceCallback serviceCallback) { return ServiceCall.create(listPremierAddOnsSlotWithServiceResponseAsync(resourceGroupName, name, slot), serviceCallback); } /** - * List premier add ons for web app. - * List premier add ons for web app. + * Gets the premier add-ons of an app. + * Gets the premier add-ons of an app. * - * @param resourceGroupName Resource group - * @param name web app name - * @param slot web app slot name - * @return the observable to the Object object + * @param resourceGroupName Name of the resource group to which the resource belongs. + * @param name Name of the app. + * @param slot Name of the deployment slot. If a slot is not specified, the API will get the premier add-ons for the production slot. + * @return the observable to the PremierAddOnInner object */ - public Observable listPremierAddOnsSlotAsync(String resourceGroupName, String name, String slot) { - return listPremierAddOnsSlotWithServiceResponseAsync(resourceGroupName, name, slot).map(new Func1, Object>() { + public Observable listPremierAddOnsSlotAsync(String resourceGroupName, String name, String slot) { + return listPremierAddOnsSlotWithServiceResponseAsync(resourceGroupName, name, slot).map(new Func1, PremierAddOnInner>() { @Override - public Object call(ServiceResponse response) { + public PremierAddOnInner call(ServiceResponse response) { return response.getBody(); } }); } /** - * List premier add ons for web app. - * List premier add ons for web app. + * Gets the premier add-ons of an app. + * Gets the premier add-ons of an app. * - * @param resourceGroupName Resource group - * @param name web app name - * @param slot web app slot name - * @return the observable to the Object object + * @param resourceGroupName Name of the resource group to which the resource belongs. + * @param name Name of the app. + * @param slot Name of the deployment slot. If a slot is not specified, the API will get the premier add-ons for the production slot. + * @return the observable to the PremierAddOnInner object */ - public Observable> listPremierAddOnsSlotWithServiceResponseAsync(String resourceGroupName, String name, String slot) { + public Observable> listPremierAddOnsSlotWithServiceResponseAsync(String resourceGroupName, String name, String slot) { if (resourceGroupName == null) { throw new IllegalArgumentException("Parameter resourceGroupName is required and cannot be null."); } @@ -17907,11 +18223,11 @@ public Observable> listPremierAddOnsSlotWithServiceRespo } final String apiVersion = "2016-08-01"; return service.listPremierAddOnsSlot(resourceGroupName, name, slot, this.client.subscriptionId(), apiVersion, this.client.acceptLanguage(), this.client.userAgent()) - .flatMap(new Func1, Observable>>() { + .flatMap(new Func1, Observable>>() { @Override - public Observable> call(Response response) { + public Observable> call(Response response) { try { - ServiceResponse clientResponse = listPremierAddOnsSlotDelegate(response); + ServiceResponse clientResponse = listPremierAddOnsSlotDelegate(response); return Observable.just(clientResponse); } catch (Throwable t) { return Observable.error(t); @@ -17920,72 +18236,72 @@ public Observable> call(Response response) }); } - private ServiceResponse listPremierAddOnsSlotDelegate(Response response) throws CloudException, IOException, IllegalArgumentException { - return new AzureServiceResponseBuilder(this.client.mapperAdapter()) - .register(200, new TypeToken() { }.getType()) + private ServiceResponse listPremierAddOnsSlotDelegate(Response response) throws CloudException, IOException, IllegalArgumentException { + return new AzureServiceResponseBuilder(this.client.mapperAdapter()) + .register(200, new TypeToken() { }.getType()) .registerError(CloudException.class) .build(response); } /** - * Gets a specific premier add on. - * Gets a specific premier add on. + * Gets a named add-on of an app. + * Gets a named add-on of an app. * - * @param resourceGroupName Resource group - * @param name web app name - * @param premierAddOnName Premier add on - * @param slot web app slot name - * @return the Object object if successful. + * @param resourceGroupName Name of the resource group to which the resource belongs. + * @param name Name of the app. + * @param premierAddOnName Add-on name. + * @param slot Name of the deployment slot. If a slot is not specified, the API will get the named add-on for the production slot. + * @return the PremierAddOnInner object if successful. */ - public Object getPremierAddOnSlot(String resourceGroupName, String name, String premierAddOnName, String slot) { + public PremierAddOnInner getPremierAddOnSlot(String resourceGroupName, String name, String premierAddOnName, String slot) { return getPremierAddOnSlotWithServiceResponseAsync(resourceGroupName, name, premierAddOnName, slot).toBlocking().single().getBody(); } /** - * Gets a specific premier add on. - * Gets a specific premier add on. + * Gets a named add-on of an app. + * Gets a named add-on of an app. * - * @param resourceGroupName Resource group - * @param name web app name - * @param premierAddOnName Premier add on - * @param slot web app slot name + * @param resourceGroupName Name of the resource group to which the resource belongs. + * @param name Name of the app. + * @param premierAddOnName Add-on name. + * @param slot Name of the deployment slot. If a slot is not specified, the API will get the named add-on for the production slot. * @param serviceCallback the async ServiceCallback to handle successful and failed responses. * @return the {@link ServiceCall} object */ - public ServiceCall getPremierAddOnSlotAsync(String resourceGroupName, String name, String premierAddOnName, String slot, final ServiceCallback serviceCallback) { + public ServiceCall getPremierAddOnSlotAsync(String resourceGroupName, String name, String premierAddOnName, String slot, final ServiceCallback serviceCallback) { return ServiceCall.create(getPremierAddOnSlotWithServiceResponseAsync(resourceGroupName, name, premierAddOnName, slot), serviceCallback); } /** - * Gets a specific premier add on. - * Gets a specific premier add on. + * Gets a named add-on of an app. + * Gets a named add-on of an app. * - * @param resourceGroupName Resource group - * @param name web app name - * @param premierAddOnName Premier add on - * @param slot web app slot name - * @return the observable to the Object object + * @param resourceGroupName Name of the resource group to which the resource belongs. + * @param name Name of the app. + * @param premierAddOnName Add-on name. + * @param slot Name of the deployment slot. If a slot is not specified, the API will get the named add-on for the production slot. + * @return the observable to the PremierAddOnInner object */ - public Observable getPremierAddOnSlotAsync(String resourceGroupName, String name, String premierAddOnName, String slot) { - return getPremierAddOnSlotWithServiceResponseAsync(resourceGroupName, name, premierAddOnName, slot).map(new Func1, Object>() { + public Observable getPremierAddOnSlotAsync(String resourceGroupName, String name, String premierAddOnName, String slot) { + return getPremierAddOnSlotWithServiceResponseAsync(resourceGroupName, name, premierAddOnName, slot).map(new Func1, PremierAddOnInner>() { @Override - public Object call(ServiceResponse response) { + public PremierAddOnInner call(ServiceResponse response) { return response.getBody(); } }); } /** - * Gets a specific premier add on. - * Gets a specific premier add on. + * Gets a named add-on of an app. + * Gets a named add-on of an app. * - * @param resourceGroupName Resource group - * @param name web app name - * @param premierAddOnName Premier add on - * @param slot web app slot name - * @return the observable to the Object object + * @param resourceGroupName Name of the resource group to which the resource belongs. + * @param name Name of the app. + * @param premierAddOnName Add-on name. + * @param slot Name of the deployment slot. If a slot is not specified, the API will get the named add-on for the production slot. + * @return the observable to the PremierAddOnInner object */ - public Observable> getPremierAddOnSlotWithServiceResponseAsync(String resourceGroupName, String name, String premierAddOnName, String slot) { + public Observable> getPremierAddOnSlotWithServiceResponseAsync(String resourceGroupName, String name, String premierAddOnName, String slot) { if (resourceGroupName == null) { throw new IllegalArgumentException("Parameter resourceGroupName is required and cannot be null."); } @@ -18003,11 +18319,11 @@ public Observable> getPremierAddOnSlotWithServiceRespons } final String apiVersion = "2016-08-01"; return service.getPremierAddOnSlot(resourceGroupName, name, premierAddOnName, slot, this.client.subscriptionId(), apiVersion, this.client.acceptLanguage(), this.client.userAgent()) - .flatMap(new Func1, Observable>>() { + .flatMap(new Func1, Observable>>() { @Override - public Observable> call(Response response) { + public Observable> call(Response response) { try { - ServiceResponse clientResponse = getPremierAddOnSlotDelegate(response); + ServiceResponse clientResponse = getPremierAddOnSlotDelegate(response); return Observable.just(clientResponse); } catch (Throwable t) { return Observable.error(t); @@ -18016,76 +18332,76 @@ public Observable> call(Response response) }); } - private ServiceResponse getPremierAddOnSlotDelegate(Response response) throws CloudException, IOException, IllegalArgumentException { - return new AzureServiceResponseBuilder(this.client.mapperAdapter()) - .register(200, new TypeToken() { }.getType()) + private ServiceResponse getPremierAddOnSlotDelegate(Response response) throws CloudException, IOException, IllegalArgumentException { + return new AzureServiceResponseBuilder(this.client.mapperAdapter()) + .register(200, new TypeToken() { }.getType()) .registerError(CloudException.class) .build(response); } /** - * Add premier add-on. - * Add premier add-on. + * Updates a named add-on of an app. + * Updates a named add-on of an app. * - * @param resourceGroupName Resource group - * @param name web app name - * @param premierAddOnName Premier add on - * @param slot web app slot name - * @param premierAddOn Premier add on request - * @return the Object object if successful. + * @param resourceGroupName Name of the resource group to which the resource belongs. + * @param name Name of the app. + * @param premierAddOnName Add-on name. + * @param slot Name of the deployment slot. If a slot is not specified, the API will update the named add-on for the production slot. + * @param premierAddOn A JSON representation of the edited premier add-on. + * @return the PremierAddOnInner object if successful. */ - public Object addPremierAddOnSlot(String resourceGroupName, String name, String premierAddOnName, String slot, PremierAddOnRequestInner premierAddOn) { + public PremierAddOnInner addPremierAddOnSlot(String resourceGroupName, String name, String premierAddOnName, String slot, PremierAddOnInner premierAddOn) { return addPremierAddOnSlotWithServiceResponseAsync(resourceGroupName, name, premierAddOnName, slot, premierAddOn).toBlocking().single().getBody(); } /** - * Add premier add-on. - * Add premier add-on. + * Updates a named add-on of an app. + * Updates a named add-on of an app. * - * @param resourceGroupName Resource group - * @param name web app name - * @param premierAddOnName Premier add on - * @param slot web app slot name - * @param premierAddOn Premier add on request + * @param resourceGroupName Name of the resource group to which the resource belongs. + * @param name Name of the app. + * @param premierAddOnName Add-on name. + * @param slot Name of the deployment slot. If a slot is not specified, the API will update the named add-on for the production slot. + * @param premierAddOn A JSON representation of the edited premier add-on. * @param serviceCallback the async ServiceCallback to handle successful and failed responses. * @return the {@link ServiceCall} object */ - public ServiceCall addPremierAddOnSlotAsync(String resourceGroupName, String name, String premierAddOnName, String slot, PremierAddOnRequestInner premierAddOn, final ServiceCallback serviceCallback) { + public ServiceCall addPremierAddOnSlotAsync(String resourceGroupName, String name, String premierAddOnName, String slot, PremierAddOnInner premierAddOn, final ServiceCallback serviceCallback) { return ServiceCall.create(addPremierAddOnSlotWithServiceResponseAsync(resourceGroupName, name, premierAddOnName, slot, premierAddOn), serviceCallback); } /** - * Add premier add-on. - * Add premier add-on. + * Updates a named add-on of an app. + * Updates a named add-on of an app. * - * @param resourceGroupName Resource group - * @param name web app name - * @param premierAddOnName Premier add on - * @param slot web app slot name - * @param premierAddOn Premier add on request - * @return the observable to the Object object + * @param resourceGroupName Name of the resource group to which the resource belongs. + * @param name Name of the app. + * @param premierAddOnName Add-on name. + * @param slot Name of the deployment slot. If a slot is not specified, the API will update the named add-on for the production slot. + * @param premierAddOn A JSON representation of the edited premier add-on. + * @return the observable to the PremierAddOnInner object */ - public Observable addPremierAddOnSlotAsync(String resourceGroupName, String name, String premierAddOnName, String slot, PremierAddOnRequestInner premierAddOn) { - return addPremierAddOnSlotWithServiceResponseAsync(resourceGroupName, name, premierAddOnName, slot, premierAddOn).map(new Func1, Object>() { + public Observable addPremierAddOnSlotAsync(String resourceGroupName, String name, String premierAddOnName, String slot, PremierAddOnInner premierAddOn) { + return addPremierAddOnSlotWithServiceResponseAsync(resourceGroupName, name, premierAddOnName, slot, premierAddOn).map(new Func1, PremierAddOnInner>() { @Override - public Object call(ServiceResponse response) { + public PremierAddOnInner call(ServiceResponse response) { return response.getBody(); } }); } /** - * Add premier add-on. - * Add premier add-on. + * Updates a named add-on of an app. + * Updates a named add-on of an app. * - * @param resourceGroupName Resource group - * @param name web app name - * @param premierAddOnName Premier add on - * @param slot web app slot name - * @param premierAddOn Premier add on request - * @return the observable to the Object object + * @param resourceGroupName Name of the resource group to which the resource belongs. + * @param name Name of the app. + * @param premierAddOnName Add-on name. + * @param slot Name of the deployment slot. If a slot is not specified, the API will update the named add-on for the production slot. + * @param premierAddOn A JSON representation of the edited premier add-on. + * @return the observable to the PremierAddOnInner object */ - public Observable> addPremierAddOnSlotWithServiceResponseAsync(String resourceGroupName, String name, String premierAddOnName, String slot, PremierAddOnRequestInner premierAddOn) { + public Observable> addPremierAddOnSlotWithServiceResponseAsync(String resourceGroupName, String name, String premierAddOnName, String slot, PremierAddOnInner premierAddOn) { if (resourceGroupName == null) { throw new IllegalArgumentException("Parameter resourceGroupName is required and cannot be null."); } @@ -18107,11 +18423,11 @@ public Observable> addPremierAddOnSlotWithServiceRespons Validator.validate(premierAddOn); final String apiVersion = "2016-08-01"; return service.addPremierAddOnSlot(resourceGroupName, name, premierAddOnName, slot, this.client.subscriptionId(), premierAddOn, apiVersion, this.client.acceptLanguage(), this.client.userAgent()) - .flatMap(new Func1, Observable>>() { + .flatMap(new Func1, Observable>>() { @Override - public Observable> call(Response response) { + public Observable> call(Response response) { try { - ServiceResponse clientResponse = addPremierAddOnSlotDelegate(response); + ServiceResponse clientResponse = addPremierAddOnSlotDelegate(response); return Observable.just(clientResponse); } catch (Throwable t) { return Observable.error(t); @@ -18120,72 +18436,71 @@ public Observable> call(Response response) }); } - private ServiceResponse addPremierAddOnSlotDelegate(Response response) throws CloudException, IOException, IllegalArgumentException { - return new AzureServiceResponseBuilder(this.client.mapperAdapter()) - .register(200, new TypeToken() { }.getType()) + private ServiceResponse addPremierAddOnSlotDelegate(Response response) throws CloudException, IOException, IllegalArgumentException { + return new AzureServiceResponseBuilder(this.client.mapperAdapter()) + .register(200, new TypeToken() { }.getType()) .registerError(CloudException.class) .build(response); } /** - * Delete premier add-on. - * Delete premier add-on. + * Delete a premier add-on from an app. + * Delete a premier add-on from an app. * - * @param resourceGroupName Resource group - * @param name web app name - * @param premierAddOnName Premier add on - * @param slot web app slot name - * @return the Object object if successful. + * @param resourceGroupName Name of the resource group to which the resource belongs. + * @param name Name of the app. + * @param premierAddOnName Add-on name. + * @param slot Name of the deployment slot. If a slot is not specified, the API will delete the named add-on for the production slot. */ - public Object deletePremierAddOnSlot(String resourceGroupName, String name, String premierAddOnName, String slot) { - return deletePremierAddOnSlotWithServiceResponseAsync(resourceGroupName, name, premierAddOnName, slot).toBlocking().single().getBody(); + public void deletePremierAddOnSlot(String resourceGroupName, String name, String premierAddOnName, String slot) { + deletePremierAddOnSlotWithServiceResponseAsync(resourceGroupName, name, premierAddOnName, slot).toBlocking().single().getBody(); } /** - * Delete premier add-on. - * Delete premier add-on. + * Delete a premier add-on from an app. + * Delete a premier add-on from an app. * - * @param resourceGroupName Resource group - * @param name web app name - * @param premierAddOnName Premier add on - * @param slot web app slot name + * @param resourceGroupName Name of the resource group to which the resource belongs. + * @param name Name of the app. + * @param premierAddOnName Add-on name. + * @param slot Name of the deployment slot. If a slot is not specified, the API will delete the named add-on for the production slot. * @param serviceCallback the async ServiceCallback to handle successful and failed responses. * @return the {@link ServiceCall} object */ - public ServiceCall deletePremierAddOnSlotAsync(String resourceGroupName, String name, String premierAddOnName, String slot, final ServiceCallback serviceCallback) { + public ServiceCall deletePremierAddOnSlotAsync(String resourceGroupName, String name, String premierAddOnName, String slot, final ServiceCallback serviceCallback) { return ServiceCall.create(deletePremierAddOnSlotWithServiceResponseAsync(resourceGroupName, name, premierAddOnName, slot), serviceCallback); } /** - * Delete premier add-on. - * Delete premier add-on. + * Delete a premier add-on from an app. + * Delete a premier add-on from an app. * - * @param resourceGroupName Resource group - * @param name web app name - * @param premierAddOnName Premier add on - * @param slot web app slot name - * @return the observable to the Object object + * @param resourceGroupName Name of the resource group to which the resource belongs. + * @param name Name of the app. + * @param premierAddOnName Add-on name. + * @param slot Name of the deployment slot. If a slot is not specified, the API will delete the named add-on for the production slot. + * @return the {@link ServiceResponse} object if successful. */ - public Observable deletePremierAddOnSlotAsync(String resourceGroupName, String name, String premierAddOnName, String slot) { - return deletePremierAddOnSlotWithServiceResponseAsync(resourceGroupName, name, premierAddOnName, slot).map(new Func1, Object>() { + public Observable deletePremierAddOnSlotAsync(String resourceGroupName, String name, String premierAddOnName, String slot) { + return deletePremierAddOnSlotWithServiceResponseAsync(resourceGroupName, name, premierAddOnName, slot).map(new Func1, Void>() { @Override - public Object call(ServiceResponse response) { + public Void call(ServiceResponse response) { return response.getBody(); } }); } /** - * Delete premier add-on. - * Delete premier add-on. + * Delete a premier add-on from an app. + * Delete a premier add-on from an app. * - * @param resourceGroupName Resource group - * @param name web app name - * @param premierAddOnName Premier add on - * @param slot web app slot name - * @return the observable to the Object object + * @param resourceGroupName Name of the resource group to which the resource belongs. + * @param name Name of the app. + * @param premierAddOnName Add-on name. + * @param slot Name of the deployment slot. If a slot is not specified, the API will delete the named add-on for the production slot. + * @return the {@link ServiceResponse} object if successful. */ - public Observable> deletePremierAddOnSlotWithServiceResponseAsync(String resourceGroupName, String name, String premierAddOnName, String slot) { + public Observable> deletePremierAddOnSlotWithServiceResponseAsync(String resourceGroupName, String name, String premierAddOnName, String slot) { if (resourceGroupName == null) { throw new IllegalArgumentException("Parameter resourceGroupName is required and cannot be null."); } @@ -18203,11 +18518,11 @@ public Observable> deletePremierAddOnSlotWithServiceResp } final String apiVersion = "2016-08-01"; return service.deletePremierAddOnSlot(resourceGroupName, name, premierAddOnName, slot, this.client.subscriptionId(), apiVersion, this.client.acceptLanguage(), this.client.userAgent()) - .flatMap(new Func1, Observable>>() { + .flatMap(new Func1, Observable>>() { @Override - public Observable> call(Response response) { + public Observable> call(Response response) { try { - ServiceResponse clientResponse = deletePremierAddOnSlotDelegate(response); + ServiceResponse clientResponse = deletePremierAddOnSlotDelegate(response); return Observable.just(clientResponse); } catch (Throwable t) { return Observable.error(t); @@ -18216,20 +18531,19 @@ public Observable> call(Response response) }); } - private ServiceResponse deletePremierAddOnSlotDelegate(Response response) throws CloudException, IOException, IllegalArgumentException { - return new AzureServiceResponseBuilder(this.client.mapperAdapter()) - .register(200, new TypeToken() { }.getType()) - .registerError(CloudException.class) + private ServiceResponse deletePremierAddOnSlotDelegate(Response response) throws CloudException, IOException, IllegalArgumentException { + return new AzureServiceResponseBuilder(this.client.mapperAdapter()) + .register(200, new TypeToken() { }.getType()) .build(response); } /** - * Gets the publishing profile for web app. - * Gets the publishing profile for web app. + * Gets the publishing profile for an app (or deployment slot, if specified). + * Gets the publishing profile for an app (or deployment slot, if specified). * - * @param resourceGroupName Name of resource group - * @param name Name of web app - * @param slot Name of web app slot. If not specified then will default to production slot. + * @param resourceGroupName Name of the resource group to which the resource belongs. + * @param name Name of the app. + * @param slot Name of the deployment slot. If a slot is not specified, the API will get the publishing profile for the production slot. * @return the InputStream object if successful. */ public InputStream listPublishingProfileXmlWithSecretsSlot(String resourceGroupName, String name, String slot) { @@ -18237,12 +18551,12 @@ public InputStream listPublishingProfileXmlWithSecretsSlot(String resourceGroupN } /** - * Gets the publishing profile for web app. - * Gets the publishing profile for web app. + * Gets the publishing profile for an app (or deployment slot, if specified). + * Gets the publishing profile for an app (or deployment slot, if specified). * - * @param resourceGroupName Name of resource group - * @param name Name of web app - * @param slot Name of web app slot. If not specified then will default to production slot. + * @param resourceGroupName Name of the resource group to which the resource belongs. + * @param name Name of the app. + * @param slot Name of the deployment slot. If a slot is not specified, the API will get the publishing profile for the production slot. * @param serviceCallback the async ServiceCallback to handle successful and failed responses. * @return the {@link ServiceCall} object */ @@ -18251,12 +18565,12 @@ public ServiceCall listPublishingProfileXmlWithSecretsSlotAsync(Str } /** - * Gets the publishing profile for web app. - * Gets the publishing profile for web app. + * Gets the publishing profile for an app (or deployment slot, if specified). + * Gets the publishing profile for an app (or deployment slot, if specified). * - * @param resourceGroupName Name of resource group - * @param name Name of web app - * @param slot Name of web app slot. If not specified then will default to production slot. + * @param resourceGroupName Name of the resource group to which the resource belongs. + * @param name Name of the app. + * @param slot Name of the deployment slot. If a slot is not specified, the API will get the publishing profile for the production slot. * @return the observable to the InputStream object */ public Observable listPublishingProfileXmlWithSecretsSlotAsync(String resourceGroupName, String name, String slot) { @@ -18269,12 +18583,12 @@ public InputStream call(ServiceResponse response) { } /** - * Gets the publishing profile for web app. - * Gets the publishing profile for web app. + * Gets the publishing profile for an app (or deployment slot, if specified). + * Gets the publishing profile for an app (or deployment slot, if specified). * - * @param resourceGroupName Name of resource group - * @param name Name of web app - * @param slot Name of web app slot. If not specified then will default to production slot. + * @param resourceGroupName Name of the resource group to which the resource belongs. + * @param name Name of the app. + * @param slot Name of the deployment slot. If a slot is not specified, the API will get the publishing profile for the production slot. * @return the observable to the InputStream object */ public Observable> listPublishingProfileXmlWithSecretsSlotWithServiceResponseAsync(String resourceGroupName, String name, String slot) { @@ -18291,7 +18605,7 @@ public Observable> listPublishingProfileXmlWithSecr throw new IllegalArgumentException("Parameter this.client.subscriptionId() is required and cannot be null."); } final String apiVersion = "2016-08-01"; - final String format = null; + final PublishingProfileFormat format = null; CsmPublishingProfileOptions options = new CsmPublishingProfileOptions(); options.withFormat(null); return service.listPublishingProfileXmlWithSecretsSlot(resourceGroupName, name, slot, this.client.subscriptionId(), apiVersion, this.client.acceptLanguage(), options, this.client.userAgent()) @@ -18309,54 +18623,54 @@ public Observable> call(Response resp } /** - * Gets the publishing profile for web app. - * Gets the publishing profile for web app. + * Gets the publishing profile for an app (or deployment slot, if specified). + * Gets the publishing profile for an app (or deployment slot, if specified). * - * @param resourceGroupName Name of resource group - * @param name Name of web app - * @param slot Name of web app slot. If not specified then will default to production slot. + * @param resourceGroupName Name of the resource group to which the resource belongs. + * @param name Name of the app. + * @param slot Name of the deployment slot. If a slot is not specified, the API will get the publishing profile for the production slot. * @param format Name of the format. Valid values are: - FileZilla3 - WebDeploy -- default - Ftp + FileZilla3 + WebDeploy -- default + Ftp. Possible values include: 'FileZilla3', 'WebDeploy', 'Ftp' * @return the InputStream object if successful. */ - public InputStream listPublishingProfileXmlWithSecretsSlot(String resourceGroupName, String name, String slot, String format) { + public InputStream listPublishingProfileXmlWithSecretsSlot(String resourceGroupName, String name, String slot, PublishingProfileFormat format) { return listPublishingProfileXmlWithSecretsSlotWithServiceResponseAsync(resourceGroupName, name, slot, format).toBlocking().single().getBody(); } /** - * Gets the publishing profile for web app. - * Gets the publishing profile for web app. + * Gets the publishing profile for an app (or deployment slot, if specified). + * Gets the publishing profile for an app (or deployment slot, if specified). * - * @param resourceGroupName Name of resource group - * @param name Name of web app - * @param slot Name of web app slot. If not specified then will default to production slot. + * @param resourceGroupName Name of the resource group to which the resource belongs. + * @param name Name of the app. + * @param slot Name of the deployment slot. If a slot is not specified, the API will get the publishing profile for the production slot. * @param format Name of the format. Valid values are: - FileZilla3 - WebDeploy -- default - Ftp + FileZilla3 + WebDeploy -- default + Ftp. Possible values include: 'FileZilla3', 'WebDeploy', 'Ftp' * @param serviceCallback the async ServiceCallback to handle successful and failed responses. * @return the {@link ServiceCall} object */ - public ServiceCall listPublishingProfileXmlWithSecretsSlotAsync(String resourceGroupName, String name, String slot, String format, final ServiceCallback serviceCallback) { + public ServiceCall listPublishingProfileXmlWithSecretsSlotAsync(String resourceGroupName, String name, String slot, PublishingProfileFormat format, final ServiceCallback serviceCallback) { return ServiceCall.create(listPublishingProfileXmlWithSecretsSlotWithServiceResponseAsync(resourceGroupName, name, slot, format), serviceCallback); } /** - * Gets the publishing profile for web app. - * Gets the publishing profile for web app. + * Gets the publishing profile for an app (or deployment slot, if specified). + * Gets the publishing profile for an app (or deployment slot, if specified). * - * @param resourceGroupName Name of resource group - * @param name Name of web app - * @param slot Name of web app slot. If not specified then will default to production slot. + * @param resourceGroupName Name of the resource group to which the resource belongs. + * @param name Name of the app. + * @param slot Name of the deployment slot. If a slot is not specified, the API will get the publishing profile for the production slot. * @param format Name of the format. Valid values are: - FileZilla3 - WebDeploy -- default - Ftp + FileZilla3 + WebDeploy -- default + Ftp. Possible values include: 'FileZilla3', 'WebDeploy', 'Ftp' * @return the observable to the InputStream object */ - public Observable listPublishingProfileXmlWithSecretsSlotAsync(String resourceGroupName, String name, String slot, String format) { + public Observable listPublishingProfileXmlWithSecretsSlotAsync(String resourceGroupName, String name, String slot, PublishingProfileFormat format) { return listPublishingProfileXmlWithSecretsSlotWithServiceResponseAsync(resourceGroupName, name, slot, format).map(new Func1, InputStream>() { @Override public InputStream call(ServiceResponse response) { @@ -18366,19 +18680,19 @@ public InputStream call(ServiceResponse response) { } /** - * Gets the publishing profile for web app. - * Gets the publishing profile for web app. + * Gets the publishing profile for an app (or deployment slot, if specified). + * Gets the publishing profile for an app (or deployment slot, if specified). * - * @param resourceGroupName Name of resource group - * @param name Name of web app - * @param slot Name of web app slot. If not specified then will default to production slot. + * @param resourceGroupName Name of the resource group to which the resource belongs. + * @param name Name of the app. + * @param slot Name of the deployment slot. If a slot is not specified, the API will get the publishing profile for the production slot. * @param format Name of the format. Valid values are: - FileZilla3 - WebDeploy -- default - Ftp + FileZilla3 + WebDeploy -- default + Ftp. Possible values include: 'FileZilla3', 'WebDeploy', 'Ftp' * @return the observable to the InputStream object */ - public Observable> listPublishingProfileXmlWithSecretsSlotWithServiceResponseAsync(String resourceGroupName, String name, String slot, String format) { + public Observable> listPublishingProfileXmlWithSecretsSlotWithServiceResponseAsync(String resourceGroupName, String name, String slot, PublishingProfileFormat format) { if (resourceGroupName == null) { throw new IllegalArgumentException("Parameter resourceGroupName is required and cannot be null."); } @@ -18419,7 +18733,7 @@ private ServiceResponse listPublishingProfileXmlWithSecretsSlotDele * Recovers a deleted web app. * Recovers a deleted web app. * - * @param resourceGroupName Name of resource group + * @param resourceGroupName Name of the resource group to which the resource belongs. * @param name Name of web app * @param slot Name of web app slot. If not specified then will default to production slot. * @param recoveryEntity Snapshot data used for web app recovery. Snapshot information can be obtained by calling GetDeletedSites or GetSiteSnapshots API. @@ -18433,7 +18747,7 @@ public RecoverResponseInner recoverSlot(String resourceGroupName, String name, S * Recovers a deleted web app. * Recovers a deleted web app. * - * @param resourceGroupName Name of resource group + * @param resourceGroupName Name of the resource group to which the resource belongs. * @param name Name of web app * @param slot Name of web app slot. If not specified then will default to production slot. * @param recoveryEntity Snapshot data used for web app recovery. Snapshot information can be obtained by calling GetDeletedSites or GetSiteSnapshots API. @@ -18448,7 +18762,7 @@ public ServiceCall recoverSlotAsync(String resourceGroupNa * Recovers a deleted web app. * Recovers a deleted web app. * - * @param resourceGroupName Name of resource group + * @param resourceGroupName Name of the resource group to which the resource belongs. * @param name Name of web app * @param slot Name of web app slot. If not specified then will default to production slot. * @param recoveryEntity Snapshot data used for web app recovery. Snapshot information can be obtained by calling GetDeletedSites or GetSiteSnapshots API. @@ -18467,7 +18781,7 @@ public RecoverResponseInner call(ServiceResponse response) * Recovers a deleted web app. * Recovers a deleted web app. * - * @param resourceGroupName Name of resource group + * @param resourceGroupName Name of the resource group to which the resource belongs. * @param name Name of web app * @param slot Name of web app slot. If not specified then will default to production slot. * @param recoveryEntity Snapshot data used for web app recovery. Snapshot information can be obtained by calling GetDeletedSites or GetSiteSnapshots API. @@ -18499,7 +18813,7 @@ public Observable> recoverSlotWithServiceR * Recovers a deleted web app. * Recovers a deleted web app. * - * @param resourceGroupName Name of resource group + * @param resourceGroupName Name of the resource group to which the resource belongs. * @param name Name of web app * @param slot Name of web app slot. If not specified then will default to production slot. * @param recoveryEntity Snapshot data used for web app recovery. Snapshot information can be obtained by calling GetDeletedSites or GetSiteSnapshots API. @@ -18513,7 +18827,7 @@ public RecoverResponseInner beginRecoverSlot(String resourceGroupName, String na * Recovers a deleted web app. * Recovers a deleted web app. * - * @param resourceGroupName Name of resource group + * @param resourceGroupName Name of the resource group to which the resource belongs. * @param name Name of web app * @param slot Name of web app slot. If not specified then will default to production slot. * @param recoveryEntity Snapshot data used for web app recovery. Snapshot information can be obtained by calling GetDeletedSites or GetSiteSnapshots API. @@ -18528,7 +18842,7 @@ public ServiceCall beginRecoverSlotAsync(String resourceGr * Recovers a deleted web app. * Recovers a deleted web app. * - * @param resourceGroupName Name of resource group + * @param resourceGroupName Name of the resource group to which the resource belongs. * @param name Name of web app * @param slot Name of web app slot. If not specified then will default to production slot. * @param recoveryEntity Snapshot data used for web app recovery. Snapshot information can be obtained by calling GetDeletedSites or GetSiteSnapshots API. @@ -18547,7 +18861,7 @@ public RecoverResponseInner call(ServiceResponse response) * Recovers a deleted web app. * Recovers a deleted web app. * - * @param resourceGroupName Name of resource group + * @param resourceGroupName Name of the resource group to which the resource belongs. * @param name Name of web app * @param slot Name of web app slot. If not specified then will default to production slot. * @param recoveryEntity Snapshot data used for web app recovery. Snapshot information can be obtained by calling GetDeletedSites or GetSiteSnapshots API. @@ -18593,60 +18907,59 @@ private ServiceResponse beginRecoverSlotDelegate(Response< } /** - * Resets the configuration settings of the current slot if they were previously modified by calling ApplySlotConfig API. - * Resets the configuration settings of the current slot if they were previously modified by calling ApplySlotConfig API. + * Resets the configuration settings of the current slot if they were previously modified by calling the API with POST. + * Resets the configuration settings of the current slot if they were previously modified by calling the API with POST. * - * @param resourceGroupName Name of resource group - * @param name Name of web app - * @param slot Name of web app slot. If not specified then will default to production slot. - * @return the Object object if successful. + * @param resourceGroupName Name of the resource group to which the resource belongs. + * @param name Name of the app. + * @param slot Name of the deployment slot. If a slot is not specified, the API resets configuration settings for the production slot. */ - public Object resetSlotConfigurationSlot(String resourceGroupName, String name, String slot) { - return resetSlotConfigurationSlotWithServiceResponseAsync(resourceGroupName, name, slot).toBlocking().single().getBody(); + public void resetSlotConfigurationSlot(String resourceGroupName, String name, String slot) { + resetSlotConfigurationSlotWithServiceResponseAsync(resourceGroupName, name, slot).toBlocking().single().getBody(); } /** - * Resets the configuration settings of the current slot if they were previously modified by calling ApplySlotConfig API. - * Resets the configuration settings of the current slot if they were previously modified by calling ApplySlotConfig API. + * Resets the configuration settings of the current slot if they were previously modified by calling the API with POST. + * Resets the configuration settings of the current slot if they were previously modified by calling the API with POST. * - * @param resourceGroupName Name of resource group - * @param name Name of web app - * @param slot Name of web app slot. If not specified then will default to production slot. + * @param resourceGroupName Name of the resource group to which the resource belongs. + * @param name Name of the app. + * @param slot Name of the deployment slot. If a slot is not specified, the API resets configuration settings for the production slot. * @param serviceCallback the async ServiceCallback to handle successful and failed responses. * @return the {@link ServiceCall} object */ - public ServiceCall resetSlotConfigurationSlotAsync(String resourceGroupName, String name, String slot, final ServiceCallback serviceCallback) { + public ServiceCall resetSlotConfigurationSlotAsync(String resourceGroupName, String name, String slot, final ServiceCallback serviceCallback) { return ServiceCall.create(resetSlotConfigurationSlotWithServiceResponseAsync(resourceGroupName, name, slot), serviceCallback); } /** - * Resets the configuration settings of the current slot if they were previously modified by calling ApplySlotConfig API. - * Resets the configuration settings of the current slot if they were previously modified by calling ApplySlotConfig API. + * Resets the configuration settings of the current slot if they were previously modified by calling the API with POST. + * Resets the configuration settings of the current slot if they were previously modified by calling the API with POST. * - * @param resourceGroupName Name of resource group - * @param name Name of web app - * @param slot Name of web app slot. If not specified then will default to production slot. - * @return the observable to the Object object + * @param resourceGroupName Name of the resource group to which the resource belongs. + * @param name Name of the app. + * @param slot Name of the deployment slot. If a slot is not specified, the API resets configuration settings for the production slot. + * @return the {@link ServiceResponse} object if successful. */ - public Observable resetSlotConfigurationSlotAsync(String resourceGroupName, String name, String slot) { - return resetSlotConfigurationSlotWithServiceResponseAsync(resourceGroupName, name, slot).map(new Func1, Object>() { + public Observable resetSlotConfigurationSlotAsync(String resourceGroupName, String name, String slot) { + return resetSlotConfigurationSlotWithServiceResponseAsync(resourceGroupName, name, slot).map(new Func1, Void>() { @Override - public Object call(ServiceResponse response) { + public Void call(ServiceResponse response) { return response.getBody(); } }); } /** - * Resets the configuration settings of the current slot if they were previously modified by calling ApplySlotConfig API. - * Resets the configuration settings of the current slot if they were previously modified by calling ApplySlotConfig API. + * Resets the configuration settings of the current slot if they were previously modified by calling the API with POST. + * Resets the configuration settings of the current slot if they were previously modified by calling the API with POST. * - * @param resourceGroupName Name of resource group - * @param name Name of web app - * @param slot Name of web app slot. If not specified then will default to production slot. - * @return the observable to the Object object + * @param resourceGroupName Name of the resource group to which the resource belongs. + * @param name Name of the app. + * @param slot Name of the deployment slot. If a slot is not specified, the API resets configuration settings for the production slot. + * @return the {@link ServiceResponse} object if successful. */ - public Observable> resetSlotConfigurationSlotWithServiceResponseAsync(String resourceGroupName, String name, String slot) { + public Observable> resetSlotConfigurationSlotWithServiceResponseAsync(String resourceGroupName, String name, String slot) { if (resourceGroupName == null) { throw new IllegalArgumentException("Parameter resourceGroupName is required and cannot be null."); } @@ -18661,11 +18974,11 @@ public Observable> resetSlotConfigurationSlotWithService } final String apiVersion = "2016-08-01"; return service.resetSlotConfigurationSlot(resourceGroupName, name, slot, this.client.subscriptionId(), apiVersion, this.client.acceptLanguage(), this.client.userAgent()) - .flatMap(new Func1, Observable>>() { + .flatMap(new Func1, Observable>>() { @Override - public Observable> call(Response response) { + public Observable> call(Response response) { try { - ServiceResponse clientResponse = resetSlotConfigurationSlotDelegate(response); + ServiceResponse clientResponse = resetSlotConfigurationSlotDelegate(response); return Observable.just(clientResponse); } catch (Throwable t) { return Observable.error(t); @@ -18674,68 +18987,66 @@ public Observable> call(Response response) }); } - private ServiceResponse resetSlotConfigurationSlotDelegate(Response response) throws CloudException, IOException, IllegalArgumentException { - return new AzureServiceResponseBuilder(this.client.mapperAdapter()) - .register(200, new TypeToken() { }.getType()) - .registerError(CloudException.class) + private ServiceResponse resetSlotConfigurationSlotDelegate(Response response) throws CloudException, IOException, IllegalArgumentException { + return new AzureServiceResponseBuilder(this.client.mapperAdapter()) + .register(204, new TypeToken() { }.getType()) .build(response); } /** - * Restarts web app. - * Restarts web app. + * Restarts an app (or deployment slot, if specified). + * Restarts an app (or deployment slot, if specified). * - * @param resourceGroupName Name of resource group - * @param name Name of web app - * @param slot Name of web app slot. If not specified then will default to production slot. - * @return the Object object if successful. + * @param resourceGroupName Name of the resource group to which the resource belongs. + * @param name Name of the app. + * @param slot Name of the deployment slot. If a slot is not specified, the API will restart the production slot. */ - public Object restartSlot(String resourceGroupName, String name, String slot) { - return restartSlotWithServiceResponseAsync(resourceGroupName, name, slot).toBlocking().single().getBody(); + public void restartSlot(String resourceGroupName, String name, String slot) { + restartSlotWithServiceResponseAsync(resourceGroupName, name, slot).toBlocking().single().getBody(); } /** - * Restarts web app. - * Restarts web app. + * Restarts an app (or deployment slot, if specified). + * Restarts an app (or deployment slot, if specified). * - * @param resourceGroupName Name of resource group - * @param name Name of web app - * @param slot Name of web app slot. If not specified then will default to production slot. + * @param resourceGroupName Name of the resource group to which the resource belongs. + * @param name Name of the app. + * @param slot Name of the deployment slot. If a slot is not specified, the API will restart the production slot. * @param serviceCallback the async ServiceCallback to handle successful and failed responses. * @return the {@link ServiceCall} object */ - public ServiceCall restartSlotAsync(String resourceGroupName, String name, String slot, final ServiceCallback serviceCallback) { + public ServiceCall restartSlotAsync(String resourceGroupName, String name, String slot, final ServiceCallback serviceCallback) { return ServiceCall.create(restartSlotWithServiceResponseAsync(resourceGroupName, name, slot), serviceCallback); } /** - * Restarts web app. - * Restarts web app. + * Restarts an app (or deployment slot, if specified). + * Restarts an app (or deployment slot, if specified). * - * @param resourceGroupName Name of resource group - * @param name Name of web app - * @param slot Name of web app slot. If not specified then will default to production slot. - * @return the observable to the Object object + * @param resourceGroupName Name of the resource group to which the resource belongs. + * @param name Name of the app. + * @param slot Name of the deployment slot. If a slot is not specified, the API will restart the production slot. + * @return the {@link ServiceResponse} object if successful. */ - public Observable restartSlotAsync(String resourceGroupName, String name, String slot) { - return restartSlotWithServiceResponseAsync(resourceGroupName, name, slot).map(new Func1, Object>() { + public Observable restartSlotAsync(String resourceGroupName, String name, String slot) { + return restartSlotWithServiceResponseAsync(resourceGroupName, name, slot).map(new Func1, Void>() { @Override - public Object call(ServiceResponse response) { + public Void call(ServiceResponse response) { return response.getBody(); } }); } /** - * Restarts web app. - * Restarts web app. + * Restarts an app (or deployment slot, if specified). + * Restarts an app (or deployment slot, if specified). * - * @param resourceGroupName Name of resource group - * @param name Name of web app - * @param slot Name of web app slot. If not specified then will default to production slot. - * @return the observable to the Object object + * @param resourceGroupName Name of the resource group to which the resource belongs. + * @param name Name of the app. + * @param slot Name of the deployment slot. If a slot is not specified, the API will restart the production slot. + * @return the {@link ServiceResponse} object if successful. */ - public Observable> restartSlotWithServiceResponseAsync(String resourceGroupName, String name, String slot) { + public Observable> restartSlotWithServiceResponseAsync(String resourceGroupName, String name, String slot) { if (resourceGroupName == null) { throw new IllegalArgumentException("Parameter resourceGroupName is required and cannot be null."); } @@ -18752,11 +19063,11 @@ public Observable> restartSlotWithServiceResponseAsync(S final Boolean softRestart = null; final Boolean synchronous = null; return service.restartSlot(resourceGroupName, name, slot, this.client.subscriptionId(), softRestart, synchronous, apiVersion, this.client.acceptLanguage(), this.client.userAgent()) - .flatMap(new Func1, Observable>>() { + .flatMap(new Func1, Observable>>() { @Override - public Observable> call(Response response) { + public Observable> call(Response response) { try { - ServiceResponse clientResponse = restartSlotDelegate(response); + ServiceResponse clientResponse = restartSlotDelegate(response); return Observable.just(clientResponse); } catch (Throwable t) { return Observable.error(t); @@ -18766,68 +19077,67 @@ public Observable> call(Response response) } /** - * Restarts web app. - * Restarts web app. + * Restarts an app (or deployment slot, if specified). + * Restarts an app (or deployment slot, if specified). * - * @param resourceGroupName Name of resource group - * @param name Name of web app - * @param slot Name of web app slot. If not specified then will default to production slot. - * @param softRestart Soft restart applies the configuration settings and restarts the app if necessary. Hard restart always restarts and reprovisions the app - * @param synchronous If true then the API will block until the app has been restarted - * @return the Object object if successful. + * @param resourceGroupName Name of the resource group to which the resource belongs. + * @param name Name of the app. + * @param slot Name of the deployment slot. If a slot is not specified, the API will restart the production slot. + * @param softRestart Specify true to apply the configuration settings and restarts the app only if necessary. By default, the API always restarts and reprovisions the app. + * @param synchronous Specify true to block until the app is restarted. By default, it is set to false, and the API responds immediately (asynchronous). */ - public Object restartSlot(String resourceGroupName, String name, String slot, Boolean softRestart, Boolean synchronous) { - return restartSlotWithServiceResponseAsync(resourceGroupName, name, slot, softRestart, synchronous).toBlocking().single().getBody(); + public void restartSlot(String resourceGroupName, String name, String slot, Boolean softRestart, Boolean synchronous) { + restartSlotWithServiceResponseAsync(resourceGroupName, name, slot, softRestart, synchronous).toBlocking().single().getBody(); } /** - * Restarts web app. - * Restarts web app. + * Restarts an app (or deployment slot, if specified). + * Restarts an app (or deployment slot, if specified). * - * @param resourceGroupName Name of resource group - * @param name Name of web app - * @param slot Name of web app slot. If not specified then will default to production slot. - * @param softRestart Soft restart applies the configuration settings and restarts the app if necessary. Hard restart always restarts and reprovisions the app - * @param synchronous If true then the API will block until the app has been restarted + * @param resourceGroupName Name of the resource group to which the resource belongs. + * @param name Name of the app. + * @param slot Name of the deployment slot. If a slot is not specified, the API will restart the production slot. + * @param softRestart Specify true to apply the configuration settings and restarts the app only if necessary. By default, the API always restarts and reprovisions the app. + * @param synchronous Specify true to block until the app is restarted. By default, it is set to false, and the API responds immediately (asynchronous). * @param serviceCallback the async ServiceCallback to handle successful and failed responses. * @return the {@link ServiceCall} object */ - public ServiceCall restartSlotAsync(String resourceGroupName, String name, String slot, Boolean softRestart, Boolean synchronous, final ServiceCallback serviceCallback) { + public ServiceCall restartSlotAsync(String resourceGroupName, String name, String slot, Boolean softRestart, Boolean synchronous, final ServiceCallback serviceCallback) { return ServiceCall.create(restartSlotWithServiceResponseAsync(resourceGroupName, name, slot, softRestart, synchronous), serviceCallback); } /** - * Restarts web app. - * Restarts web app. + * Restarts an app (or deployment slot, if specified). + * Restarts an app (or deployment slot, if specified). * - * @param resourceGroupName Name of resource group - * @param name Name of web app - * @param slot Name of web app slot. If not specified then will default to production slot. - * @param softRestart Soft restart applies the configuration settings and restarts the app if necessary. Hard restart always restarts and reprovisions the app - * @param synchronous If true then the API will block until the app has been restarted - * @return the observable to the Object object + * @param resourceGroupName Name of the resource group to which the resource belongs. + * @param name Name of the app. + * @param slot Name of the deployment slot. If a slot is not specified, the API will restart the production slot. + * @param softRestart Specify true to apply the configuration settings and restarts the app only if necessary. By default, the API always restarts and reprovisions the app. + * @param synchronous Specify true to block until the app is restarted. By default, it is set to false, and the API responds immediately (asynchronous). + * @return the {@link ServiceResponse} object if successful. */ - public Observable restartSlotAsync(String resourceGroupName, String name, String slot, Boolean softRestart, Boolean synchronous) { - return restartSlotWithServiceResponseAsync(resourceGroupName, name, slot, softRestart, synchronous).map(new Func1, Object>() { + public Observable restartSlotAsync(String resourceGroupName, String name, String slot, Boolean softRestart, Boolean synchronous) { + return restartSlotWithServiceResponseAsync(resourceGroupName, name, slot, softRestart, synchronous).map(new Func1, Void>() { @Override - public Object call(ServiceResponse response) { + public Void call(ServiceResponse response) { return response.getBody(); } }); } /** - * Restarts web app. - * Restarts web app. + * Restarts an app (or deployment slot, if specified). + * Restarts an app (or deployment slot, if specified). * - * @param resourceGroupName Name of resource group - * @param name Name of web app - * @param slot Name of web app slot. If not specified then will default to production slot. - * @param softRestart Soft restart applies the configuration settings and restarts the app if necessary. Hard restart always restarts and reprovisions the app - * @param synchronous If true then the API will block until the app has been restarted - * @return the observable to the Object object + * @param resourceGroupName Name of the resource group to which the resource belongs. + * @param name Name of the app. + * @param slot Name of the deployment slot. If a slot is not specified, the API will restart the production slot. + * @param softRestart Specify true to apply the configuration settings and restarts the app only if necessary. By default, the API always restarts and reprovisions the app. + * @param synchronous Specify true to block until the app is restarted. By default, it is set to false, and the API responds immediately (asynchronous). + * @return the {@link ServiceResponse} object if successful. */ - public Observable> restartSlotWithServiceResponseAsync(String resourceGroupName, String name, String slot, Boolean softRestart, Boolean synchronous) { + public Observable> restartSlotWithServiceResponseAsync(String resourceGroupName, String name, String slot, Boolean softRestart, Boolean synchronous) { if (resourceGroupName == null) { throw new IllegalArgumentException("Parameter resourceGroupName is required and cannot be null."); } @@ -18842,11 +19152,11 @@ public Observable> restartSlotWithServiceResponseAsync(S } final String apiVersion = "2016-08-01"; return service.restartSlot(resourceGroupName, name, slot, this.client.subscriptionId(), softRestart, synchronous, apiVersion, this.client.acceptLanguage(), this.client.userAgent()) - .flatMap(new Func1, Observable>>() { + .flatMap(new Func1, Observable>>() { @Override - public Observable> call(Response response) { + public Observable> call(Response response) { try { - ServiceResponse clientResponse = restartSlotDelegate(response); + ServiceResponse clientResponse = restartSlotDelegate(response); return Observable.just(clientResponse); } catch (Throwable t) { return Observable.error(t); @@ -18855,10 +19165,9 @@ public Observable> call(Response response) }); } - private ServiceResponse restartSlotDelegate(Response response) throws CloudException, IOException, IllegalArgumentException { - return new AzureServiceResponseBuilder(this.client.mapperAdapter()) - .register(200, new TypeToken() { }.getType()) - .registerError(CloudException.class) + private ServiceResponse restartSlotDelegate(Response response) throws CloudException, IOException, IllegalArgumentException { + return new AzureServiceResponseBuilder(this.client.mapperAdapter()) + .register(204, new TypeToken() { }.getType()) .build(response); } @@ -18866,10 +19175,10 @@ private ServiceResponse restartSlotDelegate(Response respo * Get the difference in configuration settings between two web app slots. * Get the difference in configuration settings between two web app slots. * - * @param resourceGroupName Name of resource group - * @param name Name of web app - * @param slot Name of the source slot - * @param slotSwapEntity Request body that contains the target slot name + * @param resourceGroupName Name of the resource group to which the resource belongs. + * @param name Name of the app. + * @param slot Name of the source slot. If a slot is not specified, the production slot is used as the source slot. + * @param slotSwapEntity JSON object that contains the target slot name. See example. * @return the PagedList<SlotDifferenceInner> object if successful. */ public PagedList getSlotsDifferencesSlot(final String resourceGroupName, final String name, final String slot, final CsmSlotEntityInner slotSwapEntity) { @@ -18886,10 +19195,10 @@ public Page nextPage(String nextPageLink) { * Get the difference in configuration settings between two web app slots. * Get the difference in configuration settings between two web app slots. * - * @param resourceGroupName Name of resource group - * @param name Name of web app - * @param slot Name of the source slot - * @param slotSwapEntity Request body that contains the target slot name + * @param resourceGroupName Name of the resource group to which the resource belongs. + * @param name Name of the app. + * @param slot Name of the source slot. If a slot is not specified, the production slot is used as the source slot. + * @param slotSwapEntity JSON object that contains the target slot name. See example. * @param serviceCallback the async ServiceCallback to handle successful and failed responses. * @return the {@link ServiceCall} object */ @@ -18909,10 +19218,10 @@ public Observable>> call(String nextPa * Get the difference in configuration settings between two web app slots. * Get the difference in configuration settings between two web app slots. * - * @param resourceGroupName Name of resource group - * @param name Name of web app - * @param slot Name of the source slot - * @param slotSwapEntity Request body that contains the target slot name + * @param resourceGroupName Name of the resource group to which the resource belongs. + * @param name Name of the app. + * @param slot Name of the source slot. If a slot is not specified, the production slot is used as the source slot. + * @param slotSwapEntity JSON object that contains the target slot name. See example. * @return the observable to the PagedList<SlotDifferenceInner> object */ public Observable> getSlotsDifferencesSlotAsync(final String resourceGroupName, final String name, final String slot, final CsmSlotEntityInner slotSwapEntity) { @@ -18929,10 +19238,10 @@ public Page call(ServiceResponse> * Get the difference in configuration settings between two web app slots. * Get the difference in configuration settings between two web app slots. * - * @param resourceGroupName Name of resource group - * @param name Name of web app - * @param slot Name of the source slot - * @param slotSwapEntity Request body that contains the target slot name + * @param resourceGroupName Name of the resource group to which the resource belongs. + * @param name Name of the app. + * @param slot Name of the source slot. If a slot is not specified, the production slot is used as the source slot. + * @param slotSwapEntity JSON object that contains the target slot name. See example. * @return the observable to the PagedList<SlotDifferenceInner> object */ public Observable>> getSlotsDifferencesSlotWithServiceResponseAsync(final String resourceGroupName, final String name, final String slot, final CsmSlotEntityInner slotSwapEntity) { @@ -18953,10 +19262,10 @@ public Observable>> call(ServiceRespon * Get the difference in configuration settings between two web app slots. * Get the difference in configuration settings between two web app slots. * - ServiceResponse> * @param resourceGroupName Name of resource group - ServiceResponse> * @param name Name of web app - ServiceResponse> * @param slot Name of the source slot - ServiceResponse> * @param slotSwapEntity Request body that contains the target slot name + ServiceResponse> * @param resourceGroupName Name of the resource group to which the resource belongs. + ServiceResponse> * @param name Name of the app. + ServiceResponse> * @param slot Name of the source slot. If a slot is not specified, the production slot is used as the source slot. + ServiceResponse> * @param slotSwapEntity JSON object that contains the target slot name. See example. * @return the PagedList<SlotDifferenceInner> object wrapped in {@link ServiceResponse} if successful. */ public Observable>> getSlotsDifferencesSlotSinglePageAsync(final String resourceGroupName, final String name, final String slot, final CsmSlotEntityInner slotSwapEntity) { @@ -18999,64 +19308,63 @@ private ServiceResponse> getSlotsDifferencesSlotDe } /** - * Swaps web app slots. - * Swaps web app slots. + * Swaps two deployment slots of an app. + * Swaps two deployment slots of an app. * - * @param resourceGroupName Name of resource group - * @param name Name of web app - * @param slot Name of source slot for the swap - * @param slotSwapEntity Request body that contains the target slot name - * @return the Object object if successful. + * @param resourceGroupName Name of the resource group to which the resource belongs. + * @param name Name of the app. + * @param slot Name of the source slot. If a slot is not specified, the production slot is used as the source slot. + * @param slotSwapEntity JSON object that contains the target slot name. See example. */ - public Object swapSlotsSlot(String resourceGroupName, String name, String slot, CsmSlotEntityInner slotSwapEntity) { - return swapSlotsSlotWithServiceResponseAsync(resourceGroupName, name, slot, slotSwapEntity).toBlocking().last().getBody(); + public void swapSlotSlot(String resourceGroupName, String name, String slot, CsmSlotEntityInner slotSwapEntity) { + swapSlotSlotWithServiceResponseAsync(resourceGroupName, name, slot, slotSwapEntity).toBlocking().last().getBody(); } /** - * Swaps web app slots. - * Swaps web app slots. + * Swaps two deployment slots of an app. + * Swaps two deployment slots of an app. * - * @param resourceGroupName Name of resource group - * @param name Name of web app - * @param slot Name of source slot for the swap - * @param slotSwapEntity Request body that contains the target slot name + * @param resourceGroupName Name of the resource group to which the resource belongs. + * @param name Name of the app. + * @param slot Name of the source slot. If a slot is not specified, the production slot is used as the source slot. + * @param slotSwapEntity JSON object that contains the target slot name. See example. * @param serviceCallback the async ServiceCallback to handle successful and failed responses. * @return the {@link ServiceCall} object */ - public ServiceCall swapSlotsSlotAsync(String resourceGroupName, String name, String slot, CsmSlotEntityInner slotSwapEntity, final ServiceCallback serviceCallback) { - return ServiceCall.create(swapSlotsSlotWithServiceResponseAsync(resourceGroupName, name, slot, slotSwapEntity), serviceCallback); + public ServiceCall swapSlotSlotAsync(String resourceGroupName, String name, String slot, CsmSlotEntityInner slotSwapEntity, final ServiceCallback serviceCallback) { + return ServiceCall.create(swapSlotSlotWithServiceResponseAsync(resourceGroupName, name, slot, slotSwapEntity), serviceCallback); } /** - * Swaps web app slots. - * Swaps web app slots. + * Swaps two deployment slots of an app. + * Swaps two deployment slots of an app. * - * @param resourceGroupName Name of resource group - * @param name Name of web app - * @param slot Name of source slot for the swap - * @param slotSwapEntity Request body that contains the target slot name + * @param resourceGroupName Name of the resource group to which the resource belongs. + * @param name Name of the app. + * @param slot Name of the source slot. If a slot is not specified, the production slot is used as the source slot. + * @param slotSwapEntity JSON object that contains the target slot name. See example. * @return the observable for the request */ - public Observable swapSlotsSlotAsync(String resourceGroupName, String name, String slot, CsmSlotEntityInner slotSwapEntity) { - return swapSlotsSlotWithServiceResponseAsync(resourceGroupName, name, slot, slotSwapEntity).map(new Func1, Object>() { + public Observable swapSlotSlotAsync(String resourceGroupName, String name, String slot, CsmSlotEntityInner slotSwapEntity) { + return swapSlotSlotWithServiceResponseAsync(resourceGroupName, name, slot, slotSwapEntity).map(new Func1, Void>() { @Override - public Object call(ServiceResponse response) { + public Void call(ServiceResponse response) { return response.getBody(); } }); } /** - * Swaps web app slots. - * Swaps web app slots. + * Swaps two deployment slots of an app. + * Swaps two deployment slots of an app. * - * @param resourceGroupName Name of resource group - * @param name Name of web app - * @param slot Name of source slot for the swap - * @param slotSwapEntity Request body that contains the target slot name + * @param resourceGroupName Name of the resource group to which the resource belongs. + * @param name Name of the app. + * @param slot Name of the source slot. If a slot is not specified, the production slot is used as the source slot. + * @param slotSwapEntity JSON object that contains the target slot name. See example. * @return the observable for the request */ - public Observable> swapSlotsSlotWithServiceResponseAsync(String resourceGroupName, String name, String slot, CsmSlotEntityInner slotSwapEntity) { + public Observable> swapSlotSlotWithServiceResponseAsync(String resourceGroupName, String name, String slot, CsmSlotEntityInner slotSwapEntity) { if (resourceGroupName == null) { throw new IllegalArgumentException("Parameter resourceGroupName is required and cannot be null."); } @@ -19074,69 +19382,68 @@ public Observable> swapSlotsSlotWithServiceResponseAsync } Validator.validate(slotSwapEntity); final String apiVersion = "2016-08-01"; - Observable> observable = service.swapSlotsSlot(resourceGroupName, name, slot, this.client.subscriptionId(), slotSwapEntity, apiVersion, this.client.acceptLanguage(), this.client.userAgent()); - return client.getAzureClient().getPostOrDeleteResultAsync(observable, new TypeToken() { }.getType()); + Observable> observable = service.swapSlotSlot(resourceGroupName, name, slot, this.client.subscriptionId(), slotSwapEntity, apiVersion, this.client.acceptLanguage(), this.client.userAgent()); + return client.getAzureClient().getPostOrDeleteResultAsync(observable, new TypeToken() { }.getType()); } /** - * Swaps web app slots. - * Swaps web app slots. + * Swaps two deployment slots of an app. + * Swaps two deployment slots of an app. * - * @param resourceGroupName Name of resource group - * @param name Name of web app - * @param slot Name of source slot for the swap - * @param slotSwapEntity Request body that contains the target slot name - * @return the Object object if successful. + * @param resourceGroupName Name of the resource group to which the resource belongs. + * @param name Name of the app. + * @param slot Name of the source slot. If a slot is not specified, the production slot is used as the source slot. + * @param slotSwapEntity JSON object that contains the target slot name. See example. */ - public Object beginSwapSlotsSlot(String resourceGroupName, String name, String slot, CsmSlotEntityInner slotSwapEntity) { - return beginSwapSlotsSlotWithServiceResponseAsync(resourceGroupName, name, slot, slotSwapEntity).toBlocking().single().getBody(); + public void beginSwapSlotSlot(String resourceGroupName, String name, String slot, CsmSlotEntityInner slotSwapEntity) { + beginSwapSlotSlotWithServiceResponseAsync(resourceGroupName, name, slot, slotSwapEntity).toBlocking().single().getBody(); } /** - * Swaps web app slots. - * Swaps web app slots. + * Swaps two deployment slots of an app. + * Swaps two deployment slots of an app. * - * @param resourceGroupName Name of resource group - * @param name Name of web app - * @param slot Name of source slot for the swap - * @param slotSwapEntity Request body that contains the target slot name + * @param resourceGroupName Name of the resource group to which the resource belongs. + * @param name Name of the app. + * @param slot Name of the source slot. If a slot is not specified, the production slot is used as the source slot. + * @param slotSwapEntity JSON object that contains the target slot name. See example. * @param serviceCallback the async ServiceCallback to handle successful and failed responses. * @return the {@link ServiceCall} object */ - public ServiceCall beginSwapSlotsSlotAsync(String resourceGroupName, String name, String slot, CsmSlotEntityInner slotSwapEntity, final ServiceCallback serviceCallback) { - return ServiceCall.create(beginSwapSlotsSlotWithServiceResponseAsync(resourceGroupName, name, slot, slotSwapEntity), serviceCallback); + public ServiceCall beginSwapSlotSlotAsync(String resourceGroupName, String name, String slot, CsmSlotEntityInner slotSwapEntity, final ServiceCallback serviceCallback) { + return ServiceCall.create(beginSwapSlotSlotWithServiceResponseAsync(resourceGroupName, name, slot, slotSwapEntity), serviceCallback); } /** - * Swaps web app slots. - * Swaps web app slots. + * Swaps two deployment slots of an app. + * Swaps two deployment slots of an app. * - * @param resourceGroupName Name of resource group - * @param name Name of web app - * @param slot Name of source slot for the swap - * @param slotSwapEntity Request body that contains the target slot name - * @return the observable to the Object object + * @param resourceGroupName Name of the resource group to which the resource belongs. + * @param name Name of the app. + * @param slot Name of the source slot. If a slot is not specified, the production slot is used as the source slot. + * @param slotSwapEntity JSON object that contains the target slot name. See example. + * @return the {@link ServiceResponse} object if successful. */ - public Observable beginSwapSlotsSlotAsync(String resourceGroupName, String name, String slot, CsmSlotEntityInner slotSwapEntity) { - return beginSwapSlotsSlotWithServiceResponseAsync(resourceGroupName, name, slot, slotSwapEntity).map(new Func1, Object>() { + public Observable beginSwapSlotSlotAsync(String resourceGroupName, String name, String slot, CsmSlotEntityInner slotSwapEntity) { + return beginSwapSlotSlotWithServiceResponseAsync(resourceGroupName, name, slot, slotSwapEntity).map(new Func1, Void>() { @Override - public Object call(ServiceResponse response) { + public Void call(ServiceResponse response) { return response.getBody(); } }); } /** - * Swaps web app slots. - * Swaps web app slots. + * Swaps two deployment slots of an app. + * Swaps two deployment slots of an app. * - * @param resourceGroupName Name of resource group - * @param name Name of web app - * @param slot Name of source slot for the swap - * @param slotSwapEntity Request body that contains the target slot name - * @return the observable to the Object object + * @param resourceGroupName Name of the resource group to which the resource belongs. + * @param name Name of the app. + * @param slot Name of the source slot. If a slot is not specified, the production slot is used as the source slot. + * @param slotSwapEntity JSON object that contains the target slot name. See example. + * @return the {@link ServiceResponse} object if successful. */ - public Observable> beginSwapSlotsSlotWithServiceResponseAsync(String resourceGroupName, String name, String slot, CsmSlotEntityInner slotSwapEntity) { + public Observable> beginSwapSlotSlotWithServiceResponseAsync(String resourceGroupName, String name, String slot, CsmSlotEntityInner slotSwapEntity) { if (resourceGroupName == null) { throw new IllegalArgumentException("Parameter resourceGroupName is required and cannot be null."); } @@ -19154,12 +19461,12 @@ public Observable> beginSwapSlotsSlotWithServiceResponse } Validator.validate(slotSwapEntity); final String apiVersion = "2016-08-01"; - return service.beginSwapSlotsSlot(resourceGroupName, name, slot, this.client.subscriptionId(), slotSwapEntity, apiVersion, this.client.acceptLanguage(), this.client.userAgent()) - .flatMap(new Func1, Observable>>() { + return service.beginSwapSlotSlot(resourceGroupName, name, slot, this.client.subscriptionId(), slotSwapEntity, apiVersion, this.client.acceptLanguage(), this.client.userAgent()) + .flatMap(new Func1, Observable>>() { @Override - public Observable> call(Response response) { + public Observable> call(Response response) { try { - ServiceResponse clientResponse = beginSwapSlotsSlotDelegate(response); + ServiceResponse clientResponse = beginSwapSlotSlotDelegate(response); return Observable.just(clientResponse); } catch (Throwable t) { return Observable.error(t); @@ -19168,11 +19475,10 @@ public Observable> call(Response response) }); } - private ServiceResponse beginSwapSlotsSlotDelegate(Response response) throws CloudException, IOException, IllegalArgumentException { - return new AzureServiceResponseBuilder(this.client.mapperAdapter()) - .register(200, new TypeToken() { }.getType()) - .register(202, new TypeToken() { }.getType()) - .registerError(CloudException.class) + private ServiceResponse beginSwapSlotSlotDelegate(Response response) throws CloudException, IOException, IllegalArgumentException { + return new AzureServiceResponseBuilder(this.client.mapperAdapter()) + .register(200, new TypeToken() { }.getType()) + .register(202, new TypeToken() { }.getType()) .build(response); } @@ -19180,7 +19486,7 @@ private ServiceResponse beginSwapSlotsSlotDelegate(Response nextPage(String nextPageLink) { * Returns all Snapshots to the user. * Returns all Snapshots to the user. * - * @param resourceGroupName Resource group + * @param resourceGroupName Name of the resource group to which the resource belongs. * @param name Website Name * @param slot Website Slot * @param serviceCallback the async ServiceCallback to handle successful and failed responses. @@ -19221,7 +19527,7 @@ public Observable>> call(String nextPageLink * Returns all Snapshots to the user. * Returns all Snapshots to the user. * - * @param resourceGroupName Resource group + * @param resourceGroupName Name of the resource group to which the resource belongs. * @param name Website Name * @param slot Website Slot * @return the observable to the PagedList<SnapshotInner> object @@ -19240,7 +19546,7 @@ public Page call(ServiceResponse> response) { * Returns all Snapshots to the user. * Returns all Snapshots to the user. * - * @param resourceGroupName Resource group + * @param resourceGroupName Name of the resource group to which the resource belongs. * @param name Website Name * @param slot Website Slot * @return the observable to the PagedList<SnapshotInner> object @@ -19263,7 +19569,7 @@ public Observable>> call(ServiceResponse> * @param resourceGroupName Resource group + ServiceResponse> * @param resourceGroupName Name of the resource group to which the resource belongs. ServiceResponse> * @param name Website Name ServiceResponse> * @param slot Website Slot * @return the PagedList<SnapshotInner> object wrapped in {@link ServiceResponse} if successful. @@ -19304,12 +19610,12 @@ private ServiceResponse> listSnapshotsSlotDelegate(Respo } /** - * Get the source control configuration of web app. - * Get the source control configuration of web app. + * Gets the source control configuration of an app. + * Gets the source control configuration of an app. * - * @param resourceGroupName Name of resource group - * @param name Name of web app - * @param slot Name of web app slot. If not specified then will default to production slot. + * @param resourceGroupName Name of the resource group to which the resource belongs. + * @param name Name of the app. + * @param slot Name of the deployment slot. If a slot is not specified, the API will get the source control configuration for the production slot. * @return the SiteSourceControlInner object if successful. */ public SiteSourceControlInner getSourceControlSlot(String resourceGroupName, String name, String slot) { @@ -19317,12 +19623,12 @@ public SiteSourceControlInner getSourceControlSlot(String resourceGroupName, Str } /** - * Get the source control configuration of web app. - * Get the source control configuration of web app. + * Gets the source control configuration of an app. + * Gets the source control configuration of an app. * - * @param resourceGroupName Name of resource group - * @param name Name of web app - * @param slot Name of web app slot. If not specified then will default to production slot. + * @param resourceGroupName Name of the resource group to which the resource belongs. + * @param name Name of the app. + * @param slot Name of the deployment slot. If a slot is not specified, the API will get the source control configuration for the production slot. * @param serviceCallback the async ServiceCallback to handle successful and failed responses. * @return the {@link ServiceCall} object */ @@ -19331,12 +19637,12 @@ public ServiceCall getSourceControlSlotAsync(String reso } /** - * Get the source control configuration of web app. - * Get the source control configuration of web app. + * Gets the source control configuration of an app. + * Gets the source control configuration of an app. * - * @param resourceGroupName Name of resource group - * @param name Name of web app - * @param slot Name of web app slot. If not specified then will default to production slot. + * @param resourceGroupName Name of the resource group to which the resource belongs. + * @param name Name of the app. + * @param slot Name of the deployment slot. If a slot is not specified, the API will get the source control configuration for the production slot. * @return the observable to the SiteSourceControlInner object */ public Observable getSourceControlSlotAsync(String resourceGroupName, String name, String slot) { @@ -19349,12 +19655,12 @@ public SiteSourceControlInner call(ServiceResponse respo } /** - * Get the source control configuration of web app. - * Get the source control configuration of web app. + * Gets the source control configuration of an app. + * Gets the source control configuration of an app. * - * @param resourceGroupName Name of resource group - * @param name Name of web app - * @param slot Name of web app slot. If not specified then will default to production slot. + * @param resourceGroupName Name of the resource group to which the resource belongs. + * @param name Name of the app. + * @param slot Name of the deployment slot. If a slot is not specified, the API will get the source control configuration for the production slot. * @return the observable to the SiteSourceControlInner object */ public Observable> getSourceControlSlotWithServiceResponseAsync(String resourceGroupName, String name, String slot) { @@ -19393,27 +19699,27 @@ private ServiceResponse getSourceControlSlotDelegate(Res } /** - * Update the source control configuration of web app. - * Update the source control configuration of web app. + * Updates the source control configuration of an app. + * Updates the source control configuration of an app. * - * @param resourceGroupName Name of resource group - * @param name Name of web app - * @param slot Name of web app slot. If not specified then will default to production slot. - * @param siteSourceControl Request body that contains the source control parameters + * @param resourceGroupName Name of the resource group to which the resource belongs. + * @param name Name of the app. + * @param slot Name of the deployment slot. If a slot is not specified, the API will update the source control configuration for the production slot. + * @param siteSourceControl JSON representation of a SiteSourceControl object. See example. * @return the SiteSourceControlInner object if successful. */ public SiteSourceControlInner createOrUpdateSourceControlSlot(String resourceGroupName, String name, String slot, SiteSourceControlInner siteSourceControl) { - return createOrUpdateSourceControlSlotWithServiceResponseAsync(resourceGroupName, name, slot, siteSourceControl).toBlocking().single().getBody(); + return createOrUpdateSourceControlSlotWithServiceResponseAsync(resourceGroupName, name, slot, siteSourceControl).toBlocking().last().getBody(); } /** - * Update the source control configuration of web app. - * Update the source control configuration of web app. + * Updates the source control configuration of an app. + * Updates the source control configuration of an app. * - * @param resourceGroupName Name of resource group - * @param name Name of web app - * @param slot Name of web app slot. If not specified then will default to production slot. - * @param siteSourceControl Request body that contains the source control parameters + * @param resourceGroupName Name of the resource group to which the resource belongs. + * @param name Name of the app. + * @param slot Name of the deployment slot. If a slot is not specified, the API will update the source control configuration for the production slot. + * @param siteSourceControl JSON representation of a SiteSourceControl object. See example. * @param serviceCallback the async ServiceCallback to handle successful and failed responses. * @return the {@link ServiceCall} object */ @@ -19422,14 +19728,14 @@ public ServiceCall createOrUpdateSourceControlSlotAsync( } /** - * Update the source control configuration of web app. - * Update the source control configuration of web app. + * Updates the source control configuration of an app. + * Updates the source control configuration of an app. * - * @param resourceGroupName Name of resource group - * @param name Name of web app - * @param slot Name of web app slot. If not specified then will default to production slot. - * @param siteSourceControl Request body that contains the source control parameters - * @return the observable to the SiteSourceControlInner object + * @param resourceGroupName Name of the resource group to which the resource belongs. + * @param name Name of the app. + * @param slot Name of the deployment slot. If a slot is not specified, the API will update the source control configuration for the production slot. + * @param siteSourceControl JSON representation of a SiteSourceControl object. See example. + * @return the observable for the request */ public Observable createOrUpdateSourceControlSlotAsync(String resourceGroupName, String name, String slot, SiteSourceControlInner siteSourceControl) { return createOrUpdateSourceControlSlotWithServiceResponseAsync(resourceGroupName, name, slot, siteSourceControl).map(new Func1, SiteSourceControlInner>() { @@ -19441,14 +19747,14 @@ public SiteSourceControlInner call(ServiceResponse respo } /** - * Update the source control configuration of web app. - * Update the source control configuration of web app. + * Updates the source control configuration of an app. + * Updates the source control configuration of an app. * - * @param resourceGroupName Name of resource group - * @param name Name of web app - * @param slot Name of web app slot. If not specified then will default to production slot. - * @param siteSourceControl Request body that contains the source control parameters - * @return the observable to the SiteSourceControlInner object + * @param resourceGroupName Name of the resource group to which the resource belongs. + * @param name Name of the app. + * @param slot Name of the deployment slot. If a slot is not specified, the API will update the source control configuration for the production slot. + * @param siteSourceControl JSON representation of a SiteSourceControl object. See example. + * @return the observable for the request */ public Observable> createOrUpdateSourceControlSlotWithServiceResponseAsync(String resourceGroupName, String name, String slot, SiteSourceControlInner siteSourceControl) { if (resourceGroupName == null) { @@ -19468,82 +19774,69 @@ public Observable> createOrUpdateSourceC } Validator.validate(siteSourceControl); final String apiVersion = "2016-08-01"; - return service.createOrUpdateSourceControlSlot(resourceGroupName, name, slot, this.client.subscriptionId(), siteSourceControl, apiVersion, this.client.acceptLanguage(), this.client.userAgent()) - .flatMap(new Func1, Observable>>() { - @Override - public Observable> call(Response response) { - try { - ServiceResponse clientResponse = createOrUpdateSourceControlSlotDelegate(response); - return Observable.just(clientResponse); - } catch (Throwable t) { - return Observable.error(t); - } - } - }); - } - - private ServiceResponse createOrUpdateSourceControlSlotDelegate(Response response) throws CloudException, IOException, IllegalArgumentException { - return new AzureServiceResponseBuilder(this.client.mapperAdapter()) - .register(200, new TypeToken() { }.getType()) - .registerError(CloudException.class) - .build(response); + Observable> observable = service.createOrUpdateSourceControlSlot(resourceGroupName, name, slot, this.client.subscriptionId(), siteSourceControl, apiVersion, this.client.acceptLanguage(), this.client.userAgent()); + return client.getAzureClient().getPutOrPatchResultAsync(observable, new TypeToken() { }.getType()); } /** - * Delete source control configuration of web app. - * Delete source control configuration of web app. + * Updates the source control configuration of an app. + * Updates the source control configuration of an app. * - * @param resourceGroupName Name of resource group - * @param name Name of web app - * @param slot Name of web app slot. If not specified then will default to production slot. - * @return the Object object if successful. + * @param resourceGroupName Name of the resource group to which the resource belongs. + * @param name Name of the app. + * @param slot Name of the deployment slot. If a slot is not specified, the API will update the source control configuration for the production slot. + * @param siteSourceControl JSON representation of a SiteSourceControl object. See example. + * @return the SiteSourceControlInner object if successful. */ - public Object deleteSourceControlSlot(String resourceGroupName, String name, String slot) { - return deleteSourceControlSlotWithServiceResponseAsync(resourceGroupName, name, slot).toBlocking().single().getBody(); + public SiteSourceControlInner beginCreateOrUpdateSourceControlSlot(String resourceGroupName, String name, String slot, SiteSourceControlInner siteSourceControl) { + return beginCreateOrUpdateSourceControlSlotWithServiceResponseAsync(resourceGroupName, name, slot, siteSourceControl).toBlocking().single().getBody(); } /** - * Delete source control configuration of web app. - * Delete source control configuration of web app. + * Updates the source control configuration of an app. + * Updates the source control configuration of an app. * - * @param resourceGroupName Name of resource group - * @param name Name of web app - * @param slot Name of web app slot. If not specified then will default to production slot. + * @param resourceGroupName Name of the resource group to which the resource belongs. + * @param name Name of the app. + * @param slot Name of the deployment slot. If a slot is not specified, the API will update the source control configuration for the production slot. + * @param siteSourceControl JSON representation of a SiteSourceControl object. See example. * @param serviceCallback the async ServiceCallback to handle successful and failed responses. * @return the {@link ServiceCall} object */ - public ServiceCall deleteSourceControlSlotAsync(String resourceGroupName, String name, String slot, final ServiceCallback serviceCallback) { - return ServiceCall.create(deleteSourceControlSlotWithServiceResponseAsync(resourceGroupName, name, slot), serviceCallback); + public ServiceCall beginCreateOrUpdateSourceControlSlotAsync(String resourceGroupName, String name, String slot, SiteSourceControlInner siteSourceControl, final ServiceCallback serviceCallback) { + return ServiceCall.create(beginCreateOrUpdateSourceControlSlotWithServiceResponseAsync(resourceGroupName, name, slot, siteSourceControl), serviceCallback); } /** - * Delete source control configuration of web app. - * Delete source control configuration of web app. + * Updates the source control configuration of an app. + * Updates the source control configuration of an app. * - * @param resourceGroupName Name of resource group - * @param name Name of web app - * @param slot Name of web app slot. If not specified then will default to production slot. - * @return the observable to the Object object + * @param resourceGroupName Name of the resource group to which the resource belongs. + * @param name Name of the app. + * @param slot Name of the deployment slot. If a slot is not specified, the API will update the source control configuration for the production slot. + * @param siteSourceControl JSON representation of a SiteSourceControl object. See example. + * @return the observable to the SiteSourceControlInner object */ - public Observable deleteSourceControlSlotAsync(String resourceGroupName, String name, String slot) { - return deleteSourceControlSlotWithServiceResponseAsync(resourceGroupName, name, slot).map(new Func1, Object>() { + public Observable beginCreateOrUpdateSourceControlSlotAsync(String resourceGroupName, String name, String slot, SiteSourceControlInner siteSourceControl) { + return beginCreateOrUpdateSourceControlSlotWithServiceResponseAsync(resourceGroupName, name, slot, siteSourceControl).map(new Func1, SiteSourceControlInner>() { @Override - public Object call(ServiceResponse response) { + public SiteSourceControlInner call(ServiceResponse response) { return response.getBody(); } }); } /** - * Delete source control configuration of web app. - * Delete source control configuration of web app. + * Updates the source control configuration of an app. + * Updates the source control configuration of an app. * - * @param resourceGroupName Name of resource group - * @param name Name of web app - * @param slot Name of web app slot. If not specified then will default to production slot. - * @return the observable to the Object object + * @param resourceGroupName Name of the resource group to which the resource belongs. + * @param name Name of the app. + * @param slot Name of the deployment slot. If a slot is not specified, the API will update the source control configuration for the production slot. + * @param siteSourceControl JSON representation of a SiteSourceControl object. See example. + * @return the observable to the SiteSourceControlInner object */ - public Observable> deleteSourceControlSlotWithServiceResponseAsync(String resourceGroupName, String name, String slot) { + public Observable> beginCreateOrUpdateSourceControlSlotWithServiceResponseAsync(String resourceGroupName, String name, String slot, SiteSourceControlInner siteSourceControl) { if (resourceGroupName == null) { throw new IllegalArgumentException("Parameter resourceGroupName is required and cannot be null."); } @@ -19556,13 +19849,17 @@ public Observable> deleteSourceControlSlotWithServiceRes if (this.client.subscriptionId() == null) { throw new IllegalArgumentException("Parameter this.client.subscriptionId() is required and cannot be null."); } + if (siteSourceControl == null) { + throw new IllegalArgumentException("Parameter siteSourceControl is required and cannot be null."); + } + Validator.validate(siteSourceControl); final String apiVersion = "2016-08-01"; - return service.deleteSourceControlSlot(resourceGroupName, name, slot, this.client.subscriptionId(), apiVersion, this.client.acceptLanguage(), this.client.userAgent()) - .flatMap(new Func1, Observable>>() { + return service.beginCreateOrUpdateSourceControlSlot(resourceGroupName, name, slot, this.client.subscriptionId(), siteSourceControl, apiVersion, this.client.acceptLanguage(), this.client.userAgent()) + .flatMap(new Func1, Observable>>() { @Override - public Observable> call(Response response) { + public Observable> call(Response response) { try { - ServiceResponse clientResponse = deleteSourceControlSlotDelegate(response); + ServiceResponse clientResponse = beginCreateOrUpdateSourceControlSlotDelegate(response); return Observable.just(clientResponse); } catch (Throwable t) { return Observable.error(t); @@ -19571,72 +19868,69 @@ public Observable> call(Response response) }); } - private ServiceResponse deleteSourceControlSlotDelegate(Response response) throws CloudException, IOException, IllegalArgumentException { - return new AzureServiceResponseBuilder(this.client.mapperAdapter()) - .register(200, new TypeToken() { }.getType()) + private ServiceResponse beginCreateOrUpdateSourceControlSlotDelegate(Response response) throws CloudException, IOException, IllegalArgumentException { + return new AzureServiceResponseBuilder(this.client.mapperAdapter()) + .register(200, new TypeToken() { }.getType()) + .register(201, new TypeToken() { }.getType()) .registerError(CloudException.class) .build(response); } /** - * Update the source control configuration of web app. - * Update the source control configuration of web app. + * Deletes the source control configuration of an app. + * Deletes the source control configuration of an app. * - * @param resourceGroupName Name of resource group - * @param name Name of web app - * @param slot Name of web app slot. If not specified then will default to production slot. - * @param siteSourceControl Request body that contains the source control parameters - * @return the SiteSourceControlInner object if successful. + * @param resourceGroupName Name of the resource group to which the resource belongs. + * @param name Name of the app. + * @param slot Name of the deployment slot. If a slot is not specified, the API will delete the source control configuration for the production slot. + * @return the Object object if successful. */ - public SiteSourceControlInner updateSourceControlSlot(String resourceGroupName, String name, String slot, SiteSourceControlInner siteSourceControl) { - return updateSourceControlSlotWithServiceResponseAsync(resourceGroupName, name, slot, siteSourceControl).toBlocking().single().getBody(); + public Object deleteSourceControlSlot(String resourceGroupName, String name, String slot) { + return deleteSourceControlSlotWithServiceResponseAsync(resourceGroupName, name, slot).toBlocking().single().getBody(); } /** - * Update the source control configuration of web app. - * Update the source control configuration of web app. + * Deletes the source control configuration of an app. + * Deletes the source control configuration of an app. * - * @param resourceGroupName Name of resource group - * @param name Name of web app - * @param slot Name of web app slot. If not specified then will default to production slot. - * @param siteSourceControl Request body that contains the source control parameters + * @param resourceGroupName Name of the resource group to which the resource belongs. + * @param name Name of the app. + * @param slot Name of the deployment slot. If a slot is not specified, the API will delete the source control configuration for the production slot. * @param serviceCallback the async ServiceCallback to handle successful and failed responses. * @return the {@link ServiceCall} object */ - public ServiceCall updateSourceControlSlotAsync(String resourceGroupName, String name, String slot, SiteSourceControlInner siteSourceControl, final ServiceCallback serviceCallback) { - return ServiceCall.create(updateSourceControlSlotWithServiceResponseAsync(resourceGroupName, name, slot, siteSourceControl), serviceCallback); + public ServiceCall deleteSourceControlSlotAsync(String resourceGroupName, String name, String slot, final ServiceCallback serviceCallback) { + return ServiceCall.create(deleteSourceControlSlotWithServiceResponseAsync(resourceGroupName, name, slot), serviceCallback); } /** - * Update the source control configuration of web app. - * Update the source control configuration of web app. + * Deletes the source control configuration of an app. + * Deletes the source control configuration of an app. * - * @param resourceGroupName Name of resource group - * @param name Name of web app - * @param slot Name of web app slot. If not specified then will default to production slot. - * @param siteSourceControl Request body that contains the source control parameters - * @return the observable to the SiteSourceControlInner object + * @param resourceGroupName Name of the resource group to which the resource belongs. + * @param name Name of the app. + * @param slot Name of the deployment slot. If a slot is not specified, the API will delete the source control configuration for the production slot. + * @return the observable to the Object object */ - public Observable updateSourceControlSlotAsync(String resourceGroupName, String name, String slot, SiteSourceControlInner siteSourceControl) { - return updateSourceControlSlotWithServiceResponseAsync(resourceGroupName, name, slot, siteSourceControl).map(new Func1, SiteSourceControlInner>() { + public Observable deleteSourceControlSlotAsync(String resourceGroupName, String name, String slot) { + return deleteSourceControlSlotWithServiceResponseAsync(resourceGroupName, name, slot).map(new Func1, Object>() { @Override - public SiteSourceControlInner call(ServiceResponse response) { + public Object call(ServiceResponse response) { return response.getBody(); } }); } /** - * Update the source control configuration of web app. - * Update the source control configuration of web app. + * Deletes the source control configuration of an app. + * Deletes the source control configuration of an app. * - * @param resourceGroupName Name of resource group - * @param name Name of web app - * @param slot Name of web app slot. If not specified then will default to production slot. - * @param siteSourceControl Request body that contains the source control parameters - * @return the observable to the SiteSourceControlInner object + * @param resourceGroupName Name of the resource group to which the resource belongs. + * @param name Name of the app. + * @param slot Name of the deployment slot. If a slot is not specified, the API will delete the source control configuration for the production slot. + * @return the observable to the Object object */ - public Observable> updateSourceControlSlotWithServiceResponseAsync(String resourceGroupName, String name, String slot, SiteSourceControlInner siteSourceControl) { + public Observable> deleteSourceControlSlotWithServiceResponseAsync(String resourceGroupName, String name, String slot) { if (resourceGroupName == null) { throw new IllegalArgumentException("Parameter resourceGroupName is required and cannot be null."); } @@ -19649,17 +19943,13 @@ public Observable> updateSourceControlSl if (this.client.subscriptionId() == null) { throw new IllegalArgumentException("Parameter this.client.subscriptionId() is required and cannot be null."); } - if (siteSourceControl == null) { - throw new IllegalArgumentException("Parameter siteSourceControl is required and cannot be null."); - } - Validator.validate(siteSourceControl); final String apiVersion = "2016-08-01"; - return service.updateSourceControlSlot(resourceGroupName, name, slot, this.client.subscriptionId(), siteSourceControl, apiVersion, this.client.acceptLanguage(), this.client.userAgent()) - .flatMap(new Func1, Observable>>() { + return service.deleteSourceControlSlot(resourceGroupName, name, slot, this.client.subscriptionId(), apiVersion, this.client.acceptLanguage(), this.client.userAgent()) + .flatMap(new Func1, Observable>>() { @Override - public Observable> call(Response response) { + public Observable> call(Response response) { try { - ServiceResponse clientResponse = updateSourceControlSlotDelegate(response); + ServiceResponse clientResponse = deleteSourceControlSlotDelegate(response); return Observable.just(clientResponse); } catch (Throwable t) { return Observable.error(t); @@ -19668,68 +19958,69 @@ public Observable> call(Response updateSourceControlSlotDelegate(Response response) throws CloudException, IOException, IllegalArgumentException { - return new AzureServiceResponseBuilder(this.client.mapperAdapter()) - .register(201, new TypeToken() { }.getType()) + private ServiceResponse deleteSourceControlSlotDelegate(Response response) throws CloudException, IOException, IllegalArgumentException { + return new AzureServiceResponseBuilder(this.client.mapperAdapter()) + .register(200, new TypeToken() { }.getType()) + .register(202, new TypeToken() { }.getType()) + .register(404, new TypeToken() { }.getType()) .registerError(CloudException.class) .build(response); } /** - * Starts web app. - * Starts web app. + * Starts an app (or deployment slot, if specified). + * Starts an app (or deployment slot, if specified). * - * @param resourceGroupName Name of resource group - * @param name Name of web app - * @param slot Name of web app slot. If not specified then will default to production slot. - * @return the Object object if successful. + * @param resourceGroupName Name of the resource group to which the resource belongs. + * @param name Name of the app. + * @param slot Name of the deployment slot. If a slot is not specified, the API will start the production slot. */ - public Object startSlot(String resourceGroupName, String name, String slot) { - return startSlotWithServiceResponseAsync(resourceGroupName, name, slot).toBlocking().single().getBody(); + public void startSlot(String resourceGroupName, String name, String slot) { + startSlotWithServiceResponseAsync(resourceGroupName, name, slot).toBlocking().single().getBody(); } /** - * Starts web app. - * Starts web app. + * Starts an app (or deployment slot, if specified). + * Starts an app (or deployment slot, if specified). * - * @param resourceGroupName Name of resource group - * @param name Name of web app - * @param slot Name of web app slot. If not specified then will default to production slot. + * @param resourceGroupName Name of the resource group to which the resource belongs. + * @param name Name of the app. + * @param slot Name of the deployment slot. If a slot is not specified, the API will start the production slot. * @param serviceCallback the async ServiceCallback to handle successful and failed responses. * @return the {@link ServiceCall} object */ - public ServiceCall startSlotAsync(String resourceGroupName, String name, String slot, final ServiceCallback serviceCallback) { + public ServiceCall startSlotAsync(String resourceGroupName, String name, String slot, final ServiceCallback serviceCallback) { return ServiceCall.create(startSlotWithServiceResponseAsync(resourceGroupName, name, slot), serviceCallback); } /** - * Starts web app. - * Starts web app. + * Starts an app (or deployment slot, if specified). + * Starts an app (or deployment slot, if specified). * - * @param resourceGroupName Name of resource group - * @param name Name of web app - * @param slot Name of web app slot. If not specified then will default to production slot. - * @return the observable to the Object object + * @param resourceGroupName Name of the resource group to which the resource belongs. + * @param name Name of the app. + * @param slot Name of the deployment slot. If a slot is not specified, the API will start the production slot. + * @return the {@link ServiceResponse} object if successful. */ - public Observable startSlotAsync(String resourceGroupName, String name, String slot) { - return startSlotWithServiceResponseAsync(resourceGroupName, name, slot).map(new Func1, Object>() { + public Observable startSlotAsync(String resourceGroupName, String name, String slot) { + return startSlotWithServiceResponseAsync(resourceGroupName, name, slot).map(new Func1, Void>() { @Override - public Object call(ServiceResponse response) { + public Void call(ServiceResponse response) { return response.getBody(); } }); } /** - * Starts web app. - * Starts web app. + * Starts an app (or deployment slot, if specified). + * Starts an app (or deployment slot, if specified). * - * @param resourceGroupName Name of resource group - * @param name Name of web app - * @param slot Name of web app slot. If not specified then will default to production slot. - * @return the observable to the Object object + * @param resourceGroupName Name of the resource group to which the resource belongs. + * @param name Name of the app. + * @param slot Name of the deployment slot. If a slot is not specified, the API will start the production slot. + * @return the {@link ServiceResponse} object if successful. */ - public Observable> startSlotWithServiceResponseAsync(String resourceGroupName, String name, String slot) { + public Observable> startSlotWithServiceResponseAsync(String resourceGroupName, String name, String slot) { if (resourceGroupName == null) { throw new IllegalArgumentException("Parameter resourceGroupName is required and cannot be null."); } @@ -19744,11 +20035,11 @@ public Observable> startSlotWithServiceResponseAsync(Str } final String apiVersion = "2016-08-01"; return service.startSlot(resourceGroupName, name, slot, this.client.subscriptionId(), apiVersion, this.client.acceptLanguage(), this.client.userAgent()) - .flatMap(new Func1, Observable>>() { + .flatMap(new Func1, Observable>>() { @Override - public Observable> call(Response response) { + public Observable> call(Response response) { try { - ServiceResponse clientResponse = startSlotDelegate(response); + ServiceResponse clientResponse = startSlotDelegate(response); return Observable.just(clientResponse); } catch (Throwable t) { return Observable.error(t); @@ -19757,68 +20048,66 @@ public Observable> call(Response response) }); } - private ServiceResponse startSlotDelegate(Response response) throws CloudException, IOException, IllegalArgumentException { - return new AzureServiceResponseBuilder(this.client.mapperAdapter()) - .register(200, new TypeToken() { }.getType()) - .registerError(CloudException.class) + private ServiceResponse startSlotDelegate(Response response) throws CloudException, IOException, IllegalArgumentException { + return new AzureServiceResponseBuilder(this.client.mapperAdapter()) + .register(204, new TypeToken() { }.getType()) .build(response); } /** - * Stops web app. - * Stops web app. + * Stops an app (or deployment slot, if specified). + * Stops an app (or deployment slot, if specified). * - * @param resourceGroupName Name of resource group - * @param name Name of web app - * @param slot Name of web app slot. If not specified then will default to production slot. - * @return the Object object if successful. + * @param resourceGroupName Name of the resource group to which the resource belongs. + * @param name Name of the app. + * @param slot Name of the deployment slot. If a slot is not specified, the API will stop the production slot. */ - public Object stopSlot(String resourceGroupName, String name, String slot) { - return stopSlotWithServiceResponseAsync(resourceGroupName, name, slot).toBlocking().single().getBody(); + public void stopSlot(String resourceGroupName, String name, String slot) { + stopSlotWithServiceResponseAsync(resourceGroupName, name, slot).toBlocking().single().getBody(); } /** - * Stops web app. - * Stops web app. + * Stops an app (or deployment slot, if specified). + * Stops an app (or deployment slot, if specified). * - * @param resourceGroupName Name of resource group - * @param name Name of web app - * @param slot Name of web app slot. If not specified then will default to production slot. + * @param resourceGroupName Name of the resource group to which the resource belongs. + * @param name Name of the app. + * @param slot Name of the deployment slot. If a slot is not specified, the API will stop the production slot. * @param serviceCallback the async ServiceCallback to handle successful and failed responses. * @return the {@link ServiceCall} object */ - public ServiceCall stopSlotAsync(String resourceGroupName, String name, String slot, final ServiceCallback serviceCallback) { + public ServiceCall stopSlotAsync(String resourceGroupName, String name, String slot, final ServiceCallback serviceCallback) { return ServiceCall.create(stopSlotWithServiceResponseAsync(resourceGroupName, name, slot), serviceCallback); } /** - * Stops web app. - * Stops web app. + * Stops an app (or deployment slot, if specified). + * Stops an app (or deployment slot, if specified). * - * @param resourceGroupName Name of resource group - * @param name Name of web app - * @param slot Name of web app slot. If not specified then will default to production slot. - * @return the observable to the Object object + * @param resourceGroupName Name of the resource group to which the resource belongs. + * @param name Name of the app. + * @param slot Name of the deployment slot. If a slot is not specified, the API will stop the production slot. + * @return the {@link ServiceResponse} object if successful. */ - public Observable stopSlotAsync(String resourceGroupName, String name, String slot) { - return stopSlotWithServiceResponseAsync(resourceGroupName, name, slot).map(new Func1, Object>() { + public Observable stopSlotAsync(String resourceGroupName, String name, String slot) { + return stopSlotWithServiceResponseAsync(resourceGroupName, name, slot).map(new Func1, Void>() { @Override - public Object call(ServiceResponse response) { + public Void call(ServiceResponse response) { return response.getBody(); } }); } /** - * Stops web app. - * Stops web app. + * Stops an app (or deployment slot, if specified). + * Stops an app (or deployment slot, if specified). * - * @param resourceGroupName Name of resource group - * @param name Name of web app - * @param slot Name of web app slot. If not specified then will default to production slot. - * @return the observable to the Object object + * @param resourceGroupName Name of the resource group to which the resource belongs. + * @param name Name of the app. + * @param slot Name of the deployment slot. If a slot is not specified, the API will stop the production slot. + * @return the {@link ServiceResponse} object if successful. */ - public Observable> stopSlotWithServiceResponseAsync(String resourceGroupName, String name, String slot) { + public Observable> stopSlotWithServiceResponseAsync(String resourceGroupName, String name, String slot) { if (resourceGroupName == null) { throw new IllegalArgumentException("Parameter resourceGroupName is required and cannot be null."); } @@ -19833,11 +20122,11 @@ public Observable> stopSlotWithServiceResponseAsync(Stri } final String apiVersion = "2016-08-01"; return service.stopSlot(resourceGroupName, name, slot, this.client.subscriptionId(), apiVersion, this.client.acceptLanguage(), this.client.userAgent()) - .flatMap(new Func1, Observable>>() { + .flatMap(new Func1, Observable>>() { @Override - public Observable> call(Response response) { + public Observable> call(Response response) { try { - ServiceResponse clientResponse = stopSlotDelegate(response); + ServiceResponse clientResponse = stopSlotDelegate(response); return Observable.just(clientResponse); } catch (Throwable t) { return Observable.error(t); @@ -19846,10 +20135,9 @@ public Observable> call(Response response) }); } - private ServiceResponse stopSlotDelegate(Response response) throws CloudException, IOException, IllegalArgumentException { - return new AzureServiceResponseBuilder(this.client.mapperAdapter()) - .register(200, new TypeToken() { }.getType()) - .registerError(CloudException.class) + private ServiceResponse stopSlotDelegate(Response response) throws CloudException, IOException, IllegalArgumentException { + return new AzureServiceResponseBuilder(this.client.mapperAdapter()) + .register(204, new TypeToken() { }.getType()) .build(response); } @@ -19857,26 +20145,25 @@ private ServiceResponse stopSlotDelegate(Response response * Sync web app repository. * Sync web app repository. * - * @param resourceGroupName Name of resource group + * @param resourceGroupName Name of the resource group to which the resource belongs. * @param name Name of web app * @param slot Name of web app slot. If not specified then will default to production slot. - * @return the Object object if successful. */ - public Object syncRepositorySlot(String resourceGroupName, String name, String slot) { - return syncRepositorySlotWithServiceResponseAsync(resourceGroupName, name, slot).toBlocking().single().getBody(); + public void syncRepositorySlot(String resourceGroupName, String name, String slot) { + syncRepositorySlotWithServiceResponseAsync(resourceGroupName, name, slot).toBlocking().single().getBody(); } /** * Sync web app repository. * Sync web app repository. * - * @param resourceGroupName Name of resource group + * @param resourceGroupName Name of the resource group to which the resource belongs. * @param name Name of web app * @param slot Name of web app slot. If not specified then will default to production slot. * @param serviceCallback the async ServiceCallback to handle successful and failed responses. * @return the {@link ServiceCall} object */ - public ServiceCall syncRepositorySlotAsync(String resourceGroupName, String name, String slot, final ServiceCallback serviceCallback) { + public ServiceCall syncRepositorySlotAsync(String resourceGroupName, String name, String slot, final ServiceCallback serviceCallback) { return ServiceCall.create(syncRepositorySlotWithServiceResponseAsync(resourceGroupName, name, slot), serviceCallback); } @@ -19884,15 +20171,15 @@ public ServiceCall syncRepositorySlotAsync(String resourceGroupName, Str * Sync web app repository. * Sync web app repository. * - * @param resourceGroupName Name of resource group + * @param resourceGroupName Name of the resource group to which the resource belongs. * @param name Name of web app * @param slot Name of web app slot. If not specified then will default to production slot. - * @return the observable to the Object object + * @return the {@link ServiceResponse} object if successful. */ - public Observable syncRepositorySlotAsync(String resourceGroupName, String name, String slot) { - return syncRepositorySlotWithServiceResponseAsync(resourceGroupName, name, slot).map(new Func1, Object>() { + public Observable syncRepositorySlotAsync(String resourceGroupName, String name, String slot) { + return syncRepositorySlotWithServiceResponseAsync(resourceGroupName, name, slot).map(new Func1, Void>() { @Override - public Object call(ServiceResponse response) { + public Void call(ServiceResponse response) { return response.getBody(); } }); @@ -19902,12 +20189,12 @@ public Object call(ServiceResponse response) { * Sync web app repository. * Sync web app repository. * - * @param resourceGroupName Name of resource group + * @param resourceGroupName Name of the resource group to which the resource belongs. * @param name Name of web app * @param slot Name of web app slot. If not specified then will default to production slot. - * @return the observable to the Object object + * @return the {@link ServiceResponse} object if successful. */ - public Observable> syncRepositorySlotWithServiceResponseAsync(String resourceGroupName, String name, String slot) { + public Observable> syncRepositorySlotWithServiceResponseAsync(String resourceGroupName, String name, String slot) { if (resourceGroupName == null) { throw new IllegalArgumentException("Parameter resourceGroupName is required and cannot be null."); } @@ -19922,11 +20209,11 @@ public Observable> syncRepositorySlotWithServiceResponse } final String apiVersion = "2016-08-01"; return service.syncRepositorySlot(resourceGroupName, name, slot, this.client.subscriptionId(), apiVersion, this.client.acceptLanguage(), this.client.userAgent()) - .flatMap(new Func1, Observable>>() { + .flatMap(new Func1, Observable>>() { @Override - public Observable> call(Response response) { + public Observable> call(Response response) { try { - ServiceResponse clientResponse = syncRepositorySlotDelegate(response); + ServiceResponse clientResponse = syncRepositorySlotDelegate(response); return Observable.just(clientResponse); } catch (Throwable t) { return Observable.error(t); @@ -19935,20 +20222,19 @@ public Observable> call(Response response) }); } - private ServiceResponse syncRepositorySlotDelegate(Response response) throws CloudException, IOException, IllegalArgumentException { - return new AzureServiceResponseBuilder(this.client.mapperAdapter()) - .register(200, new TypeToken() { }.getType()) - .registerError(CloudException.class) + private ServiceResponse syncRepositorySlotDelegate(Response response) throws CloudException, IOException, IllegalArgumentException { + return new AzureServiceResponseBuilder(this.client.mapperAdapter()) + .register(204, new TypeToken() { }.getType()) .build(response); } /** - * Gets the quota usage numbers for web app. - * Gets the quota usage numbers for web app. + * Gets the quota usage information of an app (or deployment slot, if specified). + * Gets the quota usage information of an app (or deployment slot, if specified). * - * @param resourceGroupName Name of resource group - * @param name Name of web app - * @param slot Name of web app slot. If not specified then will default to production slot. + * @param resourceGroupName Name of the resource group to which the resource belongs. + * @param name Name of the app. + * @param slot Name of the deployment slot. If a slot is not specified, the API will get quota information of the production slot. * @return the PagedList<CsmUsageQuotaInner> object if successful. */ public PagedList listUsagesSlot(final String resourceGroupName, final String name, final String slot) { @@ -19962,12 +20248,12 @@ public Page nextPage(String nextPageLink) { } /** - * Gets the quota usage numbers for web app. - * Gets the quota usage numbers for web app. + * Gets the quota usage information of an app (or deployment slot, if specified). + * Gets the quota usage information of an app (or deployment slot, if specified). * - * @param resourceGroupName Name of resource group - * @param name Name of web app - * @param slot Name of web app slot. If not specified then will default to production slot. + * @param resourceGroupName Name of the resource group to which the resource belongs. + * @param name Name of the app. + * @param slot Name of the deployment slot. If a slot is not specified, the API will get quota information of the production slot. * @param serviceCallback the async ServiceCallback to handle successful and failed responses. * @return the {@link ServiceCall} object */ @@ -19984,12 +20270,12 @@ public Observable>> call(String nextPag } /** - * Gets the quota usage numbers for web app. - * Gets the quota usage numbers for web app. + * Gets the quota usage information of an app (or deployment slot, if specified). + * Gets the quota usage information of an app (or deployment slot, if specified). * - * @param resourceGroupName Name of resource group - * @param name Name of web app - * @param slot Name of web app slot. If not specified then will default to production slot. + * @param resourceGroupName Name of the resource group to which the resource belongs. + * @param name Name of the app. + * @param slot Name of the deployment slot. If a slot is not specified, the API will get quota information of the production slot. * @return the observable to the PagedList<CsmUsageQuotaInner> object */ public Observable> listUsagesSlotAsync(final String resourceGroupName, final String name, final String slot) { @@ -20003,12 +20289,12 @@ public Page call(ServiceResponse> r } /** - * Gets the quota usage numbers for web app. - * Gets the quota usage numbers for web app. + * Gets the quota usage information of an app (or deployment slot, if specified). + * Gets the quota usage information of an app (or deployment slot, if specified). * - * @param resourceGroupName Name of resource group - * @param name Name of web app - * @param slot Name of web app slot. If not specified then will default to production slot. + * @param resourceGroupName Name of the resource group to which the resource belongs. + * @param name Name of the app. + * @param slot Name of the deployment slot. If a slot is not specified, the API will get quota information of the production slot. * @return the observable to the PagedList<CsmUsageQuotaInner> object */ public Observable>> listUsagesSlotWithServiceResponseAsync(final String resourceGroupName, final String name, final String slot) { @@ -20026,12 +20312,12 @@ public Observable>> call(ServiceRespons } /** - * Gets the quota usage numbers for web app. - * Gets the quota usage numbers for web app. + * Gets the quota usage information of an app (or deployment slot, if specified). + * Gets the quota usage information of an app (or deployment slot, if specified). * - * @param resourceGroupName Name of resource group - * @param name Name of web app - * @param slot Name of web app slot. If not specified then will default to production slot. + * @param resourceGroupName Name of the resource group to which the resource belongs. + * @param name Name of the app. + * @param slot Name of the deployment slot. If a slot is not specified, the API will get quota information of the production slot. * @return the PagedList<CsmUsageQuotaInner> object wrapped in {@link ServiceResponse} if successful. */ public Observable>> listUsagesSlotSinglePageAsync(final String resourceGroupName, final String name, final String slot) { @@ -20064,13 +20350,13 @@ public Observable>> call(Response listUsagesSlot(final String resourceGroupName, final String name, final String slot, final String filter) { @@ -20084,13 +20370,13 @@ public Page nextPage(String nextPageLink) { } /** - * Gets the quota usage numbers for web app. - * Gets the quota usage numbers for web app. + * Gets the quota usage information of an app (or deployment slot, if specified). + * Gets the quota usage information of an app (or deployment slot, if specified). * - * @param resourceGroupName Name of resource group - * @param name Name of web app - * @param slot Name of web app slot. If not specified then will default to production slot. - * @param filter Return only usages specified in the filter. Filter is specified by using OData syntax. Example: $filter=(name.value eq 'Metric1' or name.value eq 'Metric2') and startTime eq '2014-01-01T00:00:00Z' and endTime eq '2014-12-31T23:59:59Z' and timeGrain eq duration'[Hour|Minute|Day]'. + * @param resourceGroupName Name of the resource group to which the resource belongs. + * @param name Name of the app. + * @param slot Name of the deployment slot. If a slot is not specified, the API will get quota information of the production slot. + * @param filter Return only information specified in the filter (using OData syntax). For example: $filter=(name.value eq 'Metric1' or name.value eq 'Metric2') and startTime eq '2014-01-01T00:00:00Z' and endTime eq '2014-12-31T23:59:59Z' and timeGrain eq duration'[Hour|Minute|Day]'. * @param serviceCallback the async ServiceCallback to handle successful and failed responses. * @return the {@link ServiceCall} object */ @@ -20107,13 +20393,13 @@ public Observable>> call(String nextPag } /** - * Gets the quota usage numbers for web app. - * Gets the quota usage numbers for web app. + * Gets the quota usage information of an app (or deployment slot, if specified). + * Gets the quota usage information of an app (or deployment slot, if specified). * - * @param resourceGroupName Name of resource group - * @param name Name of web app - * @param slot Name of web app slot. If not specified then will default to production slot. - * @param filter Return only usages specified in the filter. Filter is specified by using OData syntax. Example: $filter=(name.value eq 'Metric1' or name.value eq 'Metric2') and startTime eq '2014-01-01T00:00:00Z' and endTime eq '2014-12-31T23:59:59Z' and timeGrain eq duration'[Hour|Minute|Day]'. + * @param resourceGroupName Name of the resource group to which the resource belongs. + * @param name Name of the app. + * @param slot Name of the deployment slot. If a slot is not specified, the API will get quota information of the production slot. + * @param filter Return only information specified in the filter (using OData syntax). For example: $filter=(name.value eq 'Metric1' or name.value eq 'Metric2') and startTime eq '2014-01-01T00:00:00Z' and endTime eq '2014-12-31T23:59:59Z' and timeGrain eq duration'[Hour|Minute|Day]'. * @return the observable to the PagedList<CsmUsageQuotaInner> object */ public Observable> listUsagesSlotAsync(final String resourceGroupName, final String name, final String slot, final String filter) { @@ -20127,13 +20413,13 @@ public Page call(ServiceResponse> r } /** - * Gets the quota usage numbers for web app. - * Gets the quota usage numbers for web app. + * Gets the quota usage information of an app (or deployment slot, if specified). + * Gets the quota usage information of an app (or deployment slot, if specified). * - * @param resourceGroupName Name of resource group - * @param name Name of web app - * @param slot Name of web app slot. If not specified then will default to production slot. - * @param filter Return only usages specified in the filter. Filter is specified by using OData syntax. Example: $filter=(name.value eq 'Metric1' or name.value eq 'Metric2') and startTime eq '2014-01-01T00:00:00Z' and endTime eq '2014-12-31T23:59:59Z' and timeGrain eq duration'[Hour|Minute|Day]'. + * @param resourceGroupName Name of the resource group to which the resource belongs. + * @param name Name of the app. + * @param slot Name of the deployment slot. If a slot is not specified, the API will get quota information of the production slot. + * @param filter Return only information specified in the filter (using OData syntax). For example: $filter=(name.value eq 'Metric1' or name.value eq 'Metric2') and startTime eq '2014-01-01T00:00:00Z' and endTime eq '2014-12-31T23:59:59Z' and timeGrain eq duration'[Hour|Minute|Day]'. * @return the observable to the PagedList<CsmUsageQuotaInner> object */ public Observable>> listUsagesSlotWithServiceResponseAsync(final String resourceGroupName, final String name, final String slot, final String filter) { @@ -20151,13 +20437,13 @@ public Observable>> call(ServiceRespons } /** - * Gets the quota usage numbers for web app. - * Gets the quota usage numbers for web app. + * Gets the quota usage information of an app (or deployment slot, if specified). + * Gets the quota usage information of an app (or deployment slot, if specified). * - ServiceResponse> * @param resourceGroupName Name of resource group - ServiceResponse> * @param name Name of web app - ServiceResponse> * @param slot Name of web app slot. If not specified then will default to production slot. - ServiceResponse> * @param filter Return only usages specified in the filter. Filter is specified by using OData syntax. Example: $filter=(name.value eq 'Metric1' or name.value eq 'Metric2') and startTime eq '2014-01-01T00:00:00Z' and endTime eq '2014-12-31T23:59:59Z' and timeGrain eq duration'[Hour|Minute|Day]'. + ServiceResponse> * @param resourceGroupName Name of the resource group to which the resource belongs. + ServiceResponse> * @param name Name of the app. + ServiceResponse> * @param slot Name of the deployment slot. If a slot is not specified, the API will get quota information of the production slot. + ServiceResponse> * @param filter Return only information specified in the filter (using OData syntax). For example: $filter=(name.value eq 'Metric1' or name.value eq 'Metric2') and startTime eq '2014-01-01T00:00:00Z' and endTime eq '2014-12-31T23:59:59Z' and timeGrain eq duration'[Hour|Minute|Day]'. * @return the PagedList<CsmUsageQuotaInner> object wrapped in {@link ServiceResponse} if successful. */ public Observable>> listUsagesSlotSinglePageAsync(final String resourceGroupName, final String name, final String slot, final String filter) { @@ -20196,12 +20482,12 @@ private ServiceResponse> listUsagesSlotDelegate(Res } /** - * Retrieves a list of all Virtual Network Connections associated with this web app. - * Retrieves a list of all Virtual Network Connections associated with this web app. + * Gets the virtual networks the app (or deployment slot) is connected to. + * Gets the virtual networks the app (or deployment slot) is connected to. * - * @param resourceGroupName The resource group name - * @param name The name of the web app - * @param slot The name of the slot for this web app. + * @param resourceGroupName Name of the resource group to which the resource belongs. + * @param name Name of the app. + * @param slot Name of the deployment slot. If a slot is not specified, the API will get virtual network connections for the production slot. * @return the List<VnetInfoInner> object if successful. */ public List listVnetConnectionsSlot(String resourceGroupName, String name, String slot) { @@ -20209,12 +20495,12 @@ public List listVnetConnectionsSlot(String resourceGroupName, Str } /** - * Retrieves a list of all Virtual Network Connections associated with this web app. - * Retrieves a list of all Virtual Network Connections associated with this web app. + * Gets the virtual networks the app (or deployment slot) is connected to. + * Gets the virtual networks the app (or deployment slot) is connected to. * - * @param resourceGroupName The resource group name - * @param name The name of the web app - * @param slot The name of the slot for this web app. + * @param resourceGroupName Name of the resource group to which the resource belongs. + * @param name Name of the app. + * @param slot Name of the deployment slot. If a slot is not specified, the API will get virtual network connections for the production slot. * @param serviceCallback the async ServiceCallback to handle successful and failed responses. * @return the {@link ServiceCall} object */ @@ -20223,12 +20509,12 @@ public ServiceCall> listVnetConnectionsSlotAsync(String reso } /** - * Retrieves a list of all Virtual Network Connections associated with this web app. - * Retrieves a list of all Virtual Network Connections associated with this web app. + * Gets the virtual networks the app (or deployment slot) is connected to. + * Gets the virtual networks the app (or deployment slot) is connected to. * - * @param resourceGroupName The resource group name - * @param name The name of the web app - * @param slot The name of the slot for this web app. + * @param resourceGroupName Name of the resource group to which the resource belongs. + * @param name Name of the app. + * @param slot Name of the deployment slot. If a slot is not specified, the API will get virtual network connections for the production slot. * @return the observable to the List<VnetInfoInner> object */ public Observable> listVnetConnectionsSlotAsync(String resourceGroupName, String name, String slot) { @@ -20241,12 +20527,12 @@ public List call(ServiceResponse> response) { } /** - * Retrieves a list of all Virtual Network Connections associated with this web app. - * Retrieves a list of all Virtual Network Connections associated with this web app. + * Gets the virtual networks the app (or deployment slot) is connected to. + * Gets the virtual networks the app (or deployment slot) is connected to. * - * @param resourceGroupName The resource group name - * @param name The name of the web app - * @param slot The name of the slot for this web app. + * @param resourceGroupName Name of the resource group to which the resource belongs. + * @param name Name of the app. + * @param slot Name of the deployment slot. If a slot is not specified, the API will get virtual network connections for the production slot. * @return the observable to the List<VnetInfoInner> object */ public Observable>> listVnetConnectionsSlotWithServiceResponseAsync(String resourceGroupName, String name, String slot) { @@ -20285,13 +20571,13 @@ private ServiceResponse> listVnetConnectionsSlotDelegate(Res } /** - * Retrieves a specific Virtual Network Connection associated with this web app. - * Retrieves a specific Virtual Network Connection associated with this web app. + * Gets a virtual network the app (or deployment slot) is connected to by name. + * Gets a virtual network the app (or deployment slot) is connected to by name. * - * @param resourceGroupName The resource group name - * @param name The name of the web app - * @param vnetName The name of the Virtual Network - * @param slot The name of the slot for this web app. + * @param resourceGroupName Name of the resource group to which the resource belongs. + * @param name Name of the app. + * @param vnetName Name of the virtual network. + * @param slot Name of the deployment slot. If a slot is not specified, the API will get the named virtual network for the production slot. * @return the VnetInfoInner object if successful. */ public VnetInfoInner getVnetConnectionSlot(String resourceGroupName, String name, String vnetName, String slot) { @@ -20299,13 +20585,13 @@ public VnetInfoInner getVnetConnectionSlot(String resourceGroupName, String name } /** - * Retrieves a specific Virtual Network Connection associated with this web app. - * Retrieves a specific Virtual Network Connection associated with this web app. + * Gets a virtual network the app (or deployment slot) is connected to by name. + * Gets a virtual network the app (or deployment slot) is connected to by name. * - * @param resourceGroupName The resource group name - * @param name The name of the web app - * @param vnetName The name of the Virtual Network - * @param slot The name of the slot for this web app. + * @param resourceGroupName Name of the resource group to which the resource belongs. + * @param name Name of the app. + * @param vnetName Name of the virtual network. + * @param slot Name of the deployment slot. If a slot is not specified, the API will get the named virtual network for the production slot. * @param serviceCallback the async ServiceCallback to handle successful and failed responses. * @return the {@link ServiceCall} object */ @@ -20314,13 +20600,13 @@ public ServiceCall getVnetConnectionSlotAsync(String resourceGrou } /** - * Retrieves a specific Virtual Network Connection associated with this web app. - * Retrieves a specific Virtual Network Connection associated with this web app. + * Gets a virtual network the app (or deployment slot) is connected to by name. + * Gets a virtual network the app (or deployment slot) is connected to by name. * - * @param resourceGroupName The resource group name - * @param name The name of the web app - * @param vnetName The name of the Virtual Network - * @param slot The name of the slot for this web app. + * @param resourceGroupName Name of the resource group to which the resource belongs. + * @param name Name of the app. + * @param vnetName Name of the virtual network. + * @param slot Name of the deployment slot. If a slot is not specified, the API will get the named virtual network for the production slot. * @return the observable to the VnetInfoInner object */ public Observable getVnetConnectionSlotAsync(String resourceGroupName, String name, String vnetName, String slot) { @@ -20333,13 +20619,13 @@ public VnetInfoInner call(ServiceResponse response) { } /** - * Retrieves a specific Virtual Network Connection associated with this web app. - * Retrieves a specific Virtual Network Connection associated with this web app. + * Gets a virtual network the app (or deployment slot) is connected to by name. + * Gets a virtual network the app (or deployment slot) is connected to by name. * - * @param resourceGroupName The resource group name - * @param name The name of the web app - * @param vnetName The name of the Virtual Network - * @param slot The name of the slot for this web app. + * @param resourceGroupName Name of the resource group to which the resource belongs. + * @param name Name of the app. + * @param vnetName Name of the virtual network. + * @param slot Name of the deployment slot. If a slot is not specified, the API will get the named virtual network for the production slot. * @return the observable to the VnetInfoInner object */ public Observable> getVnetConnectionSlotWithServiceResponseAsync(String resourceGroupName, String name, String vnetName, String slot) { @@ -20381,14 +20667,14 @@ private ServiceResponse getVnetConnectionSlotDelegate(Response createOrUpdateVnetConnectionSlotAsync(String r } /** - * Adds a Virtual Network Connection or updates it's properties. - * Adds a Virtual Network Connection or updates it's properties. + * Adds a Virtual Network connection to an app or slot (PUT) or updates the connection properties (PATCH). + * Adds a Virtual Network connection to an app or slot (PUT) or updates the connection properties (PATCH). * - * @param resourceGroupName The resource group name - * @param name The name of the web app - * @param vnetName The name of the Virtual Network - * @param slot The name of the slot for this web app. - * @param connectionEnvelope The properties of this Virtual Network Connection + * @param resourceGroupName Name of the resource group to which the resource belongs. + * @param name Name of the app. + * @param vnetName Name of an existing Virtual Network. + * @param slot Name of the deployment slot. If a slot is not specified, the API will add or update connections for the production slot. + * @param connectionEnvelope Properties of the Virtual Network connection. See example. * @return the observable to the VnetInfoInner object */ public Observable createOrUpdateVnetConnectionSlotAsync(String resourceGroupName, String name, String vnetName, String slot, VnetInfoInner connectionEnvelope) { @@ -20432,14 +20718,14 @@ public VnetInfoInner call(ServiceResponse response) { } /** - * Adds a Virtual Network Connection or updates it's properties. - * Adds a Virtual Network Connection or updates it's properties. + * Adds a Virtual Network connection to an app or slot (PUT) or updates the connection properties (PATCH). + * Adds a Virtual Network connection to an app or slot (PUT) or updates the connection properties (PATCH). * - * @param resourceGroupName The resource group name - * @param name The name of the web app - * @param vnetName The name of the Virtual Network - * @param slot The name of the slot for this web app. - * @param connectionEnvelope The properties of this Virtual Network Connection + * @param resourceGroupName Name of the resource group to which the resource belongs. + * @param name Name of the app. + * @param vnetName Name of an existing Virtual Network. + * @param slot Name of the deployment slot. If a slot is not specified, the API will add or update connections for the production slot. + * @param connectionEnvelope Properties of the Virtual Network connection. See example. * @return the observable to the VnetInfoInner object */ public Observable> createOrUpdateVnetConnectionSlotWithServiceResponseAsync(String resourceGroupName, String name, String vnetName, String slot, VnetInfoInner connectionEnvelope) { @@ -20485,64 +20771,63 @@ private ServiceResponse createOrUpdateVnetConnectionSlotDelegate( } /** - * Removes the specified Virtual Network Connection association from this web app. - * Removes the specified Virtual Network Connection association from this web app. + * Deletes a connection from an app (or deployment slot to a named virtual network. + * Deletes a connection from an app (or deployment slot to a named virtual network. * - * @param resourceGroupName The resource group name - * @param name The name of the web app - * @param vnetName The name of the Virtual Network - * @param slot The name of the slot for this web app. - * @return the Object object if successful. + * @param resourceGroupName Name of the resource group to which the resource belongs. + * @param name Name of the app. + * @param vnetName Name of the virtual network. + * @param slot Name of the deployment slot. If a slot is not specified, the API will delete the connection for the production slot. */ - public Object deleteVnetConnectionSlot(String resourceGroupName, String name, String vnetName, String slot) { - return deleteVnetConnectionSlotWithServiceResponseAsync(resourceGroupName, name, vnetName, slot).toBlocking().single().getBody(); + public void deleteVnetConnectionSlot(String resourceGroupName, String name, String vnetName, String slot) { + deleteVnetConnectionSlotWithServiceResponseAsync(resourceGroupName, name, vnetName, slot).toBlocking().single().getBody(); } /** - * Removes the specified Virtual Network Connection association from this web app. - * Removes the specified Virtual Network Connection association from this web app. + * Deletes a connection from an app (or deployment slot to a named virtual network. + * Deletes a connection from an app (or deployment slot to a named virtual network. * - * @param resourceGroupName The resource group name - * @param name The name of the web app - * @param vnetName The name of the Virtual Network - * @param slot The name of the slot for this web app. + * @param resourceGroupName Name of the resource group to which the resource belongs. + * @param name Name of the app. + * @param vnetName Name of the virtual network. + * @param slot Name of the deployment slot. If a slot is not specified, the API will delete the connection for the production slot. * @param serviceCallback the async ServiceCallback to handle successful and failed responses. * @return the {@link ServiceCall} object */ - public ServiceCall deleteVnetConnectionSlotAsync(String resourceGroupName, String name, String vnetName, String slot, final ServiceCallback serviceCallback) { + public ServiceCall deleteVnetConnectionSlotAsync(String resourceGroupName, String name, String vnetName, String slot, final ServiceCallback serviceCallback) { return ServiceCall.create(deleteVnetConnectionSlotWithServiceResponseAsync(resourceGroupName, name, vnetName, slot), serviceCallback); } /** - * Removes the specified Virtual Network Connection association from this web app. - * Removes the specified Virtual Network Connection association from this web app. + * Deletes a connection from an app (or deployment slot to a named virtual network. + * Deletes a connection from an app (or deployment slot to a named virtual network. * - * @param resourceGroupName The resource group name - * @param name The name of the web app - * @param vnetName The name of the Virtual Network - * @param slot The name of the slot for this web app. - * @return the observable to the Object object + * @param resourceGroupName Name of the resource group to which the resource belongs. + * @param name Name of the app. + * @param vnetName Name of the virtual network. + * @param slot Name of the deployment slot. If a slot is not specified, the API will delete the connection for the production slot. + * @return the {@link ServiceResponse} object if successful. */ - public Observable deleteVnetConnectionSlotAsync(String resourceGroupName, String name, String vnetName, String slot) { - return deleteVnetConnectionSlotWithServiceResponseAsync(resourceGroupName, name, vnetName, slot).map(new Func1, Object>() { + public Observable deleteVnetConnectionSlotAsync(String resourceGroupName, String name, String vnetName, String slot) { + return deleteVnetConnectionSlotWithServiceResponseAsync(resourceGroupName, name, vnetName, slot).map(new Func1, Void>() { @Override - public Object call(ServiceResponse response) { + public Void call(ServiceResponse response) { return response.getBody(); } }); } /** - * Removes the specified Virtual Network Connection association from this web app. - * Removes the specified Virtual Network Connection association from this web app. + * Deletes a connection from an app (or deployment slot to a named virtual network. + * Deletes a connection from an app (or deployment slot to a named virtual network. * - * @param resourceGroupName The resource group name - * @param name The name of the web app - * @param vnetName The name of the Virtual Network - * @param slot The name of the slot for this web app. - * @return the observable to the Object object + * @param resourceGroupName Name of the resource group to which the resource belongs. + * @param name Name of the app. + * @param vnetName Name of the virtual network. + * @param slot Name of the deployment slot. If a slot is not specified, the API will delete the connection for the production slot. + * @return the {@link ServiceResponse} object if successful. */ - public Observable> deleteVnetConnectionSlotWithServiceResponseAsync(String resourceGroupName, String name, String vnetName, String slot) { + public Observable> deleteVnetConnectionSlotWithServiceResponseAsync(String resourceGroupName, String name, String vnetName, String slot) { if (resourceGroupName == null) { throw new IllegalArgumentException("Parameter resourceGroupName is required and cannot be null."); } @@ -20560,11 +20845,11 @@ public Observable> deleteVnetConnectionSlotWithServiceRe } final String apiVersion = "2016-08-01"; return service.deleteVnetConnectionSlot(resourceGroupName, name, vnetName, slot, this.client.subscriptionId(), apiVersion, this.client.acceptLanguage(), this.client.userAgent()) - .flatMap(new Func1, Observable>>() { + .flatMap(new Func1, Observable>>() { @Override - public Observable> call(Response response) { + public Observable> call(Response response) { try { - ServiceResponse clientResponse = deleteVnetConnectionSlotDelegate(response); + ServiceResponse clientResponse = deleteVnetConnectionSlotDelegate(response); return Observable.just(clientResponse); } catch (Throwable t) { return Observable.error(t); @@ -20573,22 +20858,22 @@ public Observable> call(Response response) }); } - private ServiceResponse deleteVnetConnectionSlotDelegate(Response response) throws CloudException, IOException, IllegalArgumentException { - return new AzureServiceResponseBuilder(this.client.mapperAdapter()) - .register(200, new TypeToken() { }.getType()) - .registerError(CloudException.class) + private ServiceResponse deleteVnetConnectionSlotDelegate(Response response) throws CloudException, IOException, IllegalArgumentException { + return new AzureServiceResponseBuilder(this.client.mapperAdapter()) + .register(200, new TypeToken() { }.getType()) + .register(404, new TypeToken() { }.getType()) .build(response); } /** - * Adds a Virtual Network Connection or updates it's properties. - * Adds a Virtual Network Connection or updates it's properties. + * Adds a Virtual Network connection to an app or slot (PUT) or updates the connection properties (PATCH). + * Adds a Virtual Network connection to an app or slot (PUT) or updates the connection properties (PATCH). * - * @param resourceGroupName The resource group name - * @param name The name of the web app - * @param vnetName The name of the Virtual Network - * @param slot The name of the slot for this web app. - * @param connectionEnvelope The properties of this Virtual Network Connection + * @param resourceGroupName Name of the resource group to which the resource belongs. + * @param name Name of the app. + * @param vnetName Name of an existing Virtual Network. + * @param slot Name of the deployment slot. If a slot is not specified, the API will add or update connections for the production slot. + * @param connectionEnvelope Properties of the Virtual Network connection. See example. * @return the VnetInfoInner object if successful. */ public VnetInfoInner updateVnetConnectionSlot(String resourceGroupName, String name, String vnetName, String slot, VnetInfoInner connectionEnvelope) { @@ -20596,14 +20881,14 @@ public VnetInfoInner updateVnetConnectionSlot(String resourceGroupName, String n } /** - * Adds a Virtual Network Connection or updates it's properties. - * Adds a Virtual Network Connection or updates it's properties. + * Adds a Virtual Network connection to an app or slot (PUT) or updates the connection properties (PATCH). + * Adds a Virtual Network connection to an app or slot (PUT) or updates the connection properties (PATCH). * - * @param resourceGroupName The resource group name - * @param name The name of the web app - * @param vnetName The name of the Virtual Network - * @param slot The name of the slot for this web app. - * @param connectionEnvelope The properties of this Virtual Network Connection + * @param resourceGroupName Name of the resource group to which the resource belongs. + * @param name Name of the app. + * @param vnetName Name of an existing Virtual Network. + * @param slot Name of the deployment slot. If a slot is not specified, the API will add or update connections for the production slot. + * @param connectionEnvelope Properties of the Virtual Network connection. See example. * @param serviceCallback the async ServiceCallback to handle successful and failed responses. * @return the {@link ServiceCall} object */ @@ -20612,14 +20897,14 @@ public ServiceCall updateVnetConnectionSlotAsync(String resourceG } /** - * Adds a Virtual Network Connection or updates it's properties. - * Adds a Virtual Network Connection or updates it's properties. + * Adds a Virtual Network connection to an app or slot (PUT) or updates the connection properties (PATCH). + * Adds a Virtual Network connection to an app or slot (PUT) or updates the connection properties (PATCH). * - * @param resourceGroupName The resource group name - * @param name The name of the web app - * @param vnetName The name of the Virtual Network - * @param slot The name of the slot for this web app. - * @param connectionEnvelope The properties of this Virtual Network Connection + * @param resourceGroupName Name of the resource group to which the resource belongs. + * @param name Name of the app. + * @param vnetName Name of an existing Virtual Network. + * @param slot Name of the deployment slot. If a slot is not specified, the API will add or update connections for the production slot. + * @param connectionEnvelope Properties of the Virtual Network connection. See example. * @return the observable to the VnetInfoInner object */ public Observable updateVnetConnectionSlotAsync(String resourceGroupName, String name, String vnetName, String slot, VnetInfoInner connectionEnvelope) { @@ -20632,14 +20917,14 @@ public VnetInfoInner call(ServiceResponse response) { } /** - * Adds a Virtual Network Connection or updates it's properties. - * Adds a Virtual Network Connection or updates it's properties. + * Adds a Virtual Network connection to an app or slot (PUT) or updates the connection properties (PATCH). + * Adds a Virtual Network connection to an app or slot (PUT) or updates the connection properties (PATCH). * - * @param resourceGroupName The resource group name - * @param name The name of the web app - * @param vnetName The name of the Virtual Network - * @param slot The name of the slot for this web app. - * @param connectionEnvelope The properties of this Virtual Network Connection + * @param resourceGroupName Name of the resource group to which the resource belongs. + * @param name Name of the app. + * @param vnetName Name of an existing Virtual Network. + * @param slot Name of the deployment slot. If a slot is not specified, the API will add or update connections for the production slot. + * @param connectionEnvelope Properties of the Virtual Network connection. See example. * @return the observable to the VnetInfoInner object */ public Observable> updateVnetConnectionSlotWithServiceResponseAsync(String resourceGroupName, String name, String vnetName, String slot, VnetInfoInner connectionEnvelope) { @@ -20685,68 +20970,68 @@ private ServiceResponse updateVnetConnectionSlotDelegate(Response } /** - * Retrieves a Virtual Network connection gateway associated with this web app and virtual network. - * Retrieves a Virtual Network connection gateway associated with this web app and virtual network. + * Gets an app's Virtual Network gateway. + * Gets an app's Virtual Network gateway. * - * @param resourceGroupName The resource group name - * @param name The name of the web app - * @param vnetName The name of the Virtual Network - * @param gatewayName The name of the gateway. The only gateway that exists presently is "primary" - * @param slot The name of the slot for this web app. - * @return the Object object if successful. + * @param resourceGroupName Name of the resource group to which the resource belongs. + * @param name Name of the app. + * @param vnetName Name of the Virtual Network. + * @param gatewayName Name of the gateway. Currently, the only supported string is "primary". + * @param slot Name of the deployment slot. If a slot is not specified, the API will get a gateway for the production slot's Virtual Network. + * @return the VnetGatewayInner object if successful. */ - public Object getVnetConnectionGatewaySlot(String resourceGroupName, String name, String vnetName, String gatewayName, String slot) { + public VnetGatewayInner getVnetConnectionGatewaySlot(String resourceGroupName, String name, String vnetName, String gatewayName, String slot) { return getVnetConnectionGatewaySlotWithServiceResponseAsync(resourceGroupName, name, vnetName, gatewayName, slot).toBlocking().single().getBody(); } /** - * Retrieves a Virtual Network connection gateway associated with this web app and virtual network. - * Retrieves a Virtual Network connection gateway associated with this web app and virtual network. + * Gets an app's Virtual Network gateway. + * Gets an app's Virtual Network gateway. * - * @param resourceGroupName The resource group name - * @param name The name of the web app - * @param vnetName The name of the Virtual Network - * @param gatewayName The name of the gateway. The only gateway that exists presently is "primary" - * @param slot The name of the slot for this web app. + * @param resourceGroupName Name of the resource group to which the resource belongs. + * @param name Name of the app. + * @param vnetName Name of the Virtual Network. + * @param gatewayName Name of the gateway. Currently, the only supported string is "primary". + * @param slot Name of the deployment slot. If a slot is not specified, the API will get a gateway for the production slot's Virtual Network. * @param serviceCallback the async ServiceCallback to handle successful and failed responses. * @return the {@link ServiceCall} object */ - public ServiceCall getVnetConnectionGatewaySlotAsync(String resourceGroupName, String name, String vnetName, String gatewayName, String slot, final ServiceCallback serviceCallback) { + public ServiceCall getVnetConnectionGatewaySlotAsync(String resourceGroupName, String name, String vnetName, String gatewayName, String slot, final ServiceCallback serviceCallback) { return ServiceCall.create(getVnetConnectionGatewaySlotWithServiceResponseAsync(resourceGroupName, name, vnetName, gatewayName, slot), serviceCallback); } /** - * Retrieves a Virtual Network connection gateway associated with this web app and virtual network. - * Retrieves a Virtual Network connection gateway associated with this web app and virtual network. + * Gets an app's Virtual Network gateway. + * Gets an app's Virtual Network gateway. * - * @param resourceGroupName The resource group name - * @param name The name of the web app - * @param vnetName The name of the Virtual Network - * @param gatewayName The name of the gateway. The only gateway that exists presently is "primary" - * @param slot The name of the slot for this web app. - * @return the observable to the Object object + * @param resourceGroupName Name of the resource group to which the resource belongs. + * @param name Name of the app. + * @param vnetName Name of the Virtual Network. + * @param gatewayName Name of the gateway. Currently, the only supported string is "primary". + * @param slot Name of the deployment slot. If a slot is not specified, the API will get a gateway for the production slot's Virtual Network. + * @return the observable to the VnetGatewayInner object */ - public Observable getVnetConnectionGatewaySlotAsync(String resourceGroupName, String name, String vnetName, String gatewayName, String slot) { - return getVnetConnectionGatewaySlotWithServiceResponseAsync(resourceGroupName, name, vnetName, gatewayName, slot).map(new Func1, Object>() { + public Observable getVnetConnectionGatewaySlotAsync(String resourceGroupName, String name, String vnetName, String gatewayName, String slot) { + return getVnetConnectionGatewaySlotWithServiceResponseAsync(resourceGroupName, name, vnetName, gatewayName, slot).map(new Func1, VnetGatewayInner>() { @Override - public Object call(ServiceResponse response) { + public VnetGatewayInner call(ServiceResponse response) { return response.getBody(); } }); } /** - * Retrieves a Virtual Network connection gateway associated with this web app and virtual network. - * Retrieves a Virtual Network connection gateway associated with this web app and virtual network. + * Gets an app's Virtual Network gateway. + * Gets an app's Virtual Network gateway. * - * @param resourceGroupName The resource group name - * @param name The name of the web app - * @param vnetName The name of the Virtual Network - * @param gatewayName The name of the gateway. The only gateway that exists presently is "primary" - * @param slot The name of the slot for this web app. - * @return the observable to the Object object + * @param resourceGroupName Name of the resource group to which the resource belongs. + * @param name Name of the app. + * @param vnetName Name of the Virtual Network. + * @param gatewayName Name of the gateway. Currently, the only supported string is "primary". + * @param slot Name of the deployment slot. If a slot is not specified, the API will get a gateway for the production slot's Virtual Network. + * @return the observable to the VnetGatewayInner object */ - public Observable> getVnetConnectionGatewaySlotWithServiceResponseAsync(String resourceGroupName, String name, String vnetName, String gatewayName, String slot) { + public Observable> getVnetConnectionGatewaySlotWithServiceResponseAsync(String resourceGroupName, String name, String vnetName, String gatewayName, String slot) { if (resourceGroupName == null) { throw new IllegalArgumentException("Parameter resourceGroupName is required and cannot be null."); } @@ -20767,11 +21052,11 @@ public Observable> getVnetConnectionGatewaySlotWithServi } final String apiVersion = "2016-08-01"; return service.getVnetConnectionGatewaySlot(resourceGroupName, name, vnetName, gatewayName, slot, this.client.subscriptionId(), apiVersion, this.client.acceptLanguage(), this.client.userAgent()) - .flatMap(new Func1, Observable>>() { + .flatMap(new Func1, Observable>>() { @Override - public Observable> call(Response response) { + public Observable> call(Response response) { try { - ServiceResponse clientResponse = getVnetConnectionGatewaySlotDelegate(response); + ServiceResponse clientResponse = getVnetConnectionGatewaySlotDelegate(response); return Observable.just(clientResponse); } catch (Throwable t) { return Observable.error(t); @@ -20780,23 +21065,23 @@ public Observable> call(Response response) }); } - private ServiceResponse getVnetConnectionGatewaySlotDelegate(Response response) throws CloudException, IOException, IllegalArgumentException { - return new AzureServiceResponseBuilder(this.client.mapperAdapter()) - .register(200, new TypeToken() { }.getType()) + private ServiceResponse getVnetConnectionGatewaySlotDelegate(Response response) throws CloudException, IOException, IllegalArgumentException { + return new AzureServiceResponseBuilder(this.client.mapperAdapter()) + .register(200, new TypeToken() { }.getType()) .register(404, new TypeToken() { }.getType()) .registerError(CloudException.class) .build(response); } /** - * Updates the Virtual Network Gateway. - * Updates the Virtual Network Gateway. + * Adds a gateway to a connected Virtual Network (PUT) or updates it (PATCH). + * Adds a gateway to a connected Virtual Network (PUT) or updates it (PATCH). * - * @param resourceGroupName The resource group name - * @param name The name of the web app - * @param vnetName The name of the Virtual Network - * @param gatewayName The name of the gateway. The only gateway that exists presently is "primary" - * @param slot The name of the slot for this web app. + * @param resourceGroupName Name of the resource group to which the resource belongs. + * @param name Name of the app. + * @param vnetName Name of the Virtual Network. + * @param gatewayName Name of the gateway. Currently, the only supported string is "primary". + * @param slot Name of the deployment slot. If a slot is not specified, the API will add or update a gateway for the production slot's Virtual Network. * @param connectionEnvelope The properties to update this gateway with. * @return the VnetGatewayInner object if successful. */ @@ -20805,14 +21090,14 @@ public VnetGatewayInner createOrUpdateVnetConnectionGatewaySlot(String resourceG } /** - * Updates the Virtual Network Gateway. - * Updates the Virtual Network Gateway. + * Adds a gateway to a connected Virtual Network (PUT) or updates it (PATCH). + * Adds a gateway to a connected Virtual Network (PUT) or updates it (PATCH). * - * @param resourceGroupName The resource group name - * @param name The name of the web app - * @param vnetName The name of the Virtual Network - * @param gatewayName The name of the gateway. The only gateway that exists presently is "primary" - * @param slot The name of the slot for this web app. + * @param resourceGroupName Name of the resource group to which the resource belongs. + * @param name Name of the app. + * @param vnetName Name of the Virtual Network. + * @param gatewayName Name of the gateway. Currently, the only supported string is "primary". + * @param slot Name of the deployment slot. If a slot is not specified, the API will add or update a gateway for the production slot's Virtual Network. * @param connectionEnvelope The properties to update this gateway with. * @param serviceCallback the async ServiceCallback to handle successful and failed responses. * @return the {@link ServiceCall} object @@ -20822,14 +21107,14 @@ public ServiceCall createOrUpdateVnetConnectionGatewaySlotAsyn } /** - * Updates the Virtual Network Gateway. - * Updates the Virtual Network Gateway. + * Adds a gateway to a connected Virtual Network (PUT) or updates it (PATCH). + * Adds a gateway to a connected Virtual Network (PUT) or updates it (PATCH). * - * @param resourceGroupName The resource group name - * @param name The name of the web app - * @param vnetName The name of the Virtual Network - * @param gatewayName The name of the gateway. The only gateway that exists presently is "primary" - * @param slot The name of the slot for this web app. + * @param resourceGroupName Name of the resource group to which the resource belongs. + * @param name Name of the app. + * @param vnetName Name of the Virtual Network. + * @param gatewayName Name of the gateway. Currently, the only supported string is "primary". + * @param slot Name of the deployment slot. If a slot is not specified, the API will add or update a gateway for the production slot's Virtual Network. * @param connectionEnvelope The properties to update this gateway with. * @return the observable to the VnetGatewayInner object */ @@ -20843,14 +21128,14 @@ public VnetGatewayInner call(ServiceResponse response) { } /** - * Updates the Virtual Network Gateway. - * Updates the Virtual Network Gateway. + * Adds a gateway to a connected Virtual Network (PUT) or updates it (PATCH). + * Adds a gateway to a connected Virtual Network (PUT) or updates it (PATCH). * - * @param resourceGroupName The resource group name - * @param name The name of the web app - * @param vnetName The name of the Virtual Network - * @param gatewayName The name of the gateway. The only gateway that exists presently is "primary" - * @param slot The name of the slot for this web app. + * @param resourceGroupName Name of the resource group to which the resource belongs. + * @param name Name of the app. + * @param vnetName Name of the Virtual Network. + * @param gatewayName Name of the gateway. Currently, the only supported string is "primary". + * @param slot Name of the deployment slot. If a slot is not specified, the API will add or update a gateway for the production slot's Virtual Network. * @param connectionEnvelope The properties to update this gateway with. * @return the observable to the VnetGatewayInner object */ @@ -20900,14 +21185,14 @@ private ServiceResponse createOrUpdateVnetConnectionGatewaySlo } /** - * Updates the Virtual Network Gateway. - * Updates the Virtual Network Gateway. + * Adds a gateway to a connected Virtual Network (PUT) or updates it (PATCH). + * Adds a gateway to a connected Virtual Network (PUT) or updates it (PATCH). * - * @param resourceGroupName The resource group name - * @param name The name of the web app - * @param vnetName The name of the Virtual Network - * @param gatewayName The name of the gateway. The only gateway that exists presently is "primary" - * @param slot The name of the slot for this web app. + * @param resourceGroupName Name of the resource group to which the resource belongs. + * @param name Name of the app. + * @param vnetName Name of the Virtual Network. + * @param gatewayName Name of the gateway. Currently, the only supported string is "primary". + * @param slot Name of the deployment slot. If a slot is not specified, the API will add or update a gateway for the production slot's Virtual Network. * @param connectionEnvelope The properties to update this gateway with. * @return the VnetGatewayInner object if successful. */ @@ -20916,14 +21201,14 @@ public VnetGatewayInner updateVnetConnectionGatewaySlot(String resourceGroupName } /** - * Updates the Virtual Network Gateway. - * Updates the Virtual Network Gateway. + * Adds a gateway to a connected Virtual Network (PUT) or updates it (PATCH). + * Adds a gateway to a connected Virtual Network (PUT) or updates it (PATCH). * - * @param resourceGroupName The resource group name - * @param name The name of the web app - * @param vnetName The name of the Virtual Network - * @param gatewayName The name of the gateway. The only gateway that exists presently is "primary" - * @param slot The name of the slot for this web app. + * @param resourceGroupName Name of the resource group to which the resource belongs. + * @param name Name of the app. + * @param vnetName Name of the Virtual Network. + * @param gatewayName Name of the gateway. Currently, the only supported string is "primary". + * @param slot Name of the deployment slot. If a slot is not specified, the API will add or update a gateway for the production slot's Virtual Network. * @param connectionEnvelope The properties to update this gateway with. * @param serviceCallback the async ServiceCallback to handle successful and failed responses. * @return the {@link ServiceCall} object @@ -20933,14 +21218,14 @@ public ServiceCall updateVnetConnectionGatewaySlotAsync(String } /** - * Updates the Virtual Network Gateway. - * Updates the Virtual Network Gateway. + * Adds a gateway to a connected Virtual Network (PUT) or updates it (PATCH). + * Adds a gateway to a connected Virtual Network (PUT) or updates it (PATCH). * - * @param resourceGroupName The resource group name - * @param name The name of the web app - * @param vnetName The name of the Virtual Network - * @param gatewayName The name of the gateway. The only gateway that exists presently is "primary" - * @param slot The name of the slot for this web app. + * @param resourceGroupName Name of the resource group to which the resource belongs. + * @param name Name of the app. + * @param vnetName Name of the Virtual Network. + * @param gatewayName Name of the gateway. Currently, the only supported string is "primary". + * @param slot Name of the deployment slot. If a slot is not specified, the API will add or update a gateway for the production slot's Virtual Network. * @param connectionEnvelope The properties to update this gateway with. * @return the observable to the VnetGatewayInner object */ @@ -20954,14 +21239,14 @@ public VnetGatewayInner call(ServiceResponse response) { } /** - * Updates the Virtual Network Gateway. - * Updates the Virtual Network Gateway. + * Adds a gateway to a connected Virtual Network (PUT) or updates it (PATCH). + * Adds a gateway to a connected Virtual Network (PUT) or updates it (PATCH). * - * @param resourceGroupName The resource group name - * @param name The name of the web app - * @param vnetName The name of the Virtual Network - * @param gatewayName The name of the gateway. The only gateway that exists presently is "primary" - * @param slot The name of the slot for this web app. + * @param resourceGroupName Name of the resource group to which the resource belongs. + * @param name Name of the app. + * @param vnetName Name of the Virtual Network. + * @param gatewayName Name of the gateway. Currently, the only supported string is "primary". + * @param slot Name of the deployment slot. If a slot is not specified, the API will add or update a gateway for the production slot's Virtual Network. * @param connectionEnvelope The properties to update this gateway with. * @return the observable to the VnetGatewayInner object */ @@ -21014,9 +21299,9 @@ private ServiceResponse updateVnetConnectionGatewaySlotDelegat * Get the difference in configuration settings between two web app slots. * Get the difference in configuration settings between two web app slots. * - * @param resourceGroupName Name of resource group - * @param name Name of web app - * @param slotSwapEntity Request body that contains the target slot name + * @param resourceGroupName Name of the resource group to which the resource belongs. + * @param name Name of the app. + * @param slotSwapEntity JSON object that contains the target slot name. See example. * @return the PagedList<SlotDifferenceInner> object if successful. */ public PagedList getSlotsDifferencesFromProduction(final String resourceGroupName, final String name, final CsmSlotEntityInner slotSwapEntity) { @@ -21033,9 +21318,9 @@ public Page nextPage(String nextPageLink) { * Get the difference in configuration settings between two web app slots. * Get the difference in configuration settings between two web app slots. * - * @param resourceGroupName Name of resource group - * @param name Name of web app - * @param slotSwapEntity Request body that contains the target slot name + * @param resourceGroupName Name of the resource group to which the resource belongs. + * @param name Name of the app. + * @param slotSwapEntity JSON object that contains the target slot name. See example. * @param serviceCallback the async ServiceCallback to handle successful and failed responses. * @return the {@link ServiceCall} object */ @@ -21055,9 +21340,9 @@ public Observable>> call(String nextPa * Get the difference in configuration settings between two web app slots. * Get the difference in configuration settings between two web app slots. * - * @param resourceGroupName Name of resource group - * @param name Name of web app - * @param slotSwapEntity Request body that contains the target slot name + * @param resourceGroupName Name of the resource group to which the resource belongs. + * @param name Name of the app. + * @param slotSwapEntity JSON object that contains the target slot name. See example. * @return the observable to the PagedList<SlotDifferenceInner> object */ public Observable> getSlotsDifferencesFromProductionAsync(final String resourceGroupName, final String name, final CsmSlotEntityInner slotSwapEntity) { @@ -21074,9 +21359,9 @@ public Page call(ServiceResponse> * Get the difference in configuration settings between two web app slots. * Get the difference in configuration settings between two web app slots. * - * @param resourceGroupName Name of resource group - * @param name Name of web app - * @param slotSwapEntity Request body that contains the target slot name + * @param resourceGroupName Name of the resource group to which the resource belongs. + * @param name Name of the app. + * @param slotSwapEntity JSON object that contains the target slot name. See example. * @return the observable to the PagedList<SlotDifferenceInner> object */ public Observable>> getSlotsDifferencesFromProductionWithServiceResponseAsync(final String resourceGroupName, final String name, final CsmSlotEntityInner slotSwapEntity) { @@ -21097,9 +21382,9 @@ public Observable>> call(ServiceRespon * Get the difference in configuration settings between two web app slots. * Get the difference in configuration settings between two web app slots. * - ServiceResponse> * @param resourceGroupName Name of resource group - ServiceResponse> * @param name Name of web app - ServiceResponse> * @param slotSwapEntity Request body that contains the target slot name + ServiceResponse> * @param resourceGroupName Name of the resource group to which the resource belongs. + ServiceResponse> * @param name Name of the app. + ServiceResponse> * @param slotSwapEntity JSON object that contains the target slot name. See example. * @return the PagedList<SlotDifferenceInner> object wrapped in {@link ServiceResponse} if successful. */ public Observable>> getSlotsDifferencesFromProductionSinglePageAsync(final String resourceGroupName, final String name, final CsmSlotEntityInner slotSwapEntity) { @@ -21139,60 +21424,59 @@ private ServiceResponse> getSlotsDifferencesFromPr } /** - * Swaps web app slots. - * Swaps web app slots. + * Swaps two deployment slots of an app. + * Swaps two deployment slots of an app. * - * @param resourceGroupName Name of resource group - * @param name Name of web app - * @param slotSwapEntity Request body that contains the target slot name - * @return the Object object if successful. + * @param resourceGroupName Name of the resource group to which the resource belongs. + * @param name Name of the app. + * @param slotSwapEntity JSON object that contains the target slot name. See example. */ - public Object swapSlotWithProduction(String resourceGroupName, String name, CsmSlotEntityInner slotSwapEntity) { - return swapSlotWithProductionWithServiceResponseAsync(resourceGroupName, name, slotSwapEntity).toBlocking().last().getBody(); + public void swapSlotWithProduction(String resourceGroupName, String name, CsmSlotEntityInner slotSwapEntity) { + swapSlotWithProductionWithServiceResponseAsync(resourceGroupName, name, slotSwapEntity).toBlocking().last().getBody(); } /** - * Swaps web app slots. - * Swaps web app slots. + * Swaps two deployment slots of an app. + * Swaps two deployment slots of an app. * - * @param resourceGroupName Name of resource group - * @param name Name of web app - * @param slotSwapEntity Request body that contains the target slot name + * @param resourceGroupName Name of the resource group to which the resource belongs. + * @param name Name of the app. + * @param slotSwapEntity JSON object that contains the target slot name. See example. * @param serviceCallback the async ServiceCallback to handle successful and failed responses. * @return the {@link ServiceCall} object */ - public ServiceCall swapSlotWithProductionAsync(String resourceGroupName, String name, CsmSlotEntityInner slotSwapEntity, final ServiceCallback serviceCallback) { + public ServiceCall swapSlotWithProductionAsync(String resourceGroupName, String name, CsmSlotEntityInner slotSwapEntity, final ServiceCallback serviceCallback) { return ServiceCall.create(swapSlotWithProductionWithServiceResponseAsync(resourceGroupName, name, slotSwapEntity), serviceCallback); } /** - * Swaps web app slots. - * Swaps web app slots. + * Swaps two deployment slots of an app. + * Swaps two deployment slots of an app. * - * @param resourceGroupName Name of resource group - * @param name Name of web app - * @param slotSwapEntity Request body that contains the target slot name + * @param resourceGroupName Name of the resource group to which the resource belongs. + * @param name Name of the app. + * @param slotSwapEntity JSON object that contains the target slot name. See example. * @return the observable for the request */ - public Observable swapSlotWithProductionAsync(String resourceGroupName, String name, CsmSlotEntityInner slotSwapEntity) { - return swapSlotWithProductionWithServiceResponseAsync(resourceGroupName, name, slotSwapEntity).map(new Func1, Object>() { + public Observable swapSlotWithProductionAsync(String resourceGroupName, String name, CsmSlotEntityInner slotSwapEntity) { + return swapSlotWithProductionWithServiceResponseAsync(resourceGroupName, name, slotSwapEntity).map(new Func1, Void>() { @Override - public Object call(ServiceResponse response) { + public Void call(ServiceResponse response) { return response.getBody(); } }); } /** - * Swaps web app slots. - * Swaps web app slots. + * Swaps two deployment slots of an app. + * Swaps two deployment slots of an app. * - * @param resourceGroupName Name of resource group - * @param name Name of web app - * @param slotSwapEntity Request body that contains the target slot name + * @param resourceGroupName Name of the resource group to which the resource belongs. + * @param name Name of the app. + * @param slotSwapEntity JSON object that contains the target slot name. See example. * @return the observable for the request */ - public Observable> swapSlotWithProductionWithServiceResponseAsync(String resourceGroupName, String name, CsmSlotEntityInner slotSwapEntity) { + public Observable> swapSlotWithProductionWithServiceResponseAsync(String resourceGroupName, String name, CsmSlotEntityInner slotSwapEntity) { if (resourceGroupName == null) { throw new IllegalArgumentException("Parameter resourceGroupName is required and cannot be null."); } @@ -21208,64 +21492,63 @@ public Observable> swapSlotWithProductionWithServiceResp Validator.validate(slotSwapEntity); final String apiVersion = "2016-08-01"; Observable> observable = service.swapSlotWithProduction(resourceGroupName, name, this.client.subscriptionId(), slotSwapEntity, apiVersion, this.client.acceptLanguage(), this.client.userAgent()); - return client.getAzureClient().getPostOrDeleteResultAsync(observable, new TypeToken() { }.getType()); + return client.getAzureClient().getPostOrDeleteResultAsync(observable, new TypeToken() { }.getType()); } /** - * Swaps web app slots. - * Swaps web app slots. + * Swaps two deployment slots of an app. + * Swaps two deployment slots of an app. * - * @param resourceGroupName Name of resource group - * @param name Name of web app - * @param slotSwapEntity Request body that contains the target slot name - * @return the Object object if successful. + * @param resourceGroupName Name of the resource group to which the resource belongs. + * @param name Name of the app. + * @param slotSwapEntity JSON object that contains the target slot name. See example. */ - public Object beginSwapSlotWithProduction(String resourceGroupName, String name, CsmSlotEntityInner slotSwapEntity) { - return beginSwapSlotWithProductionWithServiceResponseAsync(resourceGroupName, name, slotSwapEntity).toBlocking().single().getBody(); + public void beginSwapSlotWithProduction(String resourceGroupName, String name, CsmSlotEntityInner slotSwapEntity) { + beginSwapSlotWithProductionWithServiceResponseAsync(resourceGroupName, name, slotSwapEntity).toBlocking().single().getBody(); } /** - * Swaps web app slots. - * Swaps web app slots. + * Swaps two deployment slots of an app. + * Swaps two deployment slots of an app. * - * @param resourceGroupName Name of resource group - * @param name Name of web app - * @param slotSwapEntity Request body that contains the target slot name + * @param resourceGroupName Name of the resource group to which the resource belongs. + * @param name Name of the app. + * @param slotSwapEntity JSON object that contains the target slot name. See example. * @param serviceCallback the async ServiceCallback to handle successful and failed responses. * @return the {@link ServiceCall} object */ - public ServiceCall beginSwapSlotWithProductionAsync(String resourceGroupName, String name, CsmSlotEntityInner slotSwapEntity, final ServiceCallback serviceCallback) { + public ServiceCall beginSwapSlotWithProductionAsync(String resourceGroupName, String name, CsmSlotEntityInner slotSwapEntity, final ServiceCallback serviceCallback) { return ServiceCall.create(beginSwapSlotWithProductionWithServiceResponseAsync(resourceGroupName, name, slotSwapEntity), serviceCallback); } /** - * Swaps web app slots. - * Swaps web app slots. + * Swaps two deployment slots of an app. + * Swaps two deployment slots of an app. * - * @param resourceGroupName Name of resource group - * @param name Name of web app - * @param slotSwapEntity Request body that contains the target slot name - * @return the observable to the Object object + * @param resourceGroupName Name of the resource group to which the resource belongs. + * @param name Name of the app. + * @param slotSwapEntity JSON object that contains the target slot name. See example. + * @return the {@link ServiceResponse} object if successful. */ - public Observable beginSwapSlotWithProductionAsync(String resourceGroupName, String name, CsmSlotEntityInner slotSwapEntity) { - return beginSwapSlotWithProductionWithServiceResponseAsync(resourceGroupName, name, slotSwapEntity).map(new Func1, Object>() { + public Observable beginSwapSlotWithProductionAsync(String resourceGroupName, String name, CsmSlotEntityInner slotSwapEntity) { + return beginSwapSlotWithProductionWithServiceResponseAsync(resourceGroupName, name, slotSwapEntity).map(new Func1, Void>() { @Override - public Object call(ServiceResponse response) { + public Void call(ServiceResponse response) { return response.getBody(); } }); } /** - * Swaps web app slots. - * Swaps web app slots. + * Swaps two deployment slots of an app. + * Swaps two deployment slots of an app. * - * @param resourceGroupName Name of resource group - * @param name Name of web app - * @param slotSwapEntity Request body that contains the target slot name - * @return the observable to the Object object + * @param resourceGroupName Name of the resource group to which the resource belongs. + * @param name Name of the app. + * @param slotSwapEntity JSON object that contains the target slot name. See example. + * @return the {@link ServiceResponse} object if successful. */ - public Observable> beginSwapSlotWithProductionWithServiceResponseAsync(String resourceGroupName, String name, CsmSlotEntityInner slotSwapEntity) { + public Observable> beginSwapSlotWithProductionWithServiceResponseAsync(String resourceGroupName, String name, CsmSlotEntityInner slotSwapEntity) { if (resourceGroupName == null) { throw new IllegalArgumentException("Parameter resourceGroupName is required and cannot be null."); } @@ -21281,11 +21564,11 @@ public Observable> beginSwapSlotWithProductionWithServic Validator.validate(slotSwapEntity); final String apiVersion = "2016-08-01"; return service.beginSwapSlotWithProduction(resourceGroupName, name, this.client.subscriptionId(), slotSwapEntity, apiVersion, this.client.acceptLanguage(), this.client.userAgent()) - .flatMap(new Func1, Observable>>() { + .flatMap(new Func1, Observable>>() { @Override - public Observable> call(Response response) { + public Observable> call(Response response) { try { - ServiceResponse clientResponse = beginSwapSlotWithProductionDelegate(response); + ServiceResponse clientResponse = beginSwapSlotWithProductionDelegate(response); return Observable.just(clientResponse); } catch (Throwable t) { return Observable.error(t); @@ -21294,11 +21577,10 @@ public Observable> call(Response response) }); } - private ServiceResponse beginSwapSlotWithProductionDelegate(Response response) throws CloudException, IOException, IllegalArgumentException { - return new AzureServiceResponseBuilder(this.client.mapperAdapter()) - .register(200, new TypeToken() { }.getType()) - .register(202, new TypeToken() { }.getType()) - .registerError(CloudException.class) + private ServiceResponse beginSwapSlotWithProductionDelegate(Response response) throws CloudException, IOException, IllegalArgumentException { + return new AzureServiceResponseBuilder(this.client.mapperAdapter()) + .register(200, new TypeToken() { }.getType()) + .register(202, new TypeToken() { }.getType()) .build(response); } @@ -21306,7 +21588,7 @@ private ServiceResponse beginSwapSlotWithProductionDelegate(Response nextPage(String nextPageLink) { * Returns all Snapshots to the user. * Returns all Snapshots to the user. * - * @param resourceGroupName Resource group + * @param resourceGroupName Name of the resource group to which the resource belongs. * @param name Website Name * @param serviceCallback the async ServiceCallback to handle successful and failed responses. * @return the {@link ServiceCall} object @@ -21345,7 +21627,7 @@ public Observable>> call(String nextPageLink * Returns all Snapshots to the user. * Returns all Snapshots to the user. * - * @param resourceGroupName Resource group + * @param resourceGroupName Name of the resource group to which the resource belongs. * @param name Website Name * @return the observable to the PagedList<SnapshotInner> object */ @@ -21363,7 +21645,7 @@ public Page call(ServiceResponse> response) { * Returns all Snapshots to the user. * Returns all Snapshots to the user. * - * @param resourceGroupName Resource group + * @param resourceGroupName Name of the resource group to which the resource belongs. * @param name Website Name * @return the observable to the PagedList<SnapshotInner> object */ @@ -21385,7 +21667,7 @@ public Observable>> call(ServiceResponse> * @param resourceGroupName Resource group + ServiceResponse> * @param resourceGroupName Name of the resource group to which the resource belongs. ServiceResponse> * @param name Website Name * @return the PagedList<SnapshotInner> object wrapped in {@link ServiceResponse} if successful. */ @@ -21422,11 +21704,11 @@ private ServiceResponse> listSnapshotsDelegate(Response< } /** - * Get the source control configuration of web app. - * Get the source control configuration of web app. + * Gets the source control configuration of an app. + * Gets the source control configuration of an app. * - * @param resourceGroupName Name of resource group - * @param name Name of web app + * @param resourceGroupName Name of the resource group to which the resource belongs. + * @param name Name of the app. * @return the SiteSourceControlInner object if successful. */ public SiteSourceControlInner getSourceControl(String resourceGroupName, String name) { @@ -21434,11 +21716,11 @@ public SiteSourceControlInner getSourceControl(String resourceGroupName, String } /** - * Get the source control configuration of web app. - * Get the source control configuration of web app. + * Gets the source control configuration of an app. + * Gets the source control configuration of an app. * - * @param resourceGroupName Name of resource group - * @param name Name of web app + * @param resourceGroupName Name of the resource group to which the resource belongs. + * @param name Name of the app. * @param serviceCallback the async ServiceCallback to handle successful and failed responses. * @return the {@link ServiceCall} object */ @@ -21447,11 +21729,11 @@ public ServiceCall getSourceControlAsync(String resource } /** - * Get the source control configuration of web app. - * Get the source control configuration of web app. + * Gets the source control configuration of an app. + * Gets the source control configuration of an app. * - * @param resourceGroupName Name of resource group - * @param name Name of web app + * @param resourceGroupName Name of the resource group to which the resource belongs. + * @param name Name of the app. * @return the observable to the SiteSourceControlInner object */ public Observable getSourceControlAsync(String resourceGroupName, String name) { @@ -21464,11 +21746,11 @@ public SiteSourceControlInner call(ServiceResponse respo } /** - * Get the source control configuration of web app. - * Get the source control configuration of web app. + * Gets the source control configuration of an app. + * Gets the source control configuration of an app. * - * @param resourceGroupName Name of resource group - * @param name Name of web app + * @param resourceGroupName Name of the resource group to which the resource belongs. + * @param name Name of the app. * @return the observable to the SiteSourceControlInner object */ public Observable> getSourceControlWithServiceResponseAsync(String resourceGroupName, String name) { @@ -21504,25 +21786,25 @@ private ServiceResponse getSourceControlDelegate(Respons } /** - * Update the source control configuration of web app. - * Update the source control configuration of web app. + * Updates the source control configuration of an app. + * Updates the source control configuration of an app. * - * @param resourceGroupName Name of resource group - * @param name Name of web app - * @param siteSourceControl Request body that contains the source control parameters + * @param resourceGroupName Name of the resource group to which the resource belongs. + * @param name Name of the app. + * @param siteSourceControl JSON representation of a SiteSourceControl object. See example. * @return the SiteSourceControlInner object if successful. */ public SiteSourceControlInner createOrUpdateSourceControl(String resourceGroupName, String name, SiteSourceControlInner siteSourceControl) { - return createOrUpdateSourceControlWithServiceResponseAsync(resourceGroupName, name, siteSourceControl).toBlocking().single().getBody(); + return createOrUpdateSourceControlWithServiceResponseAsync(resourceGroupName, name, siteSourceControl).toBlocking().last().getBody(); } /** - * Update the source control configuration of web app. - * Update the source control configuration of web app. + * Updates the source control configuration of an app. + * Updates the source control configuration of an app. * - * @param resourceGroupName Name of resource group - * @param name Name of web app - * @param siteSourceControl Request body that contains the source control parameters + * @param resourceGroupName Name of the resource group to which the resource belongs. + * @param name Name of the app. + * @param siteSourceControl JSON representation of a SiteSourceControl object. See example. * @param serviceCallback the async ServiceCallback to handle successful and failed responses. * @return the {@link ServiceCall} object */ @@ -21531,13 +21813,13 @@ public ServiceCall createOrUpdateSourceControlAsync(Stri } /** - * Update the source control configuration of web app. - * Update the source control configuration of web app. + * Updates the source control configuration of an app. + * Updates the source control configuration of an app. * - * @param resourceGroupName Name of resource group - * @param name Name of web app - * @param siteSourceControl Request body that contains the source control parameters - * @return the observable to the SiteSourceControlInner object + * @param resourceGroupName Name of the resource group to which the resource belongs. + * @param name Name of the app. + * @param siteSourceControl JSON representation of a SiteSourceControl object. See example. + * @return the observable for the request */ public Observable createOrUpdateSourceControlAsync(String resourceGroupName, String name, SiteSourceControlInner siteSourceControl) { return createOrUpdateSourceControlWithServiceResponseAsync(resourceGroupName, name, siteSourceControl).map(new Func1, SiteSourceControlInner>() { @@ -21549,13 +21831,13 @@ public SiteSourceControlInner call(ServiceResponse respo } /** - * Update the source control configuration of web app. - * Update the source control configuration of web app. + * Updates the source control configuration of an app. + * Updates the source control configuration of an app. * - * @param resourceGroupName Name of resource group - * @param name Name of web app - * @param siteSourceControl Request body that contains the source control parameters - * @return the observable to the SiteSourceControlInner object + * @param resourceGroupName Name of the resource group to which the resource belongs. + * @param name Name of the app. + * @param siteSourceControl JSON representation of a SiteSourceControl object. See example. + * @return the observable for the request */ public Observable> createOrUpdateSourceControlWithServiceResponseAsync(String resourceGroupName, String name, SiteSourceControlInner siteSourceControl) { if (resourceGroupName == null) { @@ -21572,78 +21854,65 @@ public Observable> createOrUpdateSourceC } Validator.validate(siteSourceControl); final String apiVersion = "2016-08-01"; - return service.createOrUpdateSourceControl(resourceGroupName, name, this.client.subscriptionId(), siteSourceControl, apiVersion, this.client.acceptLanguage(), this.client.userAgent()) - .flatMap(new Func1, Observable>>() { - @Override - public Observable> call(Response response) { - try { - ServiceResponse clientResponse = createOrUpdateSourceControlDelegate(response); - return Observable.just(clientResponse); - } catch (Throwable t) { - return Observable.error(t); - } - } - }); - } - - private ServiceResponse createOrUpdateSourceControlDelegate(Response response) throws CloudException, IOException, IllegalArgumentException { - return new AzureServiceResponseBuilder(this.client.mapperAdapter()) - .register(201, new TypeToken() { }.getType()) - .registerError(CloudException.class) - .build(response); + Observable> observable = service.createOrUpdateSourceControl(resourceGroupName, name, this.client.subscriptionId(), siteSourceControl, apiVersion, this.client.acceptLanguage(), this.client.userAgent()); + return client.getAzureClient().getPutOrPatchResultAsync(observable, new TypeToken() { }.getType()); } /** - * Delete source control configuration of web app. - * Delete source control configuration of web app. + * Updates the source control configuration of an app. + * Updates the source control configuration of an app. * - * @param resourceGroupName Name of resource group - * @param name Name of web app - * @return the Object object if successful. + * @param resourceGroupName Name of the resource group to which the resource belongs. + * @param name Name of the app. + * @param siteSourceControl JSON representation of a SiteSourceControl object. See example. + * @return the SiteSourceControlInner object if successful. */ - public Object deleteSourceControl(String resourceGroupName, String name) { - return deleteSourceControlWithServiceResponseAsync(resourceGroupName, name).toBlocking().single().getBody(); + public SiteSourceControlInner beginCreateOrUpdateSourceControl(String resourceGroupName, String name, SiteSourceControlInner siteSourceControl) { + return beginCreateOrUpdateSourceControlWithServiceResponseAsync(resourceGroupName, name, siteSourceControl).toBlocking().single().getBody(); } /** - * Delete source control configuration of web app. - * Delete source control configuration of web app. + * Updates the source control configuration of an app. + * Updates the source control configuration of an app. * - * @param resourceGroupName Name of resource group - * @param name Name of web app + * @param resourceGroupName Name of the resource group to which the resource belongs. + * @param name Name of the app. + * @param siteSourceControl JSON representation of a SiteSourceControl object. See example. * @param serviceCallback the async ServiceCallback to handle successful and failed responses. * @return the {@link ServiceCall} object */ - public ServiceCall deleteSourceControlAsync(String resourceGroupName, String name, final ServiceCallback serviceCallback) { - return ServiceCall.create(deleteSourceControlWithServiceResponseAsync(resourceGroupName, name), serviceCallback); + public ServiceCall beginCreateOrUpdateSourceControlAsync(String resourceGroupName, String name, SiteSourceControlInner siteSourceControl, final ServiceCallback serviceCallback) { + return ServiceCall.create(beginCreateOrUpdateSourceControlWithServiceResponseAsync(resourceGroupName, name, siteSourceControl), serviceCallback); } /** - * Delete source control configuration of web app. - * Delete source control configuration of web app. + * Updates the source control configuration of an app. + * Updates the source control configuration of an app. * - * @param resourceGroupName Name of resource group - * @param name Name of web app - * @return the observable to the Object object + * @param resourceGroupName Name of the resource group to which the resource belongs. + * @param name Name of the app. + * @param siteSourceControl JSON representation of a SiteSourceControl object. See example. + * @return the observable to the SiteSourceControlInner object */ - public Observable deleteSourceControlAsync(String resourceGroupName, String name) { - return deleteSourceControlWithServiceResponseAsync(resourceGroupName, name).map(new Func1, Object>() { + public Observable beginCreateOrUpdateSourceControlAsync(String resourceGroupName, String name, SiteSourceControlInner siteSourceControl) { + return beginCreateOrUpdateSourceControlWithServiceResponseAsync(resourceGroupName, name, siteSourceControl).map(new Func1, SiteSourceControlInner>() { @Override - public Object call(ServiceResponse response) { + public SiteSourceControlInner call(ServiceResponse response) { return response.getBody(); } }); } /** - * Delete source control configuration of web app. - * Delete source control configuration of web app. + * Updates the source control configuration of an app. + * Updates the source control configuration of an app. * - * @param resourceGroupName Name of resource group - * @param name Name of web app - * @return the observable to the Object object + * @param resourceGroupName Name of the resource group to which the resource belongs. + * @param name Name of the app. + * @param siteSourceControl JSON representation of a SiteSourceControl object. See example. + * @return the observable to the SiteSourceControlInner object */ - public Observable> deleteSourceControlWithServiceResponseAsync(String resourceGroupName, String name) { + public Observable> beginCreateOrUpdateSourceControlWithServiceResponseAsync(String resourceGroupName, String name, SiteSourceControlInner siteSourceControl) { if (resourceGroupName == null) { throw new IllegalArgumentException("Parameter resourceGroupName is required and cannot be null."); } @@ -21653,13 +21922,17 @@ public Observable> deleteSourceControlWithServiceRespons if (this.client.subscriptionId() == null) { throw new IllegalArgumentException("Parameter this.client.subscriptionId() is required and cannot be null."); } + if (siteSourceControl == null) { + throw new IllegalArgumentException("Parameter siteSourceControl is required and cannot be null."); + } + Validator.validate(siteSourceControl); final String apiVersion = "2016-08-01"; - return service.deleteSourceControl(resourceGroupName, name, this.client.subscriptionId(), apiVersion, this.client.acceptLanguage(), this.client.userAgent()) - .flatMap(new Func1, Observable>>() { + return service.beginCreateOrUpdateSourceControl(resourceGroupName, name, this.client.subscriptionId(), siteSourceControl, apiVersion, this.client.acceptLanguage(), this.client.userAgent()) + .flatMap(new Func1, Observable>>() { @Override - public Observable> call(Response response) { + public Observable> call(Response response) { try { - ServiceResponse clientResponse = deleteSourceControlDelegate(response); + ServiceResponse clientResponse = beginCreateOrUpdateSourceControlDelegate(response); return Observable.just(clientResponse); } catch (Throwable t) { return Observable.error(t); @@ -21668,68 +21941,65 @@ public Observable> call(Response response) }); } - private ServiceResponse deleteSourceControlDelegate(Response response) throws CloudException, IOException, IllegalArgumentException { - return new AzureServiceResponseBuilder(this.client.mapperAdapter()) - .register(200, new TypeToken() { }.getType()) + private ServiceResponse beginCreateOrUpdateSourceControlDelegate(Response response) throws CloudException, IOException, IllegalArgumentException { + return new AzureServiceResponseBuilder(this.client.mapperAdapter()) + .register(200, new TypeToken() { }.getType()) + .register(201, new TypeToken() { }.getType()) .registerError(CloudException.class) .build(response); } /** - * Update the source control configuration of web app. - * Update the source control configuration of web app. + * Deletes the source control configuration of an app. + * Deletes the source control configuration of an app. * - * @param resourceGroupName Name of resource group - * @param name Name of web app - * @param siteSourceControl Request body that contains the source control parameters - * @return the SiteSourceControlInner object if successful. + * @param resourceGroupName Name of the resource group to which the resource belongs. + * @param name Name of the app. + * @return the Object object if successful. */ - public SiteSourceControlInner updateSourceControl(String resourceGroupName, String name, SiteSourceControlInner siteSourceControl) { - return updateSourceControlWithServiceResponseAsync(resourceGroupName, name, siteSourceControl).toBlocking().single().getBody(); + public Object deleteSourceControl(String resourceGroupName, String name) { + return deleteSourceControlWithServiceResponseAsync(resourceGroupName, name).toBlocking().single().getBody(); } /** - * Update the source control configuration of web app. - * Update the source control configuration of web app. + * Deletes the source control configuration of an app. + * Deletes the source control configuration of an app. * - * @param resourceGroupName Name of resource group - * @param name Name of web app - * @param siteSourceControl Request body that contains the source control parameters + * @param resourceGroupName Name of the resource group to which the resource belongs. + * @param name Name of the app. * @param serviceCallback the async ServiceCallback to handle successful and failed responses. * @return the {@link ServiceCall} object */ - public ServiceCall updateSourceControlAsync(String resourceGroupName, String name, SiteSourceControlInner siteSourceControl, final ServiceCallback serviceCallback) { - return ServiceCall.create(updateSourceControlWithServiceResponseAsync(resourceGroupName, name, siteSourceControl), serviceCallback); + public ServiceCall deleteSourceControlAsync(String resourceGroupName, String name, final ServiceCallback serviceCallback) { + return ServiceCall.create(deleteSourceControlWithServiceResponseAsync(resourceGroupName, name), serviceCallback); } /** - * Update the source control configuration of web app. - * Update the source control configuration of web app. + * Deletes the source control configuration of an app. + * Deletes the source control configuration of an app. * - * @param resourceGroupName Name of resource group - * @param name Name of web app - * @param siteSourceControl Request body that contains the source control parameters - * @return the observable to the SiteSourceControlInner object + * @param resourceGroupName Name of the resource group to which the resource belongs. + * @param name Name of the app. + * @return the observable to the Object object */ - public Observable updateSourceControlAsync(String resourceGroupName, String name, SiteSourceControlInner siteSourceControl) { - return updateSourceControlWithServiceResponseAsync(resourceGroupName, name, siteSourceControl).map(new Func1, SiteSourceControlInner>() { + public Observable deleteSourceControlAsync(String resourceGroupName, String name) { + return deleteSourceControlWithServiceResponseAsync(resourceGroupName, name).map(new Func1, Object>() { @Override - public SiteSourceControlInner call(ServiceResponse response) { + public Object call(ServiceResponse response) { return response.getBody(); } }); } /** - * Update the source control configuration of web app. - * Update the source control configuration of web app. + * Deletes the source control configuration of an app. + * Deletes the source control configuration of an app. * - * @param resourceGroupName Name of resource group - * @param name Name of web app - * @param siteSourceControl Request body that contains the source control parameters - * @return the observable to the SiteSourceControlInner object + * @param resourceGroupName Name of the resource group to which the resource belongs. + * @param name Name of the app. + * @return the observable to the Object object */ - public Observable> updateSourceControlWithServiceResponseAsync(String resourceGroupName, String name, SiteSourceControlInner siteSourceControl) { + public Observable> deleteSourceControlWithServiceResponseAsync(String resourceGroupName, String name) { if (resourceGroupName == null) { throw new IllegalArgumentException("Parameter resourceGroupName is required and cannot be null."); } @@ -21739,17 +22009,13 @@ public Observable> updateSourceControlWi if (this.client.subscriptionId() == null) { throw new IllegalArgumentException("Parameter this.client.subscriptionId() is required and cannot be null."); } - if (siteSourceControl == null) { - throw new IllegalArgumentException("Parameter siteSourceControl is required and cannot be null."); - } - Validator.validate(siteSourceControl); final String apiVersion = "2016-08-01"; - return service.updateSourceControl(resourceGroupName, name, this.client.subscriptionId(), siteSourceControl, apiVersion, this.client.acceptLanguage(), this.client.userAgent()) - .flatMap(new Func1, Observable>>() { + return service.deleteSourceControl(resourceGroupName, name, this.client.subscriptionId(), apiVersion, this.client.acceptLanguage(), this.client.userAgent()) + .flatMap(new Func1, Observable>>() { @Override - public Observable> call(Response response) { + public Observable> call(Response response) { try { - ServiceResponse clientResponse = updateSourceControlDelegate(response); + ServiceResponse clientResponse = deleteSourceControlDelegate(response); return Observable.just(clientResponse); } catch (Throwable t) { return Observable.error(t); @@ -21758,64 +22024,65 @@ public Observable> call(Response updateSourceControlDelegate(Response response) throws CloudException, IOException, IllegalArgumentException { - return new AzureServiceResponseBuilder(this.client.mapperAdapter()) - .register(200, new TypeToken() { }.getType()) + private ServiceResponse deleteSourceControlDelegate(Response response) throws CloudException, IOException, IllegalArgumentException { + return new AzureServiceResponseBuilder(this.client.mapperAdapter()) + .register(200, new TypeToken() { }.getType()) + .register(202, new TypeToken() { }.getType()) + .register(404, new TypeToken() { }.getType()) .registerError(CloudException.class) .build(response); } /** - * Starts web app. - * Starts web app. + * Starts an app (or deployment slot, if specified). + * Starts an app (or deployment slot, if specified). * - * @param resourceGroupName Name of resource group - * @param name Name of web app - * @return the Object object if successful. + * @param resourceGroupName Name of the resource group to which the resource belongs. + * @param name Name of the app. */ - public Object start(String resourceGroupName, String name) { - return startWithServiceResponseAsync(resourceGroupName, name).toBlocking().single().getBody(); + public void start(String resourceGroupName, String name) { + startWithServiceResponseAsync(resourceGroupName, name).toBlocking().single().getBody(); } /** - * Starts web app. - * Starts web app. + * Starts an app (or deployment slot, if specified). + * Starts an app (or deployment slot, if specified). * - * @param resourceGroupName Name of resource group - * @param name Name of web app + * @param resourceGroupName Name of the resource group to which the resource belongs. + * @param name Name of the app. * @param serviceCallback the async ServiceCallback to handle successful and failed responses. * @return the {@link ServiceCall} object */ - public ServiceCall startAsync(String resourceGroupName, String name, final ServiceCallback serviceCallback) { + public ServiceCall startAsync(String resourceGroupName, String name, final ServiceCallback serviceCallback) { return ServiceCall.create(startWithServiceResponseAsync(resourceGroupName, name), serviceCallback); } /** - * Starts web app. - * Starts web app. + * Starts an app (or deployment slot, if specified). + * Starts an app (or deployment slot, if specified). * - * @param resourceGroupName Name of resource group - * @param name Name of web app - * @return the observable to the Object object + * @param resourceGroupName Name of the resource group to which the resource belongs. + * @param name Name of the app. + * @return the {@link ServiceResponse} object if successful. */ - public Observable startAsync(String resourceGroupName, String name) { - return startWithServiceResponseAsync(resourceGroupName, name).map(new Func1, Object>() { + public Observable startAsync(String resourceGroupName, String name) { + return startWithServiceResponseAsync(resourceGroupName, name).map(new Func1, Void>() { @Override - public Object call(ServiceResponse response) { + public Void call(ServiceResponse response) { return response.getBody(); } }); } /** - * Starts web app. - * Starts web app. + * Starts an app (or deployment slot, if specified). + * Starts an app (or deployment slot, if specified). * - * @param resourceGroupName Name of resource group - * @param name Name of web app - * @return the observable to the Object object + * @param resourceGroupName Name of the resource group to which the resource belongs. + * @param name Name of the app. + * @return the {@link ServiceResponse} object if successful. */ - public Observable> startWithServiceResponseAsync(String resourceGroupName, String name) { + public Observable> startWithServiceResponseAsync(String resourceGroupName, String name) { if (resourceGroupName == null) { throw new IllegalArgumentException("Parameter resourceGroupName is required and cannot be null."); } @@ -21827,11 +22094,11 @@ public Observable> startWithServiceResponseAsync(String } final String apiVersion = "2016-08-01"; return service.start(resourceGroupName, name, this.client.subscriptionId(), apiVersion, this.client.acceptLanguage(), this.client.userAgent()) - .flatMap(new Func1, Observable>>() { + .flatMap(new Func1, Observable>>() { @Override - public Observable> call(Response response) { + public Observable> call(Response response) { try { - ServiceResponse clientResponse = startDelegate(response); + ServiceResponse clientResponse = startDelegate(response); return Observable.just(clientResponse); } catch (Throwable t) { return Observable.error(t); @@ -21840,64 +22107,62 @@ public Observable> call(Response response) }); } - private ServiceResponse startDelegate(Response response) throws CloudException, IOException, IllegalArgumentException { - return new AzureServiceResponseBuilder(this.client.mapperAdapter()) - .register(200, new TypeToken() { }.getType()) - .registerError(CloudException.class) + private ServiceResponse startDelegate(Response response) throws CloudException, IOException, IllegalArgumentException { + return new AzureServiceResponseBuilder(this.client.mapperAdapter()) + .register(204, new TypeToken() { }.getType()) .build(response); } /** - * Stops web app. - * Stops web app. + * Stops an app (or deployment slot, if specified). + * Stops an app (or deployment slot, if specified). * - * @param resourceGroupName Name of resource group - * @param name Name of web app - * @return the Object object if successful. + * @param resourceGroupName Name of the resource group to which the resource belongs. + * @param name Name of the app. */ - public Object stop(String resourceGroupName, String name) { - return stopWithServiceResponseAsync(resourceGroupName, name).toBlocking().single().getBody(); + public void stop(String resourceGroupName, String name) { + stopWithServiceResponseAsync(resourceGroupName, name).toBlocking().single().getBody(); } /** - * Stops web app. - * Stops web app. + * Stops an app (or deployment slot, if specified). + * Stops an app (or deployment slot, if specified). * - * @param resourceGroupName Name of resource group - * @param name Name of web app + * @param resourceGroupName Name of the resource group to which the resource belongs. + * @param name Name of the app. * @param serviceCallback the async ServiceCallback to handle successful and failed responses. * @return the {@link ServiceCall} object */ - public ServiceCall stopAsync(String resourceGroupName, String name, final ServiceCallback serviceCallback) { + public ServiceCall stopAsync(String resourceGroupName, String name, final ServiceCallback serviceCallback) { return ServiceCall.create(stopWithServiceResponseAsync(resourceGroupName, name), serviceCallback); } /** - * Stops web app. - * Stops web app. + * Stops an app (or deployment slot, if specified). + * Stops an app (or deployment slot, if specified). * - * @param resourceGroupName Name of resource group - * @param name Name of web app - * @return the observable to the Object object + * @param resourceGroupName Name of the resource group to which the resource belongs. + * @param name Name of the app. + * @return the {@link ServiceResponse} object if successful. */ - public Observable stopAsync(String resourceGroupName, String name) { - return stopWithServiceResponseAsync(resourceGroupName, name).map(new Func1, Object>() { + public Observable stopAsync(String resourceGroupName, String name) { + return stopWithServiceResponseAsync(resourceGroupName, name).map(new Func1, Void>() { @Override - public Object call(ServiceResponse response) { + public Void call(ServiceResponse response) { return response.getBody(); } }); } /** - * Stops web app. - * Stops web app. + * Stops an app (or deployment slot, if specified). + * Stops an app (or deployment slot, if specified). * - * @param resourceGroupName Name of resource group - * @param name Name of web app - * @return the observable to the Object object + * @param resourceGroupName Name of the resource group to which the resource belongs. + * @param name Name of the app. + * @return the {@link ServiceResponse} object if successful. */ - public Observable> stopWithServiceResponseAsync(String resourceGroupName, String name) { + public Observable> stopWithServiceResponseAsync(String resourceGroupName, String name) { if (resourceGroupName == null) { throw new IllegalArgumentException("Parameter resourceGroupName is required and cannot be null."); } @@ -21909,11 +22174,11 @@ public Observable> stopWithServiceResponseAsync(String r } final String apiVersion = "2016-08-01"; return service.stop(resourceGroupName, name, this.client.subscriptionId(), apiVersion, this.client.acceptLanguage(), this.client.userAgent()) - .flatMap(new Func1, Observable>>() { + .flatMap(new Func1, Observable>>() { @Override - public Observable> call(Response response) { + public Observable> call(Response response) { try { - ServiceResponse clientResponse = stopDelegate(response); + ServiceResponse clientResponse = stopDelegate(response); return Observable.just(clientResponse); } catch (Throwable t) { return Observable.error(t); @@ -21922,10 +22187,9 @@ public Observable> call(Response response) }); } - private ServiceResponse stopDelegate(Response response) throws CloudException, IOException, IllegalArgumentException { - return new AzureServiceResponseBuilder(this.client.mapperAdapter()) - .register(200, new TypeToken() { }.getType()) - .registerError(CloudException.class) + private ServiceResponse stopDelegate(Response response) throws CloudException, IOException, IllegalArgumentException { + return new AzureServiceResponseBuilder(this.client.mapperAdapter()) + .register(204, new TypeToken() { }.getType()) .build(response); } @@ -21933,24 +22197,23 @@ private ServiceResponse stopDelegate(Response response) th * Sync web app repository. * Sync web app repository. * - * @param resourceGroupName Name of resource group + * @param resourceGroupName Name of the resource group to which the resource belongs. * @param name Name of web app - * @return the Object object if successful. */ - public Object syncRepository(String resourceGroupName, String name) { - return syncRepositoryWithServiceResponseAsync(resourceGroupName, name).toBlocking().single().getBody(); + public void syncRepository(String resourceGroupName, String name) { + syncRepositoryWithServiceResponseAsync(resourceGroupName, name).toBlocking().single().getBody(); } /** * Sync web app repository. * Sync web app repository. * - * @param resourceGroupName Name of resource group + * @param resourceGroupName Name of the resource group to which the resource belongs. * @param name Name of web app * @param serviceCallback the async ServiceCallback to handle successful and failed responses. * @return the {@link ServiceCall} object */ - public ServiceCall syncRepositoryAsync(String resourceGroupName, String name, final ServiceCallback serviceCallback) { + public ServiceCall syncRepositoryAsync(String resourceGroupName, String name, final ServiceCallback serviceCallback) { return ServiceCall.create(syncRepositoryWithServiceResponseAsync(resourceGroupName, name), serviceCallback); } @@ -21958,14 +22221,14 @@ public ServiceCall syncRepositoryAsync(String resourceGroupName, String * Sync web app repository. * Sync web app repository. * - * @param resourceGroupName Name of resource group + * @param resourceGroupName Name of the resource group to which the resource belongs. * @param name Name of web app - * @return the observable to the Object object + * @return the {@link ServiceResponse} object if successful. */ - public Observable syncRepositoryAsync(String resourceGroupName, String name) { - return syncRepositoryWithServiceResponseAsync(resourceGroupName, name).map(new Func1, Object>() { + public Observable syncRepositoryAsync(String resourceGroupName, String name) { + return syncRepositoryWithServiceResponseAsync(resourceGroupName, name).map(new Func1, Void>() { @Override - public Object call(ServiceResponse response) { + public Void call(ServiceResponse response) { return response.getBody(); } }); @@ -21975,11 +22238,11 @@ public Object call(ServiceResponse response) { * Sync web app repository. * Sync web app repository. * - * @param resourceGroupName Name of resource group + * @param resourceGroupName Name of the resource group to which the resource belongs. * @param name Name of web app - * @return the observable to the Object object + * @return the {@link ServiceResponse} object if successful. */ - public Observable> syncRepositoryWithServiceResponseAsync(String resourceGroupName, String name) { + public Observable> syncRepositoryWithServiceResponseAsync(String resourceGroupName, String name) { if (resourceGroupName == null) { throw new IllegalArgumentException("Parameter resourceGroupName is required and cannot be null."); } @@ -21991,11 +22254,11 @@ public Observable> syncRepositoryWithServiceResponseAsyn } final String apiVersion = "2016-08-01"; return service.syncRepository(resourceGroupName, name, this.client.subscriptionId(), apiVersion, this.client.acceptLanguage(), this.client.userAgent()) - .flatMap(new Func1, Observable>>() { + .flatMap(new Func1, Observable>>() { @Override - public Observable> call(Response response) { + public Observable> call(Response response) { try { - ServiceResponse clientResponse = syncRepositoryDelegate(response); + ServiceResponse clientResponse = syncRepositoryDelegate(response); return Observable.just(clientResponse); } catch (Throwable t) { return Observable.error(t); @@ -22004,19 +22267,18 @@ public Observable> call(Response response) }); } - private ServiceResponse syncRepositoryDelegate(Response response) throws CloudException, IOException, IllegalArgumentException { - return new AzureServiceResponseBuilder(this.client.mapperAdapter()) - .register(200, new TypeToken() { }.getType()) - .registerError(CloudException.class) + private ServiceResponse syncRepositoryDelegate(Response response) throws CloudException, IOException, IllegalArgumentException { + return new AzureServiceResponseBuilder(this.client.mapperAdapter()) + .register(204, new TypeToken() { }.getType()) .build(response); } /** - * Gets the quota usage numbers for web app. - * Gets the quota usage numbers for web app. + * Gets the quota usage information of an app (or deployment slot, if specified). + * Gets the quota usage information of an app (or deployment slot, if specified). * - * @param resourceGroupName Name of resource group - * @param name Name of web app + * @param resourceGroupName Name of the resource group to which the resource belongs. + * @param name Name of the app. * @return the PagedList<CsmUsageQuotaInner> object if successful. */ public PagedList listUsages(final String resourceGroupName, final String name) { @@ -22030,11 +22292,11 @@ public Page nextPage(String nextPageLink) { } /** - * Gets the quota usage numbers for web app. - * Gets the quota usage numbers for web app. + * Gets the quota usage information of an app (or deployment slot, if specified). + * Gets the quota usage information of an app (or deployment slot, if specified). * - * @param resourceGroupName Name of resource group - * @param name Name of web app + * @param resourceGroupName Name of the resource group to which the resource belongs. + * @param name Name of the app. * @param serviceCallback the async ServiceCallback to handle successful and failed responses. * @return the {@link ServiceCall} object */ @@ -22051,11 +22313,11 @@ public Observable>> call(String nextPag } /** - * Gets the quota usage numbers for web app. - * Gets the quota usage numbers for web app. + * Gets the quota usage information of an app (or deployment slot, if specified). + * Gets the quota usage information of an app (or deployment slot, if specified). * - * @param resourceGroupName Name of resource group - * @param name Name of web app + * @param resourceGroupName Name of the resource group to which the resource belongs. + * @param name Name of the app. * @return the observable to the PagedList<CsmUsageQuotaInner> object */ public Observable> listUsagesAsync(final String resourceGroupName, final String name) { @@ -22069,11 +22331,11 @@ public Page call(ServiceResponse> r } /** - * Gets the quota usage numbers for web app. - * Gets the quota usage numbers for web app. + * Gets the quota usage information of an app (or deployment slot, if specified). + * Gets the quota usage information of an app (or deployment slot, if specified). * - * @param resourceGroupName Name of resource group - * @param name Name of web app + * @param resourceGroupName Name of the resource group to which the resource belongs. + * @param name Name of the app. * @return the observable to the PagedList<CsmUsageQuotaInner> object */ public Observable>> listUsagesWithServiceResponseAsync(final String resourceGroupName, final String name) { @@ -22091,11 +22353,11 @@ public Observable>> call(ServiceRespons } /** - * Gets the quota usage numbers for web app. - * Gets the quota usage numbers for web app. + * Gets the quota usage information of an app (or deployment slot, if specified). + * Gets the quota usage information of an app (or deployment slot, if specified). * - * @param resourceGroupName Name of resource group - * @param name Name of web app + * @param resourceGroupName Name of the resource group to which the resource belongs. + * @param name Name of the app. * @return the PagedList<CsmUsageQuotaInner> object wrapped in {@link ServiceResponse} if successful. */ public Observable>> listUsagesSinglePageAsync(final String resourceGroupName, final String name) { @@ -22125,12 +22387,12 @@ public Observable>> call(Response listUsages(final String resourceGroupName, final String name, final String filter) { @@ -22144,12 +22406,12 @@ public Page nextPage(String nextPageLink) { } /** - * Gets the quota usage numbers for web app. - * Gets the quota usage numbers for web app. + * Gets the quota usage information of an app (or deployment slot, if specified). + * Gets the quota usage information of an app (or deployment slot, if specified). * - * @param resourceGroupName Name of resource group - * @param name Name of web app - * @param filter Return only usages specified in the filter. Filter is specified by using OData syntax. Example: $filter=(name.value eq 'Metric1' or name.value eq 'Metric2') and startTime eq '2014-01-01T00:00:00Z' and endTime eq '2014-12-31T23:59:59Z' and timeGrain eq duration'[Hour|Minute|Day]'. + * @param resourceGroupName Name of the resource group to which the resource belongs. + * @param name Name of the app. + * @param filter Return only information specified in the filter (using OData syntax). For example: $filter=(name.value eq 'Metric1' or name.value eq 'Metric2') and startTime eq '2014-01-01T00:00:00Z' and endTime eq '2014-12-31T23:59:59Z' and timeGrain eq duration'[Hour|Minute|Day]'. * @param serviceCallback the async ServiceCallback to handle successful and failed responses. * @return the {@link ServiceCall} object */ @@ -22166,12 +22428,12 @@ public Observable>> call(String nextPag } /** - * Gets the quota usage numbers for web app. - * Gets the quota usage numbers for web app. + * Gets the quota usage information of an app (or deployment slot, if specified). + * Gets the quota usage information of an app (or deployment slot, if specified). * - * @param resourceGroupName Name of resource group - * @param name Name of web app - * @param filter Return only usages specified in the filter. Filter is specified by using OData syntax. Example: $filter=(name.value eq 'Metric1' or name.value eq 'Metric2') and startTime eq '2014-01-01T00:00:00Z' and endTime eq '2014-12-31T23:59:59Z' and timeGrain eq duration'[Hour|Minute|Day]'. + * @param resourceGroupName Name of the resource group to which the resource belongs. + * @param name Name of the app. + * @param filter Return only information specified in the filter (using OData syntax). For example: $filter=(name.value eq 'Metric1' or name.value eq 'Metric2') and startTime eq '2014-01-01T00:00:00Z' and endTime eq '2014-12-31T23:59:59Z' and timeGrain eq duration'[Hour|Minute|Day]'. * @return the observable to the PagedList<CsmUsageQuotaInner> object */ public Observable> listUsagesAsync(final String resourceGroupName, final String name, final String filter) { @@ -22185,12 +22447,12 @@ public Page call(ServiceResponse> r } /** - * Gets the quota usage numbers for web app. - * Gets the quota usage numbers for web app. + * Gets the quota usage information of an app (or deployment slot, if specified). + * Gets the quota usage information of an app (or deployment slot, if specified). * - * @param resourceGroupName Name of resource group - * @param name Name of web app - * @param filter Return only usages specified in the filter. Filter is specified by using OData syntax. Example: $filter=(name.value eq 'Metric1' or name.value eq 'Metric2') and startTime eq '2014-01-01T00:00:00Z' and endTime eq '2014-12-31T23:59:59Z' and timeGrain eq duration'[Hour|Minute|Day]'. + * @param resourceGroupName Name of the resource group to which the resource belongs. + * @param name Name of the app. + * @param filter Return only information specified in the filter (using OData syntax). For example: $filter=(name.value eq 'Metric1' or name.value eq 'Metric2') and startTime eq '2014-01-01T00:00:00Z' and endTime eq '2014-12-31T23:59:59Z' and timeGrain eq duration'[Hour|Minute|Day]'. * @return the observable to the PagedList<CsmUsageQuotaInner> object */ public Observable>> listUsagesWithServiceResponseAsync(final String resourceGroupName, final String name, final String filter) { @@ -22208,12 +22470,12 @@ public Observable>> call(ServiceRespons } /** - * Gets the quota usage numbers for web app. - * Gets the quota usage numbers for web app. + * Gets the quota usage information of an app (or deployment slot, if specified). + * Gets the quota usage information of an app (or deployment slot, if specified). * - ServiceResponse> * @param resourceGroupName Name of resource group - ServiceResponse> * @param name Name of web app - ServiceResponse> * @param filter Return only usages specified in the filter. Filter is specified by using OData syntax. Example: $filter=(name.value eq 'Metric1' or name.value eq 'Metric2') and startTime eq '2014-01-01T00:00:00Z' and endTime eq '2014-12-31T23:59:59Z' and timeGrain eq duration'[Hour|Minute|Day]'. + ServiceResponse> * @param resourceGroupName Name of the resource group to which the resource belongs. + ServiceResponse> * @param name Name of the app. + ServiceResponse> * @param filter Return only information specified in the filter (using OData syntax). For example: $filter=(name.value eq 'Metric1' or name.value eq 'Metric2') and startTime eq '2014-01-01T00:00:00Z' and endTime eq '2014-12-31T23:59:59Z' and timeGrain eq duration'[Hour|Minute|Day]'. * @return the PagedList<CsmUsageQuotaInner> object wrapped in {@link ServiceResponse} if successful. */ public Observable>> listUsagesSinglePageAsync(final String resourceGroupName, final String name, final String filter) { @@ -22249,11 +22511,11 @@ private ServiceResponse> listUsagesDelegate(Respons } /** - * Retrieves a list of all Virtual Network Connections associated with this web app. - * Retrieves a list of all Virtual Network Connections associated with this web app. + * Gets the virtual networks the app (or deployment slot) is connected to. + * Gets the virtual networks the app (or deployment slot) is connected to. * - * @param resourceGroupName The resource group name - * @param name The name of the web app + * @param resourceGroupName Name of the resource group to which the resource belongs. + * @param name Name of the app. * @return the List<VnetInfoInner> object if successful. */ public List listVnetConnections(String resourceGroupName, String name) { @@ -22261,11 +22523,11 @@ public List listVnetConnections(String resourceGroupName, String } /** - * Retrieves a list of all Virtual Network Connections associated with this web app. - * Retrieves a list of all Virtual Network Connections associated with this web app. + * Gets the virtual networks the app (or deployment slot) is connected to. + * Gets the virtual networks the app (or deployment slot) is connected to. * - * @param resourceGroupName The resource group name - * @param name The name of the web app + * @param resourceGroupName Name of the resource group to which the resource belongs. + * @param name Name of the app. * @param serviceCallback the async ServiceCallback to handle successful and failed responses. * @return the {@link ServiceCall} object */ @@ -22274,11 +22536,11 @@ public ServiceCall> listVnetConnectionsAsync(String resource } /** - * Retrieves a list of all Virtual Network Connections associated with this web app. - * Retrieves a list of all Virtual Network Connections associated with this web app. + * Gets the virtual networks the app (or deployment slot) is connected to. + * Gets the virtual networks the app (or deployment slot) is connected to. * - * @param resourceGroupName The resource group name - * @param name The name of the web app + * @param resourceGroupName Name of the resource group to which the resource belongs. + * @param name Name of the app. * @return the observable to the List<VnetInfoInner> object */ public Observable> listVnetConnectionsAsync(String resourceGroupName, String name) { @@ -22291,11 +22553,11 @@ public List call(ServiceResponse> response) { } /** - * Retrieves a list of all Virtual Network Connections associated with this web app. - * Retrieves a list of all Virtual Network Connections associated with this web app. + * Gets the virtual networks the app (or deployment slot) is connected to. + * Gets the virtual networks the app (or deployment slot) is connected to. * - * @param resourceGroupName The resource group name - * @param name The name of the web app + * @param resourceGroupName Name of the resource group to which the resource belongs. + * @param name Name of the app. * @return the observable to the List<VnetInfoInner> object */ public Observable>> listVnetConnectionsWithServiceResponseAsync(String resourceGroupName, String name) { @@ -22331,12 +22593,12 @@ private ServiceResponse> listVnetConnectionsDelegate(Respons } /** - * Retrieves a specific Virtual Network Connection associated with this web app. - * Retrieves a specific Virtual Network Connection associated with this web app. + * Gets a virtual network the app (or deployment slot) is connected to by name. + * Gets a virtual network the app (or deployment slot) is connected to by name. * - * @param resourceGroupName The resource group name - * @param name The name of the web app - * @param vnetName The name of the Virtual Network + * @param resourceGroupName Name of the resource group to which the resource belongs. + * @param name Name of the app. + * @param vnetName Name of the virtual network. * @return the VnetInfoInner object if successful. */ public VnetInfoInner getVnetConnection(String resourceGroupName, String name, String vnetName) { @@ -22344,12 +22606,12 @@ public VnetInfoInner getVnetConnection(String resourceGroupName, String name, St } /** - * Retrieves a specific Virtual Network Connection associated with this web app. - * Retrieves a specific Virtual Network Connection associated with this web app. + * Gets a virtual network the app (or deployment slot) is connected to by name. + * Gets a virtual network the app (or deployment slot) is connected to by name. * - * @param resourceGroupName The resource group name - * @param name The name of the web app - * @param vnetName The name of the Virtual Network + * @param resourceGroupName Name of the resource group to which the resource belongs. + * @param name Name of the app. + * @param vnetName Name of the virtual network. * @param serviceCallback the async ServiceCallback to handle successful and failed responses. * @return the {@link ServiceCall} object */ @@ -22358,12 +22620,12 @@ public ServiceCall getVnetConnectionAsync(String resourceGroupNam } /** - * Retrieves a specific Virtual Network Connection associated with this web app. - * Retrieves a specific Virtual Network Connection associated with this web app. + * Gets a virtual network the app (or deployment slot) is connected to by name. + * Gets a virtual network the app (or deployment slot) is connected to by name. * - * @param resourceGroupName The resource group name - * @param name The name of the web app - * @param vnetName The name of the Virtual Network + * @param resourceGroupName Name of the resource group to which the resource belongs. + * @param name Name of the app. + * @param vnetName Name of the virtual network. * @return the observable to the VnetInfoInner object */ public Observable getVnetConnectionAsync(String resourceGroupName, String name, String vnetName) { @@ -22376,12 +22638,12 @@ public VnetInfoInner call(ServiceResponse response) { } /** - * Retrieves a specific Virtual Network Connection associated with this web app. - * Retrieves a specific Virtual Network Connection associated with this web app. + * Gets a virtual network the app (or deployment slot) is connected to by name. + * Gets a virtual network the app (or deployment slot) is connected to by name. * - * @param resourceGroupName The resource group name - * @param name The name of the web app - * @param vnetName The name of the Virtual Network + * @param resourceGroupName Name of the resource group to which the resource belongs. + * @param name Name of the app. + * @param vnetName Name of the virtual network. * @return the observable to the VnetInfoInner object */ public Observable> getVnetConnectionWithServiceResponseAsync(String resourceGroupName, String name, String vnetName) { @@ -22420,13 +22682,13 @@ private ServiceResponse getVnetConnectionDelegate(Response createOrUpdateVnetConnectionAsync(String resou } /** - * Adds a Virtual Network Connection or updates it's properties. - * Adds a Virtual Network Connection or updates it's properties. + * Adds a Virtual Network connection to an app or slot (PUT) or updates the connection properties (PATCH). + * Adds a Virtual Network connection to an app or slot (PUT) or updates the connection properties (PATCH). * - * @param resourceGroupName The resource group name - * @param name The name of the web app - * @param vnetName The name of the Virtual Network - * @param connectionEnvelope The properties of this Virtual Network Connection + * @param resourceGroupName Name of the resource group to which the resource belongs. + * @param name Name of the app. + * @param vnetName Name of an existing Virtual Network. + * @param connectionEnvelope Properties of the Virtual Network connection. See example. * @return the observable to the VnetInfoInner object */ public Observable createOrUpdateVnetConnectionAsync(String resourceGroupName, String name, String vnetName, VnetInfoInner connectionEnvelope) { @@ -22468,13 +22730,13 @@ public VnetInfoInner call(ServiceResponse response) { } /** - * Adds a Virtual Network Connection or updates it's properties. - * Adds a Virtual Network Connection or updates it's properties. + * Adds a Virtual Network connection to an app or slot (PUT) or updates the connection properties (PATCH). + * Adds a Virtual Network connection to an app or slot (PUT) or updates the connection properties (PATCH). * - * @param resourceGroupName The resource group name - * @param name The name of the web app - * @param vnetName The name of the Virtual Network - * @param connectionEnvelope The properties of this Virtual Network Connection + * @param resourceGroupName Name of the resource group to which the resource belongs. + * @param name Name of the app. + * @param vnetName Name of an existing Virtual Network. + * @param connectionEnvelope Properties of the Virtual Network connection. See example. * @return the observable to the VnetInfoInner object */ public Observable> createOrUpdateVnetConnectionWithServiceResponseAsync(String resourceGroupName, String name, String vnetName, VnetInfoInner connectionEnvelope) { @@ -22517,60 +22779,59 @@ private ServiceResponse createOrUpdateVnetConnectionDelegate(Resp } /** - * Removes the specified Virtual Network Connection association from this web app. - * Removes the specified Virtual Network Connection association from this web app. + * Deletes a connection from an app (or deployment slot to a named virtual network. + * Deletes a connection from an app (or deployment slot to a named virtual network. * - * @param resourceGroupName The resource group name - * @param name The name of the web app - * @param vnetName The name of the Virtual Network - * @return the Object object if successful. + * @param resourceGroupName Name of the resource group to which the resource belongs. + * @param name Name of the app. + * @param vnetName Name of the virtual network. */ - public Object deleteVnetConnection(String resourceGroupName, String name, String vnetName) { - return deleteVnetConnectionWithServiceResponseAsync(resourceGroupName, name, vnetName).toBlocking().single().getBody(); + public void deleteVnetConnection(String resourceGroupName, String name, String vnetName) { + deleteVnetConnectionWithServiceResponseAsync(resourceGroupName, name, vnetName).toBlocking().single().getBody(); } /** - * Removes the specified Virtual Network Connection association from this web app. - * Removes the specified Virtual Network Connection association from this web app. + * Deletes a connection from an app (or deployment slot to a named virtual network. + * Deletes a connection from an app (or deployment slot to a named virtual network. * - * @param resourceGroupName The resource group name - * @param name The name of the web app - * @param vnetName The name of the Virtual Network + * @param resourceGroupName Name of the resource group to which the resource belongs. + * @param name Name of the app. + * @param vnetName Name of the virtual network. * @param serviceCallback the async ServiceCallback to handle successful and failed responses. * @return the {@link ServiceCall} object */ - public ServiceCall deleteVnetConnectionAsync(String resourceGroupName, String name, String vnetName, final ServiceCallback serviceCallback) { + public ServiceCall deleteVnetConnectionAsync(String resourceGroupName, String name, String vnetName, final ServiceCallback serviceCallback) { return ServiceCall.create(deleteVnetConnectionWithServiceResponseAsync(resourceGroupName, name, vnetName), serviceCallback); } /** - * Removes the specified Virtual Network Connection association from this web app. - * Removes the specified Virtual Network Connection association from this web app. + * Deletes a connection from an app (or deployment slot to a named virtual network. + * Deletes a connection from an app (or deployment slot to a named virtual network. * - * @param resourceGroupName The resource group name - * @param name The name of the web app - * @param vnetName The name of the Virtual Network - * @return the observable to the Object object + * @param resourceGroupName Name of the resource group to which the resource belongs. + * @param name Name of the app. + * @param vnetName Name of the virtual network. + * @return the {@link ServiceResponse} object if successful. */ - public Observable deleteVnetConnectionAsync(String resourceGroupName, String name, String vnetName) { - return deleteVnetConnectionWithServiceResponseAsync(resourceGroupName, name, vnetName).map(new Func1, Object>() { + public Observable deleteVnetConnectionAsync(String resourceGroupName, String name, String vnetName) { + return deleteVnetConnectionWithServiceResponseAsync(resourceGroupName, name, vnetName).map(new Func1, Void>() { @Override - public Object call(ServiceResponse response) { + public Void call(ServiceResponse response) { return response.getBody(); } }); } /** - * Removes the specified Virtual Network Connection association from this web app. - * Removes the specified Virtual Network Connection association from this web app. + * Deletes a connection from an app (or deployment slot to a named virtual network. + * Deletes a connection from an app (or deployment slot to a named virtual network. * - * @param resourceGroupName The resource group name - * @param name The name of the web app - * @param vnetName The name of the Virtual Network - * @return the observable to the Object object + * @param resourceGroupName Name of the resource group to which the resource belongs. + * @param name Name of the app. + * @param vnetName Name of the virtual network. + * @return the {@link ServiceResponse} object if successful. */ - public Observable> deleteVnetConnectionWithServiceResponseAsync(String resourceGroupName, String name, String vnetName) { + public Observable> deleteVnetConnectionWithServiceResponseAsync(String resourceGroupName, String name, String vnetName) { if (resourceGroupName == null) { throw new IllegalArgumentException("Parameter resourceGroupName is required and cannot be null."); } @@ -22585,11 +22846,11 @@ public Observable> deleteVnetConnectionWithServiceRespon } final String apiVersion = "2016-08-01"; return service.deleteVnetConnection(resourceGroupName, name, vnetName, this.client.subscriptionId(), apiVersion, this.client.acceptLanguage(), this.client.userAgent()) - .flatMap(new Func1, Observable>>() { + .flatMap(new Func1, Observable>>() { @Override - public Observable> call(Response response) { + public Observable> call(Response response) { try { - ServiceResponse clientResponse = deleteVnetConnectionDelegate(response); + ServiceResponse clientResponse = deleteVnetConnectionDelegate(response); return Observable.just(clientResponse); } catch (Throwable t) { return Observable.error(t); @@ -22598,21 +22859,21 @@ public Observable> call(Response response) }); } - private ServiceResponse deleteVnetConnectionDelegate(Response response) throws CloudException, IOException, IllegalArgumentException { - return new AzureServiceResponseBuilder(this.client.mapperAdapter()) - .register(200, new TypeToken() { }.getType()) - .registerError(CloudException.class) + private ServiceResponse deleteVnetConnectionDelegate(Response response) throws CloudException, IOException, IllegalArgumentException { + return new AzureServiceResponseBuilder(this.client.mapperAdapter()) + .register(200, new TypeToken() { }.getType()) + .register(404, new TypeToken() { }.getType()) .build(response); } /** - * Adds a Virtual Network Connection or updates it's properties. - * Adds a Virtual Network Connection or updates it's properties. + * Adds a Virtual Network connection to an app or slot (PUT) or updates the connection properties (PATCH). + * Adds a Virtual Network connection to an app or slot (PUT) or updates the connection properties (PATCH). * - * @param resourceGroupName The resource group name - * @param name The name of the web app - * @param vnetName The name of the Virtual Network - * @param connectionEnvelope The properties of this Virtual Network Connection + * @param resourceGroupName Name of the resource group to which the resource belongs. + * @param name Name of the app. + * @param vnetName Name of an existing Virtual Network. + * @param connectionEnvelope Properties of the Virtual Network connection. See example. * @return the VnetInfoInner object if successful. */ public VnetInfoInner updateVnetConnection(String resourceGroupName, String name, String vnetName, VnetInfoInner connectionEnvelope) { @@ -22620,13 +22881,13 @@ public VnetInfoInner updateVnetConnection(String resourceGroupName, String name, } /** - * Adds a Virtual Network Connection or updates it's properties. - * Adds a Virtual Network Connection or updates it's properties. + * Adds a Virtual Network connection to an app or slot (PUT) or updates the connection properties (PATCH). + * Adds a Virtual Network connection to an app or slot (PUT) or updates the connection properties (PATCH). * - * @param resourceGroupName The resource group name - * @param name The name of the web app - * @param vnetName The name of the Virtual Network - * @param connectionEnvelope The properties of this Virtual Network Connection + * @param resourceGroupName Name of the resource group to which the resource belongs. + * @param name Name of the app. + * @param vnetName Name of an existing Virtual Network. + * @param connectionEnvelope Properties of the Virtual Network connection. See example. * @param serviceCallback the async ServiceCallback to handle successful and failed responses. * @return the {@link ServiceCall} object */ @@ -22635,13 +22896,13 @@ public ServiceCall updateVnetConnectionAsync(String resourceGroup } /** - * Adds a Virtual Network Connection or updates it's properties. - * Adds a Virtual Network Connection or updates it's properties. + * Adds a Virtual Network connection to an app or slot (PUT) or updates the connection properties (PATCH). + * Adds a Virtual Network connection to an app or slot (PUT) or updates the connection properties (PATCH). * - * @param resourceGroupName The resource group name - * @param name The name of the web app - * @param vnetName The name of the Virtual Network - * @param connectionEnvelope The properties of this Virtual Network Connection + * @param resourceGroupName Name of the resource group to which the resource belongs. + * @param name Name of the app. + * @param vnetName Name of an existing Virtual Network. + * @param connectionEnvelope Properties of the Virtual Network connection. See example. * @return the observable to the VnetInfoInner object */ public Observable updateVnetConnectionAsync(String resourceGroupName, String name, String vnetName, VnetInfoInner connectionEnvelope) { @@ -22654,13 +22915,13 @@ public VnetInfoInner call(ServiceResponse response) { } /** - * Adds a Virtual Network Connection or updates it's properties. - * Adds a Virtual Network Connection or updates it's properties. + * Adds a Virtual Network connection to an app or slot (PUT) or updates the connection properties (PATCH). + * Adds a Virtual Network connection to an app or slot (PUT) or updates the connection properties (PATCH). * - * @param resourceGroupName The resource group name - * @param name The name of the web app - * @param vnetName The name of the Virtual Network - * @param connectionEnvelope The properties of this Virtual Network Connection + * @param resourceGroupName Name of the resource group to which the resource belongs. + * @param name Name of the app. + * @param vnetName Name of an existing Virtual Network. + * @param connectionEnvelope Properties of the Virtual Network connection. See example. * @return the observable to the VnetInfoInner object */ public Observable> updateVnetConnectionWithServiceResponseAsync(String resourceGroupName, String name, String vnetName, VnetInfoInner connectionEnvelope) { @@ -22703,64 +22964,64 @@ private ServiceResponse updateVnetConnectionDelegate(Response getVnetConnectionGatewayAsync(String resourceGroupName, String name, String vnetName, String gatewayName, final ServiceCallback serviceCallback) { + public ServiceCall getVnetConnectionGatewayAsync(String resourceGroupName, String name, String vnetName, String gatewayName, final ServiceCallback serviceCallback) { return ServiceCall.create(getVnetConnectionGatewayWithServiceResponseAsync(resourceGroupName, name, vnetName, gatewayName), serviceCallback); } /** - * Retrieves a Virtual Network connection gateway associated with this web app and virtual network. - * Retrieves a Virtual Network connection gateway associated with this web app and virtual network. + * Gets an app's Virtual Network gateway. + * Gets an app's Virtual Network gateway. * - * @param resourceGroupName The resource group name - * @param name The name of the web app - * @param vnetName The name of the Virtual Network - * @param gatewayName The name of the gateway. The only gateway that exists presently is "primary" - * @return the observable to the Object object + * @param resourceGroupName Name of the resource group to which the resource belongs. + * @param name Name of the app. + * @param vnetName Name of the Virtual Network. + * @param gatewayName Name of the gateway. Currently, the only supported string is "primary". + * @return the observable to the VnetGatewayInner object */ - public Observable getVnetConnectionGatewayAsync(String resourceGroupName, String name, String vnetName, String gatewayName) { - return getVnetConnectionGatewayWithServiceResponseAsync(resourceGroupName, name, vnetName, gatewayName).map(new Func1, Object>() { + public Observable getVnetConnectionGatewayAsync(String resourceGroupName, String name, String vnetName, String gatewayName) { + return getVnetConnectionGatewayWithServiceResponseAsync(resourceGroupName, name, vnetName, gatewayName).map(new Func1, VnetGatewayInner>() { @Override - public Object call(ServiceResponse response) { + public VnetGatewayInner call(ServiceResponse response) { return response.getBody(); } }); } /** - * Retrieves a Virtual Network connection gateway associated with this web app and virtual network. - * Retrieves a Virtual Network connection gateway associated with this web app and virtual network. + * Gets an app's Virtual Network gateway. + * Gets an app's Virtual Network gateway. * - * @param resourceGroupName The resource group name - * @param name The name of the web app - * @param vnetName The name of the Virtual Network - * @param gatewayName The name of the gateway. The only gateway that exists presently is "primary" - * @return the observable to the Object object + * @param resourceGroupName Name of the resource group to which the resource belongs. + * @param name Name of the app. + * @param vnetName Name of the Virtual Network. + * @param gatewayName Name of the gateway. Currently, the only supported string is "primary". + * @return the observable to the VnetGatewayInner object */ - public Observable> getVnetConnectionGatewayWithServiceResponseAsync(String resourceGroupName, String name, String vnetName, String gatewayName) { + public Observable> getVnetConnectionGatewayWithServiceResponseAsync(String resourceGroupName, String name, String vnetName, String gatewayName) { if (resourceGroupName == null) { throw new IllegalArgumentException("Parameter resourceGroupName is required and cannot be null."); } @@ -22778,11 +23039,11 @@ public Observable> getVnetConnectionGatewayWithServiceRe } final String apiVersion = "2016-08-01"; return service.getVnetConnectionGateway(resourceGroupName, name, vnetName, gatewayName, this.client.subscriptionId(), apiVersion, this.client.acceptLanguage(), this.client.userAgent()) - .flatMap(new Func1, Observable>>() { + .flatMap(new Func1, Observable>>() { @Override - public Observable> call(Response response) { + public Observable> call(Response response) { try { - ServiceResponse clientResponse = getVnetConnectionGatewayDelegate(response); + ServiceResponse clientResponse = getVnetConnectionGatewayDelegate(response); return Observable.just(clientResponse); } catch (Throwable t) { return Observable.error(t); @@ -22791,22 +23052,22 @@ public Observable> call(Response response) }); } - private ServiceResponse getVnetConnectionGatewayDelegate(Response response) throws CloudException, IOException, IllegalArgumentException { - return new AzureServiceResponseBuilder(this.client.mapperAdapter()) - .register(200, new TypeToken() { }.getType()) + private ServiceResponse getVnetConnectionGatewayDelegate(Response response) throws CloudException, IOException, IllegalArgumentException { + return new AzureServiceResponseBuilder(this.client.mapperAdapter()) + .register(200, new TypeToken() { }.getType()) .register(404, new TypeToken() { }.getType()) .registerError(CloudException.class) .build(response); } /** - * Updates the Virtual Network Gateway. - * Updates the Virtual Network Gateway. + * Adds a gateway to a connected Virtual Network (PUT) or updates it (PATCH). + * Adds a gateway to a connected Virtual Network (PUT) or updates it (PATCH). * - * @param resourceGroupName The resource group name - * @param name The name of the web app - * @param vnetName The name of the Virtual Network - * @param gatewayName The name of the gateway. The only gateway that exists presently is "primary" + * @param resourceGroupName Name of the resource group to which the resource belongs. + * @param name Name of the app. + * @param vnetName Name of the Virtual Network. + * @param gatewayName Name of the gateway. Currently, the only supported string is "primary". * @param connectionEnvelope The properties to update this gateway with. * @return the VnetGatewayInner object if successful. */ @@ -22815,13 +23076,13 @@ public VnetGatewayInner createOrUpdateVnetConnectionGateway(String resourceGroup } /** - * Updates the Virtual Network Gateway. - * Updates the Virtual Network Gateway. + * Adds a gateway to a connected Virtual Network (PUT) or updates it (PATCH). + * Adds a gateway to a connected Virtual Network (PUT) or updates it (PATCH). * - * @param resourceGroupName The resource group name - * @param name The name of the web app - * @param vnetName The name of the Virtual Network - * @param gatewayName The name of the gateway. The only gateway that exists presently is "primary" + * @param resourceGroupName Name of the resource group to which the resource belongs. + * @param name Name of the app. + * @param vnetName Name of the Virtual Network. + * @param gatewayName Name of the gateway. Currently, the only supported string is "primary". * @param connectionEnvelope The properties to update this gateway with. * @param serviceCallback the async ServiceCallback to handle successful and failed responses. * @return the {@link ServiceCall} object @@ -22831,13 +23092,13 @@ public ServiceCall createOrUpdateVnetConnectionGatewayAsync(St } /** - * Updates the Virtual Network Gateway. - * Updates the Virtual Network Gateway. + * Adds a gateway to a connected Virtual Network (PUT) or updates it (PATCH). + * Adds a gateway to a connected Virtual Network (PUT) or updates it (PATCH). * - * @param resourceGroupName The resource group name - * @param name The name of the web app - * @param vnetName The name of the Virtual Network - * @param gatewayName The name of the gateway. The only gateway that exists presently is "primary" + * @param resourceGroupName Name of the resource group to which the resource belongs. + * @param name Name of the app. + * @param vnetName Name of the Virtual Network. + * @param gatewayName Name of the gateway. Currently, the only supported string is "primary". * @param connectionEnvelope The properties to update this gateway with. * @return the observable to the VnetGatewayInner object */ @@ -22851,13 +23112,13 @@ public VnetGatewayInner call(ServiceResponse response) { } /** - * Updates the Virtual Network Gateway. - * Updates the Virtual Network Gateway. + * Adds a gateway to a connected Virtual Network (PUT) or updates it (PATCH). + * Adds a gateway to a connected Virtual Network (PUT) or updates it (PATCH). * - * @param resourceGroupName The resource group name - * @param name The name of the web app - * @param vnetName The name of the Virtual Network - * @param gatewayName The name of the gateway. The only gateway that exists presently is "primary" + * @param resourceGroupName Name of the resource group to which the resource belongs. + * @param name Name of the app. + * @param vnetName Name of the Virtual Network. + * @param gatewayName Name of the gateway. Currently, the only supported string is "primary". * @param connectionEnvelope The properties to update this gateway with. * @return the observable to the VnetGatewayInner object */ @@ -22904,13 +23165,13 @@ private ServiceResponse createOrUpdateVnetConnectionGatewayDel } /** - * Updates the Virtual Network Gateway. - * Updates the Virtual Network Gateway. + * Adds a gateway to a connected Virtual Network (PUT) or updates it (PATCH). + * Adds a gateway to a connected Virtual Network (PUT) or updates it (PATCH). * - * @param resourceGroupName The resource group name - * @param name The name of the web app - * @param vnetName The name of the Virtual Network - * @param gatewayName The name of the gateway. The only gateway that exists presently is "primary" + * @param resourceGroupName Name of the resource group to which the resource belongs. + * @param name Name of the app. + * @param vnetName Name of the Virtual Network. + * @param gatewayName Name of the gateway. Currently, the only supported string is "primary". * @param connectionEnvelope The properties to update this gateway with. * @return the VnetGatewayInner object if successful. */ @@ -22919,13 +23180,13 @@ public VnetGatewayInner updateVnetConnectionGateway(String resourceGroupName, St } /** - * Updates the Virtual Network Gateway. - * Updates the Virtual Network Gateway. + * Adds a gateway to a connected Virtual Network (PUT) or updates it (PATCH). + * Adds a gateway to a connected Virtual Network (PUT) or updates it (PATCH). * - * @param resourceGroupName The resource group name - * @param name The name of the web app - * @param vnetName The name of the Virtual Network - * @param gatewayName The name of the gateway. The only gateway that exists presently is "primary" + * @param resourceGroupName Name of the resource group to which the resource belongs. + * @param name Name of the app. + * @param vnetName Name of the Virtual Network. + * @param gatewayName Name of the gateway. Currently, the only supported string is "primary". * @param connectionEnvelope The properties to update this gateway with. * @param serviceCallback the async ServiceCallback to handle successful and failed responses. * @return the {@link ServiceCall} object @@ -22935,13 +23196,13 @@ public ServiceCall updateVnetConnectionGatewayAsync(String res } /** - * Updates the Virtual Network Gateway. - * Updates the Virtual Network Gateway. + * Adds a gateway to a connected Virtual Network (PUT) or updates it (PATCH). + * Adds a gateway to a connected Virtual Network (PUT) or updates it (PATCH). * - * @param resourceGroupName The resource group name - * @param name The name of the web app - * @param vnetName The name of the Virtual Network - * @param gatewayName The name of the gateway. The only gateway that exists presently is "primary" + * @param resourceGroupName Name of the resource group to which the resource belongs. + * @param name Name of the app. + * @param vnetName Name of the Virtual Network. + * @param gatewayName Name of the gateway. Currently, the only supported string is "primary". * @param connectionEnvelope The properties to update this gateway with. * @return the observable to the VnetGatewayInner object */ @@ -22955,13 +23216,13 @@ public VnetGatewayInner call(ServiceResponse response) { } /** - * Updates the Virtual Network Gateway. - * Updates the Virtual Network Gateway. + * Adds a gateway to a connected Virtual Network (PUT) or updates it (PATCH). + * Adds a gateway to a connected Virtual Network (PUT) or updates it (PATCH). * - * @param resourceGroupName The resource group name - * @param name The name of the web app - * @param vnetName The name of the Virtual Network - * @param gatewayName The name of the gateway. The only gateway that exists presently is "primary" + * @param resourceGroupName Name of the resource group to which the resource belongs. + * @param name Name of the app. + * @param vnetName Name of the Virtual Network. + * @param gatewayName Name of the gateway. Currently, the only supported string is "primary". * @param connectionEnvelope The properties to update this gateway with. * @return the observable to the VnetGatewayInner object */ @@ -23008,8 +23269,8 @@ private ServiceResponse updateVnetConnectionGatewayDelegate(Re } /** - * Gets all Web Apps for a subscription. - * Gets all Web Apps for a subscription. + * Get all apps for a subscription. + * Get all apps for a subscription. * * @param nextPageLink The NextLink from the previous successful call to List operation. * @return the PagedList<SiteInner> object if successful. @@ -23025,8 +23286,8 @@ public Page nextPage(String nextPageLink) { } /** - * Gets all Web Apps for a subscription. - * Gets all Web Apps for a subscription. + * Get all apps for a subscription. + * Get all apps for a subscription. * * @param nextPageLink The NextLink from the previous successful call to List operation. * @param serviceCall the ServiceCall object tracking the Retrofit calls @@ -23046,8 +23307,8 @@ public Observable>> call(String nextPageLink) { } /** - * Gets all Web Apps for a subscription. - * Gets all Web Apps for a subscription. + * Get all apps for a subscription. + * Get all apps for a subscription. * * @param nextPageLink The NextLink from the previous successful call to List operation. * @return the observable to the PagedList<SiteInner> object @@ -23063,8 +23324,8 @@ public Page call(ServiceResponse> response) { } /** - * Gets all Web Apps for a subscription. - * Gets all Web Apps for a subscription. + * Get all apps for a subscription. + * Get all apps for a subscription. * * @param nextPageLink The NextLink from the previous successful call to List operation. * @return the observable to the PagedList<SiteInner> object @@ -23084,8 +23345,8 @@ public Observable>> call(ServiceResponse> * @param nextPageLink The NextLink from the previous successful call to List operation. * @return the PagedList<SiteInner> object wrapped in {@link ServiceResponse} if successful. @@ -23116,116 +23377,8 @@ private ServiceResponse> listNextDelegate(Response listDeletedNext(final String nextPageLink) { - ServiceResponse> response = listDeletedNextSinglePageAsync(nextPageLink).toBlocking().single(); - return new PagedList(response.getBody()) { - @Override - public Page nextPage(String nextPageLink) { - return listDeletedNextSinglePageAsync(nextPageLink).toBlocking().single().getBody(); - } - }; - } - - /** - * Gets deleted web apps in subscription. - * Gets deleted web apps in subscription. - * - * @param nextPageLink The NextLink from the previous successful call to List operation. - * @param serviceCall the ServiceCall object tracking the Retrofit calls - * @param serviceCallback the async ServiceCallback to handle successful and failed responses. - * @return the {@link ServiceCall} object - */ - public ServiceCall> listDeletedNextAsync(final String nextPageLink, final ServiceCall> serviceCall, final ListOperationCallback serviceCallback) { - return AzureServiceCall.create( - listDeletedNextSinglePageAsync(nextPageLink), - new Func1>>>() { - @Override - public Observable>> call(String nextPageLink) { - return listDeletedNextSinglePageAsync(nextPageLink); - } - }, - serviceCallback); - } - - /** - * Gets deleted web apps in subscription. - * Gets deleted web apps in subscription. - * - * @param nextPageLink The NextLink from the previous successful call to List operation. - * @return the observable to the PagedList<DeletedSiteInner> object - */ - public Observable> listDeletedNextAsync(final String nextPageLink) { - return listDeletedNextWithServiceResponseAsync(nextPageLink) - .map(new Func1>, Page>() { - @Override - public Page call(ServiceResponse> response) { - return response.getBody(); - } - }); - } - - /** - * Gets deleted web apps in subscription. - * Gets deleted web apps in subscription. - * - * @param nextPageLink The NextLink from the previous successful call to List operation. - * @return the observable to the PagedList<DeletedSiteInner> object - */ - public Observable>> listDeletedNextWithServiceResponseAsync(final String nextPageLink) { - return listDeletedNextSinglePageAsync(nextPageLink) - .concatMap(new Func1>, Observable>>>() { - @Override - public Observable>> call(ServiceResponse> page) { - String nextPageLink = page.getBody().getNextPageLink(); - if (nextPageLink == null) { - return Observable.just(page); - } - return Observable.just(page).concatWith(listDeletedNextWithServiceResponseAsync(nextPageLink)); - } - }); - } - - /** - * Gets deleted web apps in subscription. - * Gets deleted web apps in subscription. - * - ServiceResponse> * @param nextPageLink The NextLink from the previous successful call to List operation. - * @return the PagedList<DeletedSiteInner> object wrapped in {@link ServiceResponse} if successful. - */ - public Observable>> listDeletedNextSinglePageAsync(final String nextPageLink) { - if (nextPageLink == null) { - throw new IllegalArgumentException("Parameter nextPageLink is required and cannot be null."); - } - return service.listDeletedNext(nextPageLink, this.client.acceptLanguage(), this.client.userAgent()) - .flatMap(new Func1, Observable>>>() { - @Override - public Observable>> call(Response response) { - try { - ServiceResponse> result = listDeletedNextDelegate(response); - return Observable.just(new ServiceResponse>(result.getBody(), result.getResponse())); - } catch (Throwable t) { - return Observable.error(t); - } - } - }); - } - - private ServiceResponse> listDeletedNextDelegate(Response response) throws CloudException, IOException, IllegalArgumentException { - return new AzureServiceResponseBuilder, CloudException>(this.client.mapperAdapter()) - .register(200, new TypeToken>() { }.getType()) - .registerError(CloudException.class) - .build(response); - } - - /** - * Gets the web apps for a subscription in the specified resource group. - * Gets the web apps for a subscription in the specified resource group. + * Gets all web, mobile, and API apps in the specified resource group. + * Gets all web, mobile, and API apps in the specified resource group. * * @param nextPageLink The NextLink from the previous successful call to List operation. * @return the PagedList<SiteInner> object if successful. @@ -23241,8 +23394,8 @@ public Page nextPage(String nextPageLink) { } /** - * Gets the web apps for a subscription in the specified resource group. - * Gets the web apps for a subscription in the specified resource group. + * Gets all web, mobile, and API apps in the specified resource group. + * Gets all web, mobile, and API apps in the specified resource group. * * @param nextPageLink The NextLink from the previous successful call to List operation. * @param serviceCall the ServiceCall object tracking the Retrofit calls @@ -23262,8 +23415,8 @@ public Observable>> call(String nextPageLink) { } /** - * Gets the web apps for a subscription in the specified resource group. - * Gets the web apps for a subscription in the specified resource group. + * Gets all web, mobile, and API apps in the specified resource group. + * Gets all web, mobile, and API apps in the specified resource group. * * @param nextPageLink The NextLink from the previous successful call to List operation. * @return the observable to the PagedList<SiteInner> object @@ -23279,8 +23432,8 @@ public Page call(ServiceResponse> response) { } /** - * Gets the web apps for a subscription in the specified resource group. - * Gets the web apps for a subscription in the specified resource group. + * Gets all web, mobile, and API apps in the specified resource group. + * Gets all web, mobile, and API apps in the specified resource group. * * @param nextPageLink The NextLink from the previous successful call to List operation. * @return the observable to the PagedList<SiteInner> object @@ -23300,8 +23453,8 @@ public Observable>> call(ServiceResponse> * @param nextPageLink The NextLink from the previous successful call to List operation. * @return the PagedList<SiteInner> object wrapped in {@link ServiceResponse} if successful. @@ -23332,8 +23485,8 @@ private ServiceResponse> listByResourceGroupNextDelegate(Res } /** - * Lists all available backups for web app. - * Lists all available backups for web app. + * Gets existing backups of an app. + * Gets existing backups of an app. * * @param nextPageLink The NextLink from the previous successful call to List operation. * @return the PagedList<BackupItemInner> object if successful. @@ -23349,8 +23502,8 @@ public Page nextPage(String nextPageLink) { } /** - * Lists all available backups for web app. - * Lists all available backups for web app. + * Gets existing backups of an app. + * Gets existing backups of an app. * * @param nextPageLink The NextLink from the previous successful call to List operation. * @param serviceCall the ServiceCall object tracking the Retrofit calls @@ -23370,8 +23523,8 @@ public Observable>> call(String nextPageLi } /** - * Lists all available backups for web app. - * Lists all available backups for web app. + * Gets existing backups of an app. + * Gets existing backups of an app. * * @param nextPageLink The NextLink from the previous successful call to List operation. * @return the observable to the PagedList<BackupItemInner> object @@ -23387,8 +23540,8 @@ public Page call(ServiceResponse> respons } /** - * Lists all available backups for web app. - * Lists all available backups for web app. + * Gets existing backups of an app. + * Gets existing backups of an app. * * @param nextPageLink The NextLink from the previous successful call to List operation. * @return the observable to the PagedList<BackupItemInner> object @@ -23408,8 +23561,8 @@ public Observable>> call(ServiceResponse

> * @param nextPageLink The NextLink from the previous successful call to List operation. * @return the PagedList<BackupItemInner> object wrapped in {@link ServiceResponse} if successful. @@ -23440,8 +23593,8 @@ private ServiceResponse> listBackupsNextDelegate(Respo } /** - * List deployments. - * List deployments. + * List deployments for an app, or a deployment slot, or for an instance of a scaled-out app. + * List deployments for an app, or a deployment slot, or for an instance of a scaled-out app. * * @param nextPageLink The NextLink from the previous successful call to List operation. * @return the PagedList<DeploymentInner> object if successful. @@ -23457,8 +23610,8 @@ public Page nextPage(String nextPageLink) { } /** - * List deployments. - * List deployments. + * List deployments for an app, or a deployment slot, or for an instance of a scaled-out app. + * List deployments for an app, or a deployment slot, or for an instance of a scaled-out app. * * @param nextPageLink The NextLink from the previous successful call to List operation. * @param serviceCall the ServiceCall object tracking the Retrofit calls @@ -23478,8 +23631,8 @@ public Observable>> call(String nextPageLi } /** - * List deployments. - * List deployments. + * List deployments for an app, or a deployment slot, or for an instance of a scaled-out app. + * List deployments for an app, or a deployment slot, or for an instance of a scaled-out app. * * @param nextPageLink The NextLink from the previous successful call to List operation. * @return the observable to the PagedList<DeploymentInner> object @@ -23495,8 +23648,8 @@ public Page call(ServiceResponse> respons } /** - * List deployments. - * List deployments. + * List deployments for an app, or a deployment slot, or for an instance of a scaled-out app. + * List deployments for an app, or a deployment slot, or for an instance of a scaled-out app. * * @param nextPageLink The NextLink from the previous successful call to List operation. * @return the observable to the PagedList<DeploymentInner> object @@ -23516,8 +23669,8 @@ public Observable>> call(ServiceResponse

> * @param nextPageLink The NextLink from the previous successful call to List operation. * @return the PagedList<DeploymentInner> object wrapped in {@link ServiceResponse} if successful. @@ -23548,8 +23701,116 @@ private ServiceResponse> listDeploymentsNextDelegate(R } /** - * Get web app hostname bindings. - * Get web app hostname bindings. + * Lists ownership identifiers for domain associated with web app. + * Lists ownership identifiers for domain associated with web app. + * + * @param nextPageLink The NextLink from the previous successful call to List operation. + * @return the PagedList<IdentifierInner> object if successful. + */ + public PagedList listDomainOwnershipIdentifiersNext(final String nextPageLink) { + ServiceResponse> response = listDomainOwnershipIdentifiersNextSinglePageAsync(nextPageLink).toBlocking().single(); + return new PagedList(response.getBody()) { + @Override + public Page nextPage(String nextPageLink) { + return listDomainOwnershipIdentifiersNextSinglePageAsync(nextPageLink).toBlocking().single().getBody(); + } + }; + } + + /** + * Lists ownership identifiers for domain associated with web app. + * Lists ownership identifiers for domain associated with web app. + * + * @param nextPageLink The NextLink from the previous successful call to List operation. + * @param serviceCall the ServiceCall object tracking the Retrofit calls + * @param serviceCallback the async ServiceCallback to handle successful and failed responses. + * @return the {@link ServiceCall} object + */ + public ServiceCall> listDomainOwnershipIdentifiersNextAsync(final String nextPageLink, final ServiceCall> serviceCall, final ListOperationCallback serviceCallback) { + return AzureServiceCall.create( + listDomainOwnershipIdentifiersNextSinglePageAsync(nextPageLink), + new Func1>>>() { + @Override + public Observable>> call(String nextPageLink) { + return listDomainOwnershipIdentifiersNextSinglePageAsync(nextPageLink); + } + }, + serviceCallback); + } + + /** + * Lists ownership identifiers for domain associated with web app. + * Lists ownership identifiers for domain associated with web app. + * + * @param nextPageLink The NextLink from the previous successful call to List operation. + * @return the observable to the PagedList<IdentifierInner> object + */ + public Observable> listDomainOwnershipIdentifiersNextAsync(final String nextPageLink) { + return listDomainOwnershipIdentifiersNextWithServiceResponseAsync(nextPageLink) + .map(new Func1>, Page>() { + @Override + public Page call(ServiceResponse> response) { + return response.getBody(); + } + }); + } + + /** + * Lists ownership identifiers for domain associated with web app. + * Lists ownership identifiers for domain associated with web app. + * + * @param nextPageLink The NextLink from the previous successful call to List operation. + * @return the observable to the PagedList<IdentifierInner> object + */ + public Observable>> listDomainOwnershipIdentifiersNextWithServiceResponseAsync(final String nextPageLink) { + return listDomainOwnershipIdentifiersNextSinglePageAsync(nextPageLink) + .concatMap(new Func1>, Observable>>>() { + @Override + public Observable>> call(ServiceResponse> page) { + String nextPageLink = page.getBody().getNextPageLink(); + if (nextPageLink == null) { + return Observable.just(page); + } + return Observable.just(page).concatWith(listDomainOwnershipIdentifiersNextWithServiceResponseAsync(nextPageLink)); + } + }); + } + + /** + * Lists ownership identifiers for domain associated with web app. + * Lists ownership identifiers for domain associated with web app. + * + ServiceResponse> * @param nextPageLink The NextLink from the previous successful call to List operation. + * @return the PagedList<IdentifierInner> object wrapped in {@link ServiceResponse} if successful. + */ + public Observable>> listDomainOwnershipIdentifiersNextSinglePageAsync(final String nextPageLink) { + if (nextPageLink == null) { + throw new IllegalArgumentException("Parameter nextPageLink is required and cannot be null."); + } + return service.listDomainOwnershipIdentifiersNext(nextPageLink, this.client.acceptLanguage(), this.client.userAgent()) + .flatMap(new Func1, Observable>>>() { + @Override + public Observable>> call(Response response) { + try { + ServiceResponse> result = listDomainOwnershipIdentifiersNextDelegate(response); + return Observable.just(new ServiceResponse>(result.getBody(), result.getResponse())); + } catch (Throwable t) { + return Observable.error(t); + } + } + }); + } + + private ServiceResponse> listDomainOwnershipIdentifiersNextDelegate(Response response) throws CloudException, IOException, IllegalArgumentException { + return new AzureServiceResponseBuilder, CloudException>(this.client.mapperAdapter()) + .register(200, new TypeToken>() { }.getType()) + .registerError(CloudException.class) + .build(response); + } + + /** + * Get hostname bindings for an app or a deployment slot. + * Get hostname bindings for an app or a deployment slot. * * @param nextPageLink The NextLink from the previous successful call to List operation. * @return the PagedList<HostNameBindingInner> object if successful. @@ -23565,8 +23826,8 @@ public Page nextPage(String nextPageLink) { } /** - * Get web app hostname bindings. - * Get web app hostname bindings. + * Get hostname bindings for an app or a deployment slot. + * Get hostname bindings for an app or a deployment slot. * * @param nextPageLink The NextLink from the previous successful call to List operation. * @param serviceCall the ServiceCall object tracking the Retrofit calls @@ -23586,8 +23847,8 @@ public Observable>> call(String nextP } /** - * Get web app hostname bindings. - * Get web app hostname bindings. + * Get hostname bindings for an app or a deployment slot. + * Get hostname bindings for an app or a deployment slot. * * @param nextPageLink The NextLink from the previous successful call to List operation. * @return the observable to the PagedList<HostNameBindingInner> object @@ -23603,8 +23864,8 @@ public Page call(ServiceResponse>> call(ServiceRespo } /** - * Get web app hostname bindings. - * Get web app hostname bindings. + * Get hostname bindings for an app or a deployment slot. + * Get hostname bindings for an app or a deployment slot. * ServiceResponse> * @param nextPageLink The NextLink from the previous successful call to List operation. * @return the PagedList<HostNameBindingInner> object wrapped in {@link ServiceResponse} if successful. @@ -23656,8 +23917,8 @@ private ServiceResponse> listHostNameBindingsNext } /** - * Gets all instance of a web app. - * Gets all instance of a web app. + * Gets all scale-out instances of an app. + * Gets all scale-out instances of an app. * * @param nextPageLink The NextLink from the previous successful call to List operation. * @return the PagedList<SiteInstanceInner> object if successful. @@ -23673,8 +23934,8 @@ public Page nextPage(String nextPageLink) { } /** - * Gets all instance of a web app. - * Gets all instance of a web app. + * Gets all scale-out instances of an app. + * Gets all scale-out instances of an app. * * @param nextPageLink The NextLink from the previous successful call to List operation. * @param serviceCall the ServiceCall object tracking the Retrofit calls @@ -23694,8 +23955,8 @@ public Observable>> call(String nextPage } /** - * Gets all instance of a web app. - * Gets all instance of a web app. + * Gets all scale-out instances of an app. + * Gets all scale-out instances of an app. * * @param nextPageLink The NextLink from the previous successful call to List operation. * @return the observable to the PagedList<SiteInstanceInner> object @@ -23711,8 +23972,8 @@ public Page call(ServiceResponse> res } /** - * Gets all instance of a web app. - * Gets all instance of a web app. + * Gets all scale-out instances of an app. + * Gets all scale-out instances of an app. * * @param nextPageLink The NextLink from the previous successful call to List operation. * @return the observable to the PagedList<SiteInstanceInner> object @@ -23732,8 +23993,8 @@ public Observable>> call(ServiceResponse } /** - * Gets all instance of a web app. - * Gets all instance of a web app. + * Gets all scale-out instances of an app. + * Gets all scale-out instances of an app. * ServiceResponse> * @param nextPageLink The NextLink from the previous successful call to List operation. * @return the PagedList<SiteInstanceInner> object wrapped in {@link ServiceResponse} if successful. @@ -23764,8 +24025,8 @@ private ServiceResponse> listInstanceIdentifiersNext } /** - * List deployments. - * List deployments. + * List deployments for an app, or a deployment slot, or for an instance of a scaled-out app. + * List deployments for an app, or a deployment slot, or for an instance of a scaled-out app. * * @param nextPageLink The NextLink from the previous successful call to List operation. * @return the PagedList<DeploymentInner> object if successful. @@ -23781,8 +24042,8 @@ public Page nextPage(String nextPageLink) { } /** - * List deployments. - * List deployments. + * List deployments for an app, or a deployment slot, or for an instance of a scaled-out app. + * List deployments for an app, or a deployment slot, or for an instance of a scaled-out app. * * @param nextPageLink The NextLink from the previous successful call to List operation. * @param serviceCall the ServiceCall object tracking the Retrofit calls @@ -23802,8 +24063,8 @@ public Observable>> call(String nextPageLi } /** - * List deployments. - * List deployments. + * List deployments for an app, or a deployment slot, or for an instance of a scaled-out app. + * List deployments for an app, or a deployment slot, or for an instance of a scaled-out app. * * @param nextPageLink The NextLink from the previous successful call to List operation. * @return the observable to the PagedList<DeploymentInner> object @@ -23819,8 +24080,8 @@ public Page call(ServiceResponse> respons } /** - * List deployments. - * List deployments. + * List deployments for an app, or a deployment slot, or for an instance of a scaled-out app. + * List deployments for an app, or a deployment slot, or for an instance of a scaled-out app. * * @param nextPageLink The NextLink from the previous successful call to List operation. * @return the observable to the PagedList<DeploymentInner> object @@ -23840,8 +24101,8 @@ public Observable>> call(ServiceResponse

> * @param nextPageLink The NextLink from the previous successful call to List operation. * @return the PagedList<DeploymentInner> object wrapped in {@link ServiceResponse} if successful. @@ -23872,37 +24133,37 @@ private ServiceResponse> listInstanceDeploymentsNextDe } /** - * Gets metric definitions for web app. - * Gets metric definitions for web app. + * Gets all metric definitions of an app (or deployment slot, if specified). + * Gets all metric definitions of an app (or deployment slot, if specified). * * @param nextPageLink The NextLink from the previous successful call to List operation. - * @return the PagedList<MetricDefinitionInner> object if successful. + * @return the PagedList<ResourceMetricDefinitionInner> object if successful. */ - public PagedList listMetricDefinitionsNext(final String nextPageLink) { - ServiceResponse> response = listMetricDefinitionsNextSinglePageAsync(nextPageLink).toBlocking().single(); - return new PagedList(response.getBody()) { + public PagedList listMetricDefinitionsNext(final String nextPageLink) { + ServiceResponse> response = listMetricDefinitionsNextSinglePageAsync(nextPageLink).toBlocking().single(); + return new PagedList(response.getBody()) { @Override - public Page nextPage(String nextPageLink) { + public Page nextPage(String nextPageLink) { return listMetricDefinitionsNextSinglePageAsync(nextPageLink).toBlocking().single().getBody(); } }; } /** - * Gets metric definitions for web app. - * Gets metric definitions for web app. + * Gets all metric definitions of an app (or deployment slot, if specified). + * Gets all metric definitions of an app (or deployment slot, if specified). * * @param nextPageLink The NextLink from the previous successful call to List operation. * @param serviceCall the ServiceCall object tracking the Retrofit calls * @param serviceCallback the async ServiceCallback to handle successful and failed responses. * @return the {@link ServiceCall} object */ - public ServiceCall> listMetricDefinitionsNextAsync(final String nextPageLink, final ServiceCall> serviceCall, final ListOperationCallback serviceCallback) { + public ServiceCall> listMetricDefinitionsNextAsync(final String nextPageLink, final ServiceCall> serviceCall, final ListOperationCallback serviceCallback) { return AzureServiceCall.create( listMetricDefinitionsNextSinglePageAsync(nextPageLink), - new Func1>>>() { + new Func1>>>() { @Override - public Observable>> call(String nextPageLink) { + public Observable>> call(String nextPageLink) { return listMetricDefinitionsNextSinglePageAsync(nextPageLink); } }, @@ -23910,34 +24171,34 @@ public Observable>> call(String next } /** - * Gets metric definitions for web app. - * Gets metric definitions for web app. + * Gets all metric definitions of an app (or deployment slot, if specified). + * Gets all metric definitions of an app (or deployment slot, if specified). * * @param nextPageLink The NextLink from the previous successful call to List operation. - * @return the observable to the PagedList<MetricDefinitionInner> object + * @return the observable to the PagedList<ResourceMetricDefinitionInner> object */ - public Observable> listMetricDefinitionsNextAsync(final String nextPageLink) { + public Observable> listMetricDefinitionsNextAsync(final String nextPageLink) { return listMetricDefinitionsNextWithServiceResponseAsync(nextPageLink) - .map(new Func1>, Page>() { + .map(new Func1>, Page>() { @Override - public Page call(ServiceResponse> response) { + public Page call(ServiceResponse> response) { return response.getBody(); } }); } /** - * Gets metric definitions for web app. - * Gets metric definitions for web app. + * Gets all metric definitions of an app (or deployment slot, if specified). + * Gets all metric definitions of an app (or deployment slot, if specified). * * @param nextPageLink The NextLink from the previous successful call to List operation. - * @return the observable to the PagedList<MetricDefinitionInner> object + * @return the observable to the PagedList<ResourceMetricDefinitionInner> object */ - public Observable>> listMetricDefinitionsNextWithServiceResponseAsync(final String nextPageLink) { + public Observable>> listMetricDefinitionsNextWithServiceResponseAsync(final String nextPageLink) { return listMetricDefinitionsNextSinglePageAsync(nextPageLink) - .concatMap(new Func1>, Observable>>>() { + .concatMap(new Func1>, Observable>>>() { @Override - public Observable>> call(ServiceResponse> page) { + public Observable>> call(ServiceResponse> page) { String nextPageLink = page.getBody().getNextPageLink(); if (nextPageLink == null) { return Observable.just(page); @@ -23948,23 +24209,23 @@ public Observable>> call(ServiceResp } /** - * Gets metric definitions for web app. - * Gets metric definitions for web app. + * Gets all metric definitions of an app (or deployment slot, if specified). + * Gets all metric definitions of an app (or deployment slot, if specified). * - ServiceResponse> * @param nextPageLink The NextLink from the previous successful call to List operation. - * @return the PagedList<MetricDefinitionInner> object wrapped in {@link ServiceResponse} if successful. + ServiceResponse> * @param nextPageLink The NextLink from the previous successful call to List operation. + * @return the PagedList<ResourceMetricDefinitionInner> object wrapped in {@link ServiceResponse} if successful. */ - public Observable>> listMetricDefinitionsNextSinglePageAsync(final String nextPageLink) { + public Observable>> listMetricDefinitionsNextSinglePageAsync(final String nextPageLink) { if (nextPageLink == null) { throw new IllegalArgumentException("Parameter nextPageLink is required and cannot be null."); } return service.listMetricDefinitionsNext(nextPageLink, this.client.acceptLanguage(), this.client.userAgent()) - .flatMap(new Func1, Observable>>>() { + .flatMap(new Func1, Observable>>>() { @Override - public Observable>> call(Response response) { + public Observable>> call(Response response) { try { - ServiceResponse> result = listMetricDefinitionsNextDelegate(response); - return Observable.just(new ServiceResponse>(result.getBody(), result.getResponse())); + ServiceResponse> result = listMetricDefinitionsNextDelegate(response); + return Observable.just(new ServiceResponse>(result.getBody(), result.getResponse())); } catch (Throwable t) { return Observable.error(t); } @@ -23972,16 +24233,16 @@ public Observable>> call(Response> listMetricDefinitionsNextDelegate(Response response) throws CloudException, IOException, IllegalArgumentException { - return new AzureServiceResponseBuilder, CloudException>(this.client.mapperAdapter()) - .register(200, new TypeToken>() { }.getType()) + private ServiceResponse> listMetricDefinitionsNextDelegate(Response response) throws CloudException, IOException, IllegalArgumentException { + return new AzureServiceResponseBuilder, CloudException>(this.client.mapperAdapter()) + .register(200, new TypeToken>() { }.getType()) .registerError(CloudException.class) .build(response); } /** - * Gets metrics for web app. - * Gets metrics for web app. + * Gets performance metrics of an app (or deployment slot, if specified). + * Gets performance metrics of an app (or deployment slot, if specified). * * @param nextPageLink The NextLink from the previous successful call to List operation. * @return the PagedList<ResourceMetricInner> object if successful. @@ -23997,8 +24258,8 @@ public Page nextPage(String nextPageLink) { } /** - * Gets metrics for web app. - * Gets metrics for web app. + * Gets performance metrics of an app (or deployment slot, if specified). + * Gets performance metrics of an app (or deployment slot, if specified). * * @param nextPageLink The NextLink from the previous successful call to List operation. * @param serviceCall the ServiceCall object tracking the Retrofit calls @@ -24018,8 +24279,8 @@ public Observable>> call(String nextPa } /** - * Gets metrics for web app. - * Gets metrics for web app. + * Gets performance metrics of an app (or deployment slot, if specified). + * Gets performance metrics of an app (or deployment slot, if specified). * * @param nextPageLink The NextLink from the previous successful call to List operation. * @return the observable to the PagedList<ResourceMetricInner> object @@ -24035,8 +24296,8 @@ public Page call(ServiceResponse> } /** - * Gets metrics for web app. - * Gets metrics for web app. + * Gets performance metrics of an app (or deployment slot, if specified). + * Gets performance metrics of an app (or deployment slot, if specified). * * @param nextPageLink The NextLink from the previous successful call to List operation. * @return the observable to the PagedList<ResourceMetricInner> object @@ -24056,8 +24317,8 @@ public Observable>> call(ServiceRespon } /** - * Gets metrics for web app. - * Gets metrics for web app. + * Gets performance metrics of an app (or deployment slot, if specified). + * Gets performance metrics of an app (or deployment slot, if specified). * ServiceResponse> * @param nextPageLink The NextLink from the previous successful call to List operation. * @return the PagedList<ResourceMetricInner> object wrapped in {@link ServiceResponse} if successful. @@ -24196,8 +24457,8 @@ private ServiceResponse> listPerfMonCountersNextD } /** - * Gets all the slots for a web apps. - * Gets all the slots for a web apps. + * Gets an app's deployment slots. + * Gets an app's deployment slots. * * @param nextPageLink The NextLink from the previous successful call to List operation. * @return the PagedList<SiteInner> object if successful. @@ -24213,8 +24474,8 @@ public Page nextPage(String nextPageLink) { } /** - * Gets all the slots for a web apps. - * Gets all the slots for a web apps. + * Gets an app's deployment slots. + * Gets an app's deployment slots. * * @param nextPageLink The NextLink from the previous successful call to List operation. * @param serviceCall the ServiceCall object tracking the Retrofit calls @@ -24234,8 +24495,8 @@ public Observable>> call(String nextPageLink) { } /** - * Gets all the slots for a web apps. - * Gets all the slots for a web apps. + * Gets an app's deployment slots. + * Gets an app's deployment slots. * * @param nextPageLink The NextLink from the previous successful call to List operation. * @return the observable to the PagedList<SiteInner> object @@ -24251,8 +24512,8 @@ public Page call(ServiceResponse> response) { } /** - * Gets all the slots for a web apps. - * Gets all the slots for a web apps. + * Gets an app's deployment slots. + * Gets an app's deployment slots. * * @param nextPageLink The NextLink from the previous successful call to List operation. * @return the observable to the PagedList<SiteInner> object @@ -24272,8 +24533,8 @@ public Observable>> call(ServiceResponse> * @param nextPageLink The NextLink from the previous successful call to List operation. * @return the PagedList<SiteInner> object wrapped in {@link ServiceResponse} if successful. @@ -24304,8 +24565,8 @@ private ServiceResponse> listSlotsNextDelegate(Response nextPage(String nextPageLink) { } /** - * Lists all available backups for web app. - * Lists all available backups for web app. + * Gets existing backups of an app. + * Gets existing backups of an app. * * @param nextPageLink The NextLink from the previous successful call to List operation. * @param serviceCall the ServiceCall object tracking the Retrofit calls @@ -24342,8 +24603,8 @@ public Observable>> call(String nextPageLi } /** - * Lists all available backups for web app. - * Lists all available backups for web app. + * Gets existing backups of an app. + * Gets existing backups of an app. * * @param nextPageLink The NextLink from the previous successful call to List operation. * @return the observable to the PagedList<BackupItemInner> object @@ -24359,8 +24620,8 @@ public Page call(ServiceResponse> respons } /** - * Lists all available backups for web app. - * Lists all available backups for web app. + * Gets existing backups of an app. + * Gets existing backups of an app. * * @param nextPageLink The NextLink from the previous successful call to List operation. * @return the observable to the PagedList<BackupItemInner> object @@ -24380,8 +24641,8 @@ public Observable>> call(ServiceResponse

> * @param nextPageLink The NextLink from the previous successful call to List operation. * @return the PagedList<BackupItemInner> object wrapped in {@link ServiceResponse} if successful. @@ -24412,8 +24673,8 @@ private ServiceResponse> listBackupsSlotNextDelegate(R } /** - * List deployments. - * List deployments. + * List deployments for an app, or a deployment slot, or for an instance of a scaled-out app. + * List deployments for an app, or a deployment slot, or for an instance of a scaled-out app. * * @param nextPageLink The NextLink from the previous successful call to List operation. * @return the PagedList<DeploymentInner> object if successful. @@ -24429,8 +24690,8 @@ public Page nextPage(String nextPageLink) { } /** - * List deployments. - * List deployments. + * List deployments for an app, or a deployment slot, or for an instance of a scaled-out app. + * List deployments for an app, or a deployment slot, or for an instance of a scaled-out app. * * @param nextPageLink The NextLink from the previous successful call to List operation. * @param serviceCall the ServiceCall object tracking the Retrofit calls @@ -24450,8 +24711,8 @@ public Observable>> call(String nextPageLi } /** - * List deployments. - * List deployments. + * List deployments for an app, or a deployment slot, or for an instance of a scaled-out app. + * List deployments for an app, or a deployment slot, or for an instance of a scaled-out app. * * @param nextPageLink The NextLink from the previous successful call to List operation. * @return the observable to the PagedList<DeploymentInner> object @@ -24467,8 +24728,8 @@ public Page call(ServiceResponse> respons } /** - * List deployments. - * List deployments. + * List deployments for an app, or a deployment slot, or for an instance of a scaled-out app. + * List deployments for an app, or a deployment slot, or for an instance of a scaled-out app. * * @param nextPageLink The NextLink from the previous successful call to List operation. * @return the observable to the PagedList<DeploymentInner> object @@ -24488,8 +24749,8 @@ public Observable>> call(ServiceResponse

> * @param nextPageLink The NextLink from the previous successful call to List operation. * @return the PagedList<DeploymentInner> object wrapped in {@link ServiceResponse} if successful. @@ -24520,8 +24781,116 @@ private ServiceResponse> listDeploymentsSlotNextDelega } /** - * Get web app hostname bindings. - * Get web app hostname bindings. + * Lists ownership identifiers for domain associated with web app. + * Lists ownership identifiers for domain associated with web app. + * + * @param nextPageLink The NextLink from the previous successful call to List operation. + * @return the PagedList<IdentifierInner> object if successful. + */ + public PagedList listDomainOwnershipIdentifiersSlotNext(final String nextPageLink) { + ServiceResponse> response = listDomainOwnershipIdentifiersSlotNextSinglePageAsync(nextPageLink).toBlocking().single(); + return new PagedList(response.getBody()) { + @Override + public Page nextPage(String nextPageLink) { + return listDomainOwnershipIdentifiersSlotNextSinglePageAsync(nextPageLink).toBlocking().single().getBody(); + } + }; + } + + /** + * Lists ownership identifiers for domain associated with web app. + * Lists ownership identifiers for domain associated with web app. + * + * @param nextPageLink The NextLink from the previous successful call to List operation. + * @param serviceCall the ServiceCall object tracking the Retrofit calls + * @param serviceCallback the async ServiceCallback to handle successful and failed responses. + * @return the {@link ServiceCall} object + */ + public ServiceCall> listDomainOwnershipIdentifiersSlotNextAsync(final String nextPageLink, final ServiceCall> serviceCall, final ListOperationCallback serviceCallback) { + return AzureServiceCall.create( + listDomainOwnershipIdentifiersSlotNextSinglePageAsync(nextPageLink), + new Func1>>>() { + @Override + public Observable>> call(String nextPageLink) { + return listDomainOwnershipIdentifiersSlotNextSinglePageAsync(nextPageLink); + } + }, + serviceCallback); + } + + /** + * Lists ownership identifiers for domain associated with web app. + * Lists ownership identifiers for domain associated with web app. + * + * @param nextPageLink The NextLink from the previous successful call to List operation. + * @return the observable to the PagedList<IdentifierInner> object + */ + public Observable> listDomainOwnershipIdentifiersSlotNextAsync(final String nextPageLink) { + return listDomainOwnershipIdentifiersSlotNextWithServiceResponseAsync(nextPageLink) + .map(new Func1>, Page>() { + @Override + public Page call(ServiceResponse> response) { + return response.getBody(); + } + }); + } + + /** + * Lists ownership identifiers for domain associated with web app. + * Lists ownership identifiers for domain associated with web app. + * + * @param nextPageLink The NextLink from the previous successful call to List operation. + * @return the observable to the PagedList<IdentifierInner> object + */ + public Observable>> listDomainOwnershipIdentifiersSlotNextWithServiceResponseAsync(final String nextPageLink) { + return listDomainOwnershipIdentifiersSlotNextSinglePageAsync(nextPageLink) + .concatMap(new Func1>, Observable>>>() { + @Override + public Observable>> call(ServiceResponse> page) { + String nextPageLink = page.getBody().getNextPageLink(); + if (nextPageLink == null) { + return Observable.just(page); + } + return Observable.just(page).concatWith(listDomainOwnershipIdentifiersSlotNextWithServiceResponseAsync(nextPageLink)); + } + }); + } + + /** + * Lists ownership identifiers for domain associated with web app. + * Lists ownership identifiers for domain associated with web app. + * + ServiceResponse> * @param nextPageLink The NextLink from the previous successful call to List operation. + * @return the PagedList<IdentifierInner> object wrapped in {@link ServiceResponse} if successful. + */ + public Observable>> listDomainOwnershipIdentifiersSlotNextSinglePageAsync(final String nextPageLink) { + if (nextPageLink == null) { + throw new IllegalArgumentException("Parameter nextPageLink is required and cannot be null."); + } + return service.listDomainOwnershipIdentifiersSlotNext(nextPageLink, this.client.acceptLanguage(), this.client.userAgent()) + .flatMap(new Func1, Observable>>>() { + @Override + public Observable>> call(Response response) { + try { + ServiceResponse> result = listDomainOwnershipIdentifiersSlotNextDelegate(response); + return Observable.just(new ServiceResponse>(result.getBody(), result.getResponse())); + } catch (Throwable t) { + return Observable.error(t); + } + } + }); + } + + private ServiceResponse> listDomainOwnershipIdentifiersSlotNextDelegate(Response response) throws CloudException, IOException, IllegalArgumentException { + return new AzureServiceResponseBuilder, CloudException>(this.client.mapperAdapter()) + .register(200, new TypeToken>() { }.getType()) + .registerError(CloudException.class) + .build(response); + } + + /** + * Get hostname bindings for an app or a deployment slot. + * Get hostname bindings for an app or a deployment slot. * * @param nextPageLink The NextLink from the previous successful call to List operation. * @return the PagedList<HostNameBindingInner> object if successful. @@ -24537,8 +24906,8 @@ public Page nextPage(String nextPageLink) { } /** - * Get web app hostname bindings. - * Get web app hostname bindings. + * Get hostname bindings for an app or a deployment slot. + * Get hostname bindings for an app or a deployment slot. * * @param nextPageLink The NextLink from the previous successful call to List operation. * @param serviceCall the ServiceCall object tracking the Retrofit calls @@ -24558,8 +24927,8 @@ public Observable>> call(String nextP } /** - * Get web app hostname bindings. - * Get web app hostname bindings. + * Get hostname bindings for an app or a deployment slot. + * Get hostname bindings for an app or a deployment slot. * * @param nextPageLink The NextLink from the previous successful call to List operation. * @return the observable to the PagedList<HostNameBindingInner> object @@ -24575,8 +24944,8 @@ public Page call(ServiceResponse>> call(ServiceRespo } /** - * Get web app hostname bindings. - * Get web app hostname bindings. + * Get hostname bindings for an app or a deployment slot. + * Get hostname bindings for an app or a deployment slot. * ServiceResponse> * @param nextPageLink The NextLink from the previous successful call to List operation. * @return the PagedList<HostNameBindingInner> object wrapped in {@link ServiceResponse} if successful. @@ -24628,8 +24997,8 @@ private ServiceResponse> listHostNameBindingsSlot } /** - * Gets all instance of a web app. - * Gets all instance of a web app. + * Gets all scale-out instances of an app. + * Gets all scale-out instances of an app. * * @param nextPageLink The NextLink from the previous successful call to List operation. * @return the PagedList<SiteInstanceInner> object if successful. @@ -24645,8 +25014,8 @@ public Page nextPage(String nextPageLink) { } /** - * Gets all instance of a web app. - * Gets all instance of a web app. + * Gets all scale-out instances of an app. + * Gets all scale-out instances of an app. * * @param nextPageLink The NextLink from the previous successful call to List operation. * @param serviceCall the ServiceCall object tracking the Retrofit calls @@ -24666,8 +25035,8 @@ public Observable>> call(String nextPage } /** - * Gets all instance of a web app. - * Gets all instance of a web app. + * Gets all scale-out instances of an app. + * Gets all scale-out instances of an app. * * @param nextPageLink The NextLink from the previous successful call to List operation. * @return the observable to the PagedList<SiteInstanceInner> object @@ -24683,8 +25052,8 @@ public Page call(ServiceResponse> res } /** - * Gets all instance of a web app. - * Gets all instance of a web app. + * Gets all scale-out instances of an app. + * Gets all scale-out instances of an app. * * @param nextPageLink The NextLink from the previous successful call to List operation. * @return the observable to the PagedList<SiteInstanceInner> object @@ -24704,8 +25073,8 @@ public Observable>> call(ServiceResponse } /** - * Gets all instance of a web app. - * Gets all instance of a web app. + * Gets all scale-out instances of an app. + * Gets all scale-out instances of an app. * ServiceResponse> * @param nextPageLink The NextLink from the previous successful call to List operation. * @return the PagedList<SiteInstanceInner> object wrapped in {@link ServiceResponse} if successful. @@ -24736,8 +25105,8 @@ private ServiceResponse> listInstanceIdentifiersSlot } /** - * List deployments. - * List deployments. + * List deployments for an app, or a deployment slot, or for an instance of a scaled-out app. + * List deployments for an app, or a deployment slot, or for an instance of a scaled-out app. * * @param nextPageLink The NextLink from the previous successful call to List operation. * @return the PagedList<DeploymentInner> object if successful. @@ -24753,8 +25122,8 @@ public Page nextPage(String nextPageLink) { } /** - * List deployments. - * List deployments. + * List deployments for an app, or a deployment slot, or for an instance of a scaled-out app. + * List deployments for an app, or a deployment slot, or for an instance of a scaled-out app. * * @param nextPageLink The NextLink from the previous successful call to List operation. * @param serviceCall the ServiceCall object tracking the Retrofit calls @@ -24774,8 +25143,8 @@ public Observable>> call(String nextPageLi } /** - * List deployments. - * List deployments. + * List deployments for an app, or a deployment slot, or for an instance of a scaled-out app. + * List deployments for an app, or a deployment slot, or for an instance of a scaled-out app. * * @param nextPageLink The NextLink from the previous successful call to List operation. * @return the observable to the PagedList<DeploymentInner> object @@ -24791,8 +25160,8 @@ public Page call(ServiceResponse> respons } /** - * List deployments. - * List deployments. + * List deployments for an app, or a deployment slot, or for an instance of a scaled-out app. + * List deployments for an app, or a deployment slot, or for an instance of a scaled-out app. * * @param nextPageLink The NextLink from the previous successful call to List operation. * @return the observable to the PagedList<DeploymentInner> object @@ -24812,8 +25181,8 @@ public Observable>> call(ServiceResponse

> * @param nextPageLink The NextLink from the previous successful call to List operation. * @return the PagedList<DeploymentInner> object wrapped in {@link ServiceResponse} if successful. @@ -24844,37 +25213,37 @@ private ServiceResponse> listInstanceDeploymentsSlotNe } /** - * Gets metric definitions for web app. - * Gets metric definitions for web app. + * Gets all metric definitions of an app (or deployment slot, if specified). + * Gets all metric definitions of an app (or deployment slot, if specified). * * @param nextPageLink The NextLink from the previous successful call to List operation. - * @return the PagedList<MetricDefinitionInner> object if successful. + * @return the PagedList<ResourceMetricDefinitionInner> object if successful. */ - public PagedList listMetricDefinitionsSlotNext(final String nextPageLink) { - ServiceResponse> response = listMetricDefinitionsSlotNextSinglePageAsync(nextPageLink).toBlocking().single(); - return new PagedList(response.getBody()) { + public PagedList listMetricDefinitionsSlotNext(final String nextPageLink) { + ServiceResponse> response = listMetricDefinitionsSlotNextSinglePageAsync(nextPageLink).toBlocking().single(); + return new PagedList(response.getBody()) { @Override - public Page nextPage(String nextPageLink) { + public Page nextPage(String nextPageLink) { return listMetricDefinitionsSlotNextSinglePageAsync(nextPageLink).toBlocking().single().getBody(); } }; } /** - * Gets metric definitions for web app. - * Gets metric definitions for web app. + * Gets all metric definitions of an app (or deployment slot, if specified). + * Gets all metric definitions of an app (or deployment slot, if specified). * * @param nextPageLink The NextLink from the previous successful call to List operation. * @param serviceCall the ServiceCall object tracking the Retrofit calls * @param serviceCallback the async ServiceCallback to handle successful and failed responses. * @return the {@link ServiceCall} object */ - public ServiceCall> listMetricDefinitionsSlotNextAsync(final String nextPageLink, final ServiceCall> serviceCall, final ListOperationCallback serviceCallback) { + public ServiceCall> listMetricDefinitionsSlotNextAsync(final String nextPageLink, final ServiceCall> serviceCall, final ListOperationCallback serviceCallback) { return AzureServiceCall.create( listMetricDefinitionsSlotNextSinglePageAsync(nextPageLink), - new Func1>>>() { + new Func1>>>() { @Override - public Observable>> call(String nextPageLink) { + public Observable>> call(String nextPageLink) { return listMetricDefinitionsSlotNextSinglePageAsync(nextPageLink); } }, @@ -24882,34 +25251,34 @@ public Observable>> call(String next } /** - * Gets metric definitions for web app. - * Gets metric definitions for web app. + * Gets all metric definitions of an app (or deployment slot, if specified). + * Gets all metric definitions of an app (or deployment slot, if specified). * * @param nextPageLink The NextLink from the previous successful call to List operation. - * @return the observable to the PagedList<MetricDefinitionInner> object + * @return the observable to the PagedList<ResourceMetricDefinitionInner> object */ - public Observable> listMetricDefinitionsSlotNextAsync(final String nextPageLink) { + public Observable> listMetricDefinitionsSlotNextAsync(final String nextPageLink) { return listMetricDefinitionsSlotNextWithServiceResponseAsync(nextPageLink) - .map(new Func1>, Page>() { + .map(new Func1>, Page>() { @Override - public Page call(ServiceResponse> response) { + public Page call(ServiceResponse> response) { return response.getBody(); } }); } /** - * Gets metric definitions for web app. - * Gets metric definitions for web app. + * Gets all metric definitions of an app (or deployment slot, if specified). + * Gets all metric definitions of an app (or deployment slot, if specified). * * @param nextPageLink The NextLink from the previous successful call to List operation. - * @return the observable to the PagedList<MetricDefinitionInner> object + * @return the observable to the PagedList<ResourceMetricDefinitionInner> object */ - public Observable>> listMetricDefinitionsSlotNextWithServiceResponseAsync(final String nextPageLink) { + public Observable>> listMetricDefinitionsSlotNextWithServiceResponseAsync(final String nextPageLink) { return listMetricDefinitionsSlotNextSinglePageAsync(nextPageLink) - .concatMap(new Func1>, Observable>>>() { + .concatMap(new Func1>, Observable>>>() { @Override - public Observable>> call(ServiceResponse> page) { + public Observable>> call(ServiceResponse> page) { String nextPageLink = page.getBody().getNextPageLink(); if (nextPageLink == null) { return Observable.just(page); @@ -24920,23 +25289,23 @@ public Observable>> call(ServiceResp } /** - * Gets metric definitions for web app. - * Gets metric definitions for web app. + * Gets all metric definitions of an app (or deployment slot, if specified). + * Gets all metric definitions of an app (or deployment slot, if specified). * - ServiceResponse> * @param nextPageLink The NextLink from the previous successful call to List operation. - * @return the PagedList<MetricDefinitionInner> object wrapped in {@link ServiceResponse} if successful. + ServiceResponse> * @param nextPageLink The NextLink from the previous successful call to List operation. + * @return the PagedList<ResourceMetricDefinitionInner> object wrapped in {@link ServiceResponse} if successful. */ - public Observable>> listMetricDefinitionsSlotNextSinglePageAsync(final String nextPageLink) { + public Observable>> listMetricDefinitionsSlotNextSinglePageAsync(final String nextPageLink) { if (nextPageLink == null) { throw new IllegalArgumentException("Parameter nextPageLink is required and cannot be null."); } return service.listMetricDefinitionsSlotNext(nextPageLink, this.client.acceptLanguage(), this.client.userAgent()) - .flatMap(new Func1, Observable>>>() { + .flatMap(new Func1, Observable>>>() { @Override - public Observable>> call(Response response) { + public Observable>> call(Response response) { try { - ServiceResponse> result = listMetricDefinitionsSlotNextDelegate(response); - return Observable.just(new ServiceResponse>(result.getBody(), result.getResponse())); + ServiceResponse> result = listMetricDefinitionsSlotNextDelegate(response); + return Observable.just(new ServiceResponse>(result.getBody(), result.getResponse())); } catch (Throwable t) { return Observable.error(t); } @@ -24944,16 +25313,16 @@ public Observable>> call(Response> listMetricDefinitionsSlotNextDelegate(Response response) throws CloudException, IOException, IllegalArgumentException { - return new AzureServiceResponseBuilder, CloudException>(this.client.mapperAdapter()) - .register(200, new TypeToken>() { }.getType()) + private ServiceResponse> listMetricDefinitionsSlotNextDelegate(Response response) throws CloudException, IOException, IllegalArgumentException { + return new AzureServiceResponseBuilder, CloudException>(this.client.mapperAdapter()) + .register(200, new TypeToken>() { }.getType()) .registerError(CloudException.class) .build(response); } /** - * Gets metrics for web app. - * Gets metrics for web app. + * Gets performance metrics of an app (or deployment slot, if specified). + * Gets performance metrics of an app (or deployment slot, if specified). * * @param nextPageLink The NextLink from the previous successful call to List operation. * @return the PagedList<ResourceMetricInner> object if successful. @@ -24969,8 +25338,8 @@ public Page nextPage(String nextPageLink) { } /** - * Gets metrics for web app. - * Gets metrics for web app. + * Gets performance metrics of an app (or deployment slot, if specified). + * Gets performance metrics of an app (or deployment slot, if specified). * * @param nextPageLink The NextLink from the previous successful call to List operation. * @param serviceCall the ServiceCall object tracking the Retrofit calls @@ -24990,8 +25359,8 @@ public Observable>> call(String nextPa } /** - * Gets metrics for web app. - * Gets metrics for web app. + * Gets performance metrics of an app (or deployment slot, if specified). + * Gets performance metrics of an app (or deployment slot, if specified). * * @param nextPageLink The NextLink from the previous successful call to List operation. * @return the observable to the PagedList<ResourceMetricInner> object @@ -25007,8 +25376,8 @@ public Page call(ServiceResponse> } /** - * Gets metrics for web app. - * Gets metrics for web app. + * Gets performance metrics of an app (or deployment slot, if specified). + * Gets performance metrics of an app (or deployment slot, if specified). * * @param nextPageLink The NextLink from the previous successful call to List operation. * @return the observable to the PagedList<ResourceMetricInner> object @@ -25028,8 +25397,8 @@ public Observable>> call(ServiceRespon } /** - * Gets metrics for web app. - * Gets metrics for web app. + * Gets performance metrics of an app (or deployment slot, if specified). + * Gets performance metrics of an app (or deployment slot, if specified). * ServiceResponse> * @param nextPageLink The NextLink from the previous successful call to List operation. * @return the PagedList<ResourceMetricInner> object wrapped in {@link ServiceResponse} if successful. @@ -25384,8 +25753,8 @@ private ServiceResponse> listSnapshotsSlotNextDelegate(R } /** - * Gets the quota usage numbers for web app. - * Gets the quota usage numbers for web app. + * Gets the quota usage information of an app (or deployment slot, if specified). + * Gets the quota usage information of an app (or deployment slot, if specified). * * @param nextPageLink The NextLink from the previous successful call to List operation. * @return the PagedList<CsmUsageQuotaInner> object if successful. @@ -25401,8 +25770,8 @@ public Page nextPage(String nextPageLink) { } /** - * Gets the quota usage numbers for web app. - * Gets the quota usage numbers for web app. + * Gets the quota usage information of an app (or deployment slot, if specified). + * Gets the quota usage information of an app (or deployment slot, if specified). * * @param nextPageLink The NextLink from the previous successful call to List operation. * @param serviceCall the ServiceCall object tracking the Retrofit calls @@ -25422,8 +25791,8 @@ public Observable>> call(String nextPag } /** - * Gets the quota usage numbers for web app. - * Gets the quota usage numbers for web app. + * Gets the quota usage information of an app (or deployment slot, if specified). + * Gets the quota usage information of an app (or deployment slot, if specified). * * @param nextPageLink The NextLink from the previous successful call to List operation. * @return the observable to the PagedList<CsmUsageQuotaInner> object @@ -25439,8 +25808,8 @@ public Page call(ServiceResponse> r } /** - * Gets the quota usage numbers for web app. - * Gets the quota usage numbers for web app. + * Gets the quota usage information of an app (or deployment slot, if specified). + * Gets the quota usage information of an app (or deployment slot, if specified). * * @param nextPageLink The NextLink from the previous successful call to List operation. * @return the observable to the PagedList<CsmUsageQuotaInner> object @@ -25460,8 +25829,8 @@ public Observable>> call(ServiceRespons } /** - * Gets the quota usage numbers for web app. - * Gets the quota usage numbers for web app. + * Gets the quota usage information of an app (or deployment slot, if specified). + * Gets the quota usage information of an app (or deployment slot, if specified). * ServiceResponse> * @param nextPageLink The NextLink from the previous successful call to List operation. * @return the PagedList<CsmUsageQuotaInner> object wrapped in {@link ServiceResponse} if successful. @@ -25708,8 +26077,8 @@ private ServiceResponse> listSnapshotsNextDelegate(Respo } /** - * Gets the quota usage numbers for web app. - * Gets the quota usage numbers for web app. + * Gets the quota usage information of an app (or deployment slot, if specified). + * Gets the quota usage information of an app (or deployment slot, if specified). * * @param nextPageLink The NextLink from the previous successful call to List operation. * @return the PagedList<CsmUsageQuotaInner> object if successful. @@ -25725,8 +26094,8 @@ public Page nextPage(String nextPageLink) { } /** - * Gets the quota usage numbers for web app. - * Gets the quota usage numbers for web app. + * Gets the quota usage information of an app (or deployment slot, if specified). + * Gets the quota usage information of an app (or deployment slot, if specified). * * @param nextPageLink The NextLink from the previous successful call to List operation. * @param serviceCall the ServiceCall object tracking the Retrofit calls @@ -25746,8 +26115,8 @@ public Observable>> call(String nextPag } /** - * Gets the quota usage numbers for web app. - * Gets the quota usage numbers for web app. + * Gets the quota usage information of an app (or deployment slot, if specified). + * Gets the quota usage information of an app (or deployment slot, if specified). * * @param nextPageLink The NextLink from the previous successful call to List operation. * @return the observable to the PagedList<CsmUsageQuotaInner> object @@ -25763,8 +26132,8 @@ public Page call(ServiceResponse> r } /** - * Gets the quota usage numbers for web app. - * Gets the quota usage numbers for web app. + * Gets the quota usage information of an app (or deployment slot, if specified). + * Gets the quota usage information of an app (or deployment slot, if specified). * * @param nextPageLink The NextLink from the previous successful call to List operation. * @return the observable to the PagedList<CsmUsageQuotaInner> object @@ -25784,8 +26153,8 @@ public Observable>> call(ServiceRespons } /** - * Gets the quota usage numbers for web app. - * Gets the quota usage numbers for web app. + * Gets the quota usage information of an app (or deployment slot, if specified). + * Gets the quota usage information of an app (or deployment slot, if specified). * ServiceResponse> * @param nextPageLink The NextLink from the previous successful call to List operation. * @return the PagedList<CsmUsageQuotaInner> object wrapped in {@link ServiceResponse} if successful. diff --git a/azure-mgmt-website/src/main/java/com/microsoft/azure/management/website/implementation/WebSiteManagementClientImpl.java b/azure-mgmt-website/src/main/java/com/microsoft/azure/management/website/implementation/WebSiteManagementClientImpl.java index 1a2229d5e5d4b..87434e9883f2b 100644 --- a/azure-mgmt-website/src/main/java/com/microsoft/azure/management/website/implementation/WebSiteManagementClientImpl.java +++ b/azure-mgmt-website/src/main/java/com/microsoft/azure/management/website/implementation/WebSiteManagementClientImpl.java @@ -15,6 +15,9 @@ import com.microsoft.azure.AzureServiceResponseBuilder; import com.microsoft.azure.CloudException; import com.microsoft.azure.ListOperationCallback; +import com.microsoft.azure.management.website.CheckNameResourceTypes; +import com.microsoft.azure.management.website.ResourceNameAvailabilityRequest; +import com.microsoft.azure.management.website.SkuName; import com.microsoft.azure.Page; import com.microsoft.azure.PagedList; import com.microsoft.azure.RestClient; @@ -55,11 +58,11 @@ public AzureClient getAzureClient() { return this.azureClient; } - /** Subscription Id. */ + /** Your Azure subscription ID. This is a GUID-formatted string (e.g. 00000000-0000-0000-0000-000000000000). */ private String subscriptionId; /** - * Gets Subscription Id. + * Gets Your Azure subscription ID. This is a GUID-formatted string (e.g. 00000000-0000-0000-0000-000000000000). * * @return the subscriptionId value. */ @@ -68,7 +71,7 @@ public String subscriptionId() { } /** - * Sets Subscription Id. + * Sets Your Azure subscription ID. This is a GUID-formatted string (e.g. 00000000-0000-0000-0000-000000000000). * * @param subscriptionId the subscriptionId value. * @return the service client itself @@ -251,6 +254,19 @@ public WebAppsInner webApps() { return this.webApps; } + /** + * The DeletedWebAppsInner object to access its operations. + */ + private DeletedWebAppsInner deletedWebApps; + + /** + * Gets the DeletedWebAppsInner object to access its operations. + * @return the DeletedWebAppsInner object. + */ + public DeletedWebAppsInner deletedWebApps() { + return this.deletedWebApps; + } + /** * Initializes an instance of WebSiteManagementClient client. * @@ -295,6 +311,7 @@ protected void initialize() { this.recommendations = new RecommendationsInner(restClient().retrofit(), this); this.topLevelDomains = new TopLevelDomainsInner(restClient().retrofit(), this); this.webApps = new WebAppsInner(restClient().retrofit(), this); + this.deletedWebApps = new DeletedWebAppsInner(restClient().retrofit(), this); this.azureClient = new AzureClient(this); initializeService(); } @@ -325,20 +342,16 @@ interface WebSiteManagementClientService { Observable> listSourceControls(@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}/providers/Microsoft.Web/checknameavailability") - Observable> checkNameAvailability(@Path("subscriptionId") String subscriptionId, @Body ResourceNameAvailabilityRequestInner request, @Query("api-version") String apiVersion, @Header("accept-language") String acceptLanguage, @Header("User-Agent") String userAgent); + @PUT("providers/Microsoft.Web/sourcecontrols/{sourceControlType}") + Observable> updateSourceControl(@Path("sourceControlType") String sourceControlType, @Body SourceControlInner requestMessage, @Query("api-version") String apiVersion, @Header("accept-language") String acceptLanguage, @Header("User-Agent") String userAgent); @Headers("Content-Type: application/json; charset=utf-8") - @GET("subscriptions/{subscriptionId}/providers/Microsoft.Web/geoRegions") - Observable> getSubscriptionGeoRegions(@Path("subscriptionId") String subscriptionId, @Query("sku") String sku, @Query("api-version") String apiVersion, @Header("accept-language") String acceptLanguage, @Header("User-Agent") String userAgent); - - @Headers("Content-Type: application/json; charset=utf-8") - @GET("subscriptions/{subscriptionId}/providers/Microsoft.Web/ishostingenvironmentnameavailable") - Observable> isHostingEnvironmentNameAvailable(@Path("subscriptionId") String subscriptionId, @Query("name") String name, @Query("api-version") String apiVersion, @Header("accept-language") String acceptLanguage, @Header("User-Agent") String userAgent); + @POST("subscriptions/{subscriptionId}/providers/Microsoft.Web/checknameavailability") + Observable> checkNameAvailability(@Path("subscriptionId") String subscriptionId, @Query("api-version") String apiVersion, @Header("accept-language") String acceptLanguage, @Body ResourceNameAvailabilityRequest request, @Header("User-Agent") String userAgent); @Headers("Content-Type: application/json; charset=utf-8") - @GET("subscriptions/{subscriptionId}/providers/Microsoft.Web/ishostingenvironmentnameavailable/{name}") - Observable> isHostingEnvironmentWithLegacyNameAvailable(@Path("name") String name, @Path("subscriptionId") String subscriptionId, @Query("api-version") String apiVersion, @Header("accept-language") String acceptLanguage, @Header("User-Agent") String userAgent); + @POST("subscriptions/{subscriptionId}/providers/Microsoft.Web/geoRegions") + Observable> listGeoRegions(@Path("subscriptionId") String subscriptionId, @Query("sku") SkuName sku, @Query("api-version") String apiVersion, @Header("accept-language") String acceptLanguage, @Header("User-Agent") String userAgent); @Headers("Content-Type: application/json; charset=utf-8") @GET("subscriptions/{subscriptionId}/providers/Microsoft.Web/premieraddonoffers") @@ -358,7 +371,7 @@ interface WebSiteManagementClientService { @Headers("Content-Type: application/json; charset=utf-8") @POST("subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/moveResources") - Observable> moveResources(@Path("resourceGroupName") String resourceGroupName, @Path("subscriptionId") String subscriptionId, @Body CsmMoveResourceEnvelopeInner moveResourceEnvelope, @Query("api-version") String apiVersion, @Header("accept-language") String acceptLanguage, @Header("User-Agent") String userAgent); + Observable> move(@Path("resourceGroupName") String resourceGroupName, @Path("subscriptionId") String subscriptionId, @Body CsmMoveResourceEnvelopeInner moveResourceEnvelope, @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.Web/validate") @@ -366,15 +379,19 @@ interface WebSiteManagementClientService { @Headers("Content-Type: application/json; charset=utf-8") @POST("subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/validateMoveResources") - Observable> validateMoveResources(@Path("resourceGroupName") String resourceGroupName, @Path("subscriptionId") String subscriptionId, @Body CsmMoveResourceEnvelopeInner moveResourceEnvelope, @Query("api-version") String apiVersion, @Header("accept-language") String acceptLanguage, @Header("User-Agent") String userAgent); + Observable> validateMove(@Path("resourceGroupName") String resourceGroupName, @Path("subscriptionId") String subscriptionId, @Body CsmMoveResourceEnvelopeInner moveResourceEnvelope, @Query("api-version") String apiVersion, @Header("accept-language") String acceptLanguage, @Header("User-Agent") String userAgent); @Headers("Content-Type: application/json; charset=utf-8") @GET("{nextLink}") Observable> listSourceControlsNext(@Path(value = "nextLink", encoded = true) String nextPageLink, @Header("accept-language") String acceptLanguage, @Header("User-Agent") String userAgent); + @Headers("Content-Type: application/json; charset=utf-8") + @POST("{nextLink}") + Observable> listGeoRegionsNext(@Path(value = "nextLink", encoded = true) String nextPageLink, @Header("accept-language") String acceptLanguage, @Header("User-Agent") String userAgent); + @Headers("Content-Type: application/json; charset=utf-8") @GET("{nextLink}") - Observable> getSubscriptionGeoRegionsNext(@Path(value = "nextLink", encoded = true) String nextPageLink, @Header("accept-language") String acceptLanguage, @Header("User-Agent") String userAgent); + Observable> listPremierAddOnOffersNext(@Path(value = "nextLink", encoded = true) String nextPageLink, @Header("accept-language") String acceptLanguage, @Header("User-Agent") String userAgent); } @@ -479,37 +496,203 @@ private ServiceResponse> listSourceControlsDelegate } /** - * Check if resource name is available. - * Check if resource name is available. + * Updates source control token. + * Updates source control token. + * + * @param sourceControlType Type of source control + * @param requestMessage Source control token information + * @return the SourceControlInner object if successful. + */ + public SourceControlInner updateSourceControl(String sourceControlType, SourceControlInner requestMessage) { + return updateSourceControlWithServiceResponseAsync(sourceControlType, requestMessage).toBlocking().single().getBody(); + } + + /** + * Updates source control token. + * Updates source control token. + * + * @param sourceControlType Type of source control + * @param requestMessage Source control token information + * @param serviceCallback the async ServiceCallback to handle successful and failed responses. + * @return the {@link ServiceCall} object + */ + public ServiceCall updateSourceControlAsync(String sourceControlType, SourceControlInner requestMessage, final ServiceCallback serviceCallback) { + return ServiceCall.create(updateSourceControlWithServiceResponseAsync(sourceControlType, requestMessage), serviceCallback); + } + + /** + * Updates source control token. + * Updates source control token. + * + * @param sourceControlType Type of source control + * @param requestMessage Source control token information + * @return the observable to the SourceControlInner object + */ + public Observable updateSourceControlAsync(String sourceControlType, SourceControlInner requestMessage) { + return updateSourceControlWithServiceResponseAsync(sourceControlType, requestMessage).map(new Func1, SourceControlInner>() { + @Override + public SourceControlInner call(ServiceResponse response) { + return response.getBody(); + } + }); + } + + /** + * Updates source control token. + * Updates source control token. + * + * @param sourceControlType Type of source control + * @param requestMessage Source control token information + * @return the observable to the SourceControlInner object + */ + public Observable> updateSourceControlWithServiceResponseAsync(String sourceControlType, SourceControlInner requestMessage) { + if (sourceControlType == null) { + throw new IllegalArgumentException("Parameter sourceControlType is required and cannot be null."); + } + if (requestMessage == null) { + throw new IllegalArgumentException("Parameter requestMessage is required and cannot be null."); + } + Validator.validate(requestMessage); + final String apiVersion = "2016-03-01"; + return service.updateSourceControl(sourceControlType, requestMessage, apiVersion, this.acceptLanguage(), this.userAgent()) + .flatMap(new Func1, Observable>>() { + @Override + public Observable> call(Response response) { + try { + ServiceResponse clientResponse = updateSourceControlDelegate(response); + return Observable.just(clientResponse); + } catch (Throwable t) { + return Observable.error(t); + } + } + }); + } + + private ServiceResponse updateSourceControlDelegate(Response response) throws CloudException, IOException, IllegalArgumentException { + return new AzureServiceResponseBuilder(this.mapperAdapter()) + .register(200, new TypeToken() { }.getType()) + .registerError(CloudException.class) + .build(response); + } + + /** + * Check if a resource name is available. + * Check if a resource name is available. + * + * @param name Resource name to verify. + * @param type Resource type used for verification. Possible values include: 'Site', 'Slot', 'HostingEnvironment' + * @return the ResourceNameAvailabilityInner object if successful. + */ + public ResourceNameAvailabilityInner checkNameAvailability(String name, CheckNameResourceTypes type) { + return checkNameAvailabilityWithServiceResponseAsync(name, type).toBlocking().single().getBody(); + } + + /** + * Check if a resource name is available. + * Check if a resource name is available. + * + * @param name Resource name to verify. + * @param type Resource type used for verification. Possible values include: 'Site', 'Slot', 'HostingEnvironment' + * @param serviceCallback the async ServiceCallback to handle successful and failed responses. + * @return the {@link ServiceCall} object + */ + public ServiceCall checkNameAvailabilityAsync(String name, CheckNameResourceTypes type, final ServiceCallback serviceCallback) { + return ServiceCall.create(checkNameAvailabilityWithServiceResponseAsync(name, type), serviceCallback); + } + + /** + * Check if a resource name is available. + * Check if a resource name is available. + * + * @param name Resource name to verify. + * @param type Resource type used for verification. Possible values include: 'Site', 'Slot', 'HostingEnvironment' + * @return the observable to the ResourceNameAvailabilityInner object + */ + public Observable checkNameAvailabilityAsync(String name, CheckNameResourceTypes type) { + return checkNameAvailabilityWithServiceResponseAsync(name, type).map(new Func1, ResourceNameAvailabilityInner>() { + @Override + public ResourceNameAvailabilityInner call(ServiceResponse response) { + return response.getBody(); + } + }); + } + + /** + * Check if a resource name is available. + * Check if a resource name is available. + * + * @param name Resource name to verify. + * @param type Resource type used for verification. Possible values include: 'Site', 'Slot', 'HostingEnvironment' + * @return the observable to the ResourceNameAvailabilityInner object + */ + public Observable> checkNameAvailabilityWithServiceResponseAsync(String name, CheckNameResourceTypes type) { + if (this.subscriptionId() == null) { + throw new IllegalArgumentException("Parameter this.subscriptionId() is required and cannot be null."); + } + if (name == null) { + throw new IllegalArgumentException("Parameter name is required and cannot be null."); + } + if (type == null) { + throw new IllegalArgumentException("Parameter type is required and cannot be null."); + } + final String apiVersion = "2016-03-01"; + final Boolean isFqdn = null; + ResourceNameAvailabilityRequest request = new ResourceNameAvailabilityRequest(); + request.withName(name); + request.withType(type); + request.withIsFqdn(null); + return service.checkNameAvailability(this.subscriptionId(), apiVersion, this.acceptLanguage(), request, this.userAgent()) + .flatMap(new Func1, Observable>>() { + @Override + public Observable> call(Response response) { + try { + ServiceResponse clientResponse = checkNameAvailabilityDelegate(response); + return Observable.just(clientResponse); + } catch (Throwable t) { + return Observable.error(t); + } + } + }); + } + + /** + * Check if a resource name is available. + * Check if a resource name is available. * - * @param request Name availability request + * @param name Resource name to verify. + * @param type Resource type used for verification. Possible values include: 'Site', 'Slot', 'HostingEnvironment' + * @param isFqdn Is fully qualified domain name. * @return the ResourceNameAvailabilityInner object if successful. */ - public ResourceNameAvailabilityInner checkNameAvailability(ResourceNameAvailabilityRequestInner request) { - return checkNameAvailabilityWithServiceResponseAsync(request).toBlocking().single().getBody(); + public ResourceNameAvailabilityInner checkNameAvailability(String name, CheckNameResourceTypes type, Boolean isFqdn) { + return checkNameAvailabilityWithServiceResponseAsync(name, type, isFqdn).toBlocking().single().getBody(); } /** - * Check if resource name is available. - * Check if resource name is available. + * Check if a resource name is available. + * Check if a resource name is available. * - * @param request Name availability request + * @param name Resource name to verify. + * @param type Resource type used for verification. Possible values include: 'Site', 'Slot', 'HostingEnvironment' + * @param isFqdn Is fully qualified domain name. * @param serviceCallback the async ServiceCallback to handle successful and failed responses. * @return the {@link ServiceCall} object */ - public ServiceCall checkNameAvailabilityAsync(ResourceNameAvailabilityRequestInner request, final ServiceCallback serviceCallback) { - return ServiceCall.create(checkNameAvailabilityWithServiceResponseAsync(request), serviceCallback); + public ServiceCall checkNameAvailabilityAsync(String name, CheckNameResourceTypes type, Boolean isFqdn, final ServiceCallback serviceCallback) { + return ServiceCall.create(checkNameAvailabilityWithServiceResponseAsync(name, type, isFqdn), serviceCallback); } /** - * Check if resource name is available. - * Check if resource name is available. + * Check if a resource name is available. + * Check if a resource name is available. * - * @param request Name availability request + * @param name Resource name to verify. + * @param type Resource type used for verification. Possible values include: 'Site', 'Slot', 'HostingEnvironment' + * @param isFqdn Is fully qualified domain name. * @return the observable to the ResourceNameAvailabilityInner object */ - public Observable checkNameAvailabilityAsync(ResourceNameAvailabilityRequestInner request) { - return checkNameAvailabilityWithServiceResponseAsync(request).map(new Func1, ResourceNameAvailabilityInner>() { + public Observable checkNameAvailabilityAsync(String name, CheckNameResourceTypes type, Boolean isFqdn) { + return checkNameAvailabilityWithServiceResponseAsync(name, type, isFqdn).map(new Func1, ResourceNameAvailabilityInner>() { @Override public ResourceNameAvailabilityInner call(ServiceResponse response) { return response.getBody(); @@ -518,22 +701,30 @@ public ResourceNameAvailabilityInner call(ServiceResponse> checkNameAvailabilityWithServiceResponseAsync(ResourceNameAvailabilityRequestInner request) { + public Observable> checkNameAvailabilityWithServiceResponseAsync(String name, CheckNameResourceTypes type, Boolean isFqdn) { if (this.subscriptionId() == null) { throw new IllegalArgumentException("Parameter this.subscriptionId() is required and cannot be null."); } - if (request == null) { - throw new IllegalArgumentException("Parameter request is required and cannot be null."); + if (name == null) { + throw new IllegalArgumentException("Parameter name is required and cannot be null."); + } + if (type == null) { + throw new IllegalArgumentException("Parameter type is required and cannot be null."); } - Validator.validate(request); final String apiVersion = "2016-03-01"; - return service.checkNameAvailability(this.subscriptionId(), request, apiVersion, this.acceptLanguage(), this.userAgent()) + ResourceNameAvailabilityRequest request = new ResourceNameAvailabilityRequest(); + request.withName(name); + request.withType(type); + request.withIsFqdn(isFqdn); + return service.checkNameAvailability(this.subscriptionId(), apiVersion, this.acceptLanguage(), request, this.userAgent()) .flatMap(new Func1, Observable>>() { @Override public Observable> call(Response response) { @@ -555,48 +746,48 @@ private ServiceResponse checkNameAvailabilityDele } /** - * Gets list of available geo regions. - * Gets list of available geo regions. + * Get a list of available geographical regions. + * Get a list of available geographical regions. * * @return the PagedList<GeoRegionInner> object if successful. */ - public PagedList getSubscriptionGeoRegions() { - ServiceResponse> response = getSubscriptionGeoRegionsSinglePageAsync().toBlocking().single(); + public PagedList listGeoRegions() { + ServiceResponse> response = listGeoRegionsSinglePageAsync().toBlocking().single(); return new PagedList(response.getBody()) { @Override public Page nextPage(String nextPageLink) { - return getSubscriptionGeoRegionsNextSinglePageAsync(nextPageLink).toBlocking().single().getBody(); + return listGeoRegionsNextSinglePageAsync(nextPageLink).toBlocking().single().getBody(); } }; } /** - * Gets list of available geo regions. - * Gets list of available geo regions. + * Get a list of available geographical regions. + * Get a list of available geographical regions. * * @param serviceCallback the async ServiceCallback to handle successful and failed responses. * @return the {@link ServiceCall} object */ - public ServiceCall> getSubscriptionGeoRegionsAsync(final ListOperationCallback serviceCallback) { + public ServiceCall> listGeoRegionsAsync(final ListOperationCallback serviceCallback) { return AzureServiceCall.create( - getSubscriptionGeoRegionsSinglePageAsync(), + listGeoRegionsSinglePageAsync(), new Func1>>>() { @Override public Observable>> call(String nextPageLink) { - return getSubscriptionGeoRegionsNextSinglePageAsync(nextPageLink); + return listGeoRegionsNextSinglePageAsync(nextPageLink); } }, serviceCallback); } /** - * Gets list of available geo regions. - * Gets list of available geo regions. + * Get a list of available geographical regions. + * Get a list of available geographical regions. * * @return the observable to the PagedList<GeoRegionInner> object */ - public Observable> getSubscriptionGeoRegionsAsync() { - return getSubscriptionGeoRegionsWithServiceResponseAsync() + public Observable> listGeoRegionsAsync() { + return listGeoRegionsWithServiceResponseAsync() .map(new Func1>, Page>() { @Override public Page call(ServiceResponse> response) { @@ -606,13 +797,13 @@ public Page call(ServiceResponse> response) } /** - * Gets list of available geo regions. - * Gets list of available geo regions. + * Get a list of available geographical regions. + * Get a list of available geographical regions. * * @return the observable to the PagedList<GeoRegionInner> object */ - public Observable>> getSubscriptionGeoRegionsWithServiceResponseAsync() { - return getSubscriptionGeoRegionsSinglePageAsync() + public Observable>> listGeoRegionsWithServiceResponseAsync() { + return listGeoRegionsSinglePageAsync() .concatMap(new Func1>, Observable>>>() { @Override public Observable>> call(ServiceResponse> page) { @@ -620,29 +811,29 @@ public Observable>> call(ServiceResponse>> getSubscriptionGeoRegionsSinglePageAsync() { + public Observable>> listGeoRegionsSinglePageAsync() { if (this.subscriptionId() == null) { throw new IllegalArgumentException("Parameter this.subscriptionId() is required and cannot be null."); } final String apiVersion = "2016-03-01"; - final String sku = null; - return service.getSubscriptionGeoRegions(this.subscriptionId(), sku, apiVersion, this.acceptLanguage(), this.userAgent()) + final SkuName sku = null; + return service.listGeoRegions(this.subscriptionId(), sku, apiVersion, this.acceptLanguage(), this.userAgent()) .flatMap(new Func1, Observable>>>() { @Override public Observable>> call(Response response) { try { - ServiceResponse> result = getSubscriptionGeoRegionsDelegate(response); + ServiceResponse> result = listGeoRegionsDelegate(response); return Observable.just(new ServiceResponse>(result.getBody(), result.getResponse())); } catch (Throwable t) { return Observable.error(t); @@ -652,51 +843,51 @@ public Observable>> call(Response getSubscriptionGeoRegions(final String sku) { - ServiceResponse> response = getSubscriptionGeoRegionsSinglePageAsync(sku).toBlocking().single(); + public PagedList listGeoRegions(final SkuName sku) { + ServiceResponse> response = listGeoRegionsSinglePageAsync(sku).toBlocking().single(); return new PagedList(response.getBody()) { @Override public Page nextPage(String nextPageLink) { - return getSubscriptionGeoRegionsNextSinglePageAsync(nextPageLink).toBlocking().single().getBody(); + return listGeoRegionsNextSinglePageAsync(nextPageLink).toBlocking().single().getBody(); } }; } /** - * Gets list of available geo regions. - * Gets list of available geo regions. + * Get a list of available geographical regions. + * Get a list of available geographical regions. * - * @param sku Filter only to regions that support this sku + * @param sku Name of SKU used to filter the regions. Possible values include: 'Free', 'Shared', 'Basic', 'Standard', 'Premium', 'Dynamic' * @param serviceCallback the async ServiceCallback to handle successful and failed responses. * @return the {@link ServiceCall} object */ - public ServiceCall> getSubscriptionGeoRegionsAsync(final String sku, final ListOperationCallback serviceCallback) { + public ServiceCall> listGeoRegionsAsync(final SkuName sku, final ListOperationCallback serviceCallback) { return AzureServiceCall.create( - getSubscriptionGeoRegionsSinglePageAsync(sku), + listGeoRegionsSinglePageAsync(sku), new Func1>>>() { @Override public Observable>> call(String nextPageLink) { - return getSubscriptionGeoRegionsNextSinglePageAsync(nextPageLink); + return listGeoRegionsNextSinglePageAsync(nextPageLink); } }, serviceCallback); } /** - * Gets list of available geo regions. - * Gets list of available geo regions. + * Get a list of available geographical regions. + * Get a list of available geographical regions. * - * @param sku Filter only to regions that support this sku + * @param sku Name of SKU used to filter the regions. Possible values include: 'Free', 'Shared', 'Basic', 'Standard', 'Premium', 'Dynamic' * @return the observable to the PagedList<GeoRegionInner> object */ - public Observable> getSubscriptionGeoRegionsAsync(final String sku) { - return getSubscriptionGeoRegionsWithServiceResponseAsync(sku) + public Observable> listGeoRegionsAsync(final SkuName sku) { + return listGeoRegionsWithServiceResponseAsync(sku) .map(new Func1>, Page>() { @Override public Page call(ServiceResponse> response) { @@ -706,14 +897,14 @@ public Page call(ServiceResponse> response) } /** - * Gets list of available geo regions. - * Gets list of available geo regions. + * Get a list of available geographical regions. + * Get a list of available geographical regions. * - * @param sku Filter only to regions that support this sku + * @param sku Name of SKU used to filter the regions. Possible values include: 'Free', 'Shared', 'Basic', 'Standard', 'Premium', 'Dynamic' * @return the observable to the PagedList<GeoRegionInner> object */ - public Observable>> getSubscriptionGeoRegionsWithServiceResponseAsync(final String sku) { - return getSubscriptionGeoRegionsSinglePageAsync(sku) + public Observable>> listGeoRegionsWithServiceResponseAsync(final SkuName sku) { + return listGeoRegionsSinglePageAsync(sku) .concatMap(new Func1>, Observable>>>() { @Override public Observable>> call(ServiceResponse> page) { @@ -721,29 +912,29 @@ public Observable>> call(ServiceResponse> * @param sku Filter only to regions that support this sku + ServiceResponse> * @param sku Name of SKU used to filter the regions. Possible values include: 'Free', 'Shared', 'Basic', 'Standard', 'Premium', 'Dynamic' * @return the PagedList<GeoRegionInner> object wrapped in {@link ServiceResponse} if successful. */ - public Observable>> getSubscriptionGeoRegionsSinglePageAsync(final String sku) { + public Observable>> listGeoRegionsSinglePageAsync(final SkuName sku) { if (this.subscriptionId() == null) { throw new IllegalArgumentException("Parameter this.subscriptionId() is required and cannot be null."); } final String apiVersion = "2016-03-01"; - return service.getSubscriptionGeoRegions(this.subscriptionId(), sku, apiVersion, this.acceptLanguage(), this.userAgent()) + return service.listGeoRegions(this.subscriptionId(), sku, apiVersion, this.acceptLanguage(), this.userAgent()) .flatMap(new Func1, Observable>>>() { @Override public Observable>> call(Response response) { try { - ServiceResponse> result = getSubscriptionGeoRegionsDelegate(response); + ServiceResponse> result = listGeoRegionsDelegate(response); return Observable.just(new ServiceResponse>(result.getBody(), result.getResponse())); } catch (Throwable t) { return Observable.error(t); @@ -752,7 +943,7 @@ public Observable>> call(Response> getSubscriptionGeoRegionsDelegate(Response response) throws CloudException, IOException, IllegalArgumentException { + private ServiceResponse> listGeoRegionsDelegate(Response response) throws CloudException, IOException, IllegalArgumentException { return new AzureServiceResponseBuilder, CloudException>(this.mapperAdapter()) .register(200, new TypeToken>() { }.getType()) .registerError(CloudException.class) @@ -760,209 +951,94 @@ private ServiceResponse> getSubscriptionGeoRegionsDeleg } /** - * Whether hosting environment name is available. - * Whether hosting environment name is available. + * List all premier add-on offers. + * List all premier add-on offers. * - * @param name Hosting environment name - * @return the Object object if successful. + * @return the PagedList<PremierAddOnOfferInner> object if successful. */ - public Object isHostingEnvironmentNameAvailable(String name) { - return isHostingEnvironmentNameAvailableWithServiceResponseAsync(name).toBlocking().single().getBody(); + public PagedList listPremierAddOnOffers() { + ServiceResponse> response = listPremierAddOnOffersSinglePageAsync().toBlocking().single(); + return new PagedList(response.getBody()) { + @Override + public Page nextPage(String nextPageLink) { + return listPremierAddOnOffersNextSinglePageAsync(nextPageLink).toBlocking().single().getBody(); + } + }; } /** - * Whether hosting environment name is available. - * Whether hosting environment name is available. + * List all premier add-on offers. + * List all premier add-on offers. * - * @param name Hosting environment name * @param serviceCallback the async ServiceCallback to handle successful and failed responses. * @return the {@link ServiceCall} object */ - public ServiceCall isHostingEnvironmentNameAvailableAsync(String name, final ServiceCallback serviceCallback) { - return ServiceCall.create(isHostingEnvironmentNameAvailableWithServiceResponseAsync(name), serviceCallback); - } - - /** - * Whether hosting environment name is available. - * Whether hosting environment name is available. - * - * @param name Hosting environment name - * @return the observable to the Object object - */ - public Observable isHostingEnvironmentNameAvailableAsync(String name) { - return isHostingEnvironmentNameAvailableWithServiceResponseAsync(name).map(new Func1, Object>() { - @Override - public Object call(ServiceResponse response) { - return response.getBody(); - } - }); + public ServiceCall> listPremierAddOnOffersAsync(final ListOperationCallback serviceCallback) { + return AzureServiceCall.create( + listPremierAddOnOffersSinglePageAsync(), + new Func1>>>() { + @Override + public Observable>> call(String nextPageLink) { + return listPremierAddOnOffersNextSinglePageAsync(nextPageLink); + } + }, + serviceCallback); } /** - * Whether hosting environment name is available. - * Whether hosting environment name is available. + * List all premier add-on offers. + * List all premier add-on offers. * - * @param name Hosting environment name - * @return the observable to the Object object + * @return the observable to the PagedList<PremierAddOnOfferInner> object */ - public Observable> isHostingEnvironmentNameAvailableWithServiceResponseAsync(String name) { - if (this.subscriptionId() == null) { - throw new IllegalArgumentException("Parameter this.subscriptionId() is required and cannot be null."); - } - if (name == null) { - throw new IllegalArgumentException("Parameter name is required and cannot be null."); - } - final String apiVersion = "2016-03-01"; - return service.isHostingEnvironmentNameAvailable(this.subscriptionId(), name, apiVersion, this.acceptLanguage(), this.userAgent()) - .flatMap(new Func1, Observable>>() { + public Observable> listPremierAddOnOffersAsync() { + return listPremierAddOnOffersWithServiceResponseAsync() + .map(new Func1>, Page>() { @Override - public Observable> call(Response response) { - try { - ServiceResponse clientResponse = isHostingEnvironmentNameAvailableDelegate(response); - return Observable.just(clientResponse); - } catch (Throwable t) { - return Observable.error(t); - } + public Page call(ServiceResponse> response) { + return response.getBody(); } }); } - private ServiceResponse isHostingEnvironmentNameAvailableDelegate(Response response) throws CloudException, IOException, IllegalArgumentException { - return new AzureServiceResponseBuilder(this.mapperAdapter()) - .register(200, new TypeToken() { }.getType()) - .registerError(CloudException.class) - .build(response); - } - - /** - * Whether hosting environment name is available. - * Whether hosting environment name is available. - * - * @param name Hosting environment name - * @return the Object object if successful. - */ - public Object isHostingEnvironmentWithLegacyNameAvailable(String name) { - return isHostingEnvironmentWithLegacyNameAvailableWithServiceResponseAsync(name).toBlocking().single().getBody(); - } - - /** - * Whether hosting environment name is available. - * Whether hosting environment name is available. - * - * @param name Hosting environment name - * @param serviceCallback the async ServiceCallback to handle successful and failed responses. - * @return the {@link ServiceCall} object - */ - public ServiceCall isHostingEnvironmentWithLegacyNameAvailableAsync(String name, final ServiceCallback serviceCallback) { - return ServiceCall.create(isHostingEnvironmentWithLegacyNameAvailableWithServiceResponseAsync(name), serviceCallback); - } - /** - * Whether hosting environment name is available. - * Whether hosting environment name is available. + * List all premier add-on offers. + * List all premier add-on offers. * - * @param name Hosting environment name - * @return the observable to the Object object + * @return the observable to the PagedList<PremierAddOnOfferInner> object */ - public Observable isHostingEnvironmentWithLegacyNameAvailableAsync(String name) { - return isHostingEnvironmentWithLegacyNameAvailableWithServiceResponseAsync(name).map(new Func1, Object>() { - @Override - public Object call(ServiceResponse response) { - return response.getBody(); - } - }); - } - - /** - * Whether hosting environment name is available. - * Whether hosting environment name is available. - * - * @param name Hosting environment name - * @return the observable to the Object object - */ - public Observable> isHostingEnvironmentWithLegacyNameAvailableWithServiceResponseAsync(String name) { - if (name == null) { - throw new IllegalArgumentException("Parameter name is required and cannot be null."); - } - if (this.subscriptionId() == null) { - throw new IllegalArgumentException("Parameter this.subscriptionId() is required and cannot be null."); - } - final String apiVersion = "2016-03-01"; - return service.isHostingEnvironmentWithLegacyNameAvailable(name, this.subscriptionId(), apiVersion, this.acceptLanguage(), this.userAgent()) - .flatMap(new Func1, Observable>>() { + public Observable>> listPremierAddOnOffersWithServiceResponseAsync() { + return listPremierAddOnOffersSinglePageAsync() + .concatMap(new Func1>, Observable>>>() { @Override - public Observable> call(Response response) { - try { - ServiceResponse clientResponse = isHostingEnvironmentWithLegacyNameAvailableDelegate(response); - return Observable.just(clientResponse); - } catch (Throwable t) { - return Observable.error(t); + public Observable>> call(ServiceResponse> page) { + String nextPageLink = page.getBody().getNextPageLink(); + if (nextPageLink == null) { + return Observable.just(page); } + return Observable.just(page).concatWith(listPremierAddOnOffersNextWithServiceResponseAsync(nextPageLink)); } }); } - private ServiceResponse isHostingEnvironmentWithLegacyNameAvailableDelegate(Response response) throws CloudException, IOException, IllegalArgumentException { - return new AzureServiceResponseBuilder(this.mapperAdapter()) - .register(200, new TypeToken() { }.getType()) - .registerError(CloudException.class) - .build(response); - } - - /** - * List premier add on offers. - * List premier add on offers. - * - * @return the Object object if successful. - */ - public Object listPremierAddOnOffers() { - return listPremierAddOnOffersWithServiceResponseAsync().toBlocking().single().getBody(); - } - /** - * List premier add on offers. - * List premier add on offers. + * List all premier add-on offers. + * List all premier add-on offers. * - * @param serviceCallback the async ServiceCallback to handle successful and failed responses. - * @return the {@link ServiceCall} object + * @return the PagedList<PremierAddOnOfferInner> object wrapped in {@link ServiceResponse} if successful. */ - public ServiceCall listPremierAddOnOffersAsync(final ServiceCallback serviceCallback) { - return ServiceCall.create(listPremierAddOnOffersWithServiceResponseAsync(), serviceCallback); - } - - /** - * List premier add on offers. - * List premier add on offers. - * - * @return the observable to the Object object - */ - public Observable listPremierAddOnOffersAsync() { - return listPremierAddOnOffersWithServiceResponseAsync().map(new Func1, Object>() { - @Override - public Object call(ServiceResponse response) { - return response.getBody(); - } - }); - } - - /** - * List premier add on offers. - * List premier add on offers. - * - * @return the observable to the Object object - */ - public Observable> listPremierAddOnOffersWithServiceResponseAsync() { + public Observable>> listPremierAddOnOffersSinglePageAsync() { if (this.subscriptionId() == null) { throw new IllegalArgumentException("Parameter this.subscriptionId() is required and cannot be null."); } final String apiVersion = "2016-03-01"; return service.listPremierAddOnOffers(this.subscriptionId(), apiVersion, this.acceptLanguage(), this.userAgent()) - .flatMap(new Func1, Observable>>() { + .flatMap(new Func1, Observable>>>() { @Override - public Observable> call(Response response) { + public Observable>> call(Response response) { try { - ServiceResponse clientResponse = listPremierAddOnOffersDelegate(response); - return Observable.just(clientResponse); + ServiceResponse> result = listPremierAddOnOffersDelegate(response); + return Observable.just(new ServiceResponse>(result.getBody(), result.getResponse())); } catch (Throwable t) { return Observable.error(t); } @@ -970,16 +1046,16 @@ public Observable> call(Response response) }); } - private ServiceResponse listPremierAddOnOffersDelegate(Response response) throws CloudException, IOException, IllegalArgumentException { - return new AzureServiceResponseBuilder(this.mapperAdapter()) - .register(200, new TypeToken() { }.getType()) + private ServiceResponse> listPremierAddOnOffersDelegate(Response response) throws CloudException, IOException, IllegalArgumentException { + return new AzureServiceResponseBuilder, CloudException>(this.mapperAdapter()) + .register(200, new TypeToken>() { }.getType()) .registerError(CloudException.class) .build(response); } /** - * Gets publishing credentials for the subscription owner. - * Gets publishing credentials for the subscription owner. + * Get the publishing credentials for the subscription owner. + * Get the publishing credentials for the subscription owner. * * @return the UserInner object if successful. */ @@ -988,8 +1064,8 @@ public UserInner getPublishingCredentials() { } /** - * Gets publishing credentials for the subscription owner. - * Gets publishing credentials for the subscription owner. + * Get the publishing credentials for the subscription owner. + * Get the publishing credentials for the subscription owner. * * @param serviceCallback the async ServiceCallback to handle successful and failed responses. * @return the {@link ServiceCall} object @@ -999,8 +1075,8 @@ public ServiceCall getPublishingCredentialsAsync(final ServiceCallbac } /** - * Gets publishing credentials for the subscription owner. - * Gets publishing credentials for the subscription owner. + * Get the publishing credentials for the subscription owner. + * Get the publishing credentials for the subscription owner. * * @return the observable to the UserInner object */ @@ -1014,8 +1090,8 @@ public UserInner call(ServiceResponse response) { } /** - * Gets publishing credentials for the subscription owner. - * Gets publishing credentials for the subscription owner. + * Get the publishing credentials for the subscription owner. + * Get the publishing credentials for the subscription owner. * * @return the observable to the UserInner object */ @@ -1046,10 +1122,10 @@ private ServiceResponse getPublishingCredentialsDelegate(Response updatePublishingCredentialsAsync(UserInner request } /** - * Updates publishing credentials for the subscription owner. - * Updates publishing credentials for the subscription owner. + * Update the publishing credentials for the subscription owner. + * Update the publishing credentials for the subscription owner. * - * @param requestMessage requestMessage with new publishing credentials + * @param requestMessage A request message with the new publishing credentials. * @return the observable to the UserInner object */ public Observable updatePublishingCredentialsAsync(UserInner requestMessage) { @@ -1085,10 +1161,10 @@ public UserInner call(ServiceResponse response) { } /** - * Updates publishing credentials for the subscription owner. - * Updates publishing credentials for the subscription owner. + * Update the publishing credentials for the subscription owner. + * Update the publishing credentials for the subscription owner. * - * @param requestMessage requestMessage with new publishing credentials + * @param requestMessage A request message with the new publishing credentials. * @return the observable to the UserInner object */ public Observable> updatePublishingCredentialsWithServiceResponseAsync(UserInner requestMessage) { @@ -1122,58 +1198,58 @@ private ServiceResponse updatePublishingCredentialsDelegate(Response< } /** - * Get skus. - * Get skus. + * List all SKUs. + * List all SKUs. * - * @return the Object object if successful. + * @return the SkuInfosInner object if successful. */ - public Object listSkus() { + public SkuInfosInner listSkus() { return listSkusWithServiceResponseAsync().toBlocking().single().getBody(); } /** - * Get skus. - * Get skus. + * List all SKUs. + * List all SKUs. * * @param serviceCallback the async ServiceCallback to handle successful and failed responses. * @return the {@link ServiceCall} object */ - public ServiceCall listSkusAsync(final ServiceCallback serviceCallback) { + public ServiceCall listSkusAsync(final ServiceCallback serviceCallback) { return ServiceCall.create(listSkusWithServiceResponseAsync(), serviceCallback); } /** - * Get skus. - * Get skus. + * List all SKUs. + * List all SKUs. * - * @return the observable to the Object object + * @return the observable to the SkuInfosInner object */ - public Observable listSkusAsync() { - return listSkusWithServiceResponseAsync().map(new Func1, Object>() { + public Observable listSkusAsync() { + return listSkusWithServiceResponseAsync().map(new Func1, SkuInfosInner>() { @Override - public Object call(ServiceResponse response) { + public SkuInfosInner call(ServiceResponse response) { return response.getBody(); } }); } /** - * Get skus. - * Get skus. + * List all SKUs. + * List all SKUs. * - * @return the observable to the Object object + * @return the observable to the SkuInfosInner object */ - public Observable> listSkusWithServiceResponseAsync() { + public Observable> listSkusWithServiceResponseAsync() { if (this.subscriptionId() == null) { throw new IllegalArgumentException("Parameter this.subscriptionId() is required and cannot be null."); } final String apiVersion = "2016-03-01"; return service.listSkus(this.subscriptionId(), apiVersion, this.acceptLanguage(), this.userAgent()) - .flatMap(new Func1, Observable>>() { + .flatMap(new Func1, Observable>>() { @Override - public Observable> call(Response response) { + public Observable> call(Response response) { try { - ServiceResponse clientResponse = listSkusDelegate(response); + ServiceResponse clientResponse = listSkusDelegate(response); return Observable.just(clientResponse); } catch (Throwable t) { return Observable.error(t); @@ -1182,9 +1258,9 @@ public Observable> call(Response response) }); } - private ServiceResponse listSkusDelegate(Response response) throws CloudException, IOException, IllegalArgumentException { - return new AzureServiceResponseBuilder(this.mapperAdapter()) - .register(200, new TypeToken() { }.getType()) + private ServiceResponse listSkusDelegate(Response response) throws CloudException, IOException, IllegalArgumentException { + return new AzureServiceResponseBuilder(this.mapperAdapter()) + .register(200, new TypeToken() { }.getType()) .registerError(CloudException.class) .build(response); } @@ -1193,39 +1269,38 @@ private ServiceResponse listSkusDelegate(Response response * Move resources between resource groups. * Move resources between resource groups. * - * @param resourceGroupName Resource group - * @param moveResourceEnvelope Object representing resource to move - * @return the Object object if successful. + * @param resourceGroupName Name of the resource group to which the resource belongs. + * @param moveResourceEnvelope Object that represents the resource to move. */ - public Object moveResources(String resourceGroupName, CsmMoveResourceEnvelopeInner moveResourceEnvelope) { - return moveResourcesWithServiceResponseAsync(resourceGroupName, moveResourceEnvelope).toBlocking().single().getBody(); + public void move(String resourceGroupName, CsmMoveResourceEnvelopeInner moveResourceEnvelope) { + moveWithServiceResponseAsync(resourceGroupName, moveResourceEnvelope).toBlocking().single().getBody(); } /** * Move resources between resource groups. * Move resources between resource groups. * - * @param resourceGroupName Resource group - * @param moveResourceEnvelope Object representing resource to move + * @param resourceGroupName Name of the resource group to which the resource belongs. + * @param moveResourceEnvelope Object that represents the resource to move. * @param serviceCallback the async ServiceCallback to handle successful and failed responses. * @return the {@link ServiceCall} object */ - public ServiceCall moveResourcesAsync(String resourceGroupName, CsmMoveResourceEnvelopeInner moveResourceEnvelope, final ServiceCallback serviceCallback) { - return ServiceCall.create(moveResourcesWithServiceResponseAsync(resourceGroupName, moveResourceEnvelope), serviceCallback); + public ServiceCall moveAsync(String resourceGroupName, CsmMoveResourceEnvelopeInner moveResourceEnvelope, final ServiceCallback serviceCallback) { + return ServiceCall.create(moveWithServiceResponseAsync(resourceGroupName, moveResourceEnvelope), serviceCallback); } /** * Move resources between resource groups. * Move resources between resource groups. * - * @param resourceGroupName Resource group - * @param moveResourceEnvelope Object representing resource to move - * @return the observable to the Object object + * @param resourceGroupName Name of the resource group to which the resource belongs. + * @param moveResourceEnvelope Object that represents the resource to move. + * @return the {@link ServiceResponse} object if successful. */ - public Observable moveResourcesAsync(String resourceGroupName, CsmMoveResourceEnvelopeInner moveResourceEnvelope) { - return moveResourcesWithServiceResponseAsync(resourceGroupName, moveResourceEnvelope).map(new Func1, Object>() { + public Observable moveAsync(String resourceGroupName, CsmMoveResourceEnvelopeInner moveResourceEnvelope) { + return moveWithServiceResponseAsync(resourceGroupName, moveResourceEnvelope).map(new Func1, Void>() { @Override - public Object call(ServiceResponse response) { + public Void call(ServiceResponse response) { return response.getBody(); } }); @@ -1235,11 +1310,11 @@ public Object call(ServiceResponse response) { * Move resources between resource groups. * Move resources between resource groups. * - * @param resourceGroupName Resource group - * @param moveResourceEnvelope Object representing resource to move - * @return the observable to the Object object + * @param resourceGroupName Name of the resource group to which the resource belongs. + * @param moveResourceEnvelope Object that represents the resource to move. + * @return the {@link ServiceResponse} object if successful. */ - public Observable> moveResourcesWithServiceResponseAsync(String resourceGroupName, CsmMoveResourceEnvelopeInner moveResourceEnvelope) { + public Observable> moveWithServiceResponseAsync(String resourceGroupName, CsmMoveResourceEnvelopeInner moveResourceEnvelope) { if (resourceGroupName == null) { throw new IllegalArgumentException("Parameter resourceGroupName is required and cannot be null."); } @@ -1251,12 +1326,12 @@ public Observable> moveResourcesWithServiceResponseAsync } Validator.validate(moveResourceEnvelope); final String apiVersion = "2016-03-01"; - return service.moveResources(resourceGroupName, this.subscriptionId(), moveResourceEnvelope, apiVersion, this.acceptLanguage(), this.userAgent()) - .flatMap(new Func1, Observable>>() { + return service.move(resourceGroupName, this.subscriptionId(), moveResourceEnvelope, apiVersion, this.acceptLanguage(), this.userAgent()) + .flatMap(new Func1, Observable>>() { @Override - public Observable> call(Response response) { + public Observable> call(Response response) { try { - ServiceResponse clientResponse = moveResourcesDelegate(response); + ServiceResponse clientResponse = moveDelegate(response); return Observable.just(clientResponse); } catch (Throwable t) { return Observable.error(t); @@ -1265,19 +1340,18 @@ public Observable> call(Response response) }); } - private ServiceResponse moveResourcesDelegate(Response response) throws CloudException, IOException, IllegalArgumentException { - return new AzureServiceResponseBuilder(this.mapperAdapter()) - .register(200, new TypeToken() { }.getType()) - .registerError(CloudException.class) + private ServiceResponse moveDelegate(Response response) throws CloudException, IOException, IllegalArgumentException { + return new AzureServiceResponseBuilder(this.mapperAdapter()) + .register(204, new TypeToken() { }.getType()) .build(response); } /** - * Validates if a resource can be created. - * Validates if a resource can be created. + * Validate if a resource can be created. + * Validate if a resource can be created. * - * @param resourceGroupName Resource group - * @param validateRequest Object representing resources to validate + * @param resourceGroupName Name of the resource group to which the resource belongs. + * @param validateRequest Request with the resources to validate. * @return the ValidateResponseInner object if successful. */ public ValidateResponseInner validate(String resourceGroupName, ValidateRequestInner validateRequest) { @@ -1285,11 +1359,11 @@ public ValidateResponseInner validate(String resourceGroupName, ValidateRequestI } /** - * Validates if a resource can be created. - * Validates if a resource can be created. + * Validate if a resource can be created. + * Validate if a resource can be created. * - * @param resourceGroupName Resource group - * @param validateRequest Object representing resources to validate + * @param resourceGroupName Name of the resource group to which the resource belongs. + * @param validateRequest Request with the resources to validate. * @param serviceCallback the async ServiceCallback to handle successful and failed responses. * @return the {@link ServiceCall} object */ @@ -1298,11 +1372,11 @@ public ServiceCall validateAsync(String resourceGroupName } /** - * Validates if a resource can be created. - * Validates if a resource can be created. + * Validate if a resource can be created. + * Validate if a resource can be created. * - * @param resourceGroupName Resource group - * @param validateRequest Object representing resources to validate + * @param resourceGroupName Name of the resource group to which the resource belongs. + * @param validateRequest Request with the resources to validate. * @return the observable to the ValidateResponseInner object */ public Observable validateAsync(String resourceGroupName, ValidateRequestInner validateRequest) { @@ -1315,11 +1389,11 @@ public ValidateResponseInner call(ServiceResponse respons } /** - * Validates if a resource can be created. - * Validates if a resource can be created. + * Validate if a resource can be created. + * Validate if a resource can be created. * - * @param resourceGroupName Resource group - * @param validateRequest Object representing resources to validate + * @param resourceGroupName Name of the resource group to which the resource belongs. + * @param validateRequest Request with the resources to validate. * @return the observable to the ValidateResponseInner object */ public Observable> validateWithServiceResponseAsync(String resourceGroupName, ValidateRequestInner validateRequest) { @@ -1356,56 +1430,55 @@ private ServiceResponse validateDelegate(Response validateMoveResourcesAsync(String resourceGroupName, CsmMoveResourceEnvelopeInner moveResourceEnvelope, final ServiceCallback serviceCallback) { - return ServiceCall.create(validateMoveResourcesWithServiceResponseAsync(resourceGroupName, moveResourceEnvelope), serviceCallback); + public ServiceCall validateMoveAsync(String resourceGroupName, CsmMoveResourceEnvelopeInner moveResourceEnvelope, final ServiceCallback serviceCallback) { + return ServiceCall.create(validateMoveWithServiceResponseAsync(resourceGroupName, moveResourceEnvelope), serviceCallback); } /** - * Validate specified resources can be moved. - * Validate specified resources can be moved. + * Validate whether a resource can be moved. + * Validate whether a resource can be moved. * - * @param resourceGroupName Resource group - * @param moveResourceEnvelope Object representing resource to move - * @return the observable to the Object object + * @param resourceGroupName Name of the resource group to which the resource belongs. + * @param moveResourceEnvelope Object that represents the resource to move. + * @return the {@link ServiceResponse} object if successful. */ - public Observable validateMoveResourcesAsync(String resourceGroupName, CsmMoveResourceEnvelopeInner moveResourceEnvelope) { - return validateMoveResourcesWithServiceResponseAsync(resourceGroupName, moveResourceEnvelope).map(new Func1, Object>() { + public Observable validateMoveAsync(String resourceGroupName, CsmMoveResourceEnvelopeInner moveResourceEnvelope) { + return validateMoveWithServiceResponseAsync(resourceGroupName, moveResourceEnvelope).map(new Func1, Void>() { @Override - public Object call(ServiceResponse response) { + public Void call(ServiceResponse response) { return response.getBody(); } }); } /** - * Validate specified resources can be moved. - * Validate specified resources can be moved. + * Validate whether a resource can be moved. + * Validate whether a resource can be moved. * - * @param resourceGroupName Resource group - * @param moveResourceEnvelope Object representing resource to move - * @return the observable to the Object object + * @param resourceGroupName Name of the resource group to which the resource belongs. + * @param moveResourceEnvelope Object that represents the resource to move. + * @return the {@link ServiceResponse} object if successful. */ - public Observable> validateMoveResourcesWithServiceResponseAsync(String resourceGroupName, CsmMoveResourceEnvelopeInner moveResourceEnvelope) { + public Observable> validateMoveWithServiceResponseAsync(String resourceGroupName, CsmMoveResourceEnvelopeInner moveResourceEnvelope) { if (resourceGroupName == null) { throw new IllegalArgumentException("Parameter resourceGroupName is required and cannot be null."); } @@ -1417,12 +1490,12 @@ public Observable> validateMoveResourcesWithServiceRespo } Validator.validate(moveResourceEnvelope); final String apiVersion = "2016-03-01"; - return service.validateMoveResources(resourceGroupName, this.subscriptionId(), moveResourceEnvelope, apiVersion, this.acceptLanguage(), this.userAgent()) - .flatMap(new Func1, Observable>>() { + return service.validateMove(resourceGroupName, this.subscriptionId(), moveResourceEnvelope, apiVersion, this.acceptLanguage(), this.userAgent()) + .flatMap(new Func1, Observable>>() { @Override - public Observable> call(Response response) { + public Observable> call(Response response) { try { - ServiceResponse clientResponse = validateMoveResourcesDelegate(response); + ServiceResponse clientResponse = validateMoveDelegate(response); return Observable.just(clientResponse); } catch (Throwable t) { return Observable.error(t); @@ -1431,10 +1504,9 @@ public Observable> call(Response response) }); } - private ServiceResponse validateMoveResourcesDelegate(Response response) throws CloudException, IOException, IllegalArgumentException { - return new AzureServiceResponseBuilder(this.mapperAdapter()) - .register(200, new TypeToken() { }.getType()) - .registerError(CloudException.class) + private ServiceResponse validateMoveDelegate(Response response) throws CloudException, IOException, IllegalArgumentException { + return new AzureServiceResponseBuilder(this.mapperAdapter()) + .register(204, new TypeToken() { }.getType()) .build(response); } @@ -1547,52 +1619,52 @@ private ServiceResponse> listSourceControlsNextDele } /** - * Gets list of available geo regions. - * Gets list of available geo regions. + * Get a list of available geographical regions. + * Get a list of available geographical regions. * * @param nextPageLink The NextLink from the previous successful call to List operation. * @return the PagedList<GeoRegionInner> object if successful. */ - public PagedList getSubscriptionGeoRegionsNext(final String nextPageLink) { - ServiceResponse> response = getSubscriptionGeoRegionsNextSinglePageAsync(nextPageLink).toBlocking().single(); + public PagedList listGeoRegionsNext(final String nextPageLink) { + ServiceResponse> response = listGeoRegionsNextSinglePageAsync(nextPageLink).toBlocking().single(); return new PagedList(response.getBody()) { @Override public Page nextPage(String nextPageLink) { - return getSubscriptionGeoRegionsNextSinglePageAsync(nextPageLink).toBlocking().single().getBody(); + return listGeoRegionsNextSinglePageAsync(nextPageLink).toBlocking().single().getBody(); } }; } /** - * Gets list of available geo regions. - * Gets list of available geo regions. + * Get a list of available geographical regions. + * Get a list of available geographical regions. * * @param nextPageLink The NextLink from the previous successful call to List operation. * @param serviceCall the ServiceCall object tracking the Retrofit calls * @param serviceCallback the async ServiceCallback to handle successful and failed responses. * @return the {@link ServiceCall} object */ - public ServiceCall> getSubscriptionGeoRegionsNextAsync(final String nextPageLink, final ServiceCall> serviceCall, final ListOperationCallback serviceCallback) { + public ServiceCall> listGeoRegionsNextAsync(final String nextPageLink, final ServiceCall> serviceCall, final ListOperationCallback serviceCallback) { return AzureServiceCall.create( - getSubscriptionGeoRegionsNextSinglePageAsync(nextPageLink), + listGeoRegionsNextSinglePageAsync(nextPageLink), new Func1>>>() { @Override public Observable>> call(String nextPageLink) { - return getSubscriptionGeoRegionsNextSinglePageAsync(nextPageLink); + return listGeoRegionsNextSinglePageAsync(nextPageLink); } }, serviceCallback); } /** - * Gets list of available geo regions. - * Gets list of available geo regions. + * Get a list of available geographical regions. + * Get a list of available geographical regions. * * @param nextPageLink The NextLink from the previous successful call to List operation. * @return the observable to the PagedList<GeoRegionInner> object */ - public Observable> getSubscriptionGeoRegionsNextAsync(final String nextPageLink) { - return getSubscriptionGeoRegionsNextWithServiceResponseAsync(nextPageLink) + public Observable> listGeoRegionsNextAsync(final String nextPageLink) { + return listGeoRegionsNextWithServiceResponseAsync(nextPageLink) .map(new Func1>, Page>() { @Override public Page call(ServiceResponse> response) { @@ -1602,14 +1674,14 @@ public Page call(ServiceResponse> response) } /** - * Gets list of available geo regions. - * Gets list of available geo regions. + * Get a list of available geographical regions. + * Get a list of available geographical regions. * * @param nextPageLink The NextLink from the previous successful call to List operation. * @return the observable to the PagedList<GeoRegionInner> object */ - public Observable>> getSubscriptionGeoRegionsNextWithServiceResponseAsync(final String nextPageLink) { - return getSubscriptionGeoRegionsNextSinglePageAsync(nextPageLink) + public Observable>> listGeoRegionsNextWithServiceResponseAsync(final String nextPageLink) { + return listGeoRegionsNextSinglePageAsync(nextPageLink) .concatMap(new Func1>, Observable>>>() { @Override public Observable>> call(ServiceResponse> page) { @@ -1617,28 +1689,28 @@ public Observable>> call(ServiceResponse> * @param nextPageLink The NextLink from the previous successful call to List operation. * @return the PagedList<GeoRegionInner> object wrapped in {@link ServiceResponse} if successful. */ - public Observable>> getSubscriptionGeoRegionsNextSinglePageAsync(final String nextPageLink) { + public Observable>> listGeoRegionsNextSinglePageAsync(final String nextPageLink) { if (nextPageLink == null) { throw new IllegalArgumentException("Parameter nextPageLink is required and cannot be null."); } - return service.getSubscriptionGeoRegionsNext(nextPageLink, this.acceptLanguage(), this.userAgent()) + return service.listGeoRegionsNext(nextPageLink, this.acceptLanguage(), this.userAgent()) .flatMap(new Func1, Observable>>>() { @Override public Observable>> call(Response response) { try { - ServiceResponse> result = getSubscriptionGeoRegionsNextDelegate(response); + ServiceResponse> result = listGeoRegionsNextDelegate(response); return Observable.just(new ServiceResponse>(result.getBody(), result.getResponse())); } catch (Throwable t) { return Observable.error(t); @@ -1647,11 +1719,119 @@ public Observable>> call(Response> getSubscriptionGeoRegionsNextDelegate(Response response) throws CloudException, IOException, IllegalArgumentException { + private ServiceResponse> listGeoRegionsNextDelegate(Response response) throws CloudException, IOException, IllegalArgumentException { return new AzureServiceResponseBuilder, CloudException>(this.mapperAdapter()) .register(200, new TypeToken>() { }.getType()) .registerError(CloudException.class) .build(response); } + /** + * List all premier add-on offers. + * List all premier add-on offers. + * + * @param nextPageLink The NextLink from the previous successful call to List operation. + * @return the PagedList<PremierAddOnOfferInner> object if successful. + */ + public PagedList listPremierAddOnOffersNext(final String nextPageLink) { + ServiceResponse> response = listPremierAddOnOffersNextSinglePageAsync(nextPageLink).toBlocking().single(); + return new PagedList(response.getBody()) { + @Override + public Page nextPage(String nextPageLink) { + return listPremierAddOnOffersNextSinglePageAsync(nextPageLink).toBlocking().single().getBody(); + } + }; + } + + /** + * List all premier add-on offers. + * List all premier add-on offers. + * + * @param nextPageLink The NextLink from the previous successful call to List operation. + * @param serviceCall the ServiceCall object tracking the Retrofit calls + * @param serviceCallback the async ServiceCallback to handle successful and failed responses. + * @return the {@link ServiceCall} object + */ + public ServiceCall> listPremierAddOnOffersNextAsync(final String nextPageLink, final ServiceCall> serviceCall, final ListOperationCallback serviceCallback) { + return AzureServiceCall.create( + listPremierAddOnOffersNextSinglePageAsync(nextPageLink), + new Func1>>>() { + @Override + public Observable>> call(String nextPageLink) { + return listPremierAddOnOffersNextSinglePageAsync(nextPageLink); + } + }, + serviceCallback); + } + + /** + * List all premier add-on offers. + * List all premier add-on offers. + * + * @param nextPageLink The NextLink from the previous successful call to List operation. + * @return the observable to the PagedList<PremierAddOnOfferInner> object + */ + public Observable> listPremierAddOnOffersNextAsync(final String nextPageLink) { + return listPremierAddOnOffersNextWithServiceResponseAsync(nextPageLink) + .map(new Func1>, Page>() { + @Override + public Page call(ServiceResponse> response) { + return response.getBody(); + } + }); + } + + /** + * List all premier add-on offers. + * List all premier add-on offers. + * + * @param nextPageLink The NextLink from the previous successful call to List operation. + * @return the observable to the PagedList<PremierAddOnOfferInner> object + */ + public Observable>> listPremierAddOnOffersNextWithServiceResponseAsync(final String nextPageLink) { + return listPremierAddOnOffersNextSinglePageAsync(nextPageLink) + .concatMap(new Func1>, Observable>>>() { + @Override + public Observable>> call(ServiceResponse> page) { + String nextPageLink = page.getBody().getNextPageLink(); + if (nextPageLink == null) { + return Observable.just(page); + } + return Observable.just(page).concatWith(listPremierAddOnOffersNextWithServiceResponseAsync(nextPageLink)); + } + }); + } + + /** + * List all premier add-on offers. + * List all premier add-on offers. + * + ServiceResponse> * @param nextPageLink The NextLink from the previous successful call to List operation. + * @return the PagedList<PremierAddOnOfferInner> object wrapped in {@link ServiceResponse} if successful. + */ + public Observable>> listPremierAddOnOffersNextSinglePageAsync(final String nextPageLink) { + if (nextPageLink == null) { + throw new IllegalArgumentException("Parameter nextPageLink is required and cannot be null."); + } + return service.listPremierAddOnOffersNext(nextPageLink, this.acceptLanguage(), this.userAgent()) + .flatMap(new Func1, Observable>>>() { + @Override + public Observable>> call(Response response) { + try { + ServiceResponse> result = listPremierAddOnOffersNextDelegate(response); + return Observable.just(new ServiceResponse>(result.getBody(), result.getResponse())); + } catch (Throwable t) { + return Observable.error(t); + } + } + }); + } + + private ServiceResponse> listPremierAddOnOffersNextDelegate(Response response) throws CloudException, IOException, IllegalArgumentException { + return new AzureServiceResponseBuilder, CloudException>(this.mapperAdapter()) + .register(200, new TypeToken>() { }.getType()) + .registerError(CloudException.class) + .build(response); + } + } diff --git a/azure-mgmt-website/src/main/java/com/microsoft/azure/management/website/implementation/WorkerPoolInner.java b/azure-mgmt-website/src/main/java/com/microsoft/azure/management/website/implementation/WorkerPoolInner.java index cd63d5be36150..c5f4d9b2e0984 100644 --- a/azure-mgmt-website/src/main/java/com/microsoft/azure/management/website/implementation/WorkerPoolInner.java +++ b/azure-mgmt-website/src/main/java/com/microsoft/azure/management/website/implementation/WorkerPoolInner.java @@ -16,18 +16,18 @@ import com.microsoft.azure.Resource; /** - * Worker pool of a hostingEnvironment (App Service Environment). + * Worker pool of an App Service Environment. */ @JsonFlatten public class WorkerPoolInner extends Resource { /** - * Worker size id for referencing this worker pool. + * Worker size ID for referencing this worker pool. */ @JsonProperty(value = "properties.workerSizeId") private Integer workerSizeId; /** - * Shared or dedicated web app hosting. Possible values include: 'Shared', + * Shared or dedicated app hosting. Possible values include: 'Shared', * 'Dedicated', 'Dynamic'. */ @JsonProperty(value = "properties.computeMode") @@ -48,7 +48,7 @@ public class WorkerPoolInner extends Resource { /** * Names of all instances in the worker pool (read only). */ - @JsonProperty(value = "properties.instanceNames") + @JsonProperty(value = "properties.instanceNames", access = JsonProperty.Access.WRITE_ONLY) private List instanceNames; /** @@ -145,17 +145,6 @@ public List instanceNames() { return this.instanceNames; } - /** - * Set the instanceNames value. - * - * @param instanceNames the instanceNames value to set - * @return the WorkerPoolInner object itself. - */ - public WorkerPoolInner withInstanceNames(List instanceNames) { - this.instanceNames = instanceNames; - return this; - } - /** * Get the sku value. * From d8c6fd93602c1a278f4b2025b393439fbdf284c2 Mon Sep 17 00:00:00 2001 From: Jianghao Lu Date: Thu, 1 Dec 2016 01:59:34 -0800 Subject: [PATCH 05/10] Use generated API instead of hand-crafted ones --- .../website/AppServiceCertificateOrder.java | 4 ++ .../management/website/AppServiceDomain.java | 4 ++ .../website/HostNameSslBinding.java | 4 +- .../azure/management/website/WebAppBase.java | 5 +++ .../AppServiceCertificateOrderImpl.java | 26 ++++++------- .../implementation/AppServiceDomainImpl.java | 18 +++++++++ .../implementation/DeploymentSlotImpl.java | 18 +++++++++ .../HostNameSslBindingImpl.java | 37 ++----------------- .../website/implementation/WebAppImpl.java | 18 +++++++++ .../WebAppSourceControlImpl.java | 21 +++-------- .../website/CertificateOrdersTests.java | 4 +- .../website/samples/ManageAppService.java | 16 ++++---- 12 files changed, 99 insertions(+), 76 deletions(-) diff --git a/azure-mgmt-website/src/main/java/com/microsoft/azure/management/website/AppServiceCertificateOrder.java b/azure-mgmt-website/src/main/java/com/microsoft/azure/management/website/AppServiceCertificateOrder.java index e575ba1c94324..6818bcd34af77 100644 --- a/azure-mgmt-website/src/main/java/com/microsoft/azure/management/website/AppServiceCertificateOrder.java +++ b/azure-mgmt-website/src/main/java/com/microsoft/azure/management/website/AppServiceCertificateOrder.java @@ -122,6 +122,10 @@ public interface AppServiceCertificateOrder extends */ Observable getKeyVaultBindingAsync(); + void verifyDomainOwnership(AppServiceDomain domain); + + Observable verifyDomainOwnershipAsync(AppServiceDomain domain); + /************************************************************** * Fluent interfaces to provision a App service certificate order **************************************************************/ diff --git a/azure-mgmt-website/src/main/java/com/microsoft/azure/management/website/AppServiceDomain.java b/azure-mgmt-website/src/main/java/com/microsoft/azure/management/website/AppServiceDomain.java index 594b2453aaa0c..c59a1772bcd4d 100644 --- a/azure-mgmt-website/src/main/java/com/microsoft/azure/management/website/AppServiceDomain.java +++ b/azure-mgmt-website/src/main/java/com/microsoft/azure/management/website/AppServiceDomain.java @@ -15,6 +15,7 @@ import com.microsoft.azure.management.resources.fluentcore.model.Wrapper; import com.microsoft.azure.management.website.implementation.DomainInner; import org.joda.time.DateTime; +import rx.Observable; import java.util.List; import java.util.Map; @@ -105,6 +106,9 @@ public interface AppServiceDomain extends */ DomainPurchaseConsent consent(); + void verifyDomainOwnership(String certificateOrderName, String domainVerificationToken); + + 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/HostNameSslBinding.java b/azure-mgmt-website/src/main/java/com/microsoft/azure/management/website/HostNameSslBinding.java index a0788bf197ad5..7ca089b42ab4b 100644 --- a/azure-mgmt-website/src/main/java/com/microsoft/azure/management/website/HostNameSslBinding.java +++ b/azure-mgmt-website/src/main/java/com/microsoft/azure/management/website/HostNameSslBinding.java @@ -91,7 +91,7 @@ interface WithCertificate { * @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 withNewStandardAppServiceCertificateOrder(String certificateOrderName, CertificateProductType productType); /** * Specifies a ready-to-use certificate order to use. This is usually useful for reusing wildcard certificates. @@ -207,7 +207,7 @@ interface WithCertificate { * @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 withNewStandardAppServiceCertificateOrder(String certificateOrderName, CertificateProductType productType); /** * Specifies a ready-to-use certificate order to use. This is usually useful for reusing wildcard certificates. diff --git a/azure-mgmt-website/src/main/java/com/microsoft/azure/management/website/WebAppBase.java b/azure-mgmt-website/src/main/java/com/microsoft/azure/management/website/WebAppBase.java index 73740ad947353..cd241a435016e 100644 --- a/azure-mgmt-website/src/main/java/com/microsoft/azure/management/website/WebAppBase.java +++ b/azure-mgmt-website/src/main/java/com/microsoft/azure/management/website/WebAppBase.java @@ -14,6 +14,7 @@ import com.microsoft.azure.management.resources.fluentcore.model.Wrapper; import com.microsoft.azure.management.website.implementation.SiteInner; import org.joda.time.DateTime; +import rx.Observable; import java.util.List; import java.util.Map; @@ -238,6 +239,10 @@ public interface WebAppBase> extends WebAppSourceControl getSourceControl(); + void verifyDomainOwnership(String certificateOrderName, String domainVerificationToken); + + Observable verifyDomainOwnershipAsync(String certificateOrderName, String domainVerificationToken); + /** * Starts the web app or deployment slot. */ diff --git a/azure-mgmt-website/src/main/java/com/microsoft/azure/management/website/implementation/AppServiceCertificateOrderImpl.java b/azure-mgmt-website/src/main/java/com/microsoft/azure/management/website/implementation/AppServiceCertificateOrderImpl.java index 0eaaec9eaafb5..c5123fb0400b5 100644 --- a/azure-mgmt-website/src/main/java/com/microsoft/azure/management/website/implementation/AppServiceCertificateOrderImpl.java +++ b/azure-mgmt-website/src/main/java/com/microsoft/azure/management/website/implementation/AppServiceCertificateOrderImpl.java @@ -12,6 +12,7 @@ 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.AppServiceDomain; import com.microsoft.azure.management.website.AppServicePlan; import com.microsoft.azure.management.website.CertificateOrderStatus; import com.microsoft.azure.management.website.CertificateProductType; @@ -19,9 +20,6 @@ import rx.Observable; import rx.functions.Func1; -import java.util.HashMap; -import java.util.Map; - /** * The implementation for {@link AppServicePlan}. */ @@ -38,28 +36,16 @@ class AppServiceCertificateOrderImpl AppServiceCertificateOrder.Update { final AppServiceCertificateOrdersInner client; - private Map keyVaultBindings; 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)); - } - } } @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 +71,16 @@ public AppServiceCertificateKeyVaultBinding call(Page verifyDomainOwnershipAsync(AppServiceDomain domain) { + return domain.verifyDomainOwnershipAsync(name(), domainVerificationToken()); + } + @Override public String distinguishedName() { return inner().distinguishedName(); diff --git a/azure-mgmt-website/src/main/java/com/microsoft/azure/management/website/implementation/AppServiceDomainImpl.java b/azure-mgmt-website/src/main/java/com/microsoft/azure/management/website/implementation/AppServiceDomainImpl.java index 5f33b7751c3b1..76cf22418f1e4 100644 --- a/azure-mgmt-website/src/main/java/com/microsoft/azure/management/website/implementation/AppServiceDomainImpl.java +++ b/azure-mgmt-website/src/main/java/com/microsoft/azure/management/website/implementation/AppServiceDomainImpl.java @@ -175,6 +175,24 @@ public DomainPurchaseConsent consent() { return inner().consent(); } + @Override + public void verifyDomainOwnership(String certificateOrderName, String domainVerificationToken) { + verifyDomainOwnershipAsync(certificateOrderName, domainVerificationToken).toBlocking().subscribe(); + } + + @Override + public Observable verifyDomainOwnershipAsync(String certificateOrderName, String domainVerificationToken) { + DomainOwnershipIdentifierInner identifierInner = new DomainOwnershipIdentifierInner().withOwnershipId(domainVerificationToken); + identifierInner.withLocation("global"); + return client.createOrUpdateOwnershipIdentifierAsync(resourceGroupName(), name(), certificateOrderName, identifierInner) + .map(new Func1() { + @Override + public Void call(DomainOwnershipIdentifierInner domainOwnershipIdentifierInner) { + return null; + } + }); + } + @Override public AppServiceDomainImpl withAdminContact(Contact contact) { inner().withContactAdmin(contact); diff --git a/azure-mgmt-website/src/main/java/com/microsoft/azure/management/website/implementation/DeploymentSlotImpl.java b/azure-mgmt-website/src/main/java/com/microsoft/azure/management/website/implementation/DeploymentSlotImpl.java index a2d1f735a677c..3c24e83ec0bfb 100644 --- a/azure-mgmt-website/src/main/java/com/microsoft/azure/management/website/implementation/DeploymentSlotImpl.java +++ b/azure-mgmt-website/src/main/java/com/microsoft/azure/management/website/implementation/DeploymentSlotImpl.java @@ -202,4 +202,22 @@ public WebAppSourceControl getSourceControl() { SiteSourceControlInner siteSourceControlInner = client.getSourceControlSlot(resourceGroupName(), parent().name(), name()); return new WebAppSourceControlImpl<>(siteSourceControlInner, this, myManager); } + + @Override + public void verifyDomainOwnership(String certificateOrderName, String domainVerificationToken) { + verifyDomainOwnershipAsync(certificateOrderName, domainVerificationToken).toBlocking().subscribe(); + } + + @Override + public Observable verifyDomainOwnershipAsync(String certificateOrderName, String domainVerificationToken) { + IdentifierInner identifierInner = new IdentifierInner().withIdentifierId(domainVerificationToken); + identifierInner.withLocation("global"); + return client.createOrUpdateDomainOwnershipIdentifierSlotAsync(resourceGroupName(), parent().name(), name(), certificateOrderName, identifierInner) + .map(new Func1() { + @Override + public Void call(IdentifierInner identifierInner) { + return null; + } + }); + } } \ No newline at end of file diff --git a/azure-mgmt-website/src/main/java/com/microsoft/azure/management/website/implementation/HostNameSslBindingImpl.java b/azure-mgmt-website/src/main/java/com/microsoft/azure/management/website/implementation/HostNameSslBindingImpl.java index 821f0f6c11920..238bbc6e0e4ce 100644 --- a/azure-mgmt-website/src/main/java/com/microsoft/azure/management/website/implementation/HostNameSslBindingImpl.java +++ b/azure-mgmt-website/src/main/java/com/microsoft/azure/management/website/implementation/HostNameSslBindingImpl.java @@ -5,7 +5,6 @@ */ package com.microsoft.azure.management.website.implementation; -import com.fasterxml.jackson.annotation.JsonProperty; import com.google.common.collect.Maps; import com.microsoft.azure.management.apigeneration.Fluent; import com.microsoft.azure.management.keyvault.SecretPermissions; @@ -19,12 +18,6 @@ import com.microsoft.azure.management.website.HostNameSslState; import com.microsoft.azure.management.website.SslState; import com.microsoft.azure.management.website.WebAppBase; -import com.microsoft.rest.serializer.JsonFlatten; -import retrofit2.http.Body; -import retrofit2.http.Headers; -import retrofit2.http.PUT; -import retrofit2.http.Path; -import retrofit2.http.Query; import rx.Observable; import rx.functions.Action1; import rx.functions.Func1; @@ -50,13 +43,11 @@ class HostNameSslBindingImpl< private Observable newCertificateOrder; private final AppServiceManager manager; private final FluentImplT parent; - private final VerifyDomainOwnershipService verifyDomainOwnershipService; HostNameSslBindingImpl(HostNameSslState inner, FluentImplT parent, AppServiceManager manager) { super(inner); this.parent = parent; this.manager = manager; - this.verifyDomainOwnershipService = manager.restClient().retrofit().create(VerifyDomainOwnershipService.class); } @Override @@ -97,7 +88,7 @@ public HostNameSslBindingImpl withPfxCertificateToUpload(f } @Override - public HostNameSslBindingImpl withNewAppServiceCertificateOrder(final String certificateOrderName, CertificateProductType productType) { + public HostNameSslBindingImpl withNewStandardAppServiceCertificateOrder(final String certificateOrderName, CertificateProductType productType) { this.newCertificateOrder = manager.certificateOrders().define(certificateOrderName) .withExistingResourceGroup(parent().resourceGroupName()) .withHostName(name()) @@ -107,13 +98,10 @@ public HostNameSslBindingImpl withNewAppServiceCertificate .flatMap(new Func1>() { @Override public Observable call(final AppServiceCertificateOrder appServiceCertificateOrder) { - return verifyDomainOwnershipService.verifyDomainOwnership( - manager.subscriptionId(), parent().resourceGroupName(), parent().name(), - certificateOrderName, new DomainOwnershipIdentifier().withOwnershipId(appServiceCertificateOrder.domainVerificationToken()), - "2016-08-01") - .map(new Func1() { + return parent().verifyDomainOwnershipAsync(appServiceCertificateOrder.name(), appServiceCertificateOrder.domainVerificationToken()) + .map(new Func1() { @Override - public AppServiceCertificateOrder call(DomainOwnershipIdentifier domainOwnershipIdentifier) { + public AppServiceCertificateOrder call(Void aVoid) { return appServiceCertificateOrder; } }); @@ -228,21 +216,4 @@ public Observable call(final Map.Entry verifyDomainOwnership(@Path("subscriptionId") String subscriptionId, @Path("resourceGroupName") String resourceGroupName, @Path("name") String siteName, @Path("domainOwnershipIdentifierName") String domainOwnershipIdentifierName, @Body DomainOwnershipIdentifier domainOwnershipIdentifier, @Query("api-version") String apiVersion); - } - - @JsonFlatten - private static class DomainOwnershipIdentifier { - @JsonProperty(value = "properties.id") - private String ownershipId; - - private DomainOwnershipIdentifier withOwnershipId(String ownershipId) { - this.ownershipId = ownershipId; - return this; - } - } } diff --git a/azure-mgmt-website/src/main/java/com/microsoft/azure/management/website/implementation/WebAppImpl.java b/azure-mgmt-website/src/main/java/com/microsoft/azure/management/website/implementation/WebAppImpl.java index f78afb9af1733..c477710e6e15b 100644 --- a/azure-mgmt-website/src/main/java/com/microsoft/azure/management/website/implementation/WebAppImpl.java +++ b/azure-mgmt-website/src/main/java/com/microsoft/azure/management/website/implementation/WebAppImpl.java @@ -142,6 +142,24 @@ public WebAppSourceControl getSourceControl() { return new WebAppSourceControlImpl<>(siteSourceControlInner, this, myManager); } + @Override + public void verifyDomainOwnership(String certificateOrderName, String domainVerificationToken) { + verifyDomainOwnershipAsync(certificateOrderName, domainVerificationToken).toBlocking().subscribe(); + } + + @Override + public Observable verifyDomainOwnershipAsync(String certificateOrderName, String domainVerificationToken) { + IdentifierInner identifierInner = new IdentifierInner().withIdentifierId(domainVerificationToken); + identifierInner.withLocation("global"); + return client.createOrUpdateDomainOwnershipIdentifierAsync(resourceGroupName(), name(), certificateOrderName, identifierInner) + .map(new Func1() { + @Override + public Void call(IdentifierInner identifierInner) { + return null; + } + }); + } + @Override public void start() { client.start(resourceGroupName(), name()); diff --git a/azure-mgmt-website/src/main/java/com/microsoft/azure/management/website/implementation/WebAppSourceControlImpl.java b/azure-mgmt-website/src/main/java/com/microsoft/azure/management/website/implementation/WebAppSourceControlImpl.java index 406fd7659b271..2ff3f9367daef 100644 --- a/azure-mgmt-website/src/main/java/com/microsoft/azure/management/website/implementation/WebAppSourceControlImpl.java +++ b/azure-mgmt-website/src/main/java/com/microsoft/azure/management/website/implementation/WebAppSourceControlImpl.java @@ -10,11 +10,6 @@ import com.microsoft.azure.management.resources.fluentcore.utils.Utils; import com.microsoft.azure.management.website.WebAppBase; import com.microsoft.azure.management.website.WebAppSourceControl; -import retrofit2.http.Body; -import retrofit2.http.Headers; -import retrofit2.http.PUT; -import retrofit2.http.Path; -import retrofit2.http.Query; import rx.Observable; /** @@ -30,14 +25,14 @@ class WebAppSourceControlImpl< WebAppSourceControl.Definition>, WebAppSourceControl.UpdateDefinition> { - private WebAppBaseImpl parent; + private final WebAppBaseImpl parent; + private final WebSiteManagementClientImpl serviceClient; private String githubAccessToken; - private SourceControlService sourceControlService; - WebAppSourceControlImpl(SiteSourceControlInner inner, WebAppBaseImpl parent, AppServiceManager manager) { + WebAppSourceControlImpl(SiteSourceControlInner inner, WebAppBaseImpl parent, WebSiteManagementClientImpl serviceClient) { super(inner); this.parent = parent; - this.sourceControlService = manager.restClient().retrofit().create(SourceControlService.class); + this.serviceClient = serviceClient; } @Override @@ -137,12 +132,6 @@ Observable registerGithubAccessToken() { if (githubAccessToken == null) { return Observable.just(null); } - return sourceControlService.updateSourceControl("Github", new SourceControlInner().withToken(githubAccessToken), "2016-03-01"); - } - - private interface SourceControlService { - @Headers("Content-Type: application/json; charset=utf-8") - @PUT("/providers/Microsoft.Web/sourcecontrols/{sourceControlIdentifier}") - Observable updateSourceControl(@Path("sourceControlIdentifier") String sourceControlIdentifier, @Body SourceControlInner sourceControl, @Query("api-version") String apiVersion); + return serviceClient.updateSourceControlAsync("Github", new SourceControlInner().withToken(githubAccessToken)); } } diff --git a/azure-mgmt-website/src/test/java/com/microsoft/azure/management/website/CertificateOrdersTests.java b/azure-mgmt-website/src/test/java/com/microsoft/azure/management/website/CertificateOrdersTests.java index 1020174d36c3a..afe1b79da8bd8 100644 --- a/azure-mgmt-website/src/test/java/com/microsoft/azure/management/website/CertificateOrdersTests.java +++ b/azure-mgmt-website/src/test/java/com/microsoft/azure/management/website/CertificateOrdersTests.java @@ -15,7 +15,7 @@ public class CertificateOrdersTests extends AppServiceTestBase { private static final String RG_NAME = "javacsmrg319"; - private static final String CERTIFICATE_NAME = "javawildcert319"; + private static final String CERTIFICATE_NAME = "graphwildcert319"; @BeforeClass public static void setup() throws Exception { @@ -33,7 +33,7 @@ public void canCRUDCertificateOrder() throws Exception { AppServiceCertificateOrder certificateOrder = appServiceManager.certificateOrders() .define(CERTIFICATE_NAME) .withExistingResourceGroup(RG_NAME) - .withHostName("javatest319.com") + .withHostName("*.graph-webapp-319.com") .withSku(CertificateProductType.STANDARD_DOMAIN_VALIDATED_WILD_CARD_SSL) .withValidYears(1) .create(); diff --git a/azure-samples/src/main/java/com/microsoft/azure/management/website/samples/ManageAppService.java b/azure-samples/src/main/java/com/microsoft/azure/management/website/samples/ManageAppService.java index b8c0222dadb91..c1cc41870c96a 100644 --- a/azure-samples/src/main/java/com/microsoft/azure/management/website/samples/ManageAppService.java +++ b/azure-samples/src/main/java/com/microsoft/azure/management/website/samples/ManageAppService.java @@ -66,14 +66,14 @@ public static void main(String[] args) { .authenticate(credFile) .withDefaultSubscription(); - azure.webApps().getByGroup("javacsmrg319", "java-webapp-319") - .update() - .defineSourceControl() - .withPublicExternalRepository() - .withGit("https://github.com/jianghaolu/azure-site-test") - .withBranch("master") - .attach() - .apply(); +// azure.webApps().getByGroup("javacsmrg319", "java-webapp-319") +// .update() +// .defineSourceControl() +// .withPublicExternalRepository() +// .withGit("https://github.com/jianghaolu/azure-site-test") +// .withBranch("master") +// .attach() +// .apply(); // Print selected subscription System.out.println("Selected subscription: " + azure.subscriptionId()); From a0486da422d1863b61f999e0e48f8b7a20138a59 Mon Sep 17 00:00:00 2001 From: Jianghao Lu Date: Fri, 2 Dec 2016 01:50:39 -0800 Subject: [PATCH 06/10] Move domain verification to certificate order --- .../website/AppServiceCertificate.java | 8 +- .../website/AppServiceCertificateOrder.java | 73 +++++++- .../website/HostNameSslBinding.java | 10 +- .../AppServiceCertificateImpl.java | 43 +++-- .../AppServiceCertificateOrderImpl.java | 97 +++++++++- .../implementation/AppServiceManager.java | 2 +- .../implementation/DeploymentSlotImpl.java | 6 +- .../implementation/DeploymentSlotsImpl.java | 8 +- .../HostNameSslBindingImpl.java | 103 +++-------- .../implementation/WebAppBaseImpl.java | 50 +++-- .../website/implementation/WebAppImpl.java | 8 +- .../website/implementation/WebAppsImpl.java | 8 +- .../website/CertificateOrdersTests.java | 5 +- .../management/website/CertificatesTests.java | 2 +- .../management/website/WebAppsTests.java | 2 +- .../website/samples/ManageAppService.java | 174 ++++++++++++++---- 16 files changed, 426 insertions(+), 173 deletions(-) diff --git a/azure-mgmt-website/src/main/java/com/microsoft/azure/management/website/AppServiceCertificate.java b/azure-mgmt-website/src/main/java/com/microsoft/azure/management/website/AppServiceCertificate.java index 686a0394d9cc1..89760ebfbe13c 100644 --- a/azure-mgmt-website/src/main/java/com/microsoft/azure/management/website/AppServiceCertificate.java +++ b/azure-mgmt-website/src/main/java/com/microsoft/azure/management/website/AppServiceCertificate.java @@ -156,13 +156,11 @@ 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. diff --git a/azure-mgmt-website/src/main/java/com/microsoft/azure/management/website/AppServiceCertificateOrder.java b/azure-mgmt-website/src/main/java/com/microsoft/azure/management/website/AppServiceCertificateOrder.java index 6818bcd34af77..58357d45487e9 100644 --- a/azure-mgmt-website/src/main/java/com/microsoft/azure/management/website/AppServiceCertificateOrder.java +++ b/azure-mgmt-website/src/main/java/com/microsoft/azure/management/website/AppServiceCertificateOrder.java @@ -7,6 +7,7 @@ package com.microsoft.azure.management.website; 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; @@ -137,7 +138,8 @@ interface Definition extends DefinitionStages.Blank, DefinitionStages.WithHostName, DefinitionStages.WithCertificateSku, - DefinitionStages.WithValidYears, + DefinitionStages.WithDomainVerificationFromWebApp, + DefinitionStages.WithKeyVault, DefinitionStages.WithCreate { } @@ -168,13 +170,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); } /** @@ -208,6 +272,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/HostNameSslBinding.java b/azure-mgmt-website/src/main/java/com/microsoft/azure/management/website/HostNameSslBinding.java index 7ca089b42ab4b..61bc79e6a0f5f 100644 --- a/azure-mgmt-website/src/main/java/com/microsoft/azure/management/website/HostNameSslBinding.java +++ b/azure-mgmt-website/src/main/java/com/microsoft/azure/management/website/HostNameSslBinding.java @@ -88,17 +88,16 @@ interface WithCertificate { /** * 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 withNewStandardAppServiceCertificateOrder(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); } /** @@ -204,17 +203,16 @@ interface WithCertificate { /** * 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 withNewStandardAppServiceCertificateOrder(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/implementation/AppServiceCertificateImpl.java b/azure-mgmt-website/src/main/java/com/microsoft/azure/management/website/implementation/AppServiceCertificateImpl.java index a0fc752ff7407..a2f25d401ae61 100644 --- a/azure-mgmt-website/src/main/java/com/microsoft/azure/management/website/implementation/AppServiceCertificateImpl.java +++ b/azure-mgmt-website/src/main/java/com/microsoft/azure/management/website/implementation/AppServiceCertificateImpl.java @@ -9,6 +9,8 @@ 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.AppServiceCertificateKeyVaultBinding; +import com.microsoft.azure.management.website.AppServiceCertificateOrder; import com.microsoft.azure.management.website.AppServicePlan; import com.microsoft.azure.management.website.HostingEnvironmentProfile; import org.joda.time.DateTime; @@ -37,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); @@ -126,17 +129,35 @@ public AppServiceCertificate refresh() { @Override public Observable createResourceAsync() { - Observable pfxBytes = Observable.just(pfxBlob()); + Observable pfxBytes = Observable.just(null); if (pfxFileUrl != null) { - pfxBytes = Utils.downloadFileAsync(pfxFileUrl, myManager.restClient().retrofit()); + pfxBytes = Utils.downloadFileAsync(pfxFileUrl, myManager.restClient().retrofit()) + .map(new Func1() { + @Override + public Void call(byte[] bytes) { + inner().withPfxBlob(bytes); + return null; + } + }); } - return pfxBytes.flatMap(new Func1>() { - @Override - public Observable call(byte[] 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 @@ -162,8 +183,8 @@ 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; } diff --git a/azure-mgmt-website/src/main/java/com/microsoft/azure/management/website/implementation/AppServiceCertificateOrderImpl.java b/azure-mgmt-website/src/main/java/com/microsoft/azure/management/website/implementation/AppServiceCertificateOrderImpl.java index c5123fb0400b5..11fa9bafe5d96 100644 --- a/azure-mgmt-website/src/main/java/com/microsoft/azure/management/website/implementation/AppServiceCertificateOrderImpl.java +++ b/azure-mgmt-website/src/main/java/com/microsoft/azure/management/website/implementation/AppServiceCertificateOrderImpl.java @@ -7,7 +7,9 @@ package com.microsoft.azure.management.website.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; @@ -16,6 +18,7 @@ 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.website.WebAppBase; import org.joda.time.DateTime; import rx.Observable; import rx.functions.Func1; @@ -37,10 +40,14 @@ class AppServiceCertificateOrderImpl final AppServiceCertificateOrdersInner client; + 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"); + this.withRegion("global").withValidYears(1); } @Override @@ -118,6 +125,9 @@ public CertificateOrderStatus status() { @Override public CertificateDetailsImpl signedCertificate() { + if (inner().signedCertificate() == null) { + return null; + } return new CertificateDetailsImpl(inner().signedCertificate()); } @@ -128,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()); } @@ -179,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; } @@ -192,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 @@ -201,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/AppServiceManager.java b/azure-mgmt-website/src/main/java/com/microsoft/azure/management/website/implementation/AppServiceManager.java index 0909385665f32..90270c2414b06 100644 --- a/azure-mgmt-website/src/main/java/com/microsoft/azure/management/website/implementation/AppServiceManager.java +++ b/azure-mgmt-website/src/main/java/com/microsoft/azure/management/website/implementation/AppServiceManager.java @@ -116,7 +116,7 @@ RestClient restClient() { */ public WebApps webApps() { if (webApps == null) { - webApps = new WebAppsImpl(innerManagementClient.webApps(), this); + webApps = new WebAppsImpl(innerManagementClient.webApps(), this, innerManagementClient); } return webApps; } diff --git a/azure-mgmt-website/src/main/java/com/microsoft/azure/management/website/implementation/DeploymentSlotImpl.java b/azure-mgmt-website/src/main/java/com/microsoft/azure/management/website/implementation/DeploymentSlotImpl.java index 3c24e83ec0bfb..dc3788e6cd5b3 100644 --- a/azure-mgmt-website/src/main/java/com/microsoft/azure/management/website/implementation/DeploymentSlotImpl.java +++ b/azure-mgmt-website/src/main/java/com/microsoft/azure/management/website/implementation/DeploymentSlotImpl.java @@ -32,8 +32,8 @@ class DeploymentSlotImpl private final WebAppImpl parent; private final String name; - DeploymentSlotImpl(String name, SiteInner innerObject, SiteConfigInner configObject, final WebAppImpl parent, final WebAppsInner client, AppServiceManager manager) { - super(name.replaceAll(".*/", ""), innerObject, configObject, client, manager); + DeploymentSlotImpl(String name, SiteInner innerObject, SiteConfigInner configObject, final WebAppImpl parent, final WebAppsInner client, AppServiceManager manager, WebSiteManagementClientImpl serviceClient) { + super(name.replaceAll(".*/", ""), innerObject, configObject, client, manager, serviceClient); this.name = name.replaceAll(".*/", ""); this.parent = parent; } @@ -200,7 +200,7 @@ public PublishingCredentials getPublishingCredentials() { @Override public WebAppSourceControl getSourceControl() { SiteSourceControlInner siteSourceControlInner = client.getSourceControlSlot(resourceGroupName(), parent().name(), name()); - return new WebAppSourceControlImpl<>(siteSourceControlInner, this, myManager); + return new WebAppSourceControlImpl<>(siteSourceControlInner, this, serviceClient); } @Override diff --git a/azure-mgmt-website/src/main/java/com/microsoft/azure/management/website/implementation/DeploymentSlotsImpl.java b/azure-mgmt-website/src/main/java/com/microsoft/azure/management/website/implementation/DeploymentSlotsImpl.java index c71d93c899f3e..8ba22e14ffc49 100644 --- a/azure-mgmt-website/src/main/java/com/microsoft/azure/management/website/implementation/DeploymentSlotsImpl.java +++ b/azure-mgmt-website/src/main/java/com/microsoft/azure/management/website/implementation/DeploymentSlotsImpl.java @@ -30,9 +30,11 @@ class DeploymentSlotsImpl private final PagedListConverter converter; private final WebAppImpl parent; + private final WebSiteManagementClientImpl serviceClient; - DeploymentSlotsImpl(final WebAppImpl parent, final WebAppsInner innerCollection, AppServiceManager manager) { + DeploymentSlotsImpl(final WebAppImpl parent, final WebAppsInner innerCollection, AppServiceManager manager, WebSiteManagementClientImpl serviceClient) { super(innerCollection, manager); + this.serviceClient = serviceClient; this.parent = parent; converter = new PagedListConverter() { @@ -46,7 +48,7 @@ public DeploymentSlot typeConvert(SiteInner siteInner) { @Override protected DeploymentSlotImpl wrapModel(String name) { - return new DeploymentSlotImpl(name, new SiteInner(), null, parent, innerCollection, super.manager) + return new DeploymentSlotImpl(name, new SiteInner(), null, parent, innerCollection, super.manager, serviceClient) .withRegion(parent.regionName()) .withExistingResourceGroup(parent.resourceGroupName()); } @@ -61,7 +63,7 @@ protected DeploymentSlotImpl wrapModel(SiteInner inner) { configInner = new SiteConfigInner(); configInner.withLocation(inner.location()); } - return new DeploymentSlotImpl(inner.name(), inner, configInner, parent, innerCollection, super.manager); + return new DeploymentSlotImpl(inner.name(), inner, configInner, parent, innerCollection, super.manager, serviceClient); } protected PagedList wrapList(PagedList pagedList) { diff --git a/azure-mgmt-website/src/main/java/com/microsoft/azure/management/website/implementation/HostNameSslBindingImpl.java b/azure-mgmt-website/src/main/java/com/microsoft/azure/management/website/implementation/HostNameSslBindingImpl.java index 238bbc6e0e4ce..be52d3f1b51ea 100644 --- a/azure-mgmt-website/src/main/java/com/microsoft/azure/management/website/implementation/HostNameSslBindingImpl.java +++ b/azure-mgmt-website/src/main/java/com/microsoft/azure/management/website/implementation/HostNameSslBindingImpl.java @@ -5,15 +5,11 @@ */ package com.microsoft.azure.management.website.implementation; -import com.google.common.collect.Maps; import com.microsoft.azure.management.apigeneration.Fluent; -import com.microsoft.azure.management.keyvault.SecretPermissions; import com.microsoft.azure.management.keyvault.Vault; import com.microsoft.azure.management.resources.fluentcore.model.implementation.IndexableWrapperImpl; import com.microsoft.azure.management.website.AppServiceCertificate; -import com.microsoft.azure.management.website.AppServiceCertificateKeyVaultBinding; import com.microsoft.azure.management.website.AppServiceCertificateOrder; -import com.microsoft.azure.management.website.CertificateProductType; import com.microsoft.azure.management.website.HostNameSslBinding; import com.microsoft.azure.management.website.HostNameSslState; import com.microsoft.azure.management.website.SslState; @@ -21,10 +17,8 @@ import rx.Observable; import rx.functions.Action1; import rx.functions.Func1; -import rx.functions.Func2; import java.io.File; -import java.util.Map; /** * Implementation for {@link HostNameSslBinding} and its create and update interfaces. @@ -40,7 +34,7 @@ class HostNameSslBindingImpl< HostNameSslBinding.UpdateDefinition> { private Observable newCertificate; - private Observable newCertificateOrder; + private AppServiceCertificateOrder.DefinitionStages.WithKeyVault certificateInDefinition; private final AppServiceManager manager; private final FluentImplT parent; @@ -88,41 +82,22 @@ public HostNameSslBindingImpl withPfxCertificateToUpload(f } @Override - public HostNameSslBindingImpl withNewStandardAppServiceCertificateOrder(final String certificateOrderName, CertificateProductType productType) { - this.newCertificateOrder = manager.certificateOrders().define(certificateOrderName) + public HostNameSslBindingImpl withNewStandardSslCertificateOrder(final String certificateOrderName) { + this.certificateInDefinition = manager.certificateOrders().define(certificateOrderName) .withExistingResourceGroup(parent().resourceGroupName()) .withHostName(name()) - .withSku(productType) - .withValidYears(1) - .createAsync() - .flatMap(new Func1>() { - @Override - public Observable call(final AppServiceCertificateOrder appServiceCertificateOrder) { - return parent().verifyDomainOwnershipAsync(appServiceCertificateOrder.name(), appServiceCertificateOrder.domainVerificationToken()) - .map(new Func1() { - @Override - public AppServiceCertificateOrder call(Void aVoid) { - return appServiceCertificateOrder; - } - }); - } - }); + .withStandardSku() + .withWebAppVerification(parent()); return this; } @Override - public HostNameSslBindingImpl withReadyToUseAppServiceCertificateOrder(AppServiceCertificateOrder certificateOrder) { - newCertificate = certificateOrder.getKeyVaultBindingAsync() - .flatMap(new Func1>() { - @Override - public Observable call(AppServiceCertificateKeyVaultBinding binding) { - return manager.certificates().define(name() + "cert") - .withRegion(parent().region()) - .withExistingResourceGroup(parent().resourceGroupName()) - .withCertificateOrderKeyVaultBinding(binding.keyVaultId(), binding.keyVaultSecretName()) - .createAsync(); - } - }); + public HostNameSslBindingImpl withExistingAppServiceCertificateOrder(final AppServiceCertificateOrder certificateOrder) { + newCertificate = manager.certificates().define(name() + "cert") + .withRegion(parent().region()) + .withExistingResourceGroup(parent().resourceGroupName()) + .withExistingCertificateOrder(certificateOrder) + .createAsync(); return this; } @@ -163,27 +138,17 @@ public HostNameSslBindingImpl forHostname(String hostname) return this; } - private Observable createBindingAndCertificate(final AppServiceCertificateOrder order, final Vault vault) { - return order.createKeyVaultBindingAsync(order.name(), vault) - .flatMap(new Func1>() { - @Override - public Observable call(AppServiceCertificateKeyVaultBinding binding) { - return manager.certificates().define(order.name()) - .withRegion(parent().regionName()) - .withExistingResourceGroup(parent().resourceGroupName()) - .withCertificateOrderKeyVaultBinding(vault.id(), order.name()) - .createAsync(); - } - }); - } - @Override public HostNameSslBindingImpl withExistingKeyVault(final Vault vault) { - newCertificate = newCertificateOrder + newCertificate = certificateInDefinition.withExistingKeyVault(vault).createAsync() .flatMap(new Func1>() { @Override public Observable call(AppServiceCertificateOrder appServiceCertificateOrder) { - return createBindingAndCertificate(appServiceCertificateOrder, vault); + return manager.certificates().define(appServiceCertificateOrder.name()) + .withRegion(parent().regionName()) + .withExistingResourceGroup(parent().resourceGroupName()) + .withExistingCertificateOrder(appServiceCertificateOrder) + .createAsync(); } }); return this; @@ -191,29 +156,17 @@ public Observable call(AppServiceCertificateOrder appServ @Override public HostNameSslBindingImpl withNewKeyVault(String vaultName) { - Observable vaultObservable = manager.keyVaultManager().vaults().define(vaultName) - .withRegion(parent().region()) - .withExistingResourceGroup(parent().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(); - newCertificate = Observable.zip(newCertificateOrder, vaultObservable, new Func2>() { - @Override - public Map.Entry call(AppServiceCertificateOrder appServiceCertificateOrder, Vault vault) { - return Maps.immutableEntry(appServiceCertificateOrder, vault); - } - }).flatMap(new Func1, Observable>() { - @Override - public Observable call(final Map.Entry entry) { - return createBindingAndCertificate(entry.getKey(), entry.getValue()); - } - }); + newCertificate = certificateInDefinition.withNewKeyVault(vaultName, parent().region()).createAsync() + .flatMap(new Func1>() { + @Override + public Observable call(AppServiceCertificateOrder appServiceCertificateOrder) { + return manager.certificates().define(appServiceCertificateOrder.name()) + .withRegion(parent().regionName()) + .withExistingResourceGroup(parent().resourceGroupName()) + .withExistingCertificateOrder(appServiceCertificateOrder) + .createAsync(); + } + }); return this; } } diff --git a/azure-mgmt-website/src/main/java/com/microsoft/azure/management/website/implementation/WebAppBaseImpl.java b/azure-mgmt-website/src/main/java/com/microsoft/azure/management/website/implementation/WebAppBaseImpl.java index f5b2cb704a2ca..a1229589cc4b4 100644 --- a/azure-mgmt-website/src/main/java/com/microsoft/azure/management/website/implementation/WebAppBaseImpl.java +++ b/azure-mgmt-website/src/main/java/com/microsoft/azure/management/website/implementation/WebAppBaseImpl.java @@ -66,6 +66,7 @@ abstract class WebAppBaseImpl< WebAppBase.Update { final WebAppsInner client; + final WebSiteManagementClientImpl serviceClient; private Set hostNamesSet; private Set enabledHostNamesSet; @@ -85,9 +86,10 @@ abstract class WebAppBaseImpl< private WebAppSourceControlImpl sourceControl; private boolean sourceControlToDelete; - WebAppBaseImpl(String name, SiteInner innerObject, SiteConfigInner configObject, final WebAppsInner client, AppServiceManager manager) { + WebAppBaseImpl(String name, SiteInner innerObject, SiteConfigInner configObject, final WebAppsInner client, AppServiceManager manager, WebSiteManagementClientImpl serviceClient) { super(name, innerObject, manager); this.client = client; + this.serviceClient = serviceClient; this.inner().withSiteConfig(configObject); normalizeProperties(); } @@ -455,23 +457,6 @@ public Observable call(String s) { return createOrUpdateInner(inner()); } }) - // submit config - .flatMap(new Func1>() { - @Override - public Observable call(final SiteInner siteInner) { - if (inner().siteConfig() == null) { - return Observable.just(siteInner); - } - return createOrUpdateSiteConfig(inner().siteConfig()) - .flatMap(new Func1>() { - @Override - public Observable call(SiteConfigInner siteConfigInner) { - siteInner.withSiteConfig(siteConfigInner); - return Observable.just(siteInner); - } - }); - } - }) // Submit hostname bindings .flatMap(new Func1>() { @Override @@ -512,10 +497,18 @@ public Observable call(SiteInner site) { @Override public Observable call(final SiteInner siteInner) { List> certs = new ArrayList<>(); + Map sslMap = new HashMap<>( + Maps.uniqueIndex(siteInner.hostNameSslStates(), new Function() { + @Override + public String apply(HostNameSslState input) { + return input.name(); + } + })); for (final HostNameSslBindingImpl binding : sslBindingsToCreate.values()) { certs.add(binding.newCertificate()); - siteInner.hostNameSslStates().add(binding.inner().withToUpdate(true)); + sslMap.put(binding.inner().name(), binding.inner().withToUpdate(true)); } + siteInner.withHostNameSslStates(new ArrayList<>(sslMap.values())); if (certs.isEmpty()) { return Observable.just(siteInner); } else { @@ -533,6 +526,23 @@ public Observable call(SiteInner inner) { } } }) + // submit config + .flatMap(new Func1>() { + @Override + public Observable call(final SiteInner siteInner) { + if (inner().siteConfig() == null) { + return Observable.just(siteInner); + } + return createOrUpdateSiteConfig(inner().siteConfig()) + .flatMap(new Func1>() { + @Override + public Observable call(SiteConfigInner siteConfigInner) { + siteInner.withSiteConfig(siteConfigInner); + return Observable.just(siteInner); + } + }); + } + }) // app settings .flatMap(new Func1>() { @Override @@ -1054,7 +1064,7 @@ FluentImplT withSourceControl(WebAppSourceControlImpl sour @Override public WebAppSourceControlImpl defineSourceControl() { - return new WebAppSourceControlImpl<>(new SiteSourceControlInner(), this, myManager); + return new WebAppSourceControlImpl<>(new SiteSourceControlInner(), this, serviceClient); } @Override diff --git a/azure-mgmt-website/src/main/java/com/microsoft/azure/management/website/implementation/WebAppImpl.java b/azure-mgmt-website/src/main/java/com/microsoft/azure/management/website/implementation/WebAppImpl.java index c477710e6e15b..37da3d0edb8d2 100644 --- a/azure-mgmt-website/src/main/java/com/microsoft/azure/management/website/implementation/WebAppImpl.java +++ b/azure-mgmt-website/src/main/java/com/microsoft/azure/management/website/implementation/WebAppImpl.java @@ -38,8 +38,8 @@ class WebAppImpl private DeploymentSlots deploymentSlots; private AppServicePlanImpl appServicePlan; - WebAppImpl(String name, SiteInner innerObject, SiteConfigInner configObject, final WebAppsInner client, AppServiceManager manager) { - super(name, innerObject, configObject, client, manager); + WebAppImpl(String name, SiteInner innerObject, SiteConfigInner configObject, final WebAppsInner client, AppServiceManager manager, WebSiteManagementClientImpl serviceClient) { + super(name, innerObject, configObject, client, manager, serviceClient); } @Override @@ -110,7 +110,7 @@ public Void call(Object o) { @Override public DeploymentSlots deploymentSlots() { if (deploymentSlots == null) { - deploymentSlots = new DeploymentSlotsImpl(this, client, myManager); + deploymentSlots = new DeploymentSlotsImpl(this, client, myManager, serviceClient); } return deploymentSlots; } @@ -139,7 +139,7 @@ public PublishingCredentials getPublishingCredentials() { @Override public WebAppSourceControl getSourceControl() { SiteSourceControlInner siteSourceControlInner = client.getSourceControl(resourceGroupName(), name()); - return new WebAppSourceControlImpl<>(siteSourceControlInner, this, myManager); + return new WebAppSourceControlImpl<>(siteSourceControlInner, this, serviceClient); } @Override diff --git a/azure-mgmt-website/src/main/java/com/microsoft/azure/management/website/implementation/WebAppsImpl.java b/azure-mgmt-website/src/main/java/com/microsoft/azure/management/website/implementation/WebAppsImpl.java index 377b53474d9dd..d370b06a44a8b 100644 --- a/azure-mgmt-website/src/main/java/com/microsoft/azure/management/website/implementation/WebAppsImpl.java +++ b/azure-mgmt-website/src/main/java/com/microsoft/azure/management/website/implementation/WebAppsImpl.java @@ -27,9 +27,11 @@ class WebAppsImpl implements WebApps { private final PagedListConverter converter; + private final WebSiteManagementClientImpl serviceClient; - WebAppsImpl(final WebAppsInner innerCollection, AppServiceManager manager) { + WebAppsImpl(final WebAppsInner innerCollection, AppServiceManager manager, WebSiteManagementClientImpl serviceClient) { super(innerCollection, manager); + this.serviceClient = serviceClient; converter = new PagedListConverter() { @Override @@ -57,7 +59,7 @@ public WebApp getByGroup(String groupName, String name) { @Override protected WebAppImpl wrapModel(String name) { - return new WebAppImpl(name, new SiteInner(), null, innerCollection, super.myManager); + return new WebAppImpl(name, new SiteInner(), null, innerCollection, super.myManager, serviceClient); } @Override @@ -70,7 +72,7 @@ protected WebAppImpl wrapModel(SiteInner inner) { configInner = new SiteConfigInner(); configInner.withLocation(inner.location()); } - return new WebAppImpl(inner.name(), inner, configInner, innerCollection, super.myManager); + return new WebAppImpl(inner.name(), inner, configInner, innerCollection, super.myManager, serviceClient); } protected PagedList wrapList(PagedList pagedList) { diff --git a/azure-mgmt-website/src/test/java/com/microsoft/azure/management/website/CertificateOrdersTests.java b/azure-mgmt-website/src/test/java/com/microsoft/azure/management/website/CertificateOrdersTests.java index afe1b79da8bd8..7707f757360b0 100644 --- a/azure-mgmt-website/src/test/java/com/microsoft/azure/management/website/CertificateOrdersTests.java +++ b/azure-mgmt-website/src/test/java/com/microsoft/azure/management/website/CertificateOrdersTests.java @@ -6,6 +6,7 @@ package com.microsoft.azure.management.website; +import com.microsoft.azure.management.resources.fluentcore.arm.Region; import org.junit.AfterClass; import org.junit.Assert; import org.junit.BeforeClass; @@ -34,7 +35,9 @@ public void canCRUDCertificateOrder() throws Exception { .define(CERTIFICATE_NAME) .withExistingResourceGroup(RG_NAME) .withHostName("*.graph-webapp-319.com") - .withSku(CertificateProductType.STANDARD_DOMAIN_VALIDATED_WILD_CARD_SSL) + .withWildcardSku() + .withDomainVerification(appServiceManager.domains().getByGroup(RG_NAME, "graph-webapp-319.com")) + .withNewKeyVault("graphvault", Region.US_WEST) .withValidYears(1) .create(); Assert.assertNotNull(certificateOrder); diff --git a/azure-mgmt-website/src/test/java/com/microsoft/azure/management/website/CertificatesTests.java b/azure-mgmt-website/src/test/java/com/microsoft/azure/management/website/CertificatesTests.java index d43964c5d83c5..70eafaabbdfac 100644 --- a/azure-mgmt-website/src/test/java/com/microsoft/azure/management/website/CertificatesTests.java +++ b/azure-mgmt-website/src/test/java/com/microsoft/azure/management/website/CertificatesTests.java @@ -35,7 +35,7 @@ public void canCRDCertificate() throws Exception { AppServiceCertificate certificate = appServiceManager.certificates().define("bananacert") .withRegion(Region.US_WEST) .withExistingResourceGroup(RG_NAME) - .withCertificateOrderKeyVaultBinding(vault.id(), "bananagraphwebapp319com") + .withExistingCertificateOrder(appServiceManager.certificateOrders().getByGroup(RG_NAME, "graphwebapp319")) .create(); Assert.assertNotNull(certificate); diff --git a/azure-mgmt-website/src/test/java/com/microsoft/azure/management/website/WebAppsTests.java b/azure-mgmt-website/src/test/java/com/microsoft/azure/management/website/WebAppsTests.java index 9433ead39a9bf..82f78cd2176a1 100644 --- a/azure-mgmt-website/src/test/java/com/microsoft/azure/management/website/WebAppsTests.java +++ b/azure-mgmt-website/src/test/java/com/microsoft/azure/management/website/WebAppsTests.java @@ -37,7 +37,7 @@ public void canCRUDWebApp() throws Exception { .withManagedHostnameBindings(domain, "pineapple") .defineSslBinding() .forHostname("pineapple.graph-webapp-319.com") - .withReadyToUseAppServiceCertificateOrder(appServiceManager.certificateOrders().getByGroup(RG_NAME, "graphwildcert")) + .withExistingAppServiceCertificateOrder(appServiceManager.certificateOrders().getByGroup(RG_NAME, "graphwildcert")) // .withNewKeyVault("orangecertvault") .withSniBasedSsl() .attach() diff --git a/azure-samples/src/main/java/com/microsoft/azure/management/website/samples/ManageAppService.java b/azure-samples/src/main/java/com/microsoft/azure/management/website/samples/ManageAppService.java index c1cc41870c96a..2e5d19e171501 100644 --- a/azure-samples/src/main/java/com/microsoft/azure/management/website/samples/ManageAppService.java +++ b/azure-samples/src/main/java/com/microsoft/azure/management/website/samples/ManageAppService.java @@ -8,15 +8,17 @@ package com.microsoft.azure.management.website.samples; import com.microsoft.azure.management.Azure; +import com.microsoft.azure.management.keyvault.Vault; import com.microsoft.azure.management.resources.fluentcore.arm.CountryISOCode; import com.microsoft.azure.management.resources.fluentcore.arm.CountryPhoneCode; import com.microsoft.azure.management.resources.fluentcore.arm.Region; import com.microsoft.azure.management.resources.fluentcore.utils.ResourceNamer; import com.microsoft.azure.management.samples.Utils; +import com.microsoft.azure.management.website.AppServiceCertificateOrder; import com.microsoft.azure.management.website.AppServiceDomain; import com.microsoft.azure.management.website.AppServicePricingTier; -import com.microsoft.azure.management.website.CertificateProductType; import com.microsoft.azure.management.website.CustomHostNameDnsRecordType; +import com.microsoft.azure.management.website.DeploymentSlot; import com.microsoft.azure.management.website.WebApp; import okhttp3.OkHttpClient; import okhttp3.Request; @@ -27,14 +29,23 @@ /** * Azure App Service sample for managing web apps - - * - Create 2 web apps under the same new app service plan - * - Authorize an application - * - Update a key vault - * - alter configurations - * - change permissions - * - Create another key vault - * - List key vaults - * - Delete a key vault. + * - app service plan, web app + * - Create 2 web apps under the same new app service plan + * - domain + * - Create a domain + * - certificate + * - Create a Wildcard SSL certificate for the domain + * - update 1st web app to use the domain and a new standard SSL certificate + * - update 2nd web app to use the domain and the created wildcard SSL certificate + * - slots + * - create 2 slots under 2nd web app and bind to the domain and the wildcard SSL certificate + * - turn on auto-swap for 2nd slot + * - set connection strings to a storage account on production slot and make them sticky + * - source control + * - bind a simple web app in a public GitHub repo to 2nd slot and have it auto-swapped to production + * - Verify the web app has access to the storage account + * - Delete a slot + * - Delete a web app */ public final class ManageAppService { @@ -47,9 +58,12 @@ public final class ManageAppService { public static void main(String[] args) { final String app1Name = ResourceNamer.randomResourceName("webapp1", 20); final String app2Name = ResourceNamer.randomResourceName("webapp2", 20); + final String slot1Name = ResourceNamer.randomResourceName("slot1", 20); + final String slot2Name = ResourceNamer.randomResourceName("slot2", 20); final String planName = ResourceNamer.randomResourceName("jplan", 15); final String domainName = ResourceNamer.randomResourceName("jsdk", 10) + ".com"; - final String certName = ResourceNamer.randomResourceName("democrt", 20); + final String cert1Name = ResourceNamer.randomResourceName("std1crt", 20); + final String cert2Name = ResourceNamer.randomResourceName("wild2crt", 20); final String vaultName = ResourceNamer.randomResourceName("demovault", 20); final String rgName = ResourceNamer.randomResourceName("rgNEMV", 24); @@ -66,15 +80,6 @@ public static void main(String[] args) { .authenticate(credFile) .withDefaultSubscription(); -// azure.webApps().getByGroup("javacsmrg319", "java-webapp-319") -// .update() -// .defineSourceControl() -// .withPublicExternalRepository() -// .withGit("https://github.com/jianghaolu/azure-site-test") -// .withBranch("master") -// .attach() -// .apply(); - // Print selected subscription System.out.println("Selected subscription: " + azure.subscriptionId()); try { @@ -130,6 +135,7 @@ public static void main(String[] args) { .withPhoneCountryCode(CountryPhoneCode.UNITED_STATES) .withPhoneNumber("4258828080") .attach() + .withDomainPrivacyEnabled(true) .create(); System.out.println("Purchased domain " + domain.name()); @@ -138,32 +144,138 @@ public static void main(String[] args) { //============================================================ // Bind domain to web app 1 - System.out.println("Binding https://app1." + domainName + " to web app " + app1Name + "..."); + System.out.println("Binding http://app1." + domainName + " to web app " + app1Name + "..."); - app1.update() + app1 = app1.update() .defineHostnameBinding() .withAzureManagedDomain(domain) .withSubDomain("app1") .withDnsRecordType(CustomHostNameDnsRecordType.CNAME) .attach() + .apply(); + + System.out.println("Finish binding http://app1." + domainName + " to web app " + app1Name + "..."); + Utils.print(app1); + + System.out.println("CURLing http://app1." + domainName); + System.out.println(curl("http://app1." + domainName)); + + //============================================================ + // Purchase a wild card SSL certificate (will be canceled for a full refund) + + System.out.println("Purchasing a wildcard SSL certificate " + cert2Name + "..."); + + Vault vault = azure.vaults().getByGroup("javatestrg", "javatestautovault"); + AppServiceCertificateOrder certificateOrder = azure.appServices().certificateOrders() + .define(cert2Name) + .withExistingResourceGroup(rgName) + .withHostName("*." + domainName) + .withWildcardSku() + .withDomainVerification(domain) + .withExistingKeyVault(vault) + .withValidYears(1) + .create(); + + System.out.println("Wildcard Certificate " + cert2Name + " is ready to use."); + Utils.print(certificateOrder); + + //============================================================ + // Bind domain to web app 2 and turn on wild card SSL + + System.out.println("Binding @/www/app2." + domainName + " to web app " + app2Name + "..."); + app2 = app2.update() + .withManagedHostnameBindings(domain, "app2", "@", "www") + .defineSslBinding() + .forHostname(domainName) + .withExistingAppServiceCertificateOrder(certificateOrder) + .withSniBasedSsl() + .attach() + .defineSslBinding() + .forHostname("www." + domainName) + .withExistingAppServiceCertificateOrder(certificateOrder) + .withSniBasedSsl() + .attach() .defineSslBinding() - .forHostname("app1." + domainName) - .withNewAppServiceCertificateOrder(certName, CertificateProductType.STANDARD_DOMAIN_VALIDATED_SSL) - .withNewKeyVault(vaultName) + .forHostname("app2." + domainName) + .withExistingAppServiceCertificateOrder(certificateOrder) .withSniBasedSsl() .attach() .apply(); - System.out.println("Finish binding https://app1." + domainName + " to web app " + app1Name + "..."); - Utils.print(app1); + System.out.println("Finished binding @/www/app2." + domainName + " to web app " + app2Name + "..."); + Utils.print(app2); + + System.out.println("CURLing https://www." + domainName); + System.out.println(curl("https://www." + domainName)); + + //============================================================ + // Create 2 slots under web app 2 + + // slot1.domainName.com - SSL off - autoswap on + System.out.println("Creating slot " + slot1Name + "..."); + + DeploymentSlot slot1 = app2.deploymentSlots().define(slot1Name) + .withBrandNewConfiguration() + .withManagedHostnameBindings(domain, "slot1") + .withAutoSwapSlotName("production") + .create(); - System.out.println("CURLing https://app1." + domainName); - System.out.println(curl("https://app1." + domainName)); + System.out.println("Created slot " + slot1Name + "..."); + Utils.print(slot1); + + // slot2.domainName.com - SSL on - autoswap on - storage account info + System.out.println("Creating another slot " + slot2Name + "..."); + + DeploymentSlot slot2 = app2.deploymentSlots().define(slot2Name) + .withConfigurationFromDeploymentSlot(slot1) + .withManagedHostnameBindings(domain, "slot2") + .defineSslBinding() + .forHostname("slot2." + domainName) + .withExistingAppServiceCertificateOrder(certificateOrder) + .withSniBasedSsl() + .attach() + .withStickyAppSetting("storageaccount", "account1") + .withStickyAppSetting("storageaccountkey", "key1") + .create(); + + System.out.println("Created slot " + slot2Name + "..."); + Utils.print(slot2); //============================================================ - // Bind domain to web app 2 and also purchase a certificate + // Update slot 1 + + System.out.println("Turning on SSL for slot " + slot1Name + "..."); + + slot1 = slot1.update() + .withAutoSwapSlotName(null) // this will not affect slot 2 + .defineSslBinding() + .forHostname("slot1." + domainName) + .withExistingAppServiceCertificateOrder(certificateOrder) + .withSniBasedSsl() + .attach() + .apply(); + + System.out.println("SSL turned on for slot " + slot1Name + "..."); + Utils.print(slot1); + + //============================================================ + // Deploy public GitHub repo to slot 2 + + System.out.println("Deploying public GitHub repo to slot " + slot2Name); + + slot2 = slot2.update() + .defineSourceControl() + .withPublicExternalRepository() + .withGit("https://github.com/jianghaolu/azure-site-test") + .withBranch("master") + .attach() + .apply(); + + System.out.println("Finished deploying public GitHub repo to slot " + slot2Name); + Utils.print(slot2); - System.out.println("Binding www." + domainName + " to web app " + app1Name + "..."); + System.out.println("CURLing https://www." + domainName + ". Should contain auto-swapped slot 2 content."); + System.out.println(curl("https://www." + domainName)); } catch (Exception e) { System.err.println(e.getMessage()); @@ -195,7 +307,7 @@ private static String curl(String url) { } } - private ManageAppService() { + static { httpClient = new OkHttpClient.Builder().build(); } } From fa6884e50a1293098d386f8b1a3572b6bf30d53d Mon Sep 17 00:00:00 2001 From: Jianghao Lu Date: Fri, 2 Dec 2016 15:27:16 -0800 Subject: [PATCH 07/10] Use thumbprint as SSL certificate name for uniqueness --- .../CertificateDetailsInner.java | 18 ++++---- .../HostNameSslBindingImpl.java | 42 +++++++++++++++++-- .../implementation/WebAppBaseImpl.java | 11 +---- 3 files changed, 49 insertions(+), 22 deletions(-) diff --git a/azure-mgmt-website/src/main/java/com/microsoft/azure/management/website/implementation/CertificateDetailsInner.java b/azure-mgmt-website/src/main/java/com/microsoft/azure/management/website/implementation/CertificateDetailsInner.java index 8ce000fada8cb..ebc8e29525d51 100644 --- a/azure-mgmt-website/src/main/java/com/microsoft/azure/management/website/implementation/CertificateDetailsInner.java +++ b/azure-mgmt-website/src/main/java/com/microsoft/azure/management/website/implementation/CertificateDetailsInner.java @@ -21,55 +21,55 @@ public class CertificateDetailsInner extends Resource { /** * Version. */ - @JsonProperty(value = "properties.version", access = JsonProperty.Access.WRITE_ONLY) + @JsonProperty(value = "version", access = JsonProperty.Access.WRITE_ONLY) private Integer version; /** * Serial Number. */ - @JsonProperty(value = "properties.serialNumber", access = JsonProperty.Access.WRITE_ONLY) + @JsonProperty(value = "serialNumber", access = JsonProperty.Access.WRITE_ONLY) private String serialNumber; /** * Thumbprint. */ - @JsonProperty(value = "properties.thumbprint", access = JsonProperty.Access.WRITE_ONLY) + @JsonProperty(value = "thumbprint", access = JsonProperty.Access.WRITE_ONLY) private String thumbprint; /** * Subject. */ - @JsonProperty(value = "properties.subject", access = JsonProperty.Access.WRITE_ONLY) + @JsonProperty(value = "subject", access = JsonProperty.Access.WRITE_ONLY) private String subject; /** * Valid from. */ - @JsonProperty(value = "properties.notBefore", access = JsonProperty.Access.WRITE_ONLY) + @JsonProperty(value = "notBefore", access = JsonProperty.Access.WRITE_ONLY) private DateTime notBefore; /** * Valid to. */ - @JsonProperty(value = "properties.notAfter", access = JsonProperty.Access.WRITE_ONLY) + @JsonProperty(value = "notAfter", access = JsonProperty.Access.WRITE_ONLY) private DateTime notAfter; /** * Signature algorithm. */ - @JsonProperty(value = "properties.signatureAlgorithm", access = JsonProperty.Access.WRITE_ONLY) + @JsonProperty(value = "signatureAlgorithm", access = JsonProperty.Access.WRITE_ONLY) private String signatureAlgorithm; /** * Issuer. */ - @JsonProperty(value = "properties.issuer", access = JsonProperty.Access.WRITE_ONLY) + @JsonProperty(value = "issuer", access = JsonProperty.Access.WRITE_ONLY) private String issuer; /** * Raw certificate data. */ - @JsonProperty(value = "properties.rawData", access = JsonProperty.Access.WRITE_ONLY) + @JsonProperty(value = "rawData", access = JsonProperty.Access.WRITE_ONLY) private String rawData; /** diff --git a/azure-mgmt-website/src/main/java/com/microsoft/azure/management/website/implementation/HostNameSslBindingImpl.java b/azure-mgmt-website/src/main/java/com/microsoft/azure/management/website/implementation/HostNameSslBindingImpl.java index be52d3f1b51ea..ad5a358fb68c5 100644 --- a/azure-mgmt-website/src/main/java/com/microsoft/azure/management/website/implementation/HostNameSslBindingImpl.java +++ b/azure-mgmt-website/src/main/java/com/microsoft/azure/management/website/implementation/HostNameSslBindingImpl.java @@ -5,8 +5,10 @@ */ package com.microsoft.azure.management.website.implementation; +import com.google.common.io.BaseEncoding; import com.microsoft.azure.management.apigeneration.Fluent; import com.microsoft.azure.management.keyvault.Vault; +import com.microsoft.azure.management.resources.fluentcore.arm.Region; import com.microsoft.azure.management.resources.fluentcore.model.implementation.IndexableWrapperImpl; import com.microsoft.azure.management.website.AppServiceCertificate; import com.microsoft.azure.management.website.AppServiceCertificateOrder; @@ -19,6 +21,15 @@ import rx.functions.Func1; import java.io.File; +import java.io.FileInputStream; +import java.io.IOException; +import java.io.InputStream; +import java.security.KeyStore; +import java.security.KeyStoreException; +import java.security.MessageDigest; +import java.security.NoSuchAlgorithmException; +import java.security.cert.CertificateException; +import java.security.cert.X509Certificate; /** * Implementation for {@link HostNameSslBinding} and its create and update interfaces. @@ -35,6 +46,7 @@ class HostNameSslBindingImpl< private Observable newCertificate; private AppServiceCertificateOrder.DefinitionStages.WithKeyVault certificateInDefinition; + private final AppServiceManager manager; private final FluentImplT parent; @@ -72,7 +84,8 @@ public FluentImplT attach() { @Override public HostNameSslBindingImpl withPfxCertificateToUpload(final File pfxFile, final String password) { - newCertificate = manager.certificates().define(name() + "cert") + String thumbprint = getCertificateThumbprint(pfxFile.getPath(), password); + newCertificate = manager.certificates().define(getCertificateUniqueName(thumbprint, parent().region())) .withRegion(parent().region()) .withExistingResourceGroup(parent().resourceGroupName()) .withPfxFile(pfxFile) @@ -93,7 +106,7 @@ public HostNameSslBindingImpl withNewStandardSslCertificat @Override public HostNameSslBindingImpl withExistingAppServiceCertificateOrder(final AppServiceCertificateOrder certificateOrder) { - newCertificate = manager.certificates().define(name() + "cert") + newCertificate = manager.certificates().define(getCertificateUniqueName(certificateOrder.signedCertificate().thumbprint(), parent().region())) .withRegion(parent().region()) .withExistingResourceGroup(parent().resourceGroupName()) .withExistingCertificateOrder(certificateOrder) @@ -121,8 +134,8 @@ public HostNameSslBindingImpl withIpBasedSsl() { Observable newCertificate() { return newCertificate.doOnNext(new Action1() { @Override - public void call(AppServiceCertificate appServiceCertificateOrder) { - withCertificateThumbprint(appServiceCertificateOrder.thumbprint()); + public void call(AppServiceCertificate appServiceCertificate) { + withCertificateThumbprint(appServiceCertificate.thumbprint()); } }); } @@ -169,4 +182,25 @@ public Observable call(AppServiceCertificateOrder appServ }); return this; } + + private String getCertificateThumbprint(String pfxPath, String password) { + try { + InputStream inStream = new FileInputStream(pfxPath); + + KeyStore ks = KeyStore.getInstance("PKCS12"); + ks.load(inStream, password.toCharArray()); + + String alias = ks.aliases().nextElement(); + X509Certificate certificate = (X509Certificate) ks.getCertificate(alias); + inStream.close(); + MessageDigest sha = MessageDigest.getInstance("SHA-1"); + return BaseEncoding.base16().encode(sha.digest(certificate.getEncoded())); + } catch (KeyStoreException | CertificateException | NoSuchAlgorithmException | IOException ex) { + throw new RuntimeException(ex); + } + } + + private String getCertificateUniqueName(String thumbprint, Region region) { + return String.format("%s##%s#", thumbprint, region.label()); + } } diff --git a/azure-mgmt-website/src/main/java/com/microsoft/azure/management/website/implementation/WebAppBaseImpl.java b/azure-mgmt-website/src/main/java/com/microsoft/azure/management/website/implementation/WebAppBaseImpl.java index a1229589cc4b4..507c9b616c4d8 100644 --- a/azure-mgmt-website/src/main/java/com/microsoft/azure/management/website/implementation/WebAppBaseImpl.java +++ b/azure-mgmt-website/src/main/java/com/microsoft/azure/management/website/implementation/WebAppBaseImpl.java @@ -497,18 +497,11 @@ public Observable call(SiteInner site) { @Override public Observable call(final SiteInner siteInner) { List> certs = new ArrayList<>(); - Map sslMap = new HashMap<>( - Maps.uniqueIndex(siteInner.hostNameSslStates(), new Function() { - @Override - public String apply(HostNameSslState input) { - return input.name(); - } - })); for (final HostNameSslBindingImpl binding : sslBindingsToCreate.values()) { certs.add(binding.newCertificate()); - sslMap.put(binding.inner().name(), binding.inner().withToUpdate(true)); + hostNameSslStateMap.put(binding.inner().name(), binding.inner().withToUpdate(true)); } - siteInner.withHostNameSslStates(new ArrayList<>(sslMap.values())); + siteInner.withHostNameSslStates(new ArrayList<>(hostNameSslStateMap.values())); if (certs.isEmpty()) { return Observable.just(siteInner); } else { From ee6d051b668865bf700c20ed0c35a4da3a3b5246 Mon Sep 17 00:00:00 2001 From: Jianghao Lu Date: Fri, 2 Dec 2016 15:34:07 -0800 Subject: [PATCH 08/10] Rename website to appservice --- .../pom.xml | 6 +-- .../appservice}/AccessControlEntryAction.java | 2 +- .../azure/management/appservice}/Address.java | 2 +- .../appservice}/ApiDefinitionInfo.java | 2 +- .../appservice}/AppServiceCertificate.java | 4 +- .../AppServiceCertificateKeyVaultBinding.java | 4 +- .../AppServiceCertificateOrder.java | 4 +- .../AppServiceCertificateOrders.java | 2 +- .../appservice}/AppServiceCertificates.java | 2 +- .../appservice}/AppServiceDomain.java | 4 +- .../appservice}/AppServiceDomains.java | 2 +- .../appservice}/AppServicePlan.java | 4 +- .../AppServicePlanRestrictions.java | 2 +- .../appservice}/AppServicePlans.java | 2 +- .../appservice}/AppServicePricingTier.java | 2 +- .../management/appservice}/AppSetting.java | 2 +- .../appservice}/ApplicationLogsConfig.java | 2 +- .../appservice}/AutoHealActionType.java | 2 +- .../appservice}/AutoHealActions.java | 2 +- .../appservice}/AutoHealCustomAction.java | 2 +- .../management/appservice}/AutoHealRules.java | 2 +- .../appservice}/AutoHealTriggers.java | 2 +- ...AzureBlobStorageApplicationLogsConfig.java | 2 +- .../AzureBlobStorageHttpLogsConfig.java | 2 +- .../appservice}/AzureResourceType.java | 2 +- ...zureTableStorageApplicationLogsConfig.java | 2 +- .../appservice}/BackupItemStatus.java | 2 +- .../BackupRestoreOperationType.java | 2 +- .../appservice}/BackupSchedule.java | 2 +- .../BuiltInAuthenticationProvider.java | 2 +- .../appservice}/CertificateDetails.java | 4 +- .../CertificateOrderActionType.java | 2 +- .../appservice}/CertificateOrderStatus.java | 2 +- .../appservice}/CertificateProductType.java | 2 +- .../management/appservice}/Channels.java | 2 +- .../appservice}/CheckNameResourceTypes.java | 2 +- .../appservice}/CloneAbilityResult.java | 2 +- .../management/appservice}/CloningInfo.java | 2 +- .../appservice}/ComputeModeOptions.java | 2 +- .../appservice}/ConnStringValueTypePair.java | 2 +- .../appservice}/ConnectionString.java | 2 +- .../appservice}/ConnectionStringType.java | 2 +- .../azure/management/appservice}/Contact.java | 2 +- .../management/appservice}/CorsSettings.java | 2 +- .../CsmPublishingProfileOptions.java | 2 +- .../CustomHostNameDnsRecordType.java | 2 +- .../appservice}/DatabaseBackupSetting.java | 2 +- .../management/appservice}/DatabaseType.java | 2 +- .../appservice}/DeploymentSlot.java | 2 +- .../appservice}/DeploymentSlots.java | 2 +- .../DnsVerificationTestResult.java | 2 +- .../management/appservice}/DomainContact.java | 2 +- .../appservice}/DomainLegalAgreement.java | 4 +- .../appservice}/DomainPurchaseConsent.java | 2 +- .../management/appservice}/DomainStatus.java | 2 +- .../management/appservice}/DomainType.java | 2 +- .../management/appservice}/EnabledConfig.java | 2 +- .../management/appservice}/ErrorEntity.java | 2 +- .../management/appservice}/Experiments.java | 2 +- .../FileSystemApplicationLogsConfig.java | 2 +- .../appservice}/FileSystemHttpLogsConfig.java | 2 +- .../management/appservice}/FrequencyUnit.java | 2 +- .../appservice}/GlobalCsmSkuDescription.java | 4 +- .../appservice}/HandlerMapping.java | 2 +- .../management/appservice}/HostName.java | 2 +- .../appservice}/HostNameBinding.java | 4 +- .../appservice}/HostNameSslBinding.java | 2 +- .../appservice}/HostNameSslState.java | 2 +- .../management/appservice}/HostNameType.java | 2 +- .../HostingEnvironmentProfile.java | 2 +- .../appservice}/HostingEnvironmentStatus.java | 2 +- .../appservice}/HttpLogsConfig.java | 2 +- .../appservice}/InAvailabilityReasonType.java | 2 +- .../InternalLoadBalancingMode.java | 2 +- .../appservice}/IpSecurityRestriction.java | 2 +- .../management/appservice}/JavaVersion.java | 2 +- .../appservice}/KeyVaultSecretStatus.java | 2 +- .../appservice}/LocalizableString.java | 2 +- .../management/appservice}/LogLevel.java | 2 +- .../appservice}/ManagedPipelineMode.java | 2 +- .../appservice}/MetricAvailabilily.java | 2 +- .../management/appservice}/NameValuePair.java | 2 +- .../appservice}/NetFrameworkVersion.java | 2 +- .../NetworkAccessControlEntry.java | 2 +- .../appservice}/NotificationLevel.java | 2 +- .../appservice}/OperationStatus.java | 2 +- .../management/appservice}/PerfMonSample.java | 2 +- .../management/appservice}/PerfMonSet.java | 2 +- .../management/appservice}/PhpVersion.java | 2 +- .../appservice}/PlatformArchitecture.java | 2 +- .../appservice}/ProvisioningState.java | 2 +- .../appservice}/PublishingCredentials.java | 4 +- .../appservice}/PublishingProfileFormat.java | 2 +- .../management/appservice}/PythonVersion.java | 2 +- .../management/appservice}/RampUpRule.java | 2 +- .../RemoteVisualStudioVersion.java | 2 +- .../appservice}/RequestsBasedTrigger.java | 2 +- .../ResourceMetricAvailability.java | 2 +- .../appservice}/ResourceMetricName.java | 2 +- .../appservice}/ResourceMetricProperty.java | 2 +- .../appservice}/ResourceMetricValue.java | 2 +- .../ResourceNameAvailabilityRequest.java | 2 +- .../appservice}/ResourceScopeType.java | 2 +- .../management/appservice}/RouteType.java | 2 +- .../appservice}/SiteAvailabilityState.java | 2 +- .../SiteCloneabilityCriterion.java | 2 +- .../management/appservice}/SiteLimits.java | 2 +- .../appservice}/SiteLoadBalancing.java | 2 +- .../appservice}/SiteMachineKey.java | 2 +- .../management/appservice}/SkuCapacity.java | 2 +- .../appservice}/SkuDescription.java | 4 +- .../azure/management/appservice}/SkuName.java | 2 +- .../appservice}/SlotSwapStatus.java | 2 +- .../appservice}/SlowRequestsBasedTrigger.java | 2 +- .../management/appservice}/SslState.java | 2 +- .../appservice}/StatusCodesBasedTrigger.java | 2 +- .../management/appservice}/StatusOptions.java | 2 +- .../TopLevelDomainAgreementOption.java | 2 +- .../UnauthenticatedClientAction.java | 2 +- .../management/appservice}/UsageState.java | 2 +- .../appservice}/ValidateResourceTypes.java | 2 +- .../appservice}/ValidateResponseError.java | 2 +- .../appservice}/VirtualApplication.java | 2 +- .../appservice}/VirtualDirectory.java | 2 +- .../appservice}/VirtualIPMapping.java | 2 +- .../appservice}/VirtualNetworkProfile.java | 2 +- .../azure/management/appservice}/WebApp.java | 2 +- .../management/appservice}/WebAppBase.java | 4 +- .../appservice}/WebAppSourceControl.java | 4 +- .../azure/management/appservice}/WebApps.java | 2 +- .../management/appservice}/WebContainer.java | 2 +- .../appservice}/WorkerSizeOptions.java | 2 +- .../implementation/AddressResponseInner.java | 4 +- .../AppServiceCertificateImpl.java | 12 ++--- .../AppServiceCertificateInner.java | 4 +- ...ServiceCertificateKeyVaultBindingImpl.java | 10 ++-- .../AppServiceCertificateOrderImpl.java | 16 +++--- .../AppServiceCertificateOrderInner.java | 8 +-- .../AppServiceCertificateOrdersImpl.java | 8 +-- .../AppServiceCertificateOrdersInner.java | 2 +- .../AppServiceCertificatesImpl.java | 8 +-- .../implementation/AppServiceDomainImpl.java | 12 ++--- .../implementation/AppServiceDomainsImpl.java | 8 +-- .../AppServiceEnvironmentInner.java | 16 +++--- .../AppServiceEnvironmentsInner.java | 3 +- .../implementation/AppServiceManager.java | 12 ++--- .../implementation/AppServicePlanImpl.java | 6 +-- .../implementation/AppServicePlanInner.java | 10 ++-- .../implementation/AppServicePlansImpl.java | 6 +-- .../implementation/AppServicePlansInner.java | 2 +- .../implementation/AppSettingImpl.java | 4 +- .../implementation/BackupItemInner.java | 6 +-- .../implementation/BackupRequestInner.java | 8 +-- .../implementation/CapabilityInner.java | 2 +- .../CertificateDetailsImpl.java | 6 +-- .../CertificateDetailsInner.java | 2 +- .../implementation/CertificateEmailInner.java | 2 +- .../implementation/CertificateInner.java | 6 +-- .../CertificateOrderActionInner.java | 4 +- .../implementation/CertificatesInner.java | 2 +- .../ConnectionStringDictionaryInner.java | 4 +- .../implementation/ConnectionStringImpl.java | 8 +-- .../CsmMoveResourceEnvelopeInner.java | 2 +- .../CsmSiteRecoveryEntityInner.java | 2 +- .../implementation/CsmSlotEntityInner.java | 2 +- .../implementation/CsmUsageQuotaInner.java | 4 +- .../appservice}/implementation/CsrInner.java | 2 +- .../CustomHostnameAnalysisResultInner.java | 6 +-- .../implementation/DeletedSiteInner.java | 14 ++--- .../implementation/DeletedWebAppsInner.java | 2 +- .../implementation/DeploymentInner.java | 2 +- .../implementation/DeploymentSlotImpl.java | 12 ++--- .../implementation/DeploymentSlotsImpl.java | 6 +-- .../DomainAvailablilityCheckResultInner.java | 4 +- .../implementation/DomainContactImpl.java | 10 ++-- .../DomainControlCenterSsoRequestInner.java | 2 +- .../implementation/DomainInner.java | 12 ++--- .../DomainLegalAgreementImpl.java | 4 +- .../DomainOwnershipIdentifierInner.java | 2 +- ...inRecommendationSearchParametersInner.java | 2 +- .../implementation/DomainsInner.java | 2 +- .../implementation/GeoRegionInner.java | 2 +- .../implementation/HostNameBindingImpl.java | 16 +++--- .../implementation/HostNameBindingInner.java | 8 +-- .../HostNameSslBindingImpl.java | 14 ++--- .../HostingEnvironmentDiagnosticsInner.java | 2 +- .../implementation/HybridConnectionInner.java | 2 +- .../HybridConnectionKeyInner.java | 2 +- .../HybridConnectionLimitsInner.java | 2 +- .../implementation/IdentifierInner.java | 2 +- .../implementation/MetricDefinitionInner.java | 4 +- .../MigrateMySqlRequestInner.java | 2 +- .../implementation/NameIdentifierInner.java | 2 +- .../implementation/NetworkFeaturesInner.java | 2 +- .../implementation/OperationInner.java | 6 +-- .../appservice}/implementation/PageImpl.java | 2 +- .../implementation/PerfMonResponseInner.java | 4 +- .../implementation/PremierAddOnInner.java | 2 +- .../PremierAddOnOfferInner.java | 4 +- .../PublishingCredentialsImpl.java | 4 +- .../implementation/PushSettingsInner.java | 2 +- .../implementation/RecommendationInner.java | 8 +-- .../RecommendationRuleInner.java | 6 +-- .../implementation/RecommendationsInner.java | 2 +- .../implementation/RecoverResponseInner.java | 2 +- .../ReissueCertificateOrderRequestInner.java | 2 +- .../RelayServiceConnectionEntityInner.java | 2 +- .../RenewCertificateOrderRequestInner.java | 2 +- .../ResourceMetricDefinitionInner.java | 6 +-- .../implementation/ResourceMetricInner.java | 8 +-- .../ResourceNameAvailabilityInner.java | 4 +- .../implementation/RestoreRequestInner.java | 6 +-- .../implementation/RestoreResponseInner.java | 2 +- .../implementation/SiteAuthSettingsInner.java | 6 +-- .../implementation/SiteCloneabilityInner.java | 6 +-- .../implementation/SiteConfigInner.java | 24 ++++----- .../appservice}/implementation/SiteInner.java | 14 ++--- .../implementation/SiteInstanceInner.java | 2 +- .../implementation/SiteLogsConfigInner.java | 8 +-- .../SitePhpErrorLogFlagInner.java | 2 +- .../SiteSourceControlInner.java | 2 +- .../implementation/SkuInfoInner.java | 6 +-- .../implementation/SkuInfosInner.java | 4 +- .../SlotConfigNamesResourceInner.java | 2 +- .../implementation/SlotDifferenceInner.java | 2 +- .../implementation/SnapshotInner.java | 2 +- .../implementation/SourceControlInner.java | 2 +- .../implementation/StampCapacityInner.java | 6 +-- .../StorageMigrationOptionsInner.java | 2 +- .../StorageMigrationResponseInner.java | 2 +- .../implementation/StringDictionaryInner.java | 2 +- .../TldLegalAgreementInner.java | 2 +- .../implementation/TopLevelDomainInner.java | 2 +- .../implementation/TopLevelDomainsInner.java | 4 +- .../implementation/UsageInner.java | 4 +- .../appservice}/implementation/UserInner.java | 2 +- .../implementation/ValidateRequestInner.java | 4 +- .../implementation/ValidateResponseInner.java | 4 +- .../implementation/VnetGatewayInner.java | 2 +- .../implementation/VnetInfoInner.java | 2 +- .../implementation/VnetRouteInner.java | 4 +- .../implementation/WebAppBaseImpl.java | 52 +++++++++---------- .../implementation/WebAppImpl.java | 14 ++--- .../WebAppSourceControlImpl.java | 6 +-- .../implementation/WebAppsImpl.java | 6 +-- .../implementation/WebAppsInner.java | 6 +-- .../WebSiteManagementClientImpl.java | 8 +-- .../implementation/WorkerPoolInner.java | 6 +-- .../implementation/package-info.java | 2 +- .../management/appservice}/package-info.java | 2 +- .../appservice}/AppServicePlansTests.java | 2 +- .../appservice}/AppServiceTestBase.java | 4 +- .../appservice}/CertificateOrdersTests.java | 2 +- .../appservice}/CertificatesTests.java | 2 +- .../management/appservice}/DomainsTests.java | 2 +- .../management/appservice}/WebAppsTests.java | 2 +- azure-samples/pom.xml | 2 +- .../samples/ManageAppService.java | 14 ++--- .../samples/package-info.java | 2 +- .../azure/management/samples/Utils.java | 20 +++---- azure/pom.xml | 2 +- .../com/microsoft/azure/management/Azure.java | 4 +- gulpfile.js | 6 +-- pom.xml | 2 +- 264 files changed, 506 insertions(+), 507 deletions(-) rename {azure-mgmt-website => azure-mgmt-appservice}/pom.xml (94%) rename {azure-mgmt-website/src/main/java/com/microsoft/azure/management/website => azure-mgmt-appservice/src/main/java/com/microsoft/azure/management/appservice}/AccessControlEntryAction.java (96%) rename {azure-mgmt-website/src/main/java/com/microsoft/azure/management/website => azure-mgmt-appservice/src/main/java/com/microsoft/azure/management/appservice}/Address.java (98%) rename {azure-mgmt-website/src/main/java/com/microsoft/azure/management/website => azure-mgmt-appservice/src/main/java/com/microsoft/azure/management/appservice}/ApiDefinitionInfo.java (93%) rename {azure-mgmt-website/src/main/java/com/microsoft/azure/management/website => azure-mgmt-appservice/src/main/java/com/microsoft/azure/management/appservice}/AppServiceCertificate.java (97%) rename {azure-mgmt-website/src/main/java/com/microsoft/azure/management/website => azure-mgmt-appservice/src/main/java/com/microsoft/azure/management/appservice}/AppServiceCertificateKeyVaultBinding.java (85%) rename {azure-mgmt-website/src/main/java/com/microsoft/azure/management/website => azure-mgmt-appservice/src/main/java/com/microsoft/azure/management/appservice}/AppServiceCertificateOrder.java (98%) rename {azure-mgmt-website/src/main/java/com/microsoft/azure/management/website => azure-mgmt-appservice/src/main/java/com/microsoft/azure/management/appservice}/AppServiceCertificateOrders.java (97%) rename {azure-mgmt-website/src/main/java/com/microsoft/azure/management/website => azure-mgmt-appservice/src/main/java/com/microsoft/azure/management/appservice}/AppServiceCertificates.java (95%) rename {azure-mgmt-website/src/main/java/com/microsoft/azure/management/website => azure-mgmt-appservice/src/main/java/com/microsoft/azure/management/appservice}/AppServiceDomain.java (98%) rename {azure-mgmt-website/src/main/java/com/microsoft/azure/management/website => azure-mgmt-appservice/src/main/java/com/microsoft/azure/management/appservice}/AppServiceDomains.java (96%) rename {azure-mgmt-website/src/main/java/com/microsoft/azure/management/website => azure-mgmt-appservice/src/main/java/com/microsoft/azure/management/appservice}/AppServicePlan.java (97%) rename {azure-mgmt-website/src/main/java/com/microsoft/azure/management/website => azure-mgmt-appservice/src/main/java/com/microsoft/azure/management/appservice}/AppServicePlanRestrictions.java (96%) rename {azure-mgmt-website/src/main/java/com/microsoft/azure/management/website => azure-mgmt-appservice/src/main/java/com/microsoft/azure/management/appservice}/AppServicePlans.java (96%) rename {azure-mgmt-website/src/main/java/com/microsoft/azure/management/website => azure-mgmt-appservice/src/main/java/com/microsoft/azure/management/appservice}/AppServicePricingTier.java (98%) rename {azure-mgmt-website/src/main/java/com/microsoft/azure/management/website => azure-mgmt-appservice/src/main/java/com/microsoft/azure/management/appservice}/AppSetting.java (91%) rename {azure-mgmt-website/src/main/java/com/microsoft/azure/management/website => azure-mgmt-appservice/src/main/java/com/microsoft/azure/management/appservice}/ApplicationLogsConfig.java (97%) rename {azure-mgmt-website/src/main/java/com/microsoft/azure/management/website => azure-mgmt-appservice/src/main/java/com/microsoft/azure/management/appservice}/AutoHealActionType.java (96%) rename {azure-mgmt-website/src/main/java/com/microsoft/azure/management/website => azure-mgmt-appservice/src/main/java/com/microsoft/azure/management/appservice}/AutoHealActions.java (97%) rename {azure-mgmt-website/src/main/java/com/microsoft/azure/management/website => azure-mgmt-appservice/src/main/java/com/microsoft/azure/management/appservice}/AutoHealCustomAction.java (96%) rename {azure-mgmt-website/src/main/java/com/microsoft/azure/management/website => azure-mgmt-appservice/src/main/java/com/microsoft/azure/management/appservice}/AutoHealRules.java (96%) rename {azure-mgmt-website/src/main/java/com/microsoft/azure/management/website => azure-mgmt-appservice/src/main/java/com/microsoft/azure/management/appservice}/AutoHealTriggers.java (98%) rename {azure-mgmt-website/src/main/java/com/microsoft/azure/management/website => azure-mgmt-appservice/src/main/java/com/microsoft/azure/management/appservice}/AzureBlobStorageApplicationLogsConfig.java (97%) rename {azure-mgmt-website/src/main/java/com/microsoft/azure/management/website => azure-mgmt-appservice/src/main/java/com/microsoft/azure/management/appservice}/AzureBlobStorageHttpLogsConfig.java (97%) rename {azure-mgmt-website/src/main/java/com/microsoft/azure/management/website => azure-mgmt-appservice/src/main/java/com/microsoft/azure/management/appservice}/AzureResourceType.java (96%) rename {azure-mgmt-website/src/main/java/com/microsoft/azure/management/website => azure-mgmt-appservice/src/main/java/com/microsoft/azure/management/appservice}/AzureTableStorageApplicationLogsConfig.java (96%) rename {azure-mgmt-website/src/main/java/com/microsoft/azure/management/website => azure-mgmt-appservice/src/main/java/com/microsoft/azure/management/appservice}/BackupItemStatus.java (97%) rename {azure-mgmt-website/src/main/java/com/microsoft/azure/management/website => azure-mgmt-appservice/src/main/java/com/microsoft/azure/management/appservice}/BackupRestoreOperationType.java (96%) rename {azure-mgmt-website/src/main/java/com/microsoft/azure/management/website => azure-mgmt-appservice/src/main/java/com/microsoft/azure/management/appservice}/BackupSchedule.java (98%) rename {azure-mgmt-website/src/main/java/com/microsoft/azure/management/website => azure-mgmt-appservice/src/main/java/com/microsoft/azure/management/appservice}/BuiltInAuthenticationProvider.java (97%) rename {azure-mgmt-website/src/main/java/com/microsoft/azure/management/website => azure-mgmt-appservice/src/main/java/com/microsoft/azure/management/appservice}/CertificateDetails.java (88%) rename {azure-mgmt-website/src/main/java/com/microsoft/azure/management/website => azure-mgmt-appservice/src/main/java/com/microsoft/azure/management/appservice}/CertificateOrderActionType.java (97%) rename {azure-mgmt-website/src/main/java/com/microsoft/azure/management/website => azure-mgmt-appservice/src/main/java/com/microsoft/azure/management/appservice}/CertificateOrderStatus.java (97%) rename {azure-mgmt-website/src/main/java/com/microsoft/azure/management/website => azure-mgmt-appservice/src/main/java/com/microsoft/azure/management/appservice}/CertificateProductType.java (96%) rename {azure-mgmt-website/src/main/java/com/microsoft/azure/management/website => azure-mgmt-appservice/src/main/java/com/microsoft/azure/management/appservice}/Channels.java (96%) rename {azure-mgmt-website/src/main/java/com/microsoft/azure/management/website => azure-mgmt-appservice/src/main/java/com/microsoft/azure/management/appservice}/CheckNameResourceTypes.java (97%) rename {azure-mgmt-website/src/main/java/com/microsoft/azure/management/website => azure-mgmt-appservice/src/main/java/com/microsoft/azure/management/appservice}/CloneAbilityResult.java (96%) rename {azure-mgmt-website/src/main/java/com/microsoft/azure/management/website => azure-mgmt-appservice/src/main/java/com/microsoft/azure/management/appservice}/CloningInfo.java (99%) rename {azure-mgmt-website/src/main/java/com/microsoft/azure/management/website => azure-mgmt-appservice/src/main/java/com/microsoft/azure/management/appservice}/ComputeModeOptions.java (96%) rename {azure-mgmt-website/src/main/java/com/microsoft/azure/management/website => azure-mgmt-appservice/src/main/java/com/microsoft/azure/management/appservice}/ConnStringValueTypePair.java (96%) rename {azure-mgmt-website/src/main/java/com/microsoft/azure/management/website => azure-mgmt-appservice/src/main/java/com/microsoft/azure/management/appservice}/ConnectionString.java (92%) rename {azure-mgmt-website/src/main/java/com/microsoft/azure/management/website => azure-mgmt-appservice/src/main/java/com/microsoft/azure/management/appservice}/ConnectionStringType.java (97%) rename {azure-mgmt-website/src/main/java/com/microsoft/azure/management/website => azure-mgmt-appservice/src/main/java/com/microsoft/azure/management/appservice}/Contact.java (98%) rename {azure-mgmt-website/src/main/java/com/microsoft/azure/management/website => azure-mgmt-appservice/src/main/java/com/microsoft/azure/management/appservice}/CorsSettings.java (95%) rename {azure-mgmt-website/src/main/java/com/microsoft/azure/management/website => azure-mgmt-appservice/src/main/java/com/microsoft/azure/management/appservice}/CsmPublishingProfileOptions.java (95%) rename {azure-mgmt-website/src/main/java/com/microsoft/azure/management/website => azure-mgmt-appservice/src/main/java/com/microsoft/azure/management/appservice}/CustomHostNameDnsRecordType.java (96%) rename {azure-mgmt-website/src/main/java/com/microsoft/azure/management/website => azure-mgmt-appservice/src/main/java/com/microsoft/azure/management/appservice}/DatabaseBackupSetting.java (98%) rename {azure-mgmt-website/src/main/java/com/microsoft/azure/management/website => azure-mgmt-appservice/src/main/java/com/microsoft/azure/management/appservice}/DatabaseType.java (96%) rename {azure-mgmt-website/src/main/java/com/microsoft/azure/management/website => azure-mgmt-appservice/src/main/java/com/microsoft/azure/management/appservice}/DeploymentSlot.java (98%) rename {azure-mgmt-website/src/main/java/com/microsoft/azure/management/website => azure-mgmt-appservice/src/main/java/com/microsoft/azure/management/appservice}/DeploymentSlots.java (95%) rename {azure-mgmt-website/src/main/java/com/microsoft/azure/management/website => azure-mgmt-appservice/src/main/java/com/microsoft/azure/management/appservice}/DnsVerificationTestResult.java (96%) rename {azure-mgmt-website/src/main/java/com/microsoft/azure/management/website => azure-mgmt-appservice/src/main/java/com/microsoft/azure/management/appservice}/DomainContact.java (99%) rename {azure-mgmt-website/src/main/java/com/microsoft/azure/management/website => azure-mgmt-appservice/src/main/java/com/microsoft/azure/management/appservice}/DomainLegalAgreement.java (84%) rename {azure-mgmt-website/src/main/java/com/microsoft/azure/management/website => azure-mgmt-appservice/src/main/java/com/microsoft/azure/management/appservice}/DomainPurchaseConsent.java (97%) rename {azure-mgmt-website/src/main/java/com/microsoft/azure/management/website => azure-mgmt-appservice/src/main/java/com/microsoft/azure/management/appservice}/DomainStatus.java (97%) rename {azure-mgmt-website/src/main/java/com/microsoft/azure/management/website => azure-mgmt-appservice/src/main/java/com/microsoft/azure/management/appservice}/DomainType.java (96%) rename {azure-mgmt-website/src/main/java/com/microsoft/azure/management/website => azure-mgmt-appservice/src/main/java/com/microsoft/azure/management/appservice}/EnabledConfig.java (93%) rename {azure-mgmt-website/src/main/java/com/microsoft/azure/management/website => azure-mgmt-appservice/src/main/java/com/microsoft/azure/management/appservice}/ErrorEntity.java (98%) rename {azure-mgmt-website/src/main/java/com/microsoft/azure/management/website => azure-mgmt-appservice/src/main/java/com/microsoft/azure/management/appservice}/Experiments.java (94%) rename {azure-mgmt-website/src/main/java/com/microsoft/azure/management/website => azure-mgmt-appservice/src/main/java/com/microsoft/azure/management/appservice}/FileSystemApplicationLogsConfig.java (94%) rename {azure-mgmt-website/src/main/java/com/microsoft/azure/management/website => azure-mgmt-appservice/src/main/java/com/microsoft/azure/management/appservice}/FileSystemHttpLogsConfig.java (97%) rename {azure-mgmt-website/src/main/java/com/microsoft/azure/management/website => azure-mgmt-appservice/src/main/java/com/microsoft/azure/management/appservice}/FrequencyUnit.java (96%) rename {azure-mgmt-website/src/main/java/com/microsoft/azure/management/website => azure-mgmt-appservice/src/main/java/com/microsoft/azure/management/appservice}/GlobalCsmSkuDescription.java (95%) rename {azure-mgmt-website/src/main/java/com/microsoft/azure/management/website => azure-mgmt-appservice/src/main/java/com/microsoft/azure/management/appservice}/HandlerMapping.java (97%) rename {azure-mgmt-website/src/main/java/com/microsoft/azure/management/website => azure-mgmt-appservice/src/main/java/com/microsoft/azure/management/appservice}/HostName.java (98%) rename {azure-mgmt-website/src/main/java/com/microsoft/azure/management/website => azure-mgmt-appservice/src/main/java/com/microsoft/azure/management/appservice}/HostNameBinding.java (98%) rename {azure-mgmt-website/src/main/java/com/microsoft/azure/management/website => azure-mgmt-appservice/src/main/java/com/microsoft/azure/management/appservice}/HostNameSslBinding.java (99%) rename {azure-mgmt-website/src/main/java/com/microsoft/azure/management/website => azure-mgmt-appservice/src/main/java/com/microsoft/azure/management/appservice}/HostNameSslState.java (98%) rename {azure-mgmt-website/src/main/java/com/microsoft/azure/management/website => azure-mgmt-appservice/src/main/java/com/microsoft/azure/management/appservice}/HostNameType.java (96%) rename {azure-mgmt-website/src/main/java/com/microsoft/azure/management/website => azure-mgmt-appservice/src/main/java/com/microsoft/azure/management/appservice}/HostingEnvironmentProfile.java (96%) rename {azure-mgmt-website/src/main/java/com/microsoft/azure/management/website => azure-mgmt-appservice/src/main/java/com/microsoft/azure/management/appservice}/HostingEnvironmentStatus.java (96%) rename {azure-mgmt-website/src/main/java/com/microsoft/azure/management/website => azure-mgmt-appservice/src/main/java/com/microsoft/azure/management/appservice}/HttpLogsConfig.java (96%) rename {azure-mgmt-website/src/main/java/com/microsoft/azure/management/website => azure-mgmt-appservice/src/main/java/com/microsoft/azure/management/appservice}/InAvailabilityReasonType.java (96%) rename {azure-mgmt-website/src/main/java/com/microsoft/azure/management/website => azure-mgmt-appservice/src/main/java/com/microsoft/azure/management/appservice}/InternalLoadBalancingMode.java (96%) rename {azure-mgmt-website/src/main/java/com/microsoft/azure/management/website => azure-mgmt-appservice/src/main/java/com/microsoft/azure/management/appservice}/IpSecurityRestriction.java (96%) rename {azure-mgmt-website/src/main/java/com/microsoft/azure/management/website => azure-mgmt-appservice/src/main/java/com/microsoft/azure/management/appservice}/JavaVersion.java (97%) rename {azure-mgmt-website/src/main/java/com/microsoft/azure/management/website => azure-mgmt-appservice/src/main/java/com/microsoft/azure/management/appservice}/KeyVaultSecretStatus.java (97%) rename {azure-mgmt-website/src/main/java/com/microsoft/azure/management/website => azure-mgmt-appservice/src/main/java/com/microsoft/azure/management/appservice}/LocalizableString.java (96%) rename {azure-mgmt-website/src/main/java/com/microsoft/azure/management/website => azure-mgmt-appservice/src/main/java/com/microsoft/azure/management/appservice}/LogLevel.java (96%) rename {azure-mgmt-website/src/main/java/com/microsoft/azure/management/website => azure-mgmt-appservice/src/main/java/com/microsoft/azure/management/appservice}/ManagedPipelineMode.java (96%) rename {azure-mgmt-website/src/main/java/com/microsoft/azure/management/website => azure-mgmt-appservice/src/main/java/com/microsoft/azure/management/appservice}/MetricAvailabilily.java (96%) rename {azure-mgmt-website/src/main/java/com/microsoft/azure/management/website => azure-mgmt-appservice/src/main/java/com/microsoft/azure/management/appservice}/NameValuePair.java (95%) rename {azure-mgmt-website/src/main/java/com/microsoft/azure/management/website => azure-mgmt-appservice/src/main/java/com/microsoft/azure/management/appservice}/NetFrameworkVersion.java (96%) rename {azure-mgmt-website/src/main/java/com/microsoft/azure/management/website => azure-mgmt-appservice/src/main/java/com/microsoft/azure/management/appservice}/NetworkAccessControlEntry.java (98%) rename {azure-mgmt-website/src/main/java/com/microsoft/azure/management/website => azure-mgmt-appservice/src/main/java/com/microsoft/azure/management/appservice}/NotificationLevel.java (96%) rename {azure-mgmt-website/src/main/java/com/microsoft/azure/management/website => azure-mgmt-appservice/src/main/java/com/microsoft/azure/management/appservice}/OperationStatus.java (96%) rename {azure-mgmt-website/src/main/java/com/microsoft/azure/management/website => azure-mgmt-appservice/src/main/java/com/microsoft/azure/management/appservice}/PerfMonSample.java (97%) rename {azure-mgmt-website/src/main/java/com/microsoft/azure/management/website => azure-mgmt-appservice/src/main/java/com/microsoft/azure/management/appservice}/PerfMonSet.java (98%) rename {azure-mgmt-website/src/main/java/com/microsoft/azure/management/website => azure-mgmt-appservice/src/main/java/com/microsoft/azure/management/appservice}/PhpVersion.java (96%) rename {azure-mgmt-website/src/main/java/com/microsoft/azure/management/website => azure-mgmt-appservice/src/main/java/com/microsoft/azure/management/appservice}/PlatformArchitecture.java (88%) rename {azure-mgmt-website/src/main/java/com/microsoft/azure/management/website => azure-mgmt-appservice/src/main/java/com/microsoft/azure/management/appservice}/ProvisioningState.java (96%) rename {azure-mgmt-website/src/main/java/com/microsoft/azure/management/website => azure-mgmt-appservice/src/main/java/com/microsoft/azure/management/appservice}/PublishingCredentials.java (83%) rename {azure-mgmt-website/src/main/java/com/microsoft/azure/management/website => azure-mgmt-appservice/src/main/java/com/microsoft/azure/management/appservice}/PublishingProfileFormat.java (97%) rename {azure-mgmt-website/src/main/java/com/microsoft/azure/management/website => azure-mgmt-appservice/src/main/java/com/microsoft/azure/management/appservice}/PythonVersion.java (96%) rename {azure-mgmt-website/src/main/java/com/microsoft/azure/management/website => azure-mgmt-appservice/src/main/java/com/microsoft/azure/management/appservice}/RampUpRule.java (99%) rename {azure-mgmt-website/src/main/java/com/microsoft/azure/management/website => azure-mgmt-appservice/src/main/java/com/microsoft/azure/management/appservice}/RemoteVisualStudioVersion.java (97%) rename {azure-mgmt-website/src/main/java/com/microsoft/azure/management/website => azure-mgmt-appservice/src/main/java/com/microsoft/azure/management/appservice}/RequestsBasedTrigger.java (96%) rename {azure-mgmt-website/src/main/java/com/microsoft/azure/management/website => azure-mgmt-appservice/src/main/java/com/microsoft/azure/management/appservice}/ResourceMetricAvailability.java (95%) rename {azure-mgmt-website/src/main/java/com/microsoft/azure/management/website => azure-mgmt-appservice/src/main/java/com/microsoft/azure/management/appservice}/ResourceMetricName.java (95%) rename {azure-mgmt-website/src/main/java/com/microsoft/azure/management/website => azure-mgmt-appservice/src/main/java/com/microsoft/azure/management/appservice}/ResourceMetricProperty.java (96%) rename {azure-mgmt-website/src/main/java/com/microsoft/azure/management/website => azure-mgmt-appservice/src/main/java/com/microsoft/azure/management/appservice}/ResourceMetricValue.java (97%) rename {azure-mgmt-website/src/main/java/com/microsoft/azure/management/website => azure-mgmt-appservice/src/main/java/com/microsoft/azure/management/appservice}/ResourceNameAvailabilityRequest.java (97%) rename {azure-mgmt-website/src/main/java/com/microsoft/azure/management/website => azure-mgmt-appservice/src/main/java/com/microsoft/azure/management/appservice}/ResourceScopeType.java (96%) rename {azure-mgmt-website/src/main/java/com/microsoft/azure/management/website => azure-mgmt-appservice/src/main/java/com/microsoft/azure/management/appservice}/RouteType.java (96%) rename {azure-mgmt-website/src/main/java/com/microsoft/azure/management/website => azure-mgmt-appservice/src/main/java/com/microsoft/azure/management/appservice}/SiteAvailabilityState.java (96%) rename {azure-mgmt-website/src/main/java/com/microsoft/azure/management/website => azure-mgmt-appservice/src/main/java/com/microsoft/azure/management/appservice}/SiteCloneabilityCriterion.java (96%) rename {azure-mgmt-website/src/main/java/com/microsoft/azure/management/website => azure-mgmt-appservice/src/main/java/com/microsoft/azure/management/appservice}/SiteLimits.java (97%) rename {azure-mgmt-website/src/main/java/com/microsoft/azure/management/website => azure-mgmt-appservice/src/main/java/com/microsoft/azure/management/appservice}/SiteLoadBalancing.java (97%) rename {azure-mgmt-website/src/main/java/com/microsoft/azure/management/website => azure-mgmt-appservice/src/main/java/com/microsoft/azure/management/appservice}/SiteMachineKey.java (97%) rename {azure-mgmt-website/src/main/java/com/microsoft/azure/management/website => azure-mgmt-appservice/src/main/java/com/microsoft/azure/management/appservice}/SkuCapacity.java (98%) rename {azure-mgmt-website/src/main/java/com/microsoft/azure/management/website => azure-mgmt-appservice/src/main/java/com/microsoft/azure/management/appservice}/SkuDescription.java (97%) rename {azure-mgmt-website/src/main/java/com/microsoft/azure/management/website => azure-mgmt-appservice/src/main/java/com/microsoft/azure/management/appservice}/SkuName.java (97%) rename {azure-mgmt-website/src/main/java/com/microsoft/azure/management/website => azure-mgmt-appservice/src/main/java/com/microsoft/azure/management/appservice}/SlotSwapStatus.java (96%) rename {azure-mgmt-website/src/main/java/com/microsoft/azure/management/website => azure-mgmt-appservice/src/main/java/com/microsoft/azure/management/appservice}/SlowRequestsBasedTrigger.java (97%) rename {azure-mgmt-website/src/main/java/com/microsoft/azure/management/website => azure-mgmt-appservice/src/main/java/com/microsoft/azure/management/appservice}/SslState.java (96%) rename {azure-mgmt-website/src/main/java/com/microsoft/azure/management/website => azure-mgmt-appservice/src/main/java/com/microsoft/azure/management/appservice}/StatusCodesBasedTrigger.java (98%) rename {azure-mgmt-website/src/main/java/com/microsoft/azure/management/website => azure-mgmt-appservice/src/main/java/com/microsoft/azure/management/appservice}/StatusOptions.java (96%) rename {azure-mgmt-website/src/main/java/com/microsoft/azure/management/website => azure-mgmt-appservice/src/main/java/com/microsoft/azure/management/appservice}/TopLevelDomainAgreementOption.java (95%) rename {azure-mgmt-website/src/main/java/com/microsoft/azure/management/website => azure-mgmt-appservice/src/main/java/com/microsoft/azure/management/appservice}/UnauthenticatedClientAction.java (96%) rename {azure-mgmt-website/src/main/java/com/microsoft/azure/management/website => azure-mgmt-appservice/src/main/java/com/microsoft/azure/management/appservice}/UsageState.java (96%) rename {azure-mgmt-website/src/main/java/com/microsoft/azure/management/website => azure-mgmt-appservice/src/main/java/com/microsoft/azure/management/appservice}/ValidateResourceTypes.java (96%) rename {azure-mgmt-website/src/main/java/com/microsoft/azure/management/website => azure-mgmt-appservice/src/main/java/com/microsoft/azure/management/appservice}/ValidateResponseError.java (96%) rename {azure-mgmt-website/src/main/java/com/microsoft/azure/management/website => azure-mgmt-appservice/src/main/java/com/microsoft/azure/management/appservice}/VirtualApplication.java (98%) rename {azure-mgmt-website/src/main/java/com/microsoft/azure/management/website => azure-mgmt-appservice/src/main/java/com/microsoft/azure/management/appservice}/VirtualDirectory.java (96%) rename {azure-mgmt-website/src/main/java/com/microsoft/azure/management/website => azure-mgmt-appservice/src/main/java/com/microsoft/azure/management/appservice}/VirtualIPMapping.java (98%) rename {azure-mgmt-website/src/main/java/com/microsoft/azure/management/website => azure-mgmt-appservice/src/main/java/com/microsoft/azure/management/appservice}/VirtualNetworkProfile.java (97%) rename {azure-mgmt-website/src/main/java/com/microsoft/azure/management/website => azure-mgmt-appservice/src/main/java/com/microsoft/azure/management/appservice}/WebApp.java (98%) rename {azure-mgmt-website/src/main/java/com/microsoft/azure/management/website => azure-mgmt-appservice/src/main/java/com/microsoft/azure/management/appservice}/WebAppBase.java (99%) rename {azure-mgmt-website/src/main/java/com/microsoft/azure/management/website => azure-mgmt-appservice/src/main/java/com/microsoft/azure/management/appservice}/WebAppSourceControl.java (99%) rename {azure-mgmt-website/src/main/java/com/microsoft/azure/management/website => azure-mgmt-appservice/src/main/java/com/microsoft/azure/management/appservice}/WebApps.java (95%) rename {azure-mgmt-website/src/main/java/com/microsoft/azure/management/website => azure-mgmt-appservice/src/main/java/com/microsoft/azure/management/appservice}/WebContainer.java (97%) rename {azure-mgmt-website/src/main/java/com/microsoft/azure/management/website => azure-mgmt-appservice/src/main/java/com/microsoft/azure/management/appservice}/WorkerSizeOptions.java (96%) rename {azure-mgmt-website/src/main/java/com/microsoft/azure/management/website => azure-mgmt-appservice/src/main/java/com/microsoft/azure/management/appservice}/implementation/AddressResponseInner.java (95%) rename {azure-mgmt-website/src/main/java/com/microsoft/azure/management/website => azure-mgmt-appservice/src/main/java/com/microsoft/azure/management/appservice}/implementation/AppServiceCertificateImpl.java (92%) rename {azure-mgmt-website/src/main/java/com/microsoft/azure/management/website => azure-mgmt-appservice/src/main/java/com/microsoft/azure/management/appservice}/implementation/AppServiceCertificateInner.java (94%) rename {azure-mgmt-website/src/main/java/com/microsoft/azure/management/website => azure-mgmt-appservice/src/main/java/com/microsoft/azure/management/appservice}/implementation/AppServiceCertificateKeyVaultBindingImpl.java (86%) rename {azure-mgmt-website/src/main/java/com/microsoft/azure/management/website => azure-mgmt-appservice/src/main/java/com/microsoft/azure/management/appservice}/implementation/AppServiceCertificateOrderImpl.java (94%) rename {azure-mgmt-website/src/main/java/com/microsoft/azure/management/website => azure-mgmt-appservice/src/main/java/com/microsoft/azure/management/appservice}/implementation/AppServiceCertificateOrderInner.java (97%) rename {azure-mgmt-website/src/main/java/com/microsoft/azure/management/website => azure-mgmt-appservice/src/main/java/com/microsoft/azure/management/appservice}/implementation/AppServiceCertificateOrdersImpl.java (90%) rename {azure-mgmt-website/src/main/java/com/microsoft/azure/management/website => azure-mgmt-appservice/src/main/java/com/microsoft/azure/management/appservice}/implementation/AppServiceCertificateOrdersInner.java (99%) rename {azure-mgmt-website/src/main/java/com/microsoft/azure/management/website => azure-mgmt-appservice/src/main/java/com/microsoft/azure/management/appservice}/implementation/AppServiceCertificatesImpl.java (88%) rename {azure-mgmt-website/src/main/java/com/microsoft/azure/management/website => azure-mgmt-appservice/src/main/java/com/microsoft/azure/management/appservice}/implementation/AppServiceDomainImpl.java (95%) rename {azure-mgmt-website/src/main/java/com/microsoft/azure/management/website => azure-mgmt-appservice/src/main/java/com/microsoft/azure/management/appservice}/implementation/AppServiceDomainsImpl.java (91%) rename {azure-mgmt-website/src/main/java/com/microsoft/azure/management/website => azure-mgmt-appservice/src/main/java/com/microsoft/azure/management/appservice}/implementation/AppServiceEnvironmentInner.java (97%) rename {azure-mgmt-website/src/main/java/com/microsoft/azure/management/website => azure-mgmt-appservice/src/main/java/com/microsoft/azure/management/appservice}/implementation/AppServiceEnvironmentsInner.java (99%) rename {azure-mgmt-website/src/main/java/com/microsoft/azure/management/website => azure-mgmt-appservice/src/main/java/com/microsoft/azure/management/appservice}/implementation/AppServiceManager.java (93%) rename {azure-mgmt-website/src/main/java/com/microsoft/azure/management/website => azure-mgmt-appservice/src/main/java/com/microsoft/azure/management/appservice}/implementation/AppServicePlanImpl.java (92%) rename {azure-mgmt-website/src/main/java/com/microsoft/azure/management/website => azure-mgmt-appservice/src/main/java/com/microsoft/azure/management/appservice}/implementation/AppServicePlanInner.java (96%) rename {azure-mgmt-website/src/main/java/com/microsoft/azure/management/website => azure-mgmt-appservice/src/main/java/com/microsoft/azure/management/appservice}/implementation/AppServicePlansImpl.java (92%) rename {azure-mgmt-website/src/main/java/com/microsoft/azure/management/website => azure-mgmt-appservice/src/main/java/com/microsoft/azure/management/appservice}/implementation/AppServicePlansInner.java (99%) rename {azure-mgmt-website/src/main/java/com/microsoft/azure/management/website => azure-mgmt-appservice/src/main/java/com/microsoft/azure/management/appservice}/implementation/AppSettingImpl.java (85%) rename {azure-mgmt-website/src/main/java/com/microsoft/azure/management/website => azure-mgmt-appservice/src/main/java/com/microsoft/azure/management/appservice}/implementation/BackupItemInner.java (96%) rename {azure-mgmt-website/src/main/java/com/microsoft/azure/management/website => azure-mgmt-appservice/src/main/java/com/microsoft/azure/management/appservice}/implementation/BackupRequestInner.java (94%) rename {azure-mgmt-website/src/main/java/com/microsoft/azure/management/website => azure-mgmt-appservice/src/main/java/com/microsoft/azure/management/appservice}/implementation/CapabilityInner.java (96%) rename {azure-mgmt-website/src/main/java/com/microsoft/azure/management/website => azure-mgmt-appservice/src/main/java/com/microsoft/azure/management/appservice}/implementation/CertificateDetailsImpl.java (87%) rename {azure-mgmt-website/src/main/java/com/microsoft/azure/management/website => azure-mgmt-appservice/src/main/java/com/microsoft/azure/management/appservice}/implementation/CertificateDetailsInner.java (98%) rename {azure-mgmt-website/src/main/java/com/microsoft/azure/management/website => azure-mgmt-appservice/src/main/java/com/microsoft/azure/management/appservice}/implementation/CertificateEmailInner.java (96%) rename {azure-mgmt-website/src/main/java/com/microsoft/azure/management/website => azure-mgmt-appservice/src/main/java/com/microsoft/azure/management/appservice}/implementation/CertificateInner.java (97%) rename {azure-mgmt-website/src/main/java/com/microsoft/azure/management/website => azure-mgmt-appservice/src/main/java/com/microsoft/azure/management/appservice}/implementation/CertificateOrderActionInner.java (94%) rename {azure-mgmt-website/src/main/java/com/microsoft/azure/management/website => azure-mgmt-appservice/src/main/java/com/microsoft/azure/management/appservice}/implementation/CertificatesInner.java (99%) rename {azure-mgmt-website/src/main/java/com/microsoft/azure/management/website => azure-mgmt-appservice/src/main/java/com/microsoft/azure/management/appservice}/implementation/ConnectionStringDictionaryInner.java (88%) rename {azure-mgmt-website/src/main/java/com/microsoft/azure/management/website => azure-mgmt-appservice/src/main/java/com/microsoft/azure/management/appservice}/implementation/ConnectionStringImpl.java (77%) rename {azure-mgmt-website/src/main/java/com/microsoft/azure/management/website => azure-mgmt-appservice/src/main/java/com/microsoft/azure/management/appservice}/implementation/CsmMoveResourceEnvelopeInner.java (96%) rename {azure-mgmt-website/src/main/java/com/microsoft/azure/management/website => azure-mgmt-appservice/src/main/java/com/microsoft/azure/management/appservice}/implementation/CsmSiteRecoveryEntityInner.java (97%) rename {azure-mgmt-website/src/main/java/com/microsoft/azure/management/website => azure-mgmt-appservice/src/main/java/com/microsoft/azure/management/appservice}/implementation/CsmSlotEntityInner.java (96%) rename {azure-mgmt-website/src/main/java/com/microsoft/azure/management/website => azure-mgmt-appservice/src/main/java/com/microsoft/azure/management/appservice}/implementation/CsmUsageQuotaInner.java (95%) rename {azure-mgmt-website/src/main/java/com/microsoft/azure/management/website => azure-mgmt-appservice/src/main/java/com/microsoft/azure/management/appservice}/implementation/CsrInner.java (98%) rename {azure-mgmt-website/src/main/java/com/microsoft/azure/management/website => azure-mgmt-appservice/src/main/java/com/microsoft/azure/management/appservice}/implementation/CustomHostnameAnalysisResultInner.java (97%) rename {azure-mgmt-website/src/main/java/com/microsoft/azure/management/website => azure-mgmt-appservice/src/main/java/com/microsoft/azure/management/appservice}/implementation/DeletedSiteInner.java (97%) rename {azure-mgmt-website/src/main/java/com/microsoft/azure/management/website => azure-mgmt-appservice/src/main/java/com/microsoft/azure/management/appservice}/implementation/DeletedWebAppsInner.java (99%) rename {azure-mgmt-website/src/main/java/com/microsoft/azure/management/website => azure-mgmt-appservice/src/main/java/com/microsoft/azure/management/appservice}/implementation/DeploymentInner.java (98%) rename {azure-mgmt-website/src/main/java/com/microsoft/azure/management/website => azure-mgmt-appservice/src/main/java/com/microsoft/azure/management/appservice}/implementation/DeploymentSlotImpl.java (95%) rename {azure-mgmt-website/src/main/java/com/microsoft/azure/management/website => azure-mgmt-appservice/src/main/java/com/microsoft/azure/management/appservice}/implementation/DeploymentSlotsImpl.java (95%) rename {azure-mgmt-website/src/main/java/com/microsoft/azure/management/website => azure-mgmt-appservice/src/main/java/com/microsoft/azure/management/appservice}/implementation/DomainAvailablilityCheckResultInner.java (94%) rename {azure-mgmt-website/src/main/java/com/microsoft/azure/management/website => azure-mgmt-appservice/src/main/java/com/microsoft/azure/management/appservice}/implementation/DomainContactImpl.java (93%) rename {azure-mgmt-website/src/main/java/com/microsoft/azure/management/website => azure-mgmt-appservice/src/main/java/com/microsoft/azure/management/appservice}/implementation/DomainControlCenterSsoRequestInner.java (95%) rename {azure-mgmt-website/src/main/java/com/microsoft/azure/management/website => azure-mgmt-appservice/src/main/java/com/microsoft/azure/management/appservice}/implementation/DomainInner.java (96%) rename {azure-mgmt-website/src/main/java/com/microsoft/azure/management/website => azure-mgmt-appservice/src/main/java/com/microsoft/azure/management/appservice}/implementation/DomainLegalAgreementImpl.java (87%) rename {azure-mgmt-website/src/main/java/com/microsoft/azure/management/website => azure-mgmt-appservice/src/main/java/com/microsoft/azure/management/appservice}/implementation/DomainOwnershipIdentifierInner.java (94%) rename {azure-mgmt-website/src/main/java/com/microsoft/azure/management/website => azure-mgmt-appservice/src/main/java/com/microsoft/azure/management/appservice}/implementation/DomainRecommendationSearchParametersInner.java (96%) rename {azure-mgmt-website/src/main/java/com/microsoft/azure/management/website => azure-mgmt-appservice/src/main/java/com/microsoft/azure/management/appservice}/implementation/DomainsInner.java (99%) rename {azure-mgmt-website/src/main/java/com/microsoft/azure/management/website => azure-mgmt-appservice/src/main/java/com/microsoft/azure/management/appservice}/implementation/GeoRegionInner.java (95%) rename {azure-mgmt-website/src/main/java/com/microsoft/azure/management/website => azure-mgmt-appservice/src/main/java/com/microsoft/azure/management/appservice}/implementation/HostNameBindingImpl.java (92%) rename {azure-mgmt-website/src/main/java/com/microsoft/azure/management/website => azure-mgmt-appservice/src/main/java/com/microsoft/azure/management/appservice}/implementation/HostNameBindingInner.java (95%) rename {azure-mgmt-website/src/main/java/com/microsoft/azure/management/website => azure-mgmt-appservice/src/main/java/com/microsoft/azure/management/appservice}/implementation/HostNameSslBindingImpl.java (94%) rename {azure-mgmt-website/src/main/java/com/microsoft/azure/management/website => azure-mgmt-appservice/src/main/java/com/microsoft/azure/management/appservice}/implementation/HostingEnvironmentDiagnosticsInner.java (95%) rename {azure-mgmt-website/src/main/java/com/microsoft/azure/management/website => azure-mgmt-appservice/src/main/java/com/microsoft/azure/management/appservice}/implementation/HybridConnectionInner.java (98%) rename {azure-mgmt-website/src/main/java/com/microsoft/azure/management/website => azure-mgmt-appservice/src/main/java/com/microsoft/azure/management/appservice}/implementation/HybridConnectionKeyInner.java (94%) rename {azure-mgmt-website/src/main/java/com/microsoft/azure/management/website => azure-mgmt-appservice/src/main/java/com/microsoft/azure/management/appservice}/implementation/HybridConnectionLimitsInner.java (94%) rename {azure-mgmt-website/src/main/java/com/microsoft/azure/management/website => azure-mgmt-appservice/src/main/java/com/microsoft/azure/management/appservice}/implementation/IdentifierInner.java (94%) rename {azure-mgmt-website/src/main/java/com/microsoft/azure/management/website => azure-mgmt-appservice/src/main/java/com/microsoft/azure/management/appservice}/implementation/MetricDefinitionInner.java (94%) rename {azure-mgmt-website/src/main/java/com/microsoft/azure/management/website => azure-mgmt-appservice/src/main/java/com/microsoft/azure/management/appservice}/implementation/MigrateMySqlRequestInner.java (94%) rename {azure-mgmt-website/src/main/java/com/microsoft/azure/management/website => azure-mgmt-appservice/src/main/java/com/microsoft/azure/management/appservice}/implementation/NameIdentifierInner.java (92%) rename {azure-mgmt-website/src/main/java/com/microsoft/azure/management/website => azure-mgmt-appservice/src/main/java/com/microsoft/azure/management/appservice}/implementation/NetworkFeaturesInner.java (97%) rename {azure-mgmt-website/src/main/java/com/microsoft/azure/management/website => azure-mgmt-appservice/src/main/java/com/microsoft/azure/management/appservice}/implementation/OperationInner.java (96%) rename {azure-mgmt-website/src/main/java/com/microsoft/azure/management/website => azure-mgmt-appservice/src/main/java/com/microsoft/azure/management/appservice}/implementation/PageImpl.java (96%) rename {azure-mgmt-website/src/main/java/com/microsoft/azure/management/website => azure-mgmt-appservice/src/main/java/com/microsoft/azure/management/appservice}/implementation/PerfMonResponseInner.java (93%) rename {azure-mgmt-website/src/main/java/com/microsoft/azure/management/website => azure-mgmt-appservice/src/main/java/com/microsoft/azure/management/appservice}/implementation/PremierAddOnInner.java (98%) rename {azure-mgmt-website/src/main/java/com/microsoft/azure/management/website => azure-mgmt-appservice/src/main/java/com/microsoft/azure/management/appservice}/implementation/PremierAddOnOfferInner.java (98%) rename {azure-mgmt-website/src/main/java/com/microsoft/azure/management/website => azure-mgmt-appservice/src/main/java/com/microsoft/azure/management/appservice}/implementation/PublishingCredentialsImpl.java (84%) rename {azure-mgmt-website/src/main/java/com/microsoft/azure/management/website => azure-mgmt-appservice/src/main/java/com/microsoft/azure/management/appservice}/implementation/PushSettingsInner.java (98%) rename {azure-mgmt-website/src/main/java/com/microsoft/azure/management/website => azure-mgmt-appservice/src/main/java/com/microsoft/azure/management/appservice}/implementation/RecommendationInner.java (97%) rename {azure-mgmt-website/src/main/java/com/microsoft/azure/management/website => azure-mgmt-appservice/src/main/java/com/microsoft/azure/management/appservice}/implementation/RecommendationRuleInner.java (96%) rename {azure-mgmt-website/src/main/java/com/microsoft/azure/management/website => azure-mgmt-appservice/src/main/java/com/microsoft/azure/management/appservice}/implementation/RecommendationsInner.java (99%) rename {azure-mgmt-website/src/main/java/com/microsoft/azure/management/website => azure-mgmt-appservice/src/main/java/com/microsoft/azure/management/appservice}/implementation/RecoverResponseInner.java (93%) rename {azure-mgmt-website/src/main/java/com/microsoft/azure/management/website => azure-mgmt-appservice/src/main/java/com/microsoft/azure/management/appservice}/implementation/ReissueCertificateOrderRequestInner.java (98%) rename {azure-mgmt-website/src/main/java/com/microsoft/azure/management/website => azure-mgmt-appservice/src/main/java/com/microsoft/azure/management/appservice}/implementation/RelayServiceConnectionEntityInner.java (98%) rename {azure-mgmt-website/src/main/java/com/microsoft/azure/management/website => azure-mgmt-appservice/src/main/java/com/microsoft/azure/management/appservice}/implementation/RenewCertificateOrderRequestInner.java (97%) rename {azure-mgmt-website/src/main/java/com/microsoft/azure/management/website => azure-mgmt-appservice/src/main/java/com/microsoft/azure/management/appservice}/implementation/ResourceMetricDefinitionInner.java (93%) rename {azure-mgmt-website/src/main/java/com/microsoft/azure/management/website => azure-mgmt-appservice/src/main/java/com/microsoft/azure/management/appservice}/implementation/ResourceMetricInner.java (91%) rename {azure-mgmt-website/src/main/java/com/microsoft/azure/management/website => azure-mgmt-appservice/src/main/java/com/microsoft/azure/management/appservice}/implementation/ResourceNameAvailabilityInner.java (95%) rename {azure-mgmt-website/src/main/java/com/microsoft/azure/management/website => azure-mgmt-appservice/src/main/java/com/microsoft/azure/management/appservice}/implementation/RestoreRequestInner.java (97%) rename {azure-mgmt-website/src/main/java/com/microsoft/azure/management/website => azure-mgmt-appservice/src/main/java/com/microsoft/azure/management/appservice}/implementation/RestoreResponseInner.java (93%) rename {azure-mgmt-website/src/main/java/com/microsoft/azure/management/website => azure-mgmt-appservice/src/main/java/com/microsoft/azure/management/appservice}/implementation/SiteAuthSettingsInner.java (98%) rename {azure-mgmt-website/src/main/java/com/microsoft/azure/management/website => azure-mgmt-appservice/src/main/java/com/microsoft/azure/management/appservice}/implementation/SiteCloneabilityInner.java (94%) rename {azure-mgmt-website/src/main/java/com/microsoft/azure/management/website => azure-mgmt-appservice/src/main/java/com/microsoft/azure/management/appservice}/implementation/SiteConfigInner.java (97%) rename {azure-mgmt-website/src/main/java/com/microsoft/azure/management/website => azure-mgmt-appservice/src/main/java/com/microsoft/azure/management/appservice}/implementation/SiteInner.java (97%) rename {azure-mgmt-website/src/main/java/com/microsoft/azure/management/website => azure-mgmt-appservice/src/main/java/com/microsoft/azure/management/appservice}/implementation/SiteInstanceInner.java (92%) rename {azure-mgmt-website/src/main/java/com/microsoft/azure/management/website => azure-mgmt-appservice/src/main/java/com/microsoft/azure/management/appservice}/implementation/SiteLogsConfigInner.java (92%) rename {azure-mgmt-website/src/main/java/com/microsoft/azure/management/website => azure-mgmt-appservice/src/main/java/com/microsoft/azure/management/appservice}/implementation/SitePhpErrorLogFlagInner.java (98%) rename {azure-mgmt-website/src/main/java/com/microsoft/azure/management/website => azure-mgmt-appservice/src/main/java/com/microsoft/azure/management/appservice}/implementation/SiteSourceControlInner.java (98%) rename {azure-mgmt-website/src/main/java/com/microsoft/azure/management/website => azure-mgmt-appservice/src/main/java/com/microsoft/azure/management/appservice}/implementation/SkuInfoInner.java (90%) rename {azure-mgmt-website/src/main/java/com/microsoft/azure/management/website => azure-mgmt-appservice/src/main/java/com/microsoft/azure/management/appservice}/implementation/SkuInfosInner.java (91%) rename {azure-mgmt-website/src/main/java/com/microsoft/azure/management/website => azure-mgmt-appservice/src/main/java/com/microsoft/azure/management/appservice}/implementation/SlotConfigNamesResourceInner.java (96%) rename {azure-mgmt-website/src/main/java/com/microsoft/azure/management/website => azure-mgmt-appservice/src/main/java/com/microsoft/azure/management/appservice}/implementation/SlotDifferenceInner.java (97%) rename {azure-mgmt-website/src/main/java/com/microsoft/azure/management/website => azure-mgmt-appservice/src/main/java/com/microsoft/azure/management/appservice}/implementation/SnapshotInner.java (92%) rename {azure-mgmt-website/src/main/java/com/microsoft/azure/management/website => azure-mgmt-appservice/src/main/java/com/microsoft/azure/management/appservice}/implementation/SourceControlInner.java (98%) rename {azure-mgmt-website/src/main/java/com/microsoft/azure/management/website => azure-mgmt-appservice/src/main/java/com/microsoft/azure/management/appservice}/implementation/StampCapacityInner.java (97%) rename {azure-mgmt-website/src/main/java/com/microsoft/azure/management/website => azure-mgmt-appservice/src/main/java/com/microsoft/azure/management/appservice}/implementation/StorageMigrationOptionsInner.java (98%) rename {azure-mgmt-website/src/main/java/com/microsoft/azure/management/website => azure-mgmt-appservice/src/main/java/com/microsoft/azure/management/appservice}/implementation/StorageMigrationResponseInner.java (93%) rename {azure-mgmt-website/src/main/java/com/microsoft/azure/management/website => azure-mgmt-appservice/src/main/java/com/microsoft/azure/management/appservice}/implementation/StringDictionaryInner.java (93%) rename {azure-mgmt-website/src/main/java/com/microsoft/azure/management/website => azure-mgmt-appservice/src/main/java/com/microsoft/azure/management/appservice}/implementation/TldLegalAgreementInner.java (97%) rename {azure-mgmt-website/src/main/java/com/microsoft/azure/management/website => azure-mgmt-appservice/src/main/java/com/microsoft/azure/management/appservice}/implementation/TopLevelDomainInner.java (95%) rename {azure-mgmt-website/src/main/java/com/microsoft/azure/management/website => azure-mgmt-appservice/src/main/java/com/microsoft/azure/management/appservice}/implementation/TopLevelDomainsInner.java (99%) rename {azure-mgmt-website/src/main/java/com/microsoft/azure/management/website => azure-mgmt-appservice/src/main/java/com/microsoft/azure/management/appservice}/implementation/UsageInner.java (96%) rename {azure-mgmt-website/src/main/java/com/microsoft/azure/management/website => azure-mgmt-appservice/src/main/java/com/microsoft/azure/management/appservice}/implementation/UserInner.java (98%) rename {azure-mgmt-website/src/main/java/com/microsoft/azure/management/website => azure-mgmt-appservice/src/main/java/com/microsoft/azure/management/appservice}/implementation/ValidateRequestInner.java (97%) rename {azure-mgmt-website/src/main/java/com/microsoft/azure/management/website => azure-mgmt-appservice/src/main/java/com/microsoft/azure/management/appservice}/implementation/ValidateResponseInner.java (90%) rename {azure-mgmt-website/src/main/java/com/microsoft/azure/management/website => azure-mgmt-appservice/src/main/java/com/microsoft/azure/management/appservice}/implementation/VnetGatewayInner.java (96%) rename {azure-mgmt-website/src/main/java/com/microsoft/azure/management/website => azure-mgmt-appservice/src/main/java/com/microsoft/azure/management/appservice}/implementation/VnetInfoInner.java (98%) rename {azure-mgmt-website/src/main/java/com/microsoft/azure/management/website => azure-mgmt-appservice/src/main/java/com/microsoft/azure/management/appservice}/implementation/VnetRouteInner.java (96%) rename {azure-mgmt-website/src/main/java/com/microsoft/azure/management/website => azure-mgmt-appservice/src/main/java/com/microsoft/azure/management/appservice}/implementation/WebAppBaseImpl.java (95%) rename {azure-mgmt-website/src/main/java/com/microsoft/azure/management/website => azure-mgmt-appservice/src/main/java/com/microsoft/azure/management/appservice}/implementation/WebAppImpl.java (94%) rename {azure-mgmt-website/src/main/java/com/microsoft/azure/management/website => azure-mgmt-appservice/src/main/java/com/microsoft/azure/management/appservice}/implementation/WebAppSourceControlImpl.java (95%) rename {azure-mgmt-website/src/main/java/com/microsoft/azure/management/website => azure-mgmt-appservice/src/main/java/com/microsoft/azure/management/appservice}/implementation/WebAppsImpl.java (94%) rename {azure-mgmt-website/src/main/java/com/microsoft/azure/management/website => azure-mgmt-appservice/src/main/java/com/microsoft/azure/management/appservice}/implementation/WebAppsInner.java (99%) rename {azure-mgmt-website/src/main/java/com/microsoft/azure/management/website => azure-mgmt-appservice/src/main/java/com/microsoft/azure/management/appservice}/implementation/WebSiteManagementClientImpl.java (99%) rename {azure-mgmt-website/src/main/java/com/microsoft/azure/management/website => azure-mgmt-appservice/src/main/java/com/microsoft/azure/management/appservice}/implementation/WorkerPoolInner.java (95%) rename {azure-mgmt-website/src/main/java/com/microsoft/azure/management/website => azure-mgmt-appservice/src/main/java/com/microsoft/azure/management/appservice}/implementation/package-info.java (84%) rename {azure-mgmt-website/src/main/java/com/microsoft/azure/management/website => azure-mgmt-appservice/src/main/java/com/microsoft/azure/management/appservice}/package-info.java (87%) rename {azure-mgmt-website/src/test/java/com/microsoft/azure/management/website => azure-mgmt-appservice/src/test/java/com/microsoft/azure/management/appservice}/AppServicePlansTests.java (98%) rename {azure-mgmt-website/src/test/java/com/microsoft/azure/management/website => azure-mgmt-appservice/src/test/java/com/microsoft/azure/management/appservice}/AppServiceTestBase.java (93%) rename {azure-mgmt-website/src/test/java/com/microsoft/azure/management/website => azure-mgmt-appservice/src/test/java/com/microsoft/azure/management/appservice}/CertificateOrdersTests.java (97%) rename {azure-mgmt-website/src/test/java/com/microsoft/azure/management/website => azure-mgmt-appservice/src/test/java/com/microsoft/azure/management/appservice}/CertificatesTests.java (97%) rename {azure-mgmt-website/src/test/java/com/microsoft/azure/management/website => azure-mgmt-appservice/src/test/java/com/microsoft/azure/management/appservice}/DomainsTests.java (97%) rename {azure-mgmt-website/src/test/java/com/microsoft/azure/management/website => azure-mgmt-appservice/src/test/java/com/microsoft/azure/management/appservice}/WebAppsTests.java (97%) rename azure-samples/src/main/java/com/microsoft/azure/management/{website => appservice}/samples/ManageAppService.java (96%) rename azure-samples/src/main/java/com/microsoft/azure/management/{website => appservice}/samples/package-info.java (80%) 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 afa64b489887c..80df8341e23a2 100644 --- a/azure-mgmt-website/pom.xml +++ b/azure-mgmt-appservice/pom.xml @@ -12,11 +12,11 @@ ../pom.xml - azure-mgmt-website + azure-mgmt-appservice jar - 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 98% 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 a72936e2cced4..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,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; 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 93% 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 d6359e0538ef6..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,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/AppServiceCertificate.java b/azure-mgmt-appservice/src/main/java/com/microsoft/azure/management/appservice/AppServiceCertificate.java similarity index 97% 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 89760ebfbe13c..329771ded8aea 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; 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 98% 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 58357d45487e9..537b60bfd7981 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,7 +4,7 @@ * 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; @@ -14,7 +14,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.AppServiceCertificateOrderInner; +import com.microsoft.azure.management.appservice.implementation.AppServiceCertificateOrderInner; import org.joda.time.DateTime; import rx.Observable; 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 98% 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 c59a1772bcd4d..01b4abc6795c2 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,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.DomainInner; +import com.microsoft.azure.management.appservice.implementation.DomainInner; import org.joda.time.DateTime; import rx.Observable; 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 96% 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..dc694e0b348d9 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; 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-website/src/main/java/com/microsoft/azure/management/website/AppServicePlanRestrictions.java b/azure-mgmt-appservice/src/main/java/com/microsoft/azure/management/appservice/AppServicePlanRestrictions.java similarity index 96% rename from azure-mgmt-website/src/main/java/com/microsoft/azure/management/website/AppServicePlanRestrictions.java rename to azure-mgmt-appservice/src/main/java/com/microsoft/azure/management/appservice/AppServicePlanRestrictions.java index a719a639b2802..b5c6dab36488e 100644 --- a/azure-mgmt-website/src/main/java/com/microsoft/azure/management/website/AppServicePlanRestrictions.java +++ b/azure-mgmt-appservice/src/main/java/com/microsoft/azure/management/appservice/AppServicePlanRestrictions.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/AppServicePlans.java b/azure-mgmt-appservice/src/main/java/com/microsoft/azure/management/appservice/AppServicePlans.java similarity index 96% 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 1c3722877d968..a51721845d157 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; 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 98% 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..aeb7fb1859b50 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; 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 97% 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 44e93e313c297..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,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/AutoHealCustomAction.java b/azure-mgmt-appservice/src/main/java/com/microsoft/azure/management/appservice/AutoHealCustomAction.java similarity index 96% 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 530a41f3262d7..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,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/AutoHealRules.java b/azure-mgmt-appservice/src/main/java/com/microsoft/azure/management/appservice/AutoHealRules.java similarity index 96% 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 8436a090ab546..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,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/AutoHealTriggers.java b/azure-mgmt-appservice/src/main/java/com/microsoft/azure/management/appservice/AutoHealTriggers.java similarity index 98% 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 078ae64a622bc..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,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/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 96% 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 a206865f2e041..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,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; 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 98% 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 4a705231b0705..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; 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 97% 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 1fc4156e2af57..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; 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 96% 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 025c7d5a5d8a0..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; 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 99% 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 826d6850292eb..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,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.Map; import com.fasterxml.jackson.annotation.JsonProperty; 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 96% 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 e2a79b3061901..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; 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 98% 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 50c407ecb9676..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,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; 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 95% 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 663960db86502..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,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/CsmPublishingProfileOptions.java b/azure-mgmt-appservice/src/main/java/com/microsoft/azure/management/appservice/CsmPublishingProfileOptions.java similarity index 95% 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 c8497cbc9a8f1..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; /** 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 98% 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 1ed69476fc604..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,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; diff --git a/azure-mgmt-website/src/main/java/com/microsoft/azure/management/website/DatabaseType.java b/azure-mgmt-appservice/src/main/java/com/microsoft/azure/management/appservice/DatabaseType.java similarity index 96% rename from azure-mgmt-website/src/main/java/com/microsoft/azure/management/website/DatabaseType.java rename to azure-mgmt-appservice/src/main/java/com/microsoft/azure/management/appservice/DatabaseType.java index 6439eb13e8f2b..53708167be2b0 100644 --- a/azure-mgmt-website/src/main/java/com/microsoft/azure/management/website/DatabaseType.java +++ b/azure-mgmt-appservice/src/main/java/com/microsoft/azure/management/appservice/DatabaseType.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/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 8c1e838288862..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; 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 97% 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 538a89b01b057..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,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 org.joda.time.DateTime; 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 94% 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 1728f89a02f3f..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,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/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 97% 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 dd945a9ff7148..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; /** 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-website/src/main/java/com/microsoft/azure/management/website/GlobalCsmSkuDescription.java b/azure-mgmt-appservice/src/main/java/com/microsoft/azure/management/appservice/GlobalCsmSkuDescription.java similarity index 95% rename from azure-mgmt-website/src/main/java/com/microsoft/azure/management/website/GlobalCsmSkuDescription.java rename to azure-mgmt-appservice/src/main/java/com/microsoft/azure/management/appservice/GlobalCsmSkuDescription.java index 5e32064d8fe7f..a5437c069e282 100644 --- a/azure-mgmt-website/src/main/java/com/microsoft/azure/management/website/GlobalCsmSkuDescription.java +++ b/azure-mgmt-appservice/src/main/java/com/microsoft/azure/management/appservice/GlobalCsmSkuDescription.java @@ -6,10 +6,10 @@ * 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; /** * A Global SKU Description. 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 97% 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 f2a12e7937a5b..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,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/HostName.java b/azure-mgmt-appservice/src/main/java/com/microsoft/azure/management/appservice/HostName.java similarity index 98% 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 69e2dc9ad360a..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; 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 98% 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..a62831e7ec56a 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. 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 99% 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 61bc79e6a0f5f..1bd9557ff5cf2 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; 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 98% 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 fd4151cf80581..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,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/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 96% 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 e7f52b8165386..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,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; 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-website/src/main/java/com/microsoft/azure/management/website/InAvailabilityReasonType.java b/azure-mgmt-appservice/src/main/java/com/microsoft/azure/management/appservice/InAvailabilityReasonType.java similarity index 96% rename from azure-mgmt-website/src/main/java/com/microsoft/azure/management/website/InAvailabilityReasonType.java rename to azure-mgmt-appservice/src/main/java/com/microsoft/azure/management/appservice/InAvailabilityReasonType.java index e21422db3cc69..d36a2638805bb 100644 --- a/azure-mgmt-website/src/main/java/com/microsoft/azure/management/website/InAvailabilityReasonType.java +++ b/azure-mgmt-appservice/src/main/java/com/microsoft/azure/management/appservice/InAvailabilityReasonType.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/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 96% 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 f73907619abca..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,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; 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 97% 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 4716d196b5b83..849d1839fa057 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; 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 96% 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 561ca247f82b5..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,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/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 96% 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 8ee244377d936..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,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/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 98% 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 47b01cdbd681d..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,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/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 97% 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 08e5ae2284e8e..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,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; 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 98% 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 7cf18fb0f85e0..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,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 java.util.List; 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-website/src/main/java/com/microsoft/azure/management/website/PublishingCredentials.java b/azure-mgmt-appservice/src/main/java/com/microsoft/azure/management/appservice/PublishingCredentials.java similarity index 83% rename from azure-mgmt-website/src/main/java/com/microsoft/azure/management/website/PublishingCredentials.java rename to azure-mgmt-appservice/src/main/java/com/microsoft/azure/management/appservice/PublishingCredentials.java index d97bee39342fb..4e5662f7ade6c 100644 --- a/azure-mgmt-website/src/main/java/com/microsoft/azure/management/website/PublishingCredentials.java +++ b/azure-mgmt-appservice/src/main/java/com/microsoft/azure/management/appservice/PublishingCredentials.java @@ -3,11 +3,11 @@ * 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.model.Wrapper; -import com.microsoft.azure.management.website.implementation.UserInner; +import com.microsoft.azure.management.appservice.implementation.UserInner; /** * A credential for publishing to a web app. diff --git a/azure-mgmt-website/src/main/java/com/microsoft/azure/management/website/PublishingProfileFormat.java b/azure-mgmt-appservice/src/main/java/com/microsoft/azure/management/appservice/PublishingProfileFormat.java similarity index 97% rename from azure-mgmt-website/src/main/java/com/microsoft/azure/management/website/PublishingProfileFormat.java rename to azure-mgmt-appservice/src/main/java/com/microsoft/azure/management/appservice/PublishingProfileFormat.java index 2ca4ba6e1aa72..386c0feb1c4c8 100644 --- a/azure-mgmt-website/src/main/java/com/microsoft/azure/management/website/PublishingProfileFormat.java +++ b/azure-mgmt-appservice/src/main/java/com/microsoft/azure/management/appservice/PublishingProfileFormat.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/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 99% 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 1032995861fa9..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; /** 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 96% 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 df9979a92cc51..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,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/ResourceMetricAvailability.java b/azure-mgmt-appservice/src/main/java/com/microsoft/azure/management/appservice/ResourceMetricAvailability.java similarity index 95% rename from azure-mgmt-website/src/main/java/com/microsoft/azure/management/website/ResourceMetricAvailability.java rename to azure-mgmt-appservice/src/main/java/com/microsoft/azure/management/appservice/ResourceMetricAvailability.java index cbf30177cb82b..9da98eef591c1 100644 --- a/azure-mgmt-website/src/main/java/com/microsoft/azure/management/website/ResourceMetricAvailability.java +++ b/azure-mgmt-appservice/src/main/java/com/microsoft/azure/management/appservice/ResourceMetricAvailability.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; 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 95% 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 d4cb0f6cfb95b..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,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; 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/ResourceNameAvailabilityRequest.java b/azure-mgmt-appservice/src/main/java/com/microsoft/azure/management/appservice/ResourceNameAvailabilityRequest.java similarity index 97% rename from azure-mgmt-website/src/main/java/com/microsoft/azure/management/website/ResourceNameAvailabilityRequest.java rename to azure-mgmt-appservice/src/main/java/com/microsoft/azure/management/appservice/ResourceNameAvailabilityRequest.java index 81ad6f9f39a4f..f86d71b663075 100644 --- a/azure-mgmt-website/src/main/java/com/microsoft/azure/management/website/ResourceNameAvailabilityRequest.java +++ b/azure-mgmt-appservice/src/main/java/com/microsoft/azure/management/appservice/ResourceNameAvailabilityRequest.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; diff --git a/azure-mgmt-website/src/main/java/com/microsoft/azure/management/website/ResourceScopeType.java b/azure-mgmt-appservice/src/main/java/com/microsoft/azure/management/appservice/ResourceScopeType.java similarity index 96% rename from azure-mgmt-website/src/main/java/com/microsoft/azure/management/website/ResourceScopeType.java rename to azure-mgmt-appservice/src/main/java/com/microsoft/azure/management/appservice/ResourceScopeType.java index 1ecaec5ef788f..398cb2522bd4c 100644 --- a/azure-mgmt-website/src/main/java/com/microsoft/azure/management/website/ResourceScopeType.java +++ b/azure-mgmt-appservice/src/main/java/com/microsoft/azure/management/appservice/ResourceScopeType.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/RouteType.java b/azure-mgmt-appservice/src/main/java/com/microsoft/azure/management/appservice/RouteType.java similarity index 96% rename from azure-mgmt-website/src/main/java/com/microsoft/azure/management/website/RouteType.java rename to azure-mgmt-appservice/src/main/java/com/microsoft/azure/management/appservice/RouteType.java index d2612f7c77466..a032a3323a7b6 100644 --- a/azure-mgmt-website/src/main/java/com/microsoft/azure/management/website/RouteType.java +++ b/azure-mgmt-appservice/src/main/java/com/microsoft/azure/management/appservice/RouteType.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/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 96% 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 158834d5fc3f6..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,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/SiteLimits.java b/azure-mgmt-appservice/src/main/java/com/microsoft/azure/management/appservice/SiteLimits.java similarity index 97% 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 125385dc9a1cb..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,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/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 97% 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 e546f2e719d5f..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,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/SkuCapacity.java b/azure-mgmt-appservice/src/main/java/com/microsoft/azure/management/appservice/SkuCapacity.java similarity index 98% 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 32292cde10d47..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,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; 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 97% 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 fb69891f293c4..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,10 +6,10 @@ * 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; /** * Description of a SKU for a scalable resource. diff --git a/azure-mgmt-website/src/main/java/com/microsoft/azure/management/website/SkuName.java b/azure-mgmt-appservice/src/main/java/com/microsoft/azure/management/appservice/SkuName.java similarity index 97% rename from azure-mgmt-website/src/main/java/com/microsoft/azure/management/website/SkuName.java rename to azure-mgmt-appservice/src/main/java/com/microsoft/azure/management/appservice/SkuName.java index 8e2bfef3378d8..b475c61754a69 100644 --- a/azure-mgmt-website/src/main/java/com/microsoft/azure/management/website/SkuName.java +++ b/azure-mgmt-appservice/src/main/java/com/microsoft/azure/management/appservice/SkuName.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/SlotSwapStatus.java b/azure-mgmt-appservice/src/main/java/com/microsoft/azure/management/appservice/SlotSwapStatus.java similarity index 96% rename from azure-mgmt-website/src/main/java/com/microsoft/azure/management/website/SlotSwapStatus.java rename to azure-mgmt-appservice/src/main/java/com/microsoft/azure/management/appservice/SlotSwapStatus.java index 25dd41076037c..801b1bf1c476b 100644 --- a/azure-mgmt-website/src/main/java/com/microsoft/azure/management/website/SlotSwapStatus.java +++ b/azure-mgmt-appservice/src/main/java/com/microsoft/azure/management/appservice/SlotSwapStatus.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; 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 97% 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 cbf68366f5abe..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,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/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 98% 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 e9bb1704fe00a..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,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/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 95% 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 a4a0395aaba4d..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; /** 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 98% 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 4f96d44707d0f..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,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/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 98% 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 091fdd5d91850..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,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/VirtualNetworkProfile.java b/azure-mgmt-appservice/src/main/java/com/microsoft/azure/management/appservice/VirtualNetworkProfile.java similarity index 97% 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 5a595d50c7c30..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,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; diff --git a/azure-mgmt-website/src/main/java/com/microsoft/azure/management/website/WebApp.java b/azure-mgmt-appservice/src/main/java/com/microsoft/azure/management/appservice/WebApp.java similarity index 98% rename from azure-mgmt-website/src/main/java/com/microsoft/azure/management/website/WebApp.java rename to azure-mgmt-appservice/src/main/java/com/microsoft/azure/management/appservice/WebApp.java index b989c0c72384b..4da4dcbbad1db 100644 --- a/azure-mgmt-website/src/main/java/com/microsoft/azure/management/website/WebApp.java +++ b/azure-mgmt-appservice/src/main/java/com/microsoft/azure/management/appservice/WebApp.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.model.Updatable; 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 99% 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 cd241a435016e..d79fdbb58e711 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,7 +12,7 @@ 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; diff --git a/azure-mgmt-website/src/main/java/com/microsoft/azure/management/website/WebAppSourceControl.java b/azure-mgmt-appservice/src/main/java/com/microsoft/azure/management/appservice/WebAppSourceControl.java similarity index 99% rename from azure-mgmt-website/src/main/java/com/microsoft/azure/management/website/WebAppSourceControl.java rename to azure-mgmt-appservice/src/main/java/com/microsoft/azure/management/appservice/WebAppSourceControl.java index 0e1ebcb28e71f..a8971811b0a05 100644 --- a/azure-mgmt-website/src/main/java/com/microsoft/azure/management/website/WebAppSourceControl.java +++ b/azure-mgmt-appservice/src/main/java/com/microsoft/azure/management/appservice/WebAppSourceControl.java @@ -3,13 +3,13 @@ * 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.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.website.implementation.SiteSourceControlInner; +import com.microsoft.azure.management.appservice.implementation.SiteSourceControlInner; /** * A web app source control in a web app. 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 97% 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..69ae4d229f6ad 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; 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 95% 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 efb9723cb37ea..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,10 +6,10 @@ * 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 virtual IPs. 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 92% 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 a2f25d401ae61..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,15 +4,15 @@ * 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.GroupableResourceImpl; import com.microsoft.azure.management.resources.fluentcore.utils.Utils; -import com.microsoft.azure.management.website.AppServiceCertificate; -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.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; 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 94% 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 c7d8328edb59b..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,9 +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 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; 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 94% 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 11fa9bafe5d96..9f35b1f929308 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,7 +4,7 @@ * 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; @@ -12,13 +12,13 @@ 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.AppServiceDomain; -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.website.WebAppBase; +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; 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 97% 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 976f9f1f27cc3..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,12 +6,12 @@ * 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; 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 99% 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 ae2dbcc1f430f..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,7 +6,7 @@ * 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; diff --git a/azure-mgmt-website/src/main/java/com/microsoft/azure/management/website/implementation/AppServiceCertificatesImpl.java b/azure-mgmt-appservice/src/main/java/com/microsoft/azure/management/appservice/implementation/AppServiceCertificatesImpl.java similarity index 88% rename from azure-mgmt-website/src/main/java/com/microsoft/azure/management/website/implementation/AppServiceCertificatesImpl.java rename to azure-mgmt-appservice/src/main/java/com/microsoft/azure/management/appservice/implementation/AppServiceCertificatesImpl.java index 35617bfe39769..68e25b2bcb4fb 100644 --- a/azure-mgmt-website/src/main/java/com/microsoft/azure/management/website/implementation/AppServiceCertificatesImpl.java +++ b/azure-mgmt-appservice/src/main/java/com/microsoft/azure/management/appservice/implementation/AppServiceCertificatesImpl.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.AppServiceCertificate; -import com.microsoft.azure.management.website.AppServiceCertificates; -import com.microsoft.azure.management.website.AppServicePlans; +import com.microsoft.azure.management.appservice.AppServiceCertificate; +import com.microsoft.azure.management.appservice.AppServiceCertificates; +import com.microsoft.azure.management.appservice.AppServicePlans; import rx.Observable; import rx.functions.Func1; diff --git a/azure-mgmt-website/src/main/java/com/microsoft/azure/management/website/implementation/AppServiceDomainImpl.java b/azure-mgmt-appservice/src/main/java/com/microsoft/azure/management/appservice/implementation/AppServiceDomainImpl.java similarity index 95% rename from azure-mgmt-website/src/main/java/com/microsoft/azure/management/website/implementation/AppServiceDomainImpl.java rename to azure-mgmt-appservice/src/main/java/com/microsoft/azure/management/appservice/implementation/AppServiceDomainImpl.java index 76cf22418f1e4..f77c8878b4855 100644 --- a/azure-mgmt-website/src/main/java/com/microsoft/azure/management/website/implementation/AppServiceDomainImpl.java +++ b/azure-mgmt-appservice/src/main/java/com/microsoft/azure/management/appservice/implementation/AppServiceDomainImpl.java @@ -4,18 +4,18 @@ * license information. */ -package com.microsoft.azure.management.website.implementation; +package com.microsoft.azure.management.appservice.implementation; import com.google.common.base.Function; import com.google.common.collect.Maps; import com.microsoft.azure.Page; 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.AppServiceDomain; -import com.microsoft.azure.management.website.Contact; -import com.microsoft.azure.management.website.DomainPurchaseConsent; -import com.microsoft.azure.management.website.DomainStatus; -import com.microsoft.azure.management.website.HostName; +import com.microsoft.azure.management.appservice.AppServiceDomain; +import com.microsoft.azure.management.appservice.Contact; +import com.microsoft.azure.management.appservice.DomainPurchaseConsent; +import com.microsoft.azure.management.appservice.DomainStatus; +import com.microsoft.azure.management.appservice.HostName; import org.joda.time.DateTime; import rx.Observable; import rx.functions.Func1; diff --git a/azure-mgmt-website/src/main/java/com/microsoft/azure/management/website/implementation/AppServiceDomainsImpl.java b/azure-mgmt-appservice/src/main/java/com/microsoft/azure/management/appservice/implementation/AppServiceDomainsImpl.java similarity index 91% rename from azure-mgmt-website/src/main/java/com/microsoft/azure/management/website/implementation/AppServiceDomainsImpl.java rename to azure-mgmt-appservice/src/main/java/com/microsoft/azure/management/appservice/implementation/AppServiceDomainsImpl.java index 2a6971c4b1c36..abf23451b89ec 100644 --- a/azure-mgmt-website/src/main/java/com/microsoft/azure/management/website/implementation/AppServiceDomainsImpl.java +++ b/azure-mgmt-appservice/src/main/java/com/microsoft/azure/management/appservice/implementation/AppServiceDomainsImpl.java @@ -4,14 +4,14 @@ * 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.resources.fluentcore.utils.PagedListConverter; -import com.microsoft.azure.management.website.AppServiceDomain; -import com.microsoft.azure.management.website.AppServiceDomains; -import com.microsoft.azure.management.website.DomainLegalAgreement; +import com.microsoft.azure.management.appservice.AppServiceDomain; +import com.microsoft.azure.management.appservice.AppServiceDomains; +import com.microsoft.azure.management.appservice.DomainLegalAgreement; import rx.Observable; import rx.functions.Func1; diff --git a/azure-mgmt-website/src/main/java/com/microsoft/azure/management/website/implementation/AppServiceEnvironmentInner.java b/azure-mgmt-appservice/src/main/java/com/microsoft/azure/management/appservice/implementation/AppServiceEnvironmentInner.java similarity index 97% rename from azure-mgmt-website/src/main/java/com/microsoft/azure/management/website/implementation/AppServiceEnvironmentInner.java rename to azure-mgmt-appservice/src/main/java/com/microsoft/azure/management/appservice/implementation/AppServiceEnvironmentInner.java index 334054e91d963..4dd562c1c13d3 100644 --- a/azure-mgmt-website/src/main/java/com/microsoft/azure/management/website/implementation/AppServiceEnvironmentInner.java +++ b/azure-mgmt-appservice/src/main/java/com/microsoft/azure/management/appservice/implementation/AppServiceEnvironmentInner.java @@ -6,16 +6,16 @@ * 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.ProvisioningState; -import com.microsoft.azure.management.website.HostingEnvironmentStatus; -import com.microsoft.azure.management.website.VirtualNetworkProfile; -import com.microsoft.azure.management.website.InternalLoadBalancingMode; +import com.microsoft.azure.management.appservice.ProvisioningState; +import com.microsoft.azure.management.appservice.HostingEnvironmentStatus; +import com.microsoft.azure.management.appservice.VirtualNetworkProfile; +import com.microsoft.azure.management.appservice.InternalLoadBalancingMode; import java.util.List; -import com.microsoft.azure.management.website.VirtualIPMapping; -import com.microsoft.azure.management.website.NetworkAccessControlEntry; -import com.microsoft.azure.management.website.NameValuePair; +import com.microsoft.azure.management.appservice.VirtualIPMapping; +import com.microsoft.azure.management.appservice.NetworkAccessControlEntry; +import com.microsoft.azure.management.appservice.NameValuePair; import com.fasterxml.jackson.annotation.JsonProperty; import com.microsoft.rest.serializer.JsonFlatten; import com.microsoft.azure.Resource; diff --git a/azure-mgmt-website/src/main/java/com/microsoft/azure/management/website/implementation/AppServiceEnvironmentsInner.java b/azure-mgmt-appservice/src/main/java/com/microsoft/azure/management/appservice/implementation/AppServiceEnvironmentsInner.java similarity index 99% rename from azure-mgmt-website/src/main/java/com/microsoft/azure/management/website/implementation/AppServiceEnvironmentsInner.java rename to azure-mgmt-appservice/src/main/java/com/microsoft/azure/management/appservice/implementation/AppServiceEnvironmentsInner.java index fa02f53614df9..e2712ba08a79e 100644 --- a/azure-mgmt-website/src/main/java/com/microsoft/azure/management/website/implementation/AppServiceEnvironmentsInner.java +++ b/azure-mgmt-appservice/src/main/java/com/microsoft/azure/management/appservice/implementation/AppServiceEnvironmentsInner.java @@ -6,7 +6,7 @@ * 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; @@ -21,7 +21,6 @@ import com.microsoft.rest.ServiceResponse; import com.microsoft.rest.Validator; import java.io.IOException; -import java.util.ArrayList; import java.util.List; import okhttp3.ResponseBody; import retrofit2.http.Body; diff --git a/azure-mgmt-website/src/main/java/com/microsoft/azure/management/website/implementation/AppServiceManager.java b/azure-mgmt-appservice/src/main/java/com/microsoft/azure/management/appservice/implementation/AppServiceManager.java similarity index 93% rename from azure-mgmt-website/src/main/java/com/microsoft/azure/management/website/implementation/AppServiceManager.java rename to azure-mgmt-appservice/src/main/java/com/microsoft/azure/management/appservice/implementation/AppServiceManager.java index 90270c2414b06..576c359d43069 100644 --- a/azure-mgmt-website/src/main/java/com/microsoft/azure/management/website/implementation/AppServiceManager.java +++ b/azure-mgmt-appservice/src/main/java/com/microsoft/azure/management/appservice/implementation/AppServiceManager.java @@ -4,7 +4,7 @@ * license information. */ -package com.microsoft.azure.management.website.implementation; +package com.microsoft.azure.management.appservice.implementation; import com.microsoft.azure.AzureEnvironment; import com.microsoft.azure.RestClient; @@ -13,11 +13,11 @@ import com.microsoft.azure.management.resources.fluentcore.arm.AzureConfigurable; import com.microsoft.azure.management.resources.fluentcore.arm.implementation.AzureConfigurableImpl; import com.microsoft.azure.management.resources.fluentcore.arm.implementation.Manager; -import com.microsoft.azure.management.website.AppServiceCertificates; -import com.microsoft.azure.management.website.AppServiceDomains; -import com.microsoft.azure.management.website.AppServicePlans; -import com.microsoft.azure.management.website.AppServiceCertificateOrders; -import com.microsoft.azure.management.website.WebApps; +import com.microsoft.azure.management.appservice.AppServiceCertificates; +import com.microsoft.azure.management.appservice.AppServiceDomains; +import com.microsoft.azure.management.appservice.AppServicePlans; +import com.microsoft.azure.management.appservice.AppServiceCertificateOrders; +import com.microsoft.azure.management.appservice.WebApps; /** * Entry point to Azure storage resource management. diff --git a/azure-mgmt-website/src/main/java/com/microsoft/azure/management/website/implementation/AppServicePlanImpl.java b/azure-mgmt-appservice/src/main/java/com/microsoft/azure/management/appservice/implementation/AppServicePlanImpl.java similarity index 92% rename from azure-mgmt-website/src/main/java/com/microsoft/azure/management/website/implementation/AppServicePlanImpl.java rename to azure-mgmt-appservice/src/main/java/com/microsoft/azure/management/appservice/implementation/AppServicePlanImpl.java index 6427e058e9a0a..ebba8b51914b6 100644 --- a/azure-mgmt-website/src/main/java/com/microsoft/azure/management/website/implementation/AppServicePlanImpl.java +++ b/azure-mgmt-appservice/src/main/java/com/microsoft/azure/management/appservice/implementation/AppServicePlanImpl.java @@ -4,11 +4,11 @@ * 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.GroupableResourceImpl; -import com.microsoft.azure.management.website.AppServicePlan; -import com.microsoft.azure.management.website.AppServicePricingTier; +import com.microsoft.azure.management.appservice.AppServicePlan; +import com.microsoft.azure.management.appservice.AppServicePricingTier; import rx.Observable; /** diff --git a/azure-mgmt-website/src/main/java/com/microsoft/azure/management/website/implementation/AppServicePlanInner.java b/azure-mgmt-appservice/src/main/java/com/microsoft/azure/management/appservice/implementation/AppServicePlanInner.java similarity index 96% rename from azure-mgmt-website/src/main/java/com/microsoft/azure/management/website/implementation/AppServicePlanInner.java rename to azure-mgmt-appservice/src/main/java/com/microsoft/azure/management/appservice/implementation/AppServicePlanInner.java index 5f6fbbd41b8c8..93e3cfe799f9c 100644 --- a/azure-mgmt-website/src/main/java/com/microsoft/azure/management/website/implementation/AppServicePlanInner.java +++ b/azure-mgmt-appservice/src/main/java/com/microsoft/azure/management/appservice/implementation/AppServicePlanInner.java @@ -6,12 +6,12 @@ * 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.StatusOptions; -import com.microsoft.azure.management.website.HostingEnvironmentProfile; -import com.microsoft.azure.management.website.ProvisioningState; -import com.microsoft.azure.management.website.SkuDescription; +import com.microsoft.azure.management.appservice.StatusOptions; +import com.microsoft.azure.management.appservice.HostingEnvironmentProfile; +import com.microsoft.azure.management.appservice.ProvisioningState; +import com.microsoft.azure.management.appservice.SkuDescription; import com.fasterxml.jackson.annotation.JsonProperty; import com.microsoft.rest.serializer.JsonFlatten; import com.microsoft.azure.Resource; diff --git a/azure-mgmt-website/src/main/java/com/microsoft/azure/management/website/implementation/AppServicePlansImpl.java b/azure-mgmt-appservice/src/main/java/com/microsoft/azure/management/appservice/implementation/AppServicePlansImpl.java similarity index 92% rename from azure-mgmt-website/src/main/java/com/microsoft/azure/management/website/implementation/AppServicePlansImpl.java rename to azure-mgmt-appservice/src/main/java/com/microsoft/azure/management/appservice/implementation/AppServicePlansImpl.java index fec026e6bdf7b..c743a97704bce 100644 --- a/azure-mgmt-website/src/main/java/com/microsoft/azure/management/website/implementation/AppServicePlansImpl.java +++ b/azure-mgmt-appservice/src/main/java/com/microsoft/azure/management/appservice/implementation/AppServicePlansImpl.java @@ -4,12 +4,12 @@ * 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.AppServicePlan; -import com.microsoft.azure.management.website.AppServicePlans; +import com.microsoft.azure.management.appservice.AppServicePlan; +import com.microsoft.azure.management.appservice.AppServicePlans; import rx.Observable; import rx.functions.Func1; diff --git a/azure-mgmt-website/src/main/java/com/microsoft/azure/management/website/implementation/AppServicePlansInner.java b/azure-mgmt-appservice/src/main/java/com/microsoft/azure/management/appservice/implementation/AppServicePlansInner.java similarity index 99% rename from azure-mgmt-website/src/main/java/com/microsoft/azure/management/website/implementation/AppServicePlansInner.java rename to azure-mgmt-appservice/src/main/java/com/microsoft/azure/management/appservice/implementation/AppServicePlansInner.java index b7e0658e8e695..01b571c930fce 100644 --- a/azure-mgmt-website/src/main/java/com/microsoft/azure/management/website/implementation/AppServicePlansInner.java +++ b/azure-mgmt-appservice/src/main/java/com/microsoft/azure/management/appservice/implementation/AppServicePlansInner.java @@ -6,7 +6,7 @@ * 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; diff --git a/azure-mgmt-website/src/main/java/com/microsoft/azure/management/website/implementation/AppSettingImpl.java b/azure-mgmt-appservice/src/main/java/com/microsoft/azure/management/appservice/implementation/AppSettingImpl.java similarity index 85% rename from azure-mgmt-website/src/main/java/com/microsoft/azure/management/website/implementation/AppSettingImpl.java rename to azure-mgmt-appservice/src/main/java/com/microsoft/azure/management/appservice/implementation/AppSettingImpl.java index aaea23c24499d..e70d003660d6d 100644 --- a/azure-mgmt-website/src/main/java/com/microsoft/azure/management/website/implementation/AppSettingImpl.java +++ b/azure-mgmt-appservice/src/main/java/com/microsoft/azure/management/appservice/implementation/AppSettingImpl.java @@ -4,9 +4,9 @@ * license information. */ -package com.microsoft.azure.management.website.implementation; +package com.microsoft.azure.management.appservice.implementation; -import com.microsoft.azure.management.website.AppSetting; +import com.microsoft.azure.management.appservice.AppSetting; /** * 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/implementation/BackupItemInner.java b/azure-mgmt-appservice/src/main/java/com/microsoft/azure/management/appservice/implementation/BackupItemInner.java similarity index 96% rename from azure-mgmt-website/src/main/java/com/microsoft/azure/management/website/implementation/BackupItemInner.java rename to azure-mgmt-appservice/src/main/java/com/microsoft/azure/management/appservice/implementation/BackupItemInner.java index 45179c1f70040..761aee2bb58a7 100644 --- a/azure-mgmt-website/src/main/java/com/microsoft/azure/management/website/implementation/BackupItemInner.java +++ b/azure-mgmt-appservice/src/main/java/com/microsoft/azure/management/appservice/implementation/BackupItemInner.java @@ -6,12 +6,12 @@ * 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.BackupItemStatus; +import com.microsoft.azure.management.appservice.BackupItemStatus; import org.joda.time.DateTime; import java.util.List; -import com.microsoft.azure.management.website.DatabaseBackupSetting; +import com.microsoft.azure.management.appservice.DatabaseBackupSetting; import com.fasterxml.jackson.annotation.JsonProperty; import com.microsoft.rest.serializer.JsonFlatten; import com.microsoft.azure.Resource; diff --git a/azure-mgmt-website/src/main/java/com/microsoft/azure/management/website/implementation/BackupRequestInner.java b/azure-mgmt-appservice/src/main/java/com/microsoft/azure/management/appservice/implementation/BackupRequestInner.java similarity index 94% rename from azure-mgmt-website/src/main/java/com/microsoft/azure/management/website/implementation/BackupRequestInner.java rename to azure-mgmt-appservice/src/main/java/com/microsoft/azure/management/appservice/implementation/BackupRequestInner.java index 99a7049f16d70..b12120b84ea9d 100644 --- a/azure-mgmt-website/src/main/java/com/microsoft/azure/management/website/implementation/BackupRequestInner.java +++ b/azure-mgmt-appservice/src/main/java/com/microsoft/azure/management/appservice/implementation/BackupRequestInner.java @@ -6,12 +6,12 @@ * 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.BackupSchedule; +import com.microsoft.azure.management.appservice.BackupSchedule; import java.util.List; -import com.microsoft.azure.management.website.DatabaseBackupSetting; -import com.microsoft.azure.management.website.BackupRestoreOperationType; +import com.microsoft.azure.management.appservice.DatabaseBackupSetting; +import com.microsoft.azure.management.appservice.BackupRestoreOperationType; import com.fasterxml.jackson.annotation.JsonProperty; import com.microsoft.rest.serializer.JsonFlatten; import com.microsoft.azure.Resource; diff --git a/azure-mgmt-website/src/main/java/com/microsoft/azure/management/website/implementation/CapabilityInner.java b/azure-mgmt-appservice/src/main/java/com/microsoft/azure/management/appservice/implementation/CapabilityInner.java similarity index 96% rename from azure-mgmt-website/src/main/java/com/microsoft/azure/management/website/implementation/CapabilityInner.java rename to azure-mgmt-appservice/src/main/java/com/microsoft/azure/management/appservice/implementation/CapabilityInner.java index 84f1ac55c5e27..07c543d05f451 100644 --- a/azure-mgmt-website/src/main/java/com/microsoft/azure/management/website/implementation/CapabilityInner.java +++ b/azure-mgmt-appservice/src/main/java/com/microsoft/azure/management/appservice/implementation/CapabilityInner.java @@ -6,7 +6,7 @@ * Code generated by Microsoft (R) AutoRest Code Generator. */ -package com.microsoft.azure.management.website.implementation; +package com.microsoft.azure.management.appservice.implementation; /** diff --git a/azure-mgmt-website/src/main/java/com/microsoft/azure/management/website/implementation/CertificateDetailsImpl.java b/azure-mgmt-appservice/src/main/java/com/microsoft/azure/management/appservice/implementation/CertificateDetailsImpl.java similarity index 87% rename from azure-mgmt-website/src/main/java/com/microsoft/azure/management/website/implementation/CertificateDetailsImpl.java rename to azure-mgmt-appservice/src/main/java/com/microsoft/azure/management/appservice/implementation/CertificateDetailsImpl.java index cc25867095b52..c48265b2db90a 100644 --- a/azure-mgmt-website/src/main/java/com/microsoft/azure/management/website/implementation/CertificateDetailsImpl.java +++ b/azure-mgmt-appservice/src/main/java/com/microsoft/azure/management/appservice/implementation/CertificateDetailsImpl.java @@ -4,11 +4,11 @@ * license information. */ -package com.microsoft.azure.management.website.implementation; +package com.microsoft.azure.management.appservice.implementation; import com.microsoft.azure.management.resources.fluentcore.model.implementation.IndexableWrapperImpl; -import com.microsoft.azure.management.website.AppServicePlan; -import com.microsoft.azure.management.website.CertificateDetails; +import com.microsoft.azure.management.appservice.AppServicePlan; +import com.microsoft.azure.management.appservice.CertificateDetails; import org.joda.time.DateTime; /** diff --git a/azure-mgmt-website/src/main/java/com/microsoft/azure/management/website/implementation/CertificateDetailsInner.java b/azure-mgmt-appservice/src/main/java/com/microsoft/azure/management/appservice/implementation/CertificateDetailsInner.java similarity index 98% rename from azure-mgmt-website/src/main/java/com/microsoft/azure/management/website/implementation/CertificateDetailsInner.java rename to azure-mgmt-appservice/src/main/java/com/microsoft/azure/management/appservice/implementation/CertificateDetailsInner.java index ebc8e29525d51..1446fb7334c67 100644 --- a/azure-mgmt-website/src/main/java/com/microsoft/azure/management/website/implementation/CertificateDetailsInner.java +++ b/azure-mgmt-appservice/src/main/java/com/microsoft/azure/management/appservice/implementation/CertificateDetailsInner.java @@ -6,7 +6,7 @@ * Code generated by Microsoft (R) AutoRest Code Generator. */ -package com.microsoft.azure.management.website.implementation; +package com.microsoft.azure.management.appservice.implementation; import org.joda.time.DateTime; import com.fasterxml.jackson.annotation.JsonProperty; diff --git a/azure-mgmt-website/src/main/java/com/microsoft/azure/management/website/implementation/CertificateEmailInner.java b/azure-mgmt-appservice/src/main/java/com/microsoft/azure/management/appservice/implementation/CertificateEmailInner.java similarity index 96% rename from azure-mgmt-website/src/main/java/com/microsoft/azure/management/website/implementation/CertificateEmailInner.java rename to azure-mgmt-appservice/src/main/java/com/microsoft/azure/management/appservice/implementation/CertificateEmailInner.java index 85842b3463138..70a7a1435d923 100644 --- a/azure-mgmt-website/src/main/java/com/microsoft/azure/management/website/implementation/CertificateEmailInner.java +++ b/azure-mgmt-appservice/src/main/java/com/microsoft/azure/management/appservice/implementation/CertificateEmailInner.java @@ -6,7 +6,7 @@ * Code generated by Microsoft (R) AutoRest Code Generator. */ -package com.microsoft.azure.management.website.implementation; +package com.microsoft.azure.management.appservice.implementation; import org.joda.time.DateTime; import com.fasterxml.jackson.annotation.JsonProperty; diff --git a/azure-mgmt-website/src/main/java/com/microsoft/azure/management/website/implementation/CertificateInner.java b/azure-mgmt-appservice/src/main/java/com/microsoft/azure/management/appservice/implementation/CertificateInner.java similarity index 97% rename from azure-mgmt-website/src/main/java/com/microsoft/azure/management/website/implementation/CertificateInner.java rename to azure-mgmt-appservice/src/main/java/com/microsoft/azure/management/appservice/implementation/CertificateInner.java index 659301f389f1d..507dfc76b9dae 100644 --- a/azure-mgmt-website/src/main/java/com/microsoft/azure/management/website/implementation/CertificateInner.java +++ b/azure-mgmt-appservice/src/main/java/com/microsoft/azure/management/appservice/implementation/CertificateInner.java @@ -6,12 +6,12 @@ * 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 org.joda.time.DateTime; -import com.microsoft.azure.management.website.HostingEnvironmentProfile; -import com.microsoft.azure.management.website.KeyVaultSecretStatus; +import com.microsoft.azure.management.appservice.HostingEnvironmentProfile; +import com.microsoft.azure.management.appservice.KeyVaultSecretStatus; import com.fasterxml.jackson.annotation.JsonProperty; import com.microsoft.rest.serializer.JsonFlatten; import com.microsoft.azure.Resource; diff --git a/azure-mgmt-website/src/main/java/com/microsoft/azure/management/website/implementation/CertificateOrderActionInner.java b/azure-mgmt-appservice/src/main/java/com/microsoft/azure/management/appservice/implementation/CertificateOrderActionInner.java similarity index 94% rename from azure-mgmt-website/src/main/java/com/microsoft/azure/management/website/implementation/CertificateOrderActionInner.java rename to azure-mgmt-appservice/src/main/java/com/microsoft/azure/management/appservice/implementation/CertificateOrderActionInner.java index 4d86210eb052b..6707b2f2727d1 100644 --- a/azure-mgmt-website/src/main/java/com/microsoft/azure/management/website/implementation/CertificateOrderActionInner.java +++ b/azure-mgmt-appservice/src/main/java/com/microsoft/azure/management/appservice/implementation/CertificateOrderActionInner.java @@ -6,9 +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 com.microsoft.azure.management.website.CertificateOrderActionType; +import com.microsoft.azure.management.appservice.CertificateOrderActionType; import org.joda.time.DateTime; import com.fasterxml.jackson.annotation.JsonProperty; import com.microsoft.rest.serializer.JsonFlatten; diff --git a/azure-mgmt-website/src/main/java/com/microsoft/azure/management/website/implementation/CertificatesInner.java b/azure-mgmt-appservice/src/main/java/com/microsoft/azure/management/appservice/implementation/CertificatesInner.java similarity index 99% rename from azure-mgmt-website/src/main/java/com/microsoft/azure/management/website/implementation/CertificatesInner.java rename to azure-mgmt-appservice/src/main/java/com/microsoft/azure/management/appservice/implementation/CertificatesInner.java index 8c71652f4a47a..7df112e806d54 100644 --- a/azure-mgmt-website/src/main/java/com/microsoft/azure/management/website/implementation/CertificatesInner.java +++ b/azure-mgmt-appservice/src/main/java/com/microsoft/azure/management/appservice/implementation/CertificatesInner.java @@ -6,7 +6,7 @@ * 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; diff --git a/azure-mgmt-website/src/main/java/com/microsoft/azure/management/website/implementation/ConnectionStringDictionaryInner.java b/azure-mgmt-appservice/src/main/java/com/microsoft/azure/management/appservice/implementation/ConnectionStringDictionaryInner.java similarity index 88% rename from azure-mgmt-website/src/main/java/com/microsoft/azure/management/website/implementation/ConnectionStringDictionaryInner.java rename to azure-mgmt-appservice/src/main/java/com/microsoft/azure/management/appservice/implementation/ConnectionStringDictionaryInner.java index a962d1f22bcab..063cfad8ff8be 100644 --- a/azure-mgmt-website/src/main/java/com/microsoft/azure/management/website/implementation/ConnectionStringDictionaryInner.java +++ b/azure-mgmt-appservice/src/main/java/com/microsoft/azure/management/appservice/implementation/ConnectionStringDictionaryInner.java @@ -6,10 +6,10 @@ * 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.ConnStringValueTypePair; +import com.microsoft.azure.management.appservice.ConnStringValueTypePair; import com.microsoft.azure.Resource; /** diff --git a/azure-mgmt-website/src/main/java/com/microsoft/azure/management/website/implementation/ConnectionStringImpl.java b/azure-mgmt-appservice/src/main/java/com/microsoft/azure/management/appservice/implementation/ConnectionStringImpl.java similarity index 77% rename from azure-mgmt-website/src/main/java/com/microsoft/azure/management/website/implementation/ConnectionStringImpl.java rename to azure-mgmt-appservice/src/main/java/com/microsoft/azure/management/appservice/implementation/ConnectionStringImpl.java index e82765c8bab65..406c69425298a 100644 --- a/azure-mgmt-website/src/main/java/com/microsoft/azure/management/website/implementation/ConnectionStringImpl.java +++ b/azure-mgmt-appservice/src/main/java/com/microsoft/azure/management/appservice/implementation/ConnectionStringImpl.java @@ -4,11 +4,11 @@ * license information. */ -package com.microsoft.azure.management.website.implementation; +package com.microsoft.azure.management.appservice.implementation; -import com.microsoft.azure.management.website.ConnStringValueTypePair; -import com.microsoft.azure.management.website.ConnectionString; -import com.microsoft.azure.management.website.ConnectionStringType; +import com.microsoft.azure.management.appservice.ConnStringValueTypePair; +import com.microsoft.azure.management.appservice.ConnectionString; +import com.microsoft.azure.management.appservice.ConnectionStringType; /** * 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/implementation/CsmMoveResourceEnvelopeInner.java b/azure-mgmt-appservice/src/main/java/com/microsoft/azure/management/appservice/implementation/CsmMoveResourceEnvelopeInner.java similarity index 96% rename from azure-mgmt-website/src/main/java/com/microsoft/azure/management/website/implementation/CsmMoveResourceEnvelopeInner.java rename to azure-mgmt-appservice/src/main/java/com/microsoft/azure/management/appservice/implementation/CsmMoveResourceEnvelopeInner.java index 049ee9a3dc13c..8982224d9c991 100644 --- a/azure-mgmt-website/src/main/java/com/microsoft/azure/management/website/implementation/CsmMoveResourceEnvelopeInner.java +++ b/azure-mgmt-appservice/src/main/java/com/microsoft/azure/management/appservice/implementation/CsmMoveResourceEnvelopeInner.java @@ -6,7 +6,7 @@ * 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; diff --git a/azure-mgmt-website/src/main/java/com/microsoft/azure/management/website/implementation/CsmSiteRecoveryEntityInner.java b/azure-mgmt-appservice/src/main/java/com/microsoft/azure/management/appservice/implementation/CsmSiteRecoveryEntityInner.java similarity index 97% rename from azure-mgmt-website/src/main/java/com/microsoft/azure/management/website/implementation/CsmSiteRecoveryEntityInner.java rename to azure-mgmt-appservice/src/main/java/com/microsoft/azure/management/appservice/implementation/CsmSiteRecoveryEntityInner.java index 7657aef7d3b0d..2268400aa55dc 100644 --- a/azure-mgmt-website/src/main/java/com/microsoft/azure/management/website/implementation/CsmSiteRecoveryEntityInner.java +++ b/azure-mgmt-appservice/src/main/java/com/microsoft/azure/management/appservice/implementation/CsmSiteRecoveryEntityInner.java @@ -6,7 +6,7 @@ * Code generated by Microsoft (R) AutoRest Code Generator. */ -package com.microsoft.azure.management.website.implementation; +package com.microsoft.azure.management.appservice.implementation; import org.joda.time.DateTime; diff --git a/azure-mgmt-website/src/main/java/com/microsoft/azure/management/website/implementation/CsmSlotEntityInner.java b/azure-mgmt-appservice/src/main/java/com/microsoft/azure/management/appservice/implementation/CsmSlotEntityInner.java similarity index 96% rename from azure-mgmt-website/src/main/java/com/microsoft/azure/management/website/implementation/CsmSlotEntityInner.java rename to azure-mgmt-appservice/src/main/java/com/microsoft/azure/management/appservice/implementation/CsmSlotEntityInner.java index ec1e9a50b89e6..dd17c60db596e 100644 --- a/azure-mgmt-website/src/main/java/com/microsoft/azure/management/website/implementation/CsmSlotEntityInner.java +++ b/azure-mgmt-appservice/src/main/java/com/microsoft/azure/management/appservice/implementation/CsmSlotEntityInner.java @@ -6,7 +6,7 @@ * Code generated by Microsoft (R) AutoRest Code Generator. */ -package com.microsoft.azure.management.website.implementation; +package com.microsoft.azure.management.appservice.implementation; import com.fasterxml.jackson.annotation.JsonProperty; diff --git a/azure-mgmt-website/src/main/java/com/microsoft/azure/management/website/implementation/CsmUsageQuotaInner.java b/azure-mgmt-appservice/src/main/java/com/microsoft/azure/management/appservice/implementation/CsmUsageQuotaInner.java similarity index 95% rename from azure-mgmt-website/src/main/java/com/microsoft/azure/management/website/implementation/CsmUsageQuotaInner.java rename to azure-mgmt-appservice/src/main/java/com/microsoft/azure/management/appservice/implementation/CsmUsageQuotaInner.java index 641fd6b076942..baa1e00b6374a 100644 --- a/azure-mgmt-website/src/main/java/com/microsoft/azure/management/website/implementation/CsmUsageQuotaInner.java +++ b/azure-mgmt-appservice/src/main/java/com/microsoft/azure/management/appservice/implementation/CsmUsageQuotaInner.java @@ -6,10 +6,10 @@ * Code generated by Microsoft (R) AutoRest Code Generator. */ -package com.microsoft.azure.management.website.implementation; +package com.microsoft.azure.management.appservice.implementation; import org.joda.time.DateTime; -import com.microsoft.azure.management.website.LocalizableString; +import com.microsoft.azure.management.appservice.LocalizableString; /** * Usage of the quota resource. diff --git a/azure-mgmt-website/src/main/java/com/microsoft/azure/management/website/implementation/CsrInner.java b/azure-mgmt-appservice/src/main/java/com/microsoft/azure/management/appservice/implementation/CsrInner.java similarity index 98% rename from azure-mgmt-website/src/main/java/com/microsoft/azure/management/website/implementation/CsrInner.java rename to azure-mgmt-appservice/src/main/java/com/microsoft/azure/management/appservice/implementation/CsrInner.java index ddc612b464186..0726335563bf9 100644 --- a/azure-mgmt-website/src/main/java/com/microsoft/azure/management/website/implementation/CsrInner.java +++ b/azure-mgmt-appservice/src/main/java/com/microsoft/azure/management/appservice/implementation/CsrInner.java @@ -6,7 +6,7 @@ * Code generated by Microsoft (R) AutoRest Code Generator. */ -package com.microsoft.azure.management.website.implementation; +package com.microsoft.azure.management.appservice.implementation; import com.fasterxml.jackson.annotation.JsonProperty; import com.microsoft.rest.serializer.JsonFlatten; diff --git a/azure-mgmt-website/src/main/java/com/microsoft/azure/management/website/implementation/CustomHostnameAnalysisResultInner.java b/azure-mgmt-appservice/src/main/java/com/microsoft/azure/management/appservice/implementation/CustomHostnameAnalysisResultInner.java similarity index 97% rename from azure-mgmt-website/src/main/java/com/microsoft/azure/management/website/implementation/CustomHostnameAnalysisResultInner.java rename to azure-mgmt-appservice/src/main/java/com/microsoft/azure/management/appservice/implementation/CustomHostnameAnalysisResultInner.java index 73682ed410174..399064c63477c 100644 --- a/azure-mgmt-website/src/main/java/com/microsoft/azure/management/website/implementation/CustomHostnameAnalysisResultInner.java +++ b/azure-mgmt-appservice/src/main/java/com/microsoft/azure/management/appservice/implementation/CustomHostnameAnalysisResultInner.java @@ -6,10 +6,10 @@ * 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.DnsVerificationTestResult; -import com.microsoft.azure.management.website.ErrorEntity; +import com.microsoft.azure.management.appservice.DnsVerificationTestResult; +import com.microsoft.azure.management.appservice.ErrorEntity; import java.util.List; import com.fasterxml.jackson.annotation.JsonProperty; import com.microsoft.rest.serializer.JsonFlatten; diff --git a/azure-mgmt-website/src/main/java/com/microsoft/azure/management/website/implementation/DeletedSiteInner.java b/azure-mgmt-appservice/src/main/java/com/microsoft/azure/management/appservice/implementation/DeletedSiteInner.java similarity index 97% rename from azure-mgmt-website/src/main/java/com/microsoft/azure/management/website/implementation/DeletedSiteInner.java rename to azure-mgmt-appservice/src/main/java/com/microsoft/azure/management/appservice/implementation/DeletedSiteInner.java index c87116a7012f3..a53f7ef6d5dc5 100644 --- a/azure-mgmt-website/src/main/java/com/microsoft/azure/management/website/implementation/DeletedSiteInner.java +++ b/azure-mgmt-appservice/src/main/java/com/microsoft/azure/management/appservice/implementation/DeletedSiteInner.java @@ -6,16 +6,16 @@ * Code generated by Microsoft (R) AutoRest Code Generator. */ -package com.microsoft.azure.management.website.implementation; +package com.microsoft.azure.management.appservice.implementation; import org.joda.time.DateTime; import java.util.List; -import com.microsoft.azure.management.website.UsageState; -import com.microsoft.azure.management.website.SiteAvailabilityState; -import com.microsoft.azure.management.website.HostNameSslState; -import com.microsoft.azure.management.website.HostingEnvironmentProfile; -import com.microsoft.azure.management.website.CloningInfo; -import com.microsoft.azure.management.website.SlotSwapStatus; +import com.microsoft.azure.management.appservice.UsageState; +import com.microsoft.azure.management.appservice.SiteAvailabilityState; +import com.microsoft.azure.management.appservice.HostNameSslState; +import com.microsoft.azure.management.appservice.HostingEnvironmentProfile; +import com.microsoft.azure.management.appservice.CloningInfo; +import com.microsoft.azure.management.appservice.SlotSwapStatus; import com.fasterxml.jackson.annotation.JsonProperty; import com.microsoft.rest.serializer.JsonFlatten; import com.microsoft.azure.Resource; diff --git a/azure-mgmt-website/src/main/java/com/microsoft/azure/management/website/implementation/DeletedWebAppsInner.java b/azure-mgmt-appservice/src/main/java/com/microsoft/azure/management/appservice/implementation/DeletedWebAppsInner.java similarity index 99% rename from azure-mgmt-website/src/main/java/com/microsoft/azure/management/website/implementation/DeletedWebAppsInner.java rename to azure-mgmt-appservice/src/main/java/com/microsoft/azure/management/appservice/implementation/DeletedWebAppsInner.java index e7212178c2ae8..c7001008a0819 100644 --- a/azure-mgmt-website/src/main/java/com/microsoft/azure/management/website/implementation/DeletedWebAppsInner.java +++ b/azure-mgmt-appservice/src/main/java/com/microsoft/azure/management/appservice/implementation/DeletedWebAppsInner.java @@ -6,7 +6,7 @@ * 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; diff --git a/azure-mgmt-website/src/main/java/com/microsoft/azure/management/website/implementation/DeploymentInner.java b/azure-mgmt-appservice/src/main/java/com/microsoft/azure/management/appservice/implementation/DeploymentInner.java similarity index 98% rename from azure-mgmt-website/src/main/java/com/microsoft/azure/management/website/implementation/DeploymentInner.java rename to azure-mgmt-appservice/src/main/java/com/microsoft/azure/management/appservice/implementation/DeploymentInner.java index 389acf0abb1b5..b4e1a702cd270 100644 --- a/azure-mgmt-website/src/main/java/com/microsoft/azure/management/website/implementation/DeploymentInner.java +++ b/azure-mgmt-appservice/src/main/java/com/microsoft/azure/management/appservice/implementation/DeploymentInner.java @@ -6,7 +6,7 @@ * Code generated by Microsoft (R) AutoRest Code Generator. */ -package com.microsoft.azure.management.website.implementation; +package com.microsoft.azure.management.appservice.implementation; import org.joda.time.DateTime; import com.fasterxml.jackson.annotation.JsonProperty; diff --git a/azure-mgmt-website/src/main/java/com/microsoft/azure/management/website/implementation/DeploymentSlotImpl.java b/azure-mgmt-appservice/src/main/java/com/microsoft/azure/management/appservice/implementation/DeploymentSlotImpl.java similarity index 95% rename from azure-mgmt-website/src/main/java/com/microsoft/azure/management/website/implementation/DeploymentSlotImpl.java rename to azure-mgmt-appservice/src/main/java/com/microsoft/azure/management/appservice/implementation/DeploymentSlotImpl.java index dc3788e6cd5b3..d5e1bc4973a84 100644 --- a/azure-mgmt-website/src/main/java/com/microsoft/azure/management/website/implementation/DeploymentSlotImpl.java +++ b/azure-mgmt-appservice/src/main/java/com/microsoft/azure/management/appservice/implementation/DeploymentSlotImpl.java @@ -4,15 +4,15 @@ * license information. */ -package com.microsoft.azure.management.website.implementation; +package com.microsoft.azure.management.appservice.implementation; import com.google.common.base.Function; import com.google.common.collect.Maps; -import com.microsoft.azure.management.website.DeploymentSlot; -import com.microsoft.azure.management.website.HostNameBinding; -import com.microsoft.azure.management.website.PublishingCredentials; -import com.microsoft.azure.management.website.WebApp; -import com.microsoft.azure.management.website.WebAppSourceControl; +import com.microsoft.azure.management.appservice.DeploymentSlot; +import com.microsoft.azure.management.appservice.HostNameBinding; +import com.microsoft.azure.management.appservice.PublishingCredentials; +import com.microsoft.azure.management.appservice.WebApp; +import com.microsoft.azure.management.appservice.WebAppSourceControl; import rx.Observable; import rx.functions.Func1; diff --git a/azure-mgmt-website/src/main/java/com/microsoft/azure/management/website/implementation/DeploymentSlotsImpl.java b/azure-mgmt-appservice/src/main/java/com/microsoft/azure/management/appservice/implementation/DeploymentSlotsImpl.java similarity index 95% rename from azure-mgmt-website/src/main/java/com/microsoft/azure/management/website/implementation/DeploymentSlotsImpl.java rename to azure-mgmt-appservice/src/main/java/com/microsoft/azure/management/appservice/implementation/DeploymentSlotsImpl.java index 8ba22e14ffc49..6dde17e20ec2d 100644 --- a/azure-mgmt-website/src/main/java/com/microsoft/azure/management/website/implementation/DeploymentSlotsImpl.java +++ b/azure-mgmt-appservice/src/main/java/com/microsoft/azure/management/appservice/implementation/DeploymentSlotsImpl.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.IndependentChildResourcesImpl; import com.microsoft.azure.management.resources.fluentcore.utils.PagedListConverter; -import com.microsoft.azure.management.website.DeploymentSlot; -import com.microsoft.azure.management.website.DeploymentSlots; +import com.microsoft.azure.management.appservice.DeploymentSlot; +import com.microsoft.azure.management.appservice.DeploymentSlots; import com.microsoft.rest.ServiceCall; import com.microsoft.rest.ServiceCallback; import rx.Observable; diff --git a/azure-mgmt-website/src/main/java/com/microsoft/azure/management/website/implementation/DomainAvailablilityCheckResultInner.java b/azure-mgmt-appservice/src/main/java/com/microsoft/azure/management/appservice/implementation/DomainAvailablilityCheckResultInner.java similarity index 94% rename from azure-mgmt-website/src/main/java/com/microsoft/azure/management/website/implementation/DomainAvailablilityCheckResultInner.java rename to azure-mgmt-appservice/src/main/java/com/microsoft/azure/management/appservice/implementation/DomainAvailablilityCheckResultInner.java index 93849c1a87d37..efc0a272dfb3c 100644 --- a/azure-mgmt-website/src/main/java/com/microsoft/azure/management/website/implementation/DomainAvailablilityCheckResultInner.java +++ b/azure-mgmt-appservice/src/main/java/com/microsoft/azure/management/appservice/implementation/DomainAvailablilityCheckResultInner.java @@ -6,9 +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 com.microsoft.azure.management.website.DomainType; +import com.microsoft.azure.management.appservice.DomainType; /** * Domain availablility check result. diff --git a/azure-mgmt-website/src/main/java/com/microsoft/azure/management/website/implementation/DomainContactImpl.java b/azure-mgmt-appservice/src/main/java/com/microsoft/azure/management/appservice/implementation/DomainContactImpl.java similarity index 93% rename from azure-mgmt-website/src/main/java/com/microsoft/azure/management/website/implementation/DomainContactImpl.java rename to azure-mgmt-appservice/src/main/java/com/microsoft/azure/management/appservice/implementation/DomainContactImpl.java index d7eabd7ff1dfe..ea54e2a2947b7 100644 --- a/azure-mgmt-website/src/main/java/com/microsoft/azure/management/website/implementation/DomainContactImpl.java +++ b/azure-mgmt-appservice/src/main/java/com/microsoft/azure/management/appservice/implementation/DomainContactImpl.java @@ -3,16 +3,16 @@ * Licensed under the MIT License. See License.txt in the project root for * license information. */ -package com.microsoft.azure.management.website.implementation; +package com.microsoft.azure.management.appservice.implementation; import com.microsoft.azure.management.apigeneration.LangDefinition; import com.microsoft.azure.management.resources.fluentcore.arm.models.implementation.ChildResourceImpl; -import com.microsoft.azure.management.website.Address; -import com.microsoft.azure.management.website.AppServiceDomain; -import com.microsoft.azure.management.website.Contact; +import com.microsoft.azure.management.appservice.Address; +import com.microsoft.azure.management.appservice.AppServiceDomain; +import com.microsoft.azure.management.appservice.Contact; import com.microsoft.azure.management.resources.fluentcore.arm.CountryISOCode; import com.microsoft.azure.management.resources.fluentcore.arm.CountryPhoneCode; -import com.microsoft.azure.management.website.DomainContact; +import com.microsoft.azure.management.appservice.DomainContact; /** * Implementation for {@link DomainContact} and its create and update interfaces. diff --git a/azure-mgmt-website/src/main/java/com/microsoft/azure/management/website/implementation/DomainControlCenterSsoRequestInner.java b/azure-mgmt-appservice/src/main/java/com/microsoft/azure/management/appservice/implementation/DomainControlCenterSsoRequestInner.java similarity index 95% rename from azure-mgmt-website/src/main/java/com/microsoft/azure/management/website/implementation/DomainControlCenterSsoRequestInner.java rename to azure-mgmt-appservice/src/main/java/com/microsoft/azure/management/appservice/implementation/DomainControlCenterSsoRequestInner.java index 57f71dd579864..2599a3dc05ebb 100644 --- a/azure-mgmt-website/src/main/java/com/microsoft/azure/management/website/implementation/DomainControlCenterSsoRequestInner.java +++ b/azure-mgmt-appservice/src/main/java/com/microsoft/azure/management/appservice/implementation/DomainControlCenterSsoRequestInner.java @@ -6,7 +6,7 @@ * Code generated by Microsoft (R) AutoRest Code Generator. */ -package com.microsoft.azure.management.website.implementation; +package com.microsoft.azure.management.appservice.implementation; import com.fasterxml.jackson.annotation.JsonProperty; diff --git a/azure-mgmt-website/src/main/java/com/microsoft/azure/management/website/implementation/DomainInner.java b/azure-mgmt-appservice/src/main/java/com/microsoft/azure/management/appservice/implementation/DomainInner.java similarity index 96% rename from azure-mgmt-website/src/main/java/com/microsoft/azure/management/website/implementation/DomainInner.java rename to azure-mgmt-appservice/src/main/java/com/microsoft/azure/management/appservice/implementation/DomainInner.java index 9cf31d98509c9..f98b6d0021516 100644 --- a/azure-mgmt-website/src/main/java/com/microsoft/azure/management/website/implementation/DomainInner.java +++ b/azure-mgmt-appservice/src/main/java/com/microsoft/azure/management/appservice/implementation/DomainInner.java @@ -6,15 +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.Contact; -import com.microsoft.azure.management.website.DomainStatus; -import com.microsoft.azure.management.website.ProvisioningState; +import com.microsoft.azure.management.appservice.Contact; +import com.microsoft.azure.management.appservice.DomainStatus; +import com.microsoft.azure.management.appservice.ProvisioningState; import java.util.List; import org.joda.time.DateTime; -import com.microsoft.azure.management.website.HostName; -import com.microsoft.azure.management.website.DomainPurchaseConsent; +import com.microsoft.azure.management.appservice.HostName; +import com.microsoft.azure.management.appservice.DomainPurchaseConsent; import com.fasterxml.jackson.annotation.JsonProperty; import com.microsoft.rest.serializer.JsonFlatten; import com.microsoft.azure.Resource; diff --git a/azure-mgmt-website/src/main/java/com/microsoft/azure/management/website/implementation/DomainLegalAgreementImpl.java b/azure-mgmt-appservice/src/main/java/com/microsoft/azure/management/appservice/implementation/DomainLegalAgreementImpl.java similarity index 87% rename from azure-mgmt-website/src/main/java/com/microsoft/azure/management/website/implementation/DomainLegalAgreementImpl.java rename to azure-mgmt-appservice/src/main/java/com/microsoft/azure/management/appservice/implementation/DomainLegalAgreementImpl.java index ae995182d1c93..8f941cded4f2f 100644 --- a/azure-mgmt-website/src/main/java/com/microsoft/azure/management/website/implementation/DomainLegalAgreementImpl.java +++ b/azure-mgmt-appservice/src/main/java/com/microsoft/azure/management/appservice/implementation/DomainLegalAgreementImpl.java @@ -4,11 +4,11 @@ * license information. */ -package com.microsoft.azure.management.website.implementation; +package com.microsoft.azure.management.appservice.implementation; import com.microsoft.azure.management.resources.Tenant; import com.microsoft.azure.management.resources.fluentcore.model.implementation.WrapperImpl; -import com.microsoft.azure.management.website.DomainLegalAgreement; +import com.microsoft.azure.management.appservice.DomainLegalAgreement; /** * Implementation for {@link Tenant}. diff --git a/azure-mgmt-website/src/main/java/com/microsoft/azure/management/website/implementation/DomainOwnershipIdentifierInner.java b/azure-mgmt-appservice/src/main/java/com/microsoft/azure/management/appservice/implementation/DomainOwnershipIdentifierInner.java similarity index 94% rename from azure-mgmt-website/src/main/java/com/microsoft/azure/management/website/implementation/DomainOwnershipIdentifierInner.java rename to azure-mgmt-appservice/src/main/java/com/microsoft/azure/management/appservice/implementation/DomainOwnershipIdentifierInner.java index 4e0af0c14a118..fbbf306af8e48 100644 --- a/azure-mgmt-website/src/main/java/com/microsoft/azure/management/website/implementation/DomainOwnershipIdentifierInner.java +++ b/azure-mgmt-appservice/src/main/java/com/microsoft/azure/management/appservice/implementation/DomainOwnershipIdentifierInner.java @@ -6,7 +6,7 @@ * Code generated by Microsoft (R) AutoRest Code Generator. */ -package com.microsoft.azure.management.website.implementation; +package com.microsoft.azure.management.appservice.implementation; import com.fasterxml.jackson.annotation.JsonProperty; import com.microsoft.rest.serializer.JsonFlatten; diff --git a/azure-mgmt-website/src/main/java/com/microsoft/azure/management/website/implementation/DomainRecommendationSearchParametersInner.java b/azure-mgmt-appservice/src/main/java/com/microsoft/azure/management/appservice/implementation/DomainRecommendationSearchParametersInner.java similarity index 96% rename from azure-mgmt-website/src/main/java/com/microsoft/azure/management/website/implementation/DomainRecommendationSearchParametersInner.java rename to azure-mgmt-appservice/src/main/java/com/microsoft/azure/management/appservice/implementation/DomainRecommendationSearchParametersInner.java index 24e4df4a9e1f0..9d74a6aadf174 100644 --- a/azure-mgmt-website/src/main/java/com/microsoft/azure/management/website/implementation/DomainRecommendationSearchParametersInner.java +++ b/azure-mgmt-appservice/src/main/java/com/microsoft/azure/management/appservice/implementation/DomainRecommendationSearchParametersInner.java @@ -6,7 +6,7 @@ * Code generated by Microsoft (R) AutoRest Code Generator. */ -package com.microsoft.azure.management.website.implementation; +package com.microsoft.azure.management.appservice.implementation; /** diff --git a/azure-mgmt-website/src/main/java/com/microsoft/azure/management/website/implementation/DomainsInner.java b/azure-mgmt-appservice/src/main/java/com/microsoft/azure/management/appservice/implementation/DomainsInner.java similarity index 99% rename from azure-mgmt-website/src/main/java/com/microsoft/azure/management/website/implementation/DomainsInner.java rename to azure-mgmt-appservice/src/main/java/com/microsoft/azure/management/appservice/implementation/DomainsInner.java index 1105b99c9a7c0..7d5403b9e1b33 100644 --- a/azure-mgmt-website/src/main/java/com/microsoft/azure/management/website/implementation/DomainsInner.java +++ b/azure-mgmt-appservice/src/main/java/com/microsoft/azure/management/appservice/implementation/DomainsInner.java @@ -6,7 +6,7 @@ * 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; diff --git a/azure-mgmt-website/src/main/java/com/microsoft/azure/management/website/implementation/GeoRegionInner.java b/azure-mgmt-appservice/src/main/java/com/microsoft/azure/management/appservice/implementation/GeoRegionInner.java similarity index 95% rename from azure-mgmt-website/src/main/java/com/microsoft/azure/management/website/implementation/GeoRegionInner.java rename to azure-mgmt-appservice/src/main/java/com/microsoft/azure/management/appservice/implementation/GeoRegionInner.java index fcc436a58f043..64e7cebd2dd62 100644 --- a/azure-mgmt-website/src/main/java/com/microsoft/azure/management/website/implementation/GeoRegionInner.java +++ b/azure-mgmt-appservice/src/main/java/com/microsoft/azure/management/appservice/implementation/GeoRegionInner.java @@ -6,7 +6,7 @@ * Code generated by Microsoft (R) AutoRest Code Generator. */ -package com.microsoft.azure.management.website.implementation; +package com.microsoft.azure.management.appservice.implementation; import com.fasterxml.jackson.annotation.JsonProperty; import com.microsoft.rest.serializer.JsonFlatten; diff --git a/azure-mgmt-website/src/main/java/com/microsoft/azure/management/website/implementation/HostNameBindingImpl.java b/azure-mgmt-appservice/src/main/java/com/microsoft/azure/management/appservice/implementation/HostNameBindingImpl.java similarity index 92% rename from azure-mgmt-website/src/main/java/com/microsoft/azure/management/website/implementation/HostNameBindingImpl.java rename to azure-mgmt-appservice/src/main/java/com/microsoft/azure/management/appservice/implementation/HostNameBindingImpl.java index 007af2a94c087..2c4d78b7af991 100644 --- a/azure-mgmt-website/src/main/java/com/microsoft/azure/management/website/implementation/HostNameBindingImpl.java +++ b/azure-mgmt-appservice/src/main/java/com/microsoft/azure/management/appservice/implementation/HostNameBindingImpl.java @@ -4,18 +4,18 @@ * license information. */ -package com.microsoft.azure.management.website.implementation; +package com.microsoft.azure.management.appservice.implementation; import com.microsoft.azure.management.resources.fluentcore.arm.Region; import com.microsoft.azure.management.resources.fluentcore.model.Creatable; import com.microsoft.azure.management.resources.fluentcore.model.implementation.IndexableWrapperImpl; -import com.microsoft.azure.management.website.AzureResourceType; -import com.microsoft.azure.management.website.CustomHostNameDnsRecordType; -import com.microsoft.azure.management.website.DeploymentSlot; -import com.microsoft.azure.management.website.AppServiceDomain; -import com.microsoft.azure.management.website.HostNameBinding; -import com.microsoft.azure.management.website.HostNameType; -import com.microsoft.azure.management.website.WebAppBase; +import com.microsoft.azure.management.appservice.AzureResourceType; +import com.microsoft.azure.management.appservice.CustomHostNameDnsRecordType; +import com.microsoft.azure.management.appservice.DeploymentSlot; +import com.microsoft.azure.management.appservice.AppServiceDomain; +import com.microsoft.azure.management.appservice.HostNameBinding; +import com.microsoft.azure.management.appservice.HostNameType; +import com.microsoft.azure.management.appservice.WebAppBase; import com.microsoft.rest.ServiceCall; import com.microsoft.rest.ServiceCallback; import com.microsoft.rest.ServiceResponse; diff --git a/azure-mgmt-website/src/main/java/com/microsoft/azure/management/website/implementation/HostNameBindingInner.java b/azure-mgmt-appservice/src/main/java/com/microsoft/azure/management/appservice/implementation/HostNameBindingInner.java similarity index 95% rename from azure-mgmt-website/src/main/java/com/microsoft/azure/management/website/implementation/HostNameBindingInner.java rename to azure-mgmt-appservice/src/main/java/com/microsoft/azure/management/appservice/implementation/HostNameBindingInner.java index df18bf93698c7..95416ec85cff2 100644 --- a/azure-mgmt-website/src/main/java/com/microsoft/azure/management/website/implementation/HostNameBindingInner.java +++ b/azure-mgmt-appservice/src/main/java/com/microsoft/azure/management/appservice/implementation/HostNameBindingInner.java @@ -6,11 +6,11 @@ * 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.AzureResourceType; -import com.microsoft.azure.management.website.CustomHostNameDnsRecordType; -import com.microsoft.azure.management.website.HostNameType; +import com.microsoft.azure.management.appservice.AzureResourceType; +import com.microsoft.azure.management.appservice.CustomHostNameDnsRecordType; +import com.microsoft.azure.management.appservice.HostNameType; import com.fasterxml.jackson.annotation.JsonProperty; import com.microsoft.rest.serializer.JsonFlatten; import com.microsoft.azure.Resource; diff --git a/azure-mgmt-website/src/main/java/com/microsoft/azure/management/website/implementation/HostNameSslBindingImpl.java b/azure-mgmt-appservice/src/main/java/com/microsoft/azure/management/appservice/implementation/HostNameSslBindingImpl.java similarity index 94% rename from azure-mgmt-website/src/main/java/com/microsoft/azure/management/website/implementation/HostNameSslBindingImpl.java rename to azure-mgmt-appservice/src/main/java/com/microsoft/azure/management/appservice/implementation/HostNameSslBindingImpl.java index ad5a358fb68c5..1fa1170a73fe5 100644 --- a/azure-mgmt-website/src/main/java/com/microsoft/azure/management/website/implementation/HostNameSslBindingImpl.java +++ b/azure-mgmt-appservice/src/main/java/com/microsoft/azure/management/appservice/implementation/HostNameSslBindingImpl.java @@ -3,19 +3,19 @@ * Licensed under the MIT License. See License.txt in the project root for * 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.apigeneration.Fluent; import com.microsoft.azure.management.keyvault.Vault; import com.microsoft.azure.management.resources.fluentcore.arm.Region; import com.microsoft.azure.management.resources.fluentcore.model.implementation.IndexableWrapperImpl; -import com.microsoft.azure.management.website.AppServiceCertificate; -import com.microsoft.azure.management.website.AppServiceCertificateOrder; -import com.microsoft.azure.management.website.HostNameSslBinding; -import com.microsoft.azure.management.website.HostNameSslState; -import com.microsoft.azure.management.website.SslState; -import com.microsoft.azure.management.website.WebAppBase; +import com.microsoft.azure.management.appservice.AppServiceCertificate; +import com.microsoft.azure.management.appservice.AppServiceCertificateOrder; +import com.microsoft.azure.management.appservice.HostNameSslBinding; +import com.microsoft.azure.management.appservice.HostNameSslState; +import com.microsoft.azure.management.appservice.SslState; +import com.microsoft.azure.management.appservice.WebAppBase; import rx.Observable; import rx.functions.Action1; import rx.functions.Func1; diff --git a/azure-mgmt-website/src/main/java/com/microsoft/azure/management/website/implementation/HostingEnvironmentDiagnosticsInner.java b/azure-mgmt-appservice/src/main/java/com/microsoft/azure/management/appservice/implementation/HostingEnvironmentDiagnosticsInner.java similarity index 95% rename from azure-mgmt-website/src/main/java/com/microsoft/azure/management/website/implementation/HostingEnvironmentDiagnosticsInner.java rename to azure-mgmt-appservice/src/main/java/com/microsoft/azure/management/appservice/implementation/HostingEnvironmentDiagnosticsInner.java index 50ae664e82a8f..ebadf3a651ab6 100644 --- a/azure-mgmt-website/src/main/java/com/microsoft/azure/management/website/implementation/HostingEnvironmentDiagnosticsInner.java +++ b/azure-mgmt-appservice/src/main/java/com/microsoft/azure/management/appservice/implementation/HostingEnvironmentDiagnosticsInner.java @@ -6,7 +6,7 @@ * Code generated by Microsoft (R) AutoRest Code Generator. */ -package com.microsoft.azure.management.website.implementation; +package com.microsoft.azure.management.appservice.implementation; /** diff --git a/azure-mgmt-website/src/main/java/com/microsoft/azure/management/website/implementation/HybridConnectionInner.java b/azure-mgmt-appservice/src/main/java/com/microsoft/azure/management/appservice/implementation/HybridConnectionInner.java similarity index 98% rename from azure-mgmt-website/src/main/java/com/microsoft/azure/management/website/implementation/HybridConnectionInner.java rename to azure-mgmt-appservice/src/main/java/com/microsoft/azure/management/appservice/implementation/HybridConnectionInner.java index a072143ff19f8..1e7552d3fe60b 100644 --- a/azure-mgmt-website/src/main/java/com/microsoft/azure/management/website/implementation/HybridConnectionInner.java +++ b/azure-mgmt-appservice/src/main/java/com/microsoft/azure/management/appservice/implementation/HybridConnectionInner.java @@ -6,7 +6,7 @@ * Code generated by Microsoft (R) AutoRest Code Generator. */ -package com.microsoft.azure.management.website.implementation; +package com.microsoft.azure.management.appservice.implementation; import com.fasterxml.jackson.annotation.JsonProperty; import com.microsoft.rest.serializer.JsonFlatten; diff --git a/azure-mgmt-website/src/main/java/com/microsoft/azure/management/website/implementation/HybridConnectionKeyInner.java b/azure-mgmt-appservice/src/main/java/com/microsoft/azure/management/appservice/implementation/HybridConnectionKeyInner.java similarity index 94% rename from azure-mgmt-website/src/main/java/com/microsoft/azure/management/website/implementation/HybridConnectionKeyInner.java rename to azure-mgmt-appservice/src/main/java/com/microsoft/azure/management/appservice/implementation/HybridConnectionKeyInner.java index b7d53a8027d1b..5be88edf457dd 100644 --- a/azure-mgmt-website/src/main/java/com/microsoft/azure/management/website/implementation/HybridConnectionKeyInner.java +++ b/azure-mgmt-appservice/src/main/java/com/microsoft/azure/management/appservice/implementation/HybridConnectionKeyInner.java @@ -6,7 +6,7 @@ * Code generated by Microsoft (R) AutoRest Code Generator. */ -package com.microsoft.azure.management.website.implementation; +package com.microsoft.azure.management.appservice.implementation; import com.fasterxml.jackson.annotation.JsonProperty; import com.microsoft.rest.serializer.JsonFlatten; diff --git a/azure-mgmt-website/src/main/java/com/microsoft/azure/management/website/implementation/HybridConnectionLimitsInner.java b/azure-mgmt-appservice/src/main/java/com/microsoft/azure/management/appservice/implementation/HybridConnectionLimitsInner.java similarity index 94% rename from azure-mgmt-website/src/main/java/com/microsoft/azure/management/website/implementation/HybridConnectionLimitsInner.java rename to azure-mgmt-appservice/src/main/java/com/microsoft/azure/management/appservice/implementation/HybridConnectionLimitsInner.java index 1d058324df2be..a396f95199b7d 100644 --- a/azure-mgmt-website/src/main/java/com/microsoft/azure/management/website/implementation/HybridConnectionLimitsInner.java +++ b/azure-mgmt-appservice/src/main/java/com/microsoft/azure/management/appservice/implementation/HybridConnectionLimitsInner.java @@ -6,7 +6,7 @@ * Code generated by Microsoft (R) AutoRest Code Generator. */ -package com.microsoft.azure.management.website.implementation; +package com.microsoft.azure.management.appservice.implementation; import com.fasterxml.jackson.annotation.JsonProperty; import com.microsoft.rest.serializer.JsonFlatten; diff --git a/azure-mgmt-website/src/main/java/com/microsoft/azure/management/website/implementation/IdentifierInner.java b/azure-mgmt-appservice/src/main/java/com/microsoft/azure/management/appservice/implementation/IdentifierInner.java similarity index 94% rename from azure-mgmt-website/src/main/java/com/microsoft/azure/management/website/implementation/IdentifierInner.java rename to azure-mgmt-appservice/src/main/java/com/microsoft/azure/management/appservice/implementation/IdentifierInner.java index 6c59383ec35ac..1b62abb9c2b98 100644 --- a/azure-mgmt-website/src/main/java/com/microsoft/azure/management/website/implementation/IdentifierInner.java +++ b/azure-mgmt-appservice/src/main/java/com/microsoft/azure/management/appservice/implementation/IdentifierInner.java @@ -6,7 +6,7 @@ * Code generated by Microsoft (R) AutoRest Code Generator. */ -package com.microsoft.azure.management.website.implementation; +package com.microsoft.azure.management.appservice.implementation; import com.fasterxml.jackson.annotation.JsonProperty; import com.microsoft.rest.serializer.JsonFlatten; diff --git a/azure-mgmt-website/src/main/java/com/microsoft/azure/management/website/implementation/MetricDefinitionInner.java b/azure-mgmt-appservice/src/main/java/com/microsoft/azure/management/appservice/implementation/MetricDefinitionInner.java similarity index 94% rename from azure-mgmt-website/src/main/java/com/microsoft/azure/management/website/implementation/MetricDefinitionInner.java rename to azure-mgmt-appservice/src/main/java/com/microsoft/azure/management/appservice/implementation/MetricDefinitionInner.java index 5cb3fba71e8c5..e52dbc3779ccb 100644 --- a/azure-mgmt-website/src/main/java/com/microsoft/azure/management/website/implementation/MetricDefinitionInner.java +++ b/azure-mgmt-appservice/src/main/java/com/microsoft/azure/management/appservice/implementation/MetricDefinitionInner.java @@ -6,10 +6,10 @@ * 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.MetricAvailabilily; +import com.microsoft.azure.management.appservice.MetricAvailabilily; import com.fasterxml.jackson.annotation.JsonProperty; import com.microsoft.rest.serializer.JsonFlatten; import com.microsoft.azure.Resource; diff --git a/azure-mgmt-website/src/main/java/com/microsoft/azure/management/website/implementation/MigrateMySqlRequestInner.java b/azure-mgmt-appservice/src/main/java/com/microsoft/azure/management/appservice/implementation/MigrateMySqlRequestInner.java similarity index 94% rename from azure-mgmt-website/src/main/java/com/microsoft/azure/management/website/implementation/MigrateMySqlRequestInner.java rename to azure-mgmt-appservice/src/main/java/com/microsoft/azure/management/appservice/implementation/MigrateMySqlRequestInner.java index c1df96ff7d6c0..a36e0c272c716 100644 --- a/azure-mgmt-website/src/main/java/com/microsoft/azure/management/website/implementation/MigrateMySqlRequestInner.java +++ b/azure-mgmt-appservice/src/main/java/com/microsoft/azure/management/appservice/implementation/MigrateMySqlRequestInner.java @@ -6,7 +6,7 @@ * Code generated by Microsoft (R) AutoRest Code Generator. */ -package com.microsoft.azure.management.website.implementation; +package com.microsoft.azure.management.appservice.implementation; import com.fasterxml.jackson.annotation.JsonProperty; import com.microsoft.rest.serializer.JsonFlatten; diff --git a/azure-mgmt-website/src/main/java/com/microsoft/azure/management/website/implementation/NameIdentifierInner.java b/azure-mgmt-appservice/src/main/java/com/microsoft/azure/management/appservice/implementation/NameIdentifierInner.java similarity index 92% rename from azure-mgmt-website/src/main/java/com/microsoft/azure/management/website/implementation/NameIdentifierInner.java rename to azure-mgmt-appservice/src/main/java/com/microsoft/azure/management/appservice/implementation/NameIdentifierInner.java index d63417c2d595b..1e78bbbd2756d 100644 --- a/azure-mgmt-website/src/main/java/com/microsoft/azure/management/website/implementation/NameIdentifierInner.java +++ b/azure-mgmt-appservice/src/main/java/com/microsoft/azure/management/appservice/implementation/NameIdentifierInner.java @@ -6,7 +6,7 @@ * Code generated by Microsoft (R) AutoRest Code Generator. */ -package com.microsoft.azure.management.website.implementation; +package com.microsoft.azure.management.appservice.implementation; /** diff --git a/azure-mgmt-website/src/main/java/com/microsoft/azure/management/website/implementation/NetworkFeaturesInner.java b/azure-mgmt-appservice/src/main/java/com/microsoft/azure/management/appservice/implementation/NetworkFeaturesInner.java similarity index 97% rename from azure-mgmt-website/src/main/java/com/microsoft/azure/management/website/implementation/NetworkFeaturesInner.java rename to azure-mgmt-appservice/src/main/java/com/microsoft/azure/management/appservice/implementation/NetworkFeaturesInner.java index 77f5b1acfd5ba..ebef2ed8a5f65 100644 --- a/azure-mgmt-website/src/main/java/com/microsoft/azure/management/website/implementation/NetworkFeaturesInner.java +++ b/azure-mgmt-appservice/src/main/java/com/microsoft/azure/management/appservice/implementation/NetworkFeaturesInner.java @@ -6,7 +6,7 @@ * 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.fasterxml.jackson.annotation.JsonProperty; diff --git a/azure-mgmt-website/src/main/java/com/microsoft/azure/management/website/implementation/OperationInner.java b/azure-mgmt-appservice/src/main/java/com/microsoft/azure/management/appservice/implementation/OperationInner.java similarity index 96% rename from azure-mgmt-website/src/main/java/com/microsoft/azure/management/website/implementation/OperationInner.java rename to azure-mgmt-appservice/src/main/java/com/microsoft/azure/management/appservice/implementation/OperationInner.java index e583327203661..0b9a83b2da347 100644 --- a/azure-mgmt-website/src/main/java/com/microsoft/azure/management/website/implementation/OperationInner.java +++ b/azure-mgmt-appservice/src/main/java/com/microsoft/azure/management/appservice/implementation/OperationInner.java @@ -6,11 +6,11 @@ * 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.OperationStatus; +import com.microsoft.azure.management.appservice.OperationStatus; import java.util.List; -import com.microsoft.azure.management.website.ErrorEntity; +import com.microsoft.azure.management.appservice.ErrorEntity; import org.joda.time.DateTime; /** diff --git a/azure-mgmt-website/src/main/java/com/microsoft/azure/management/website/implementation/PageImpl.java b/azure-mgmt-appservice/src/main/java/com/microsoft/azure/management/appservice/implementation/PageImpl.java similarity index 96% rename from azure-mgmt-website/src/main/java/com/microsoft/azure/management/website/implementation/PageImpl.java rename to azure-mgmt-appservice/src/main/java/com/microsoft/azure/management/appservice/implementation/PageImpl.java index 5f0bda260100a..058e4609d5c95 100644 --- a/azure-mgmt-website/src/main/java/com/microsoft/azure/management/website/implementation/PageImpl.java +++ b/azure-mgmt-appservice/src/main/java/com/microsoft/azure/management/appservice/implementation/PageImpl.java @@ -6,7 +6,7 @@ * Code generated by Microsoft (R) AutoRest Code Generator. */ -package com.microsoft.azure.management.website.implementation; +package com.microsoft.azure.management.appservice.implementation; import com.fasterxml.jackson.annotation.JsonProperty; import com.microsoft.azure.Page; diff --git a/azure-mgmt-website/src/main/java/com/microsoft/azure/management/website/implementation/PerfMonResponseInner.java b/azure-mgmt-appservice/src/main/java/com/microsoft/azure/management/appservice/implementation/PerfMonResponseInner.java similarity index 93% rename from azure-mgmt-website/src/main/java/com/microsoft/azure/management/website/implementation/PerfMonResponseInner.java rename to azure-mgmt-appservice/src/main/java/com/microsoft/azure/management/appservice/implementation/PerfMonResponseInner.java index 0cdc5066bf666..a440a57ae881a 100644 --- a/azure-mgmt-website/src/main/java/com/microsoft/azure/management/website/implementation/PerfMonResponseInner.java +++ b/azure-mgmt-appservice/src/main/java/com/microsoft/azure/management/appservice/implementation/PerfMonResponseInner.java @@ -6,9 +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 com.microsoft.azure.management.website.PerfMonSet; +import com.microsoft.azure.management.appservice.PerfMonSet; /** * Performance monitor API response. diff --git a/azure-mgmt-website/src/main/java/com/microsoft/azure/management/website/implementation/PremierAddOnInner.java b/azure-mgmt-appservice/src/main/java/com/microsoft/azure/management/appservice/implementation/PremierAddOnInner.java similarity index 98% rename from azure-mgmt-website/src/main/java/com/microsoft/azure/management/website/implementation/PremierAddOnInner.java rename to azure-mgmt-appservice/src/main/java/com/microsoft/azure/management/appservice/implementation/PremierAddOnInner.java index c70c4df5433fb..d76587ce079af 100644 --- a/azure-mgmt-website/src/main/java/com/microsoft/azure/management/website/implementation/PremierAddOnInner.java +++ b/azure-mgmt-appservice/src/main/java/com/microsoft/azure/management/appservice/implementation/PremierAddOnInner.java @@ -6,7 +6,7 @@ * 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.fasterxml.jackson.annotation.JsonProperty; diff --git a/azure-mgmt-website/src/main/java/com/microsoft/azure/management/website/implementation/PremierAddOnOfferInner.java b/azure-mgmt-appservice/src/main/java/com/microsoft/azure/management/appservice/implementation/PremierAddOnOfferInner.java similarity index 98% rename from azure-mgmt-website/src/main/java/com/microsoft/azure/management/website/implementation/PremierAddOnOfferInner.java rename to azure-mgmt-appservice/src/main/java/com/microsoft/azure/management/appservice/implementation/PremierAddOnOfferInner.java index 3c69f599abd01..15dd2bc7f0102 100644 --- a/azure-mgmt-website/src/main/java/com/microsoft/azure/management/website/implementation/PremierAddOnOfferInner.java +++ b/azure-mgmt-appservice/src/main/java/com/microsoft/azure/management/appservice/implementation/PremierAddOnOfferInner.java @@ -6,9 +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 com.microsoft.azure.management.website.AppServicePlanRestrictions; +import com.microsoft.azure.management.appservice.AppServicePlanRestrictions; import com.fasterxml.jackson.annotation.JsonProperty; import com.microsoft.rest.serializer.JsonFlatten; import com.microsoft.azure.Resource; diff --git a/azure-mgmt-website/src/main/java/com/microsoft/azure/management/website/implementation/PublishingCredentialsImpl.java b/azure-mgmt-appservice/src/main/java/com/microsoft/azure/management/appservice/implementation/PublishingCredentialsImpl.java similarity index 84% rename from azure-mgmt-website/src/main/java/com/microsoft/azure/management/website/implementation/PublishingCredentialsImpl.java rename to azure-mgmt-appservice/src/main/java/com/microsoft/azure/management/appservice/implementation/PublishingCredentialsImpl.java index ede4b56327c9d..a642729f3586f 100644 --- a/azure-mgmt-website/src/main/java/com/microsoft/azure/management/website/implementation/PublishingCredentialsImpl.java +++ b/azure-mgmt-appservice/src/main/java/com/microsoft/azure/management/appservice/implementation/PublishingCredentialsImpl.java @@ -3,11 +3,11 @@ * Licensed under the MIT License. See License.txt in the project root for * license information. */ -package com.microsoft.azure.management.website.implementation; +package com.microsoft.azure.management.appservice.implementation; import com.microsoft.azure.management.apigeneration.Fluent; import com.microsoft.azure.management.resources.fluentcore.model.implementation.WrapperImpl; -import com.microsoft.azure.management.website.PublishingCredentials; +import com.microsoft.azure.management.appservice.PublishingCredentials; /** * A credential for publishing to a web app. diff --git a/azure-mgmt-website/src/main/java/com/microsoft/azure/management/website/implementation/PushSettingsInner.java b/azure-mgmt-appservice/src/main/java/com/microsoft/azure/management/appservice/implementation/PushSettingsInner.java similarity index 98% rename from azure-mgmt-website/src/main/java/com/microsoft/azure/management/website/implementation/PushSettingsInner.java rename to azure-mgmt-appservice/src/main/java/com/microsoft/azure/management/appservice/implementation/PushSettingsInner.java index c6ad8a5c0c688..a732d5522f719 100644 --- a/azure-mgmt-website/src/main/java/com/microsoft/azure/management/website/implementation/PushSettingsInner.java +++ b/azure-mgmt-appservice/src/main/java/com/microsoft/azure/management/appservice/implementation/PushSettingsInner.java @@ -6,7 +6,7 @@ * Code generated by Microsoft (R) AutoRest Code Generator. */ -package com.microsoft.azure.management.website.implementation; +package com.microsoft.azure.management.appservice.implementation; import com.fasterxml.jackson.annotation.JsonProperty; diff --git a/azure-mgmt-website/src/main/java/com/microsoft/azure/management/website/implementation/RecommendationInner.java b/azure-mgmt-appservice/src/main/java/com/microsoft/azure/management/appservice/implementation/RecommendationInner.java similarity index 97% rename from azure-mgmt-website/src/main/java/com/microsoft/azure/management/website/implementation/RecommendationInner.java rename to azure-mgmt-appservice/src/main/java/com/microsoft/azure/management/appservice/implementation/RecommendationInner.java index ed1537f462520..57016e7e7115d 100644 --- a/azure-mgmt-website/src/main/java/com/microsoft/azure/management/website/implementation/RecommendationInner.java +++ b/azure-mgmt-appservice/src/main/java/com/microsoft/azure/management/appservice/implementation/RecommendationInner.java @@ -6,12 +6,12 @@ * Code generated by Microsoft (R) AutoRest Code Generator. */ -package com.microsoft.azure.management.website.implementation; +package com.microsoft.azure.management.appservice.implementation; import org.joda.time.DateTime; -import com.microsoft.azure.management.website.ResourceScopeType; -import com.microsoft.azure.management.website.NotificationLevel; -import com.microsoft.azure.management.website.Channels; +import com.microsoft.azure.management.appservice.ResourceScopeType; +import com.microsoft.azure.management.appservice.NotificationLevel; +import com.microsoft.azure.management.appservice.Channels; import java.util.List; /** diff --git a/azure-mgmt-website/src/main/java/com/microsoft/azure/management/website/implementation/RecommendationRuleInner.java b/azure-mgmt-appservice/src/main/java/com/microsoft/azure/management/appservice/implementation/RecommendationRuleInner.java similarity index 96% rename from azure-mgmt-website/src/main/java/com/microsoft/azure/management/website/implementation/RecommendationRuleInner.java rename to azure-mgmt-appservice/src/main/java/com/microsoft/azure/management/appservice/implementation/RecommendationRuleInner.java index 651929a88c0e5..f7a1ffca5ba87 100644 --- a/azure-mgmt-website/src/main/java/com/microsoft/azure/management/website/implementation/RecommendationRuleInner.java +++ b/azure-mgmt-appservice/src/main/java/com/microsoft/azure/management/appservice/implementation/RecommendationRuleInner.java @@ -6,11 +6,11 @@ * 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.UUID; -import com.microsoft.azure.management.website.NotificationLevel; -import com.microsoft.azure.management.website.Channels; +import com.microsoft.azure.management.appservice.NotificationLevel; +import com.microsoft.azure.management.appservice.Channels; import java.util.List; /** diff --git a/azure-mgmt-website/src/main/java/com/microsoft/azure/management/website/implementation/RecommendationsInner.java b/azure-mgmt-appservice/src/main/java/com/microsoft/azure/management/appservice/implementation/RecommendationsInner.java similarity index 99% rename from azure-mgmt-website/src/main/java/com/microsoft/azure/management/website/implementation/RecommendationsInner.java rename to azure-mgmt-appservice/src/main/java/com/microsoft/azure/management/appservice/implementation/RecommendationsInner.java index 83e3659607153..8b3db778e8edb 100644 --- a/azure-mgmt-website/src/main/java/com/microsoft/azure/management/website/implementation/RecommendationsInner.java +++ b/azure-mgmt-appservice/src/main/java/com/microsoft/azure/management/appservice/implementation/RecommendationsInner.java @@ -6,7 +6,7 @@ * 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; diff --git a/azure-mgmt-website/src/main/java/com/microsoft/azure/management/website/implementation/RecoverResponseInner.java b/azure-mgmt-appservice/src/main/java/com/microsoft/azure/management/appservice/implementation/RecoverResponseInner.java similarity index 93% rename from azure-mgmt-website/src/main/java/com/microsoft/azure/management/website/implementation/RecoverResponseInner.java rename to azure-mgmt-appservice/src/main/java/com/microsoft/azure/management/appservice/implementation/RecoverResponseInner.java index a3c9486233735..6682c1364dac5 100644 --- a/azure-mgmt-website/src/main/java/com/microsoft/azure/management/website/implementation/RecoverResponseInner.java +++ b/azure-mgmt-appservice/src/main/java/com/microsoft/azure/management/appservice/implementation/RecoverResponseInner.java @@ -6,7 +6,7 @@ * Code generated by Microsoft (R) AutoRest Code Generator. */ -package com.microsoft.azure.management.website.implementation; +package com.microsoft.azure.management.appservice.implementation; import com.fasterxml.jackson.annotation.JsonProperty; import com.microsoft.rest.serializer.JsonFlatten; diff --git a/azure-mgmt-website/src/main/java/com/microsoft/azure/management/website/implementation/ReissueCertificateOrderRequestInner.java b/azure-mgmt-appservice/src/main/java/com/microsoft/azure/management/appservice/implementation/ReissueCertificateOrderRequestInner.java similarity index 98% rename from azure-mgmt-website/src/main/java/com/microsoft/azure/management/website/implementation/ReissueCertificateOrderRequestInner.java rename to azure-mgmt-appservice/src/main/java/com/microsoft/azure/management/appservice/implementation/ReissueCertificateOrderRequestInner.java index 2ee79bea65a71..559ba06df0109 100644 --- a/azure-mgmt-website/src/main/java/com/microsoft/azure/management/website/implementation/ReissueCertificateOrderRequestInner.java +++ b/azure-mgmt-appservice/src/main/java/com/microsoft/azure/management/appservice/implementation/ReissueCertificateOrderRequestInner.java @@ -6,7 +6,7 @@ * Code generated by Microsoft (R) AutoRest Code Generator. */ -package com.microsoft.azure.management.website.implementation; +package com.microsoft.azure.management.appservice.implementation; import com.fasterxml.jackson.annotation.JsonProperty; import com.microsoft.rest.serializer.JsonFlatten; diff --git a/azure-mgmt-website/src/main/java/com/microsoft/azure/management/website/implementation/RelayServiceConnectionEntityInner.java b/azure-mgmt-appservice/src/main/java/com/microsoft/azure/management/appservice/implementation/RelayServiceConnectionEntityInner.java similarity index 98% rename from azure-mgmt-website/src/main/java/com/microsoft/azure/management/website/implementation/RelayServiceConnectionEntityInner.java rename to azure-mgmt-appservice/src/main/java/com/microsoft/azure/management/appservice/implementation/RelayServiceConnectionEntityInner.java index 3096163cafa78..7a8c1175cac9d 100644 --- a/azure-mgmt-website/src/main/java/com/microsoft/azure/management/website/implementation/RelayServiceConnectionEntityInner.java +++ b/azure-mgmt-appservice/src/main/java/com/microsoft/azure/management/appservice/implementation/RelayServiceConnectionEntityInner.java @@ -6,7 +6,7 @@ * Code generated by Microsoft (R) AutoRest Code Generator. */ -package com.microsoft.azure.management.website.implementation; +package com.microsoft.azure.management.appservice.implementation; import com.fasterxml.jackson.annotation.JsonProperty; import com.microsoft.rest.serializer.JsonFlatten; diff --git a/azure-mgmt-website/src/main/java/com/microsoft/azure/management/website/implementation/RenewCertificateOrderRequestInner.java b/azure-mgmt-appservice/src/main/java/com/microsoft/azure/management/appservice/implementation/RenewCertificateOrderRequestInner.java similarity index 97% rename from azure-mgmt-website/src/main/java/com/microsoft/azure/management/website/implementation/RenewCertificateOrderRequestInner.java rename to azure-mgmt-appservice/src/main/java/com/microsoft/azure/management/appservice/implementation/RenewCertificateOrderRequestInner.java index 120d1f29512ca..83ea1c2219155 100644 --- a/azure-mgmt-website/src/main/java/com/microsoft/azure/management/website/implementation/RenewCertificateOrderRequestInner.java +++ b/azure-mgmt-appservice/src/main/java/com/microsoft/azure/management/appservice/implementation/RenewCertificateOrderRequestInner.java @@ -6,7 +6,7 @@ * Code generated by Microsoft (R) AutoRest Code Generator. */ -package com.microsoft.azure.management.website.implementation; +package com.microsoft.azure.management.appservice.implementation; import com.fasterxml.jackson.annotation.JsonProperty; import com.microsoft.rest.serializer.JsonFlatten; diff --git a/azure-mgmt-website/src/main/java/com/microsoft/azure/management/website/implementation/ResourceMetricDefinitionInner.java b/azure-mgmt-appservice/src/main/java/com/microsoft/azure/management/appservice/implementation/ResourceMetricDefinitionInner.java similarity index 93% rename from azure-mgmt-website/src/main/java/com/microsoft/azure/management/website/implementation/ResourceMetricDefinitionInner.java rename to azure-mgmt-appservice/src/main/java/com/microsoft/azure/management/appservice/implementation/ResourceMetricDefinitionInner.java index ce3fdf81be583..b86a185f51e49 100644 --- a/azure-mgmt-website/src/main/java/com/microsoft/azure/management/website/implementation/ResourceMetricDefinitionInner.java +++ b/azure-mgmt-appservice/src/main/java/com/microsoft/azure/management/appservice/implementation/ResourceMetricDefinitionInner.java @@ -6,11 +6,11 @@ * 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.ResourceMetricName; +import com.microsoft.azure.management.appservice.ResourceMetricName; import java.util.List; -import com.microsoft.azure.management.website.ResourceMetricAvailability; +import com.microsoft.azure.management.appservice.ResourceMetricAvailability; import java.util.Map; import com.fasterxml.jackson.annotation.JsonProperty; import com.microsoft.rest.serializer.JsonFlatten; diff --git a/azure-mgmt-website/src/main/java/com/microsoft/azure/management/website/implementation/ResourceMetricInner.java b/azure-mgmt-appservice/src/main/java/com/microsoft/azure/management/appservice/implementation/ResourceMetricInner.java similarity index 91% rename from azure-mgmt-website/src/main/java/com/microsoft/azure/management/website/implementation/ResourceMetricInner.java rename to azure-mgmt-appservice/src/main/java/com/microsoft/azure/management/appservice/implementation/ResourceMetricInner.java index 70db003edbf89..590a89926d064 100644 --- a/azure-mgmt-website/src/main/java/com/microsoft/azure/management/website/implementation/ResourceMetricInner.java +++ b/azure-mgmt-appservice/src/main/java/com/microsoft/azure/management/appservice/implementation/ResourceMetricInner.java @@ -6,13 +6,13 @@ * 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.ResourceMetricName; +import com.microsoft.azure.management.appservice.ResourceMetricName; import org.joda.time.DateTime; import java.util.List; -import com.microsoft.azure.management.website.ResourceMetricValue; -import com.microsoft.azure.management.website.ResourceMetricProperty; +import com.microsoft.azure.management.appservice.ResourceMetricValue; +import com.microsoft.azure.management.appservice.ResourceMetricProperty; import com.fasterxml.jackson.annotation.JsonProperty; /** diff --git a/azure-mgmt-website/src/main/java/com/microsoft/azure/management/website/implementation/ResourceNameAvailabilityInner.java b/azure-mgmt-appservice/src/main/java/com/microsoft/azure/management/appservice/implementation/ResourceNameAvailabilityInner.java similarity index 95% rename from azure-mgmt-website/src/main/java/com/microsoft/azure/management/website/implementation/ResourceNameAvailabilityInner.java rename to azure-mgmt-appservice/src/main/java/com/microsoft/azure/management/appservice/implementation/ResourceNameAvailabilityInner.java index 53d726be2685c..761810ffc665c 100644 --- a/azure-mgmt-website/src/main/java/com/microsoft/azure/management/website/implementation/ResourceNameAvailabilityInner.java +++ b/azure-mgmt-appservice/src/main/java/com/microsoft/azure/management/appservice/implementation/ResourceNameAvailabilityInner.java @@ -6,9 +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 com.microsoft.azure.management.website.InAvailabilityReasonType; +import com.microsoft.azure.management.appservice.InAvailabilityReasonType; /** * Information regarding availbility of a resource name. diff --git a/azure-mgmt-website/src/main/java/com/microsoft/azure/management/website/implementation/RestoreRequestInner.java b/azure-mgmt-appservice/src/main/java/com/microsoft/azure/management/appservice/implementation/RestoreRequestInner.java similarity index 97% rename from azure-mgmt-website/src/main/java/com/microsoft/azure/management/website/implementation/RestoreRequestInner.java rename to azure-mgmt-appservice/src/main/java/com/microsoft/azure/management/appservice/implementation/RestoreRequestInner.java index f4203f5987723..3cf0e9fae9f0e 100644 --- a/azure-mgmt-website/src/main/java/com/microsoft/azure/management/website/implementation/RestoreRequestInner.java +++ b/azure-mgmt-appservice/src/main/java/com/microsoft/azure/management/appservice/implementation/RestoreRequestInner.java @@ -6,11 +6,11 @@ * 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.DatabaseBackupSetting; -import com.microsoft.azure.management.website.BackupRestoreOperationType; +import com.microsoft.azure.management.appservice.DatabaseBackupSetting; +import com.microsoft.azure.management.appservice.BackupRestoreOperationType; import com.fasterxml.jackson.annotation.JsonProperty; import com.microsoft.rest.serializer.JsonFlatten; import com.microsoft.azure.Resource; diff --git a/azure-mgmt-website/src/main/java/com/microsoft/azure/management/website/implementation/RestoreResponseInner.java b/azure-mgmt-appservice/src/main/java/com/microsoft/azure/management/appservice/implementation/RestoreResponseInner.java similarity index 93% rename from azure-mgmt-website/src/main/java/com/microsoft/azure/management/website/implementation/RestoreResponseInner.java rename to azure-mgmt-appservice/src/main/java/com/microsoft/azure/management/appservice/implementation/RestoreResponseInner.java index 9351b1c2454ed..e5ed97d5c5da7 100644 --- a/azure-mgmt-website/src/main/java/com/microsoft/azure/management/website/implementation/RestoreResponseInner.java +++ b/azure-mgmt-appservice/src/main/java/com/microsoft/azure/management/appservice/implementation/RestoreResponseInner.java @@ -6,7 +6,7 @@ * Code generated by Microsoft (R) AutoRest Code Generator. */ -package com.microsoft.azure.management.website.implementation; +package com.microsoft.azure.management.appservice.implementation; import com.fasterxml.jackson.annotation.JsonProperty; import com.microsoft.rest.serializer.JsonFlatten; diff --git a/azure-mgmt-website/src/main/java/com/microsoft/azure/management/website/implementation/SiteAuthSettingsInner.java b/azure-mgmt-appservice/src/main/java/com/microsoft/azure/management/appservice/implementation/SiteAuthSettingsInner.java similarity index 98% rename from azure-mgmt-website/src/main/java/com/microsoft/azure/management/website/implementation/SiteAuthSettingsInner.java rename to azure-mgmt-appservice/src/main/java/com/microsoft/azure/management/appservice/implementation/SiteAuthSettingsInner.java index ddb9489b8d01e..51716c4a3f9d6 100644 --- a/azure-mgmt-website/src/main/java/com/microsoft/azure/management/website/implementation/SiteAuthSettingsInner.java +++ b/azure-mgmt-appservice/src/main/java/com/microsoft/azure/management/appservice/implementation/SiteAuthSettingsInner.java @@ -6,11 +6,11 @@ * 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.UnauthenticatedClientAction; +import com.microsoft.azure.management.appservice.UnauthenticatedClientAction; import java.util.List; -import com.microsoft.azure.management.website.BuiltInAuthenticationProvider; +import com.microsoft.azure.management.appservice.BuiltInAuthenticationProvider; /** * Configuration settings for the Azure App Service Authentication / diff --git a/azure-mgmt-website/src/main/java/com/microsoft/azure/management/website/implementation/SiteCloneabilityInner.java b/azure-mgmt-appservice/src/main/java/com/microsoft/azure/management/appservice/implementation/SiteCloneabilityInner.java similarity index 94% rename from azure-mgmt-website/src/main/java/com/microsoft/azure/management/website/implementation/SiteCloneabilityInner.java rename to azure-mgmt-appservice/src/main/java/com/microsoft/azure/management/appservice/implementation/SiteCloneabilityInner.java index b7b39c6095571..64b37bc4e6dca 100644 --- a/azure-mgmt-website/src/main/java/com/microsoft/azure/management/website/implementation/SiteCloneabilityInner.java +++ b/azure-mgmt-appservice/src/main/java/com/microsoft/azure/management/appservice/implementation/SiteCloneabilityInner.java @@ -6,11 +6,11 @@ * 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.CloneAbilityResult; +import com.microsoft.azure.management.appservice.CloneAbilityResult; import java.util.List; -import com.microsoft.azure.management.website.SiteCloneabilityCriterion; +import com.microsoft.azure.management.appservice.SiteCloneabilityCriterion; /** * Represents whether or not an app is cloneable. diff --git a/azure-mgmt-website/src/main/java/com/microsoft/azure/management/website/implementation/SiteConfigInner.java b/azure-mgmt-appservice/src/main/java/com/microsoft/azure/management/appservice/implementation/SiteConfigInner.java similarity index 97% rename from azure-mgmt-website/src/main/java/com/microsoft/azure/management/website/implementation/SiteConfigInner.java rename to azure-mgmt-appservice/src/main/java/com/microsoft/azure/management/appservice/implementation/SiteConfigInner.java index 549e8bb1c7e74..8b0c3f7cbba01 100644 --- a/azure-mgmt-website/src/main/java/com/microsoft/azure/management/website/implementation/SiteConfigInner.java +++ b/azure-mgmt-appservice/src/main/java/com/microsoft/azure/management/appservice/implementation/SiteConfigInner.java @@ -6,21 +6,21 @@ * 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 org.joda.time.DateTime; -import com.microsoft.azure.management.website.SiteMachineKey; -import com.microsoft.azure.management.website.HandlerMapping; -import com.microsoft.azure.management.website.ManagedPipelineMode; -import com.microsoft.azure.management.website.VirtualApplication; -import com.microsoft.azure.management.website.SiteLoadBalancing; -import com.microsoft.azure.management.website.Experiments; -import com.microsoft.azure.management.website.SiteLimits; -import com.microsoft.azure.management.website.AutoHealRules; -import com.microsoft.azure.management.website.CorsSettings; -import com.microsoft.azure.management.website.ApiDefinitionInfo; -import com.microsoft.azure.management.website.IpSecurityRestriction; +import com.microsoft.azure.management.appservice.SiteMachineKey; +import com.microsoft.azure.management.appservice.HandlerMapping; +import com.microsoft.azure.management.appservice.ManagedPipelineMode; +import com.microsoft.azure.management.appservice.VirtualApplication; +import com.microsoft.azure.management.appservice.SiteLoadBalancing; +import com.microsoft.azure.management.appservice.Experiments; +import com.microsoft.azure.management.appservice.SiteLimits; +import com.microsoft.azure.management.appservice.AutoHealRules; +import com.microsoft.azure.management.appservice.CorsSettings; +import com.microsoft.azure.management.appservice.ApiDefinitionInfo; +import com.microsoft.azure.management.appservice.IpSecurityRestriction; import com.fasterxml.jackson.annotation.JsonProperty; import com.microsoft.rest.serializer.JsonFlatten; import com.microsoft.azure.Resource; diff --git a/azure-mgmt-website/src/main/java/com/microsoft/azure/management/website/implementation/SiteInner.java b/azure-mgmt-appservice/src/main/java/com/microsoft/azure/management/appservice/implementation/SiteInner.java similarity index 97% rename from azure-mgmt-website/src/main/java/com/microsoft/azure/management/website/implementation/SiteInner.java rename to azure-mgmt-appservice/src/main/java/com/microsoft/azure/management/appservice/implementation/SiteInner.java index fd28167cc0e7f..0b2bbba2ca626 100644 --- a/azure-mgmt-website/src/main/java/com/microsoft/azure/management/website/implementation/SiteInner.java +++ b/azure-mgmt-appservice/src/main/java/com/microsoft/azure/management/appservice/implementation/SiteInner.java @@ -6,16 +6,16 @@ * 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.UsageState; -import com.microsoft.azure.management.website.SiteAvailabilityState; -import com.microsoft.azure.management.website.HostNameSslState; +import com.microsoft.azure.management.appservice.UsageState; +import com.microsoft.azure.management.appservice.SiteAvailabilityState; +import com.microsoft.azure.management.appservice.HostNameSslState; import org.joda.time.DateTime; -import com.microsoft.azure.management.website.HostingEnvironmentProfile; -import com.microsoft.azure.management.website.CloningInfo; -import com.microsoft.azure.management.website.SlotSwapStatus; +import com.microsoft.azure.management.appservice.HostingEnvironmentProfile; +import com.microsoft.azure.management.appservice.CloningInfo; +import com.microsoft.azure.management.appservice.SlotSwapStatus; import com.fasterxml.jackson.annotation.JsonProperty; import com.microsoft.rest.serializer.JsonFlatten; import com.microsoft.azure.Resource; diff --git a/azure-mgmt-website/src/main/java/com/microsoft/azure/management/website/implementation/SiteInstanceInner.java b/azure-mgmt-appservice/src/main/java/com/microsoft/azure/management/appservice/implementation/SiteInstanceInner.java similarity index 92% rename from azure-mgmt-website/src/main/java/com/microsoft/azure/management/website/implementation/SiteInstanceInner.java rename to azure-mgmt-appservice/src/main/java/com/microsoft/azure/management/appservice/implementation/SiteInstanceInner.java index fd8bfc019ad43..679ad0f9159a4 100644 --- a/azure-mgmt-website/src/main/java/com/microsoft/azure/management/website/implementation/SiteInstanceInner.java +++ b/azure-mgmt-appservice/src/main/java/com/microsoft/azure/management/appservice/implementation/SiteInstanceInner.java @@ -6,7 +6,7 @@ * Code generated by Microsoft (R) AutoRest Code Generator. */ -package com.microsoft.azure.management.website.implementation; +package com.microsoft.azure.management.appservice.implementation; import com.fasterxml.jackson.annotation.JsonProperty; import com.microsoft.rest.serializer.JsonFlatten; diff --git a/azure-mgmt-website/src/main/java/com/microsoft/azure/management/website/implementation/SiteLogsConfigInner.java b/azure-mgmt-appservice/src/main/java/com/microsoft/azure/management/appservice/implementation/SiteLogsConfigInner.java similarity index 92% rename from azure-mgmt-website/src/main/java/com/microsoft/azure/management/website/implementation/SiteLogsConfigInner.java rename to azure-mgmt-appservice/src/main/java/com/microsoft/azure/management/appservice/implementation/SiteLogsConfigInner.java index c1d12393ff5f9..69481378eaf05 100644 --- a/azure-mgmt-website/src/main/java/com/microsoft/azure/management/website/implementation/SiteLogsConfigInner.java +++ b/azure-mgmt-appservice/src/main/java/com/microsoft/azure/management/appservice/implementation/SiteLogsConfigInner.java @@ -6,11 +6,11 @@ * 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.ApplicationLogsConfig; -import com.microsoft.azure.management.website.HttpLogsConfig; -import com.microsoft.azure.management.website.EnabledConfig; +import com.microsoft.azure.management.appservice.ApplicationLogsConfig; +import com.microsoft.azure.management.appservice.HttpLogsConfig; +import com.microsoft.azure.management.appservice.EnabledConfig; import com.fasterxml.jackson.annotation.JsonProperty; import com.microsoft.rest.serializer.JsonFlatten; import com.microsoft.azure.Resource; diff --git a/azure-mgmt-website/src/main/java/com/microsoft/azure/management/website/implementation/SitePhpErrorLogFlagInner.java b/azure-mgmt-appservice/src/main/java/com/microsoft/azure/management/appservice/implementation/SitePhpErrorLogFlagInner.java similarity index 98% rename from azure-mgmt-website/src/main/java/com/microsoft/azure/management/website/implementation/SitePhpErrorLogFlagInner.java rename to azure-mgmt-appservice/src/main/java/com/microsoft/azure/management/appservice/implementation/SitePhpErrorLogFlagInner.java index aeb4c70be4273..f240a828e63ed 100644 --- a/azure-mgmt-website/src/main/java/com/microsoft/azure/management/website/implementation/SitePhpErrorLogFlagInner.java +++ b/azure-mgmt-appservice/src/main/java/com/microsoft/azure/management/appservice/implementation/SitePhpErrorLogFlagInner.java @@ -6,7 +6,7 @@ * Code generated by Microsoft (R) AutoRest Code Generator. */ -package com.microsoft.azure.management.website.implementation; +package com.microsoft.azure.management.appservice.implementation; import com.fasterxml.jackson.annotation.JsonProperty; import com.microsoft.rest.serializer.JsonFlatten; diff --git a/azure-mgmt-website/src/main/java/com/microsoft/azure/management/website/implementation/SiteSourceControlInner.java b/azure-mgmt-appservice/src/main/java/com/microsoft/azure/management/appservice/implementation/SiteSourceControlInner.java similarity index 98% rename from azure-mgmt-website/src/main/java/com/microsoft/azure/management/website/implementation/SiteSourceControlInner.java rename to azure-mgmt-appservice/src/main/java/com/microsoft/azure/management/appservice/implementation/SiteSourceControlInner.java index 7abe1cca34ab0..970f5cd3f634d 100644 --- a/azure-mgmt-website/src/main/java/com/microsoft/azure/management/website/implementation/SiteSourceControlInner.java +++ b/azure-mgmt-appservice/src/main/java/com/microsoft/azure/management/appservice/implementation/SiteSourceControlInner.java @@ -6,7 +6,7 @@ * Code generated by Microsoft (R) AutoRest Code Generator. */ -package com.microsoft.azure.management.website.implementation; +package com.microsoft.azure.management.appservice.implementation; import com.fasterxml.jackson.annotation.JsonProperty; import com.microsoft.rest.serializer.JsonFlatten; diff --git a/azure-mgmt-website/src/main/java/com/microsoft/azure/management/website/implementation/SkuInfoInner.java b/azure-mgmt-appservice/src/main/java/com/microsoft/azure/management/appservice/implementation/SkuInfoInner.java similarity index 90% rename from azure-mgmt-website/src/main/java/com/microsoft/azure/management/website/implementation/SkuInfoInner.java rename to azure-mgmt-appservice/src/main/java/com/microsoft/azure/management/appservice/implementation/SkuInfoInner.java index c6994faa402ad..a446662fbf621 100644 --- a/azure-mgmt-website/src/main/java/com/microsoft/azure/management/website/implementation/SkuInfoInner.java +++ b/azure-mgmt-appservice/src/main/java/com/microsoft/azure/management/appservice/implementation/SkuInfoInner.java @@ -6,10 +6,10 @@ * 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.SkuDescription; -import com.microsoft.azure.management.website.SkuCapacity; +import com.microsoft.azure.management.appservice.SkuDescription; +import com.microsoft.azure.management.appservice.SkuCapacity; /** * SKU discovery information. diff --git a/azure-mgmt-website/src/main/java/com/microsoft/azure/management/website/implementation/SkuInfosInner.java b/azure-mgmt-appservice/src/main/java/com/microsoft/azure/management/appservice/implementation/SkuInfosInner.java similarity index 91% rename from azure-mgmt-website/src/main/java/com/microsoft/azure/management/website/implementation/SkuInfosInner.java rename to azure-mgmt-appservice/src/main/java/com/microsoft/azure/management/appservice/implementation/SkuInfosInner.java index c0784f6e46ba0..203757b8941d2 100644 --- a/azure-mgmt-website/src/main/java/com/microsoft/azure/management/website/implementation/SkuInfosInner.java +++ b/azure-mgmt-appservice/src/main/java/com/microsoft/azure/management/appservice/implementation/SkuInfosInner.java @@ -6,10 +6,10 @@ * 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.GlobalCsmSkuDescription; +import com.microsoft.azure.management.appservice.GlobalCsmSkuDescription; /** * Collection of SKU information. diff --git a/azure-mgmt-website/src/main/java/com/microsoft/azure/management/website/implementation/SlotConfigNamesResourceInner.java b/azure-mgmt-appservice/src/main/java/com/microsoft/azure/management/appservice/implementation/SlotConfigNamesResourceInner.java similarity index 96% rename from azure-mgmt-website/src/main/java/com/microsoft/azure/management/website/implementation/SlotConfigNamesResourceInner.java rename to azure-mgmt-appservice/src/main/java/com/microsoft/azure/management/appservice/implementation/SlotConfigNamesResourceInner.java index 204d99b8e10bb..07969fb2197a0 100644 --- a/azure-mgmt-website/src/main/java/com/microsoft/azure/management/website/implementation/SlotConfigNamesResourceInner.java +++ b/azure-mgmt-appservice/src/main/java/com/microsoft/azure/management/appservice/implementation/SlotConfigNamesResourceInner.java @@ -6,7 +6,7 @@ * 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.fasterxml.jackson.annotation.JsonProperty; diff --git a/azure-mgmt-website/src/main/java/com/microsoft/azure/management/website/implementation/SlotDifferenceInner.java b/azure-mgmt-appservice/src/main/java/com/microsoft/azure/management/appservice/implementation/SlotDifferenceInner.java similarity index 97% rename from azure-mgmt-website/src/main/java/com/microsoft/azure/management/website/implementation/SlotDifferenceInner.java rename to azure-mgmt-appservice/src/main/java/com/microsoft/azure/management/appservice/implementation/SlotDifferenceInner.java index 055621c12e5cc..1d0c8d3c829cf 100644 --- a/azure-mgmt-website/src/main/java/com/microsoft/azure/management/website/implementation/SlotDifferenceInner.java +++ b/azure-mgmt-appservice/src/main/java/com/microsoft/azure/management/appservice/implementation/SlotDifferenceInner.java @@ -6,7 +6,7 @@ * Code generated by Microsoft (R) AutoRest Code Generator. */ -package com.microsoft.azure.management.website.implementation; +package com.microsoft.azure.management.appservice.implementation; import com.fasterxml.jackson.annotation.JsonProperty; import com.microsoft.rest.serializer.JsonFlatten; diff --git a/azure-mgmt-website/src/main/java/com/microsoft/azure/management/website/implementation/SnapshotInner.java b/azure-mgmt-appservice/src/main/java/com/microsoft/azure/management/appservice/implementation/SnapshotInner.java similarity index 92% rename from azure-mgmt-website/src/main/java/com/microsoft/azure/management/website/implementation/SnapshotInner.java rename to azure-mgmt-appservice/src/main/java/com/microsoft/azure/management/appservice/implementation/SnapshotInner.java index 59710a8ffac81..a06960afa312c 100644 --- a/azure-mgmt-website/src/main/java/com/microsoft/azure/management/website/implementation/SnapshotInner.java +++ b/azure-mgmt-appservice/src/main/java/com/microsoft/azure/management/appservice/implementation/SnapshotInner.java @@ -6,7 +6,7 @@ * Code generated by Microsoft (R) AutoRest Code Generator. */ -package com.microsoft.azure.management.website.implementation; +package com.microsoft.azure.management.appservice.implementation; import org.joda.time.DateTime; import com.fasterxml.jackson.annotation.JsonProperty; diff --git a/azure-mgmt-website/src/main/java/com/microsoft/azure/management/website/implementation/SourceControlInner.java b/azure-mgmt-appservice/src/main/java/com/microsoft/azure/management/appservice/implementation/SourceControlInner.java similarity index 98% rename from azure-mgmt-website/src/main/java/com/microsoft/azure/management/website/implementation/SourceControlInner.java rename to azure-mgmt-appservice/src/main/java/com/microsoft/azure/management/appservice/implementation/SourceControlInner.java index c64d4d0f7fd3b..23a4694402fcd 100644 --- a/azure-mgmt-website/src/main/java/com/microsoft/azure/management/website/implementation/SourceControlInner.java +++ b/azure-mgmt-appservice/src/main/java/com/microsoft/azure/management/appservice/implementation/SourceControlInner.java @@ -6,7 +6,7 @@ * Code generated by Microsoft (R) AutoRest Code Generator. */ -package com.microsoft.azure.management.website.implementation; +package com.microsoft.azure.management.appservice.implementation; import org.joda.time.DateTime; import com.fasterxml.jackson.annotation.JsonProperty; diff --git a/azure-mgmt-website/src/main/java/com/microsoft/azure/management/website/implementation/StampCapacityInner.java b/azure-mgmt-appservice/src/main/java/com/microsoft/azure/management/appservice/implementation/StampCapacityInner.java similarity index 97% rename from azure-mgmt-website/src/main/java/com/microsoft/azure/management/website/implementation/StampCapacityInner.java rename to azure-mgmt-appservice/src/main/java/com/microsoft/azure/management/appservice/implementation/StampCapacityInner.java index d9fae491c5ff8..1a61c5b9d1426 100644 --- a/azure-mgmt-website/src/main/java/com/microsoft/azure/management/website/implementation/StampCapacityInner.java +++ b/azure-mgmt-appservice/src/main/java/com/microsoft/azure/management/appservice/implementation/StampCapacityInner.java @@ -6,10 +6,10 @@ * 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.ComputeModeOptions; -import com.microsoft.azure.management.website.WorkerSizeOptions; +import com.microsoft.azure.management.appservice.ComputeModeOptions; +import com.microsoft.azure.management.appservice.WorkerSizeOptions; /** * Stamp capacity information. diff --git a/azure-mgmt-website/src/main/java/com/microsoft/azure/management/website/implementation/StorageMigrationOptionsInner.java b/azure-mgmt-appservice/src/main/java/com/microsoft/azure/management/appservice/implementation/StorageMigrationOptionsInner.java similarity index 98% rename from azure-mgmt-website/src/main/java/com/microsoft/azure/management/website/implementation/StorageMigrationOptionsInner.java rename to azure-mgmt-appservice/src/main/java/com/microsoft/azure/management/appservice/implementation/StorageMigrationOptionsInner.java index 10c81927e8708..83bc5ce360c6d 100644 --- a/azure-mgmt-website/src/main/java/com/microsoft/azure/management/website/implementation/StorageMigrationOptionsInner.java +++ b/azure-mgmt-appservice/src/main/java/com/microsoft/azure/management/appservice/implementation/StorageMigrationOptionsInner.java @@ -6,7 +6,7 @@ * Code generated by Microsoft (R) AutoRest Code Generator. */ -package com.microsoft.azure.management.website.implementation; +package com.microsoft.azure.management.appservice.implementation; import com.fasterxml.jackson.annotation.JsonProperty; import com.microsoft.rest.serializer.JsonFlatten; diff --git a/azure-mgmt-website/src/main/java/com/microsoft/azure/management/website/implementation/StorageMigrationResponseInner.java b/azure-mgmt-appservice/src/main/java/com/microsoft/azure/management/appservice/implementation/StorageMigrationResponseInner.java similarity index 93% rename from azure-mgmt-website/src/main/java/com/microsoft/azure/management/website/implementation/StorageMigrationResponseInner.java rename to azure-mgmt-appservice/src/main/java/com/microsoft/azure/management/appservice/implementation/StorageMigrationResponseInner.java index 03aaeeea5cbb1..e8104a928c538 100644 --- a/azure-mgmt-website/src/main/java/com/microsoft/azure/management/website/implementation/StorageMigrationResponseInner.java +++ b/azure-mgmt-appservice/src/main/java/com/microsoft/azure/management/appservice/implementation/StorageMigrationResponseInner.java @@ -6,7 +6,7 @@ * Code generated by Microsoft (R) AutoRest Code Generator. */ -package com.microsoft.azure.management.website.implementation; +package com.microsoft.azure.management.appservice.implementation; import com.fasterxml.jackson.annotation.JsonProperty; import com.microsoft.rest.serializer.JsonFlatten; diff --git a/azure-mgmt-website/src/main/java/com/microsoft/azure/management/website/implementation/StringDictionaryInner.java b/azure-mgmt-appservice/src/main/java/com/microsoft/azure/management/appservice/implementation/StringDictionaryInner.java similarity index 93% rename from azure-mgmt-website/src/main/java/com/microsoft/azure/management/website/implementation/StringDictionaryInner.java rename to azure-mgmt-appservice/src/main/java/com/microsoft/azure/management/appservice/implementation/StringDictionaryInner.java index 71ddf2e490d4d..254174c42be4c 100644 --- a/azure-mgmt-website/src/main/java/com/microsoft/azure/management/website/implementation/StringDictionaryInner.java +++ b/azure-mgmt-appservice/src/main/java/com/microsoft/azure/management/appservice/implementation/StringDictionaryInner.java @@ -6,7 +6,7 @@ * 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.Resource; diff --git a/azure-mgmt-website/src/main/java/com/microsoft/azure/management/website/implementation/TldLegalAgreementInner.java b/azure-mgmt-appservice/src/main/java/com/microsoft/azure/management/appservice/implementation/TldLegalAgreementInner.java similarity index 97% rename from azure-mgmt-website/src/main/java/com/microsoft/azure/management/website/implementation/TldLegalAgreementInner.java rename to azure-mgmt-appservice/src/main/java/com/microsoft/azure/management/appservice/implementation/TldLegalAgreementInner.java index 6f413e732ee1c..25b0b87927990 100644 --- a/azure-mgmt-website/src/main/java/com/microsoft/azure/management/website/implementation/TldLegalAgreementInner.java +++ b/azure-mgmt-appservice/src/main/java/com/microsoft/azure/management/appservice/implementation/TldLegalAgreementInner.java @@ -6,7 +6,7 @@ * Code generated by Microsoft (R) AutoRest Code Generator. */ -package com.microsoft.azure.management.website.implementation; +package com.microsoft.azure.management.appservice.implementation; import com.fasterxml.jackson.annotation.JsonProperty; diff --git a/azure-mgmt-website/src/main/java/com/microsoft/azure/management/website/implementation/TopLevelDomainInner.java b/azure-mgmt-appservice/src/main/java/com/microsoft/azure/management/appservice/implementation/TopLevelDomainInner.java similarity index 95% rename from azure-mgmt-website/src/main/java/com/microsoft/azure/management/website/implementation/TopLevelDomainInner.java rename to azure-mgmt-appservice/src/main/java/com/microsoft/azure/management/appservice/implementation/TopLevelDomainInner.java index d472e2780b112..47111a0471e1d 100644 --- a/azure-mgmt-website/src/main/java/com/microsoft/azure/management/website/implementation/TopLevelDomainInner.java +++ b/azure-mgmt-appservice/src/main/java/com/microsoft/azure/management/appservice/implementation/TopLevelDomainInner.java @@ -6,7 +6,7 @@ * Code generated by Microsoft (R) AutoRest Code Generator. */ -package com.microsoft.azure.management.website.implementation; +package com.microsoft.azure.management.appservice.implementation; import com.fasterxml.jackson.annotation.JsonProperty; import com.microsoft.rest.serializer.JsonFlatten; diff --git a/azure-mgmt-website/src/main/java/com/microsoft/azure/management/website/implementation/TopLevelDomainsInner.java b/azure-mgmt-appservice/src/main/java/com/microsoft/azure/management/appservice/implementation/TopLevelDomainsInner.java similarity index 99% rename from azure-mgmt-website/src/main/java/com/microsoft/azure/management/website/implementation/TopLevelDomainsInner.java rename to azure-mgmt-appservice/src/main/java/com/microsoft/azure/management/appservice/implementation/TopLevelDomainsInner.java index 300f267c8bd3b..c99989034526e 100644 --- a/azure-mgmt-website/src/main/java/com/microsoft/azure/management/website/implementation/TopLevelDomainsInner.java +++ b/azure-mgmt-appservice/src/main/java/com/microsoft/azure/management/appservice/implementation/TopLevelDomainsInner.java @@ -6,7 +6,7 @@ * 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; @@ -14,7 +14,7 @@ import com.microsoft.azure.AzureServiceResponseBuilder; import com.microsoft.azure.CloudException; import com.microsoft.azure.ListOperationCallback; -import com.microsoft.azure.management.website.TopLevelDomainAgreementOption; +import com.microsoft.azure.management.appservice.TopLevelDomainAgreementOption; import com.microsoft.azure.Page; import com.microsoft.azure.PagedList; import com.microsoft.rest.ServiceCall; diff --git a/azure-mgmt-website/src/main/java/com/microsoft/azure/management/website/implementation/UsageInner.java b/azure-mgmt-appservice/src/main/java/com/microsoft/azure/management/appservice/implementation/UsageInner.java similarity index 96% rename from azure-mgmt-website/src/main/java/com/microsoft/azure/management/website/implementation/UsageInner.java rename to azure-mgmt-appservice/src/main/java/com/microsoft/azure/management/appservice/implementation/UsageInner.java index 3a906c1512070..d9375ab7084ce 100644 --- a/azure-mgmt-website/src/main/java/com/microsoft/azure/management/website/implementation/UsageInner.java +++ b/azure-mgmt-appservice/src/main/java/com/microsoft/azure/management/appservice/implementation/UsageInner.java @@ -6,10 +6,10 @@ * Code generated by Microsoft (R) AutoRest Code Generator. */ -package com.microsoft.azure.management.website.implementation; +package com.microsoft.azure.management.appservice.implementation; import org.joda.time.DateTime; -import com.microsoft.azure.management.website.ComputeModeOptions; +import com.microsoft.azure.management.appservice.ComputeModeOptions; import com.fasterxml.jackson.annotation.JsonProperty; import com.microsoft.rest.serializer.JsonFlatten; import com.microsoft.azure.Resource; diff --git a/azure-mgmt-website/src/main/java/com/microsoft/azure/management/website/implementation/UserInner.java b/azure-mgmt-appservice/src/main/java/com/microsoft/azure/management/appservice/implementation/UserInner.java similarity index 98% rename from azure-mgmt-website/src/main/java/com/microsoft/azure/management/website/implementation/UserInner.java rename to azure-mgmt-appservice/src/main/java/com/microsoft/azure/management/appservice/implementation/UserInner.java index a91ffc2ae8f2e..b89d25b68e2c3 100644 --- a/azure-mgmt-website/src/main/java/com/microsoft/azure/management/website/implementation/UserInner.java +++ b/azure-mgmt-appservice/src/main/java/com/microsoft/azure/management/appservice/implementation/UserInner.java @@ -6,7 +6,7 @@ * Code generated by Microsoft (R) AutoRest Code Generator. */ -package com.microsoft.azure.management.website.implementation; +package com.microsoft.azure.management.appservice.implementation; import com.fasterxml.jackson.annotation.JsonProperty; import com.microsoft.rest.serializer.JsonFlatten; diff --git a/azure-mgmt-website/src/main/java/com/microsoft/azure/management/website/implementation/ValidateRequestInner.java b/azure-mgmt-appservice/src/main/java/com/microsoft/azure/management/appservice/implementation/ValidateRequestInner.java similarity index 97% rename from azure-mgmt-website/src/main/java/com/microsoft/azure/management/website/implementation/ValidateRequestInner.java rename to azure-mgmt-appservice/src/main/java/com/microsoft/azure/management/appservice/implementation/ValidateRequestInner.java index 97336869c9d41..f5aabba461ba2 100644 --- a/azure-mgmt-website/src/main/java/com/microsoft/azure/management/website/implementation/ValidateRequestInner.java +++ b/azure-mgmt-appservice/src/main/java/com/microsoft/azure/management/appservice/implementation/ValidateRequestInner.java @@ -6,9 +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 com.microsoft.azure.management.website.ValidateResourceTypes; +import com.microsoft.azure.management.appservice.ValidateResourceTypes; import com.fasterxml.jackson.annotation.JsonProperty; import com.microsoft.rest.serializer.JsonFlatten; diff --git a/azure-mgmt-website/src/main/java/com/microsoft/azure/management/website/implementation/ValidateResponseInner.java b/azure-mgmt-appservice/src/main/java/com/microsoft/azure/management/appservice/implementation/ValidateResponseInner.java similarity index 90% rename from azure-mgmt-website/src/main/java/com/microsoft/azure/management/website/implementation/ValidateResponseInner.java rename to azure-mgmt-appservice/src/main/java/com/microsoft/azure/management/appservice/implementation/ValidateResponseInner.java index 49da5be38f424..f6929d823017a 100644 --- a/azure-mgmt-website/src/main/java/com/microsoft/azure/management/website/implementation/ValidateResponseInner.java +++ b/azure-mgmt-appservice/src/main/java/com/microsoft/azure/management/appservice/implementation/ValidateResponseInner.java @@ -6,9 +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 com.microsoft.azure.management.website.ValidateResponseError; +import com.microsoft.azure.management.appservice.ValidateResponseError; /** * Describes the result of resource validation. diff --git a/azure-mgmt-website/src/main/java/com/microsoft/azure/management/website/implementation/VnetGatewayInner.java b/azure-mgmt-appservice/src/main/java/com/microsoft/azure/management/appservice/implementation/VnetGatewayInner.java similarity index 96% rename from azure-mgmt-website/src/main/java/com/microsoft/azure/management/website/implementation/VnetGatewayInner.java rename to azure-mgmt-appservice/src/main/java/com/microsoft/azure/management/appservice/implementation/VnetGatewayInner.java index ef0b4ca16d875..668f858e83ae3 100644 --- a/azure-mgmt-website/src/main/java/com/microsoft/azure/management/website/implementation/VnetGatewayInner.java +++ b/azure-mgmt-appservice/src/main/java/com/microsoft/azure/management/appservice/implementation/VnetGatewayInner.java @@ -6,7 +6,7 @@ * Code generated by Microsoft (R) AutoRest Code Generator. */ -package com.microsoft.azure.management.website.implementation; +package com.microsoft.azure.management.appservice.implementation; import com.fasterxml.jackson.annotation.JsonProperty; import com.microsoft.rest.serializer.JsonFlatten; diff --git a/azure-mgmt-website/src/main/java/com/microsoft/azure/management/website/implementation/VnetInfoInner.java b/azure-mgmt-appservice/src/main/java/com/microsoft/azure/management/appservice/implementation/VnetInfoInner.java similarity index 98% rename from azure-mgmt-website/src/main/java/com/microsoft/azure/management/website/implementation/VnetInfoInner.java rename to azure-mgmt-appservice/src/main/java/com/microsoft/azure/management/appservice/implementation/VnetInfoInner.java index ed948dc08e163..d6826679e51d0 100644 --- a/azure-mgmt-website/src/main/java/com/microsoft/azure/management/website/implementation/VnetInfoInner.java +++ b/azure-mgmt-appservice/src/main/java/com/microsoft/azure/management/appservice/implementation/VnetInfoInner.java @@ -6,7 +6,7 @@ * 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.fasterxml.jackson.annotation.JsonProperty; diff --git a/azure-mgmt-website/src/main/java/com/microsoft/azure/management/website/implementation/VnetRouteInner.java b/azure-mgmt-appservice/src/main/java/com/microsoft/azure/management/appservice/implementation/VnetRouteInner.java similarity index 96% rename from azure-mgmt-website/src/main/java/com/microsoft/azure/management/website/implementation/VnetRouteInner.java rename to azure-mgmt-appservice/src/main/java/com/microsoft/azure/management/appservice/implementation/VnetRouteInner.java index 72b1bf5837574..b45684c1b2a35 100644 --- a/azure-mgmt-website/src/main/java/com/microsoft/azure/management/website/implementation/VnetRouteInner.java +++ b/azure-mgmt-appservice/src/main/java/com/microsoft/azure/management/appservice/implementation/VnetRouteInner.java @@ -6,9 +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 com.microsoft.azure.management.website.RouteType; +import com.microsoft.azure.management.appservice.RouteType; import com.fasterxml.jackson.annotation.JsonProperty; import com.microsoft.rest.serializer.JsonFlatten; import com.microsoft.azure.Resource; diff --git a/azure-mgmt-website/src/main/java/com/microsoft/azure/management/website/implementation/WebAppBaseImpl.java b/azure-mgmt-appservice/src/main/java/com/microsoft/azure/management/appservice/implementation/WebAppBaseImpl.java similarity index 95% rename from azure-mgmt-website/src/main/java/com/microsoft/azure/management/website/implementation/WebAppBaseImpl.java rename to azure-mgmt-appservice/src/main/java/com/microsoft/azure/management/appservice/implementation/WebAppBaseImpl.java index 507c9b616c4d8..cc5039cec200c 100644 --- a/azure-mgmt-website/src/main/java/com/microsoft/azure/management/website/implementation/WebAppBaseImpl.java +++ b/azure-mgmt-appservice/src/main/java/com/microsoft/azure/management/appservice/implementation/WebAppBaseImpl.java @@ -4,38 +4,38 @@ * license information. */ -package com.microsoft.azure.management.website.implementation; +package com.microsoft.azure.management.appservice.implementation; import com.google.common.base.Function; import com.google.common.collect.Maps; import com.google.common.collect.Sets; 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.AppServiceDomain; -import com.microsoft.azure.management.website.AppServicePlan; -import com.microsoft.azure.management.website.AppSetting; -import com.microsoft.azure.management.website.AzureResourceType; -import com.microsoft.azure.management.website.CloningInfo; -import com.microsoft.azure.management.website.ConnStringValueTypePair; -import com.microsoft.azure.management.website.ConnectionString; -import com.microsoft.azure.management.website.ConnectionStringType; -import com.microsoft.azure.management.website.CustomHostNameDnsRecordType; -import com.microsoft.azure.management.website.HostNameBinding; -import com.microsoft.azure.management.website.HostNameSslState; -import com.microsoft.azure.management.website.HostNameType; -import com.microsoft.azure.management.website.JavaVersion; -import com.microsoft.azure.management.website.ManagedPipelineMode; -import com.microsoft.azure.management.website.NetFrameworkVersion; -import com.microsoft.azure.management.website.PhpVersion; -import com.microsoft.azure.management.website.PlatformArchitecture; -import com.microsoft.azure.management.website.PythonVersion; -import com.microsoft.azure.management.website.RemoteVisualStudioVersion; -import com.microsoft.azure.management.website.SiteAvailabilityState; -import com.microsoft.azure.management.website.SslState; -import com.microsoft.azure.management.website.UsageState; -import com.microsoft.azure.management.website.WebAppBase; -import com.microsoft.azure.management.website.WebContainer; +import com.microsoft.azure.management.appservice.AppServiceCertificate; +import com.microsoft.azure.management.appservice.AppServiceDomain; +import com.microsoft.azure.management.appservice.AppServicePlan; +import com.microsoft.azure.management.appservice.AppSetting; +import com.microsoft.azure.management.appservice.AzureResourceType; +import com.microsoft.azure.management.appservice.CloningInfo; +import com.microsoft.azure.management.appservice.ConnStringValueTypePair; +import com.microsoft.azure.management.appservice.ConnectionString; +import com.microsoft.azure.management.appservice.ConnectionStringType; +import com.microsoft.azure.management.appservice.CustomHostNameDnsRecordType; +import com.microsoft.azure.management.appservice.HostNameBinding; +import com.microsoft.azure.management.appservice.HostNameSslState; +import com.microsoft.azure.management.appservice.HostNameType; +import com.microsoft.azure.management.appservice.JavaVersion; +import com.microsoft.azure.management.appservice.ManagedPipelineMode; +import com.microsoft.azure.management.appservice.NetFrameworkVersion; +import com.microsoft.azure.management.appservice.PhpVersion; +import com.microsoft.azure.management.appservice.PlatformArchitecture; +import com.microsoft.azure.management.appservice.PythonVersion; +import com.microsoft.azure.management.appservice.RemoteVisualStudioVersion; +import com.microsoft.azure.management.appservice.SiteAvailabilityState; +import com.microsoft.azure.management.appservice.SslState; +import com.microsoft.azure.management.appservice.UsageState; +import com.microsoft.azure.management.appservice.WebAppBase; +import com.microsoft.azure.management.appservice.WebContainer; import org.joda.time.DateTime; import rx.Observable; import rx.functions.Func1; diff --git a/azure-mgmt-website/src/main/java/com/microsoft/azure/management/website/implementation/WebAppImpl.java b/azure-mgmt-appservice/src/main/java/com/microsoft/azure/management/appservice/implementation/WebAppImpl.java similarity index 94% rename from azure-mgmt-website/src/main/java/com/microsoft/azure/management/website/implementation/WebAppImpl.java rename to azure-mgmt-appservice/src/main/java/com/microsoft/azure/management/appservice/implementation/WebAppImpl.java index 37da3d0edb8d2..64d6980e64eab 100644 --- a/azure-mgmt-website/src/main/java/com/microsoft/azure/management/website/implementation/WebAppImpl.java +++ b/azure-mgmt-appservice/src/main/java/com/microsoft/azure/management/appservice/implementation/WebAppImpl.java @@ -4,18 +4,18 @@ * license information. */ -package com.microsoft.azure.management.website.implementation; +package com.microsoft.azure.management.appservice.implementation; import com.google.common.base.Function; import com.google.common.collect.Maps; import com.microsoft.azure.management.resources.fluentcore.model.Wrapper; import com.microsoft.azure.management.resources.implementation.ResourceGroupInner; -import com.microsoft.azure.management.website.AppServicePricingTier; -import com.microsoft.azure.management.website.DeploymentSlots; -import com.microsoft.azure.management.website.HostNameBinding; -import com.microsoft.azure.management.website.PublishingCredentials; -import com.microsoft.azure.management.website.WebApp; -import com.microsoft.azure.management.website.WebAppSourceControl; +import com.microsoft.azure.management.appservice.AppServicePricingTier; +import com.microsoft.azure.management.appservice.DeploymentSlots; +import com.microsoft.azure.management.appservice.HostNameBinding; +import com.microsoft.azure.management.appservice.PublishingCredentials; +import com.microsoft.azure.management.appservice.WebApp; +import com.microsoft.azure.management.appservice.WebAppSourceControl; import rx.Observable; import rx.functions.Func1; diff --git a/azure-mgmt-website/src/main/java/com/microsoft/azure/management/website/implementation/WebAppSourceControlImpl.java b/azure-mgmt-appservice/src/main/java/com/microsoft/azure/management/appservice/implementation/WebAppSourceControlImpl.java similarity index 95% rename from azure-mgmt-website/src/main/java/com/microsoft/azure/management/website/implementation/WebAppSourceControlImpl.java rename to azure-mgmt-appservice/src/main/java/com/microsoft/azure/management/appservice/implementation/WebAppSourceControlImpl.java index 2ff3f9367daef..4985ee7edbd66 100644 --- a/azure-mgmt-website/src/main/java/com/microsoft/azure/management/website/implementation/WebAppSourceControlImpl.java +++ b/azure-mgmt-appservice/src/main/java/com/microsoft/azure/management/appservice/implementation/WebAppSourceControlImpl.java @@ -3,13 +3,13 @@ * Licensed under the MIT License. See License.txt in the project root for * license information. */ -package com.microsoft.azure.management.website.implementation; +package com.microsoft.azure.management.appservice.implementation; import com.microsoft.azure.management.apigeneration.LangDefinition; import com.microsoft.azure.management.resources.fluentcore.model.implementation.IndexableWrapperImpl; import com.microsoft.azure.management.resources.fluentcore.utils.Utils; -import com.microsoft.azure.management.website.WebAppBase; -import com.microsoft.azure.management.website.WebAppSourceControl; +import com.microsoft.azure.management.appservice.WebAppBase; +import com.microsoft.azure.management.appservice.WebAppSourceControl; import rx.Observable; /** diff --git a/azure-mgmt-website/src/main/java/com/microsoft/azure/management/website/implementation/WebAppsImpl.java b/azure-mgmt-appservice/src/main/java/com/microsoft/azure/management/appservice/implementation/WebAppsImpl.java similarity index 94% rename from azure-mgmt-website/src/main/java/com/microsoft/azure/management/website/implementation/WebAppsImpl.java rename to azure-mgmt-appservice/src/main/java/com/microsoft/azure/management/appservice/implementation/WebAppsImpl.java index d370b06a44a8b..7c6614254ad21 100644 --- a/azure-mgmt-website/src/main/java/com/microsoft/azure/management/website/implementation/WebAppsImpl.java +++ b/azure-mgmt-appservice/src/main/java/com/microsoft/azure/management/appservice/implementation/WebAppsImpl.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.resources.fluentcore.utils.PagedListConverter; -import com.microsoft.azure.management.website.WebApp; -import com.microsoft.azure.management.website.WebApps; +import com.microsoft.azure.management.appservice.WebApp; +import com.microsoft.azure.management.appservice.WebApps; import rx.Observable; import rx.functions.Func1; diff --git a/azure-mgmt-website/src/main/java/com/microsoft/azure/management/website/implementation/WebAppsInner.java b/azure-mgmt-appservice/src/main/java/com/microsoft/azure/management/appservice/implementation/WebAppsInner.java similarity index 99% rename from azure-mgmt-website/src/main/java/com/microsoft/azure/management/website/implementation/WebAppsInner.java rename to azure-mgmt-appservice/src/main/java/com/microsoft/azure/management/appservice/implementation/WebAppsInner.java index 50d8e30d1d2b9..62221a43b5f77 100644 --- a/azure-mgmt-website/src/main/java/com/microsoft/azure/management/website/implementation/WebAppsInner.java +++ b/azure-mgmt-appservice/src/main/java/com/microsoft/azure/management/appservice/implementation/WebAppsInner.java @@ -6,7 +6,7 @@ * 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; @@ -14,8 +14,8 @@ import com.microsoft.azure.AzureServiceResponseBuilder; import com.microsoft.azure.CloudException; import com.microsoft.azure.ListOperationCallback; -import com.microsoft.azure.management.website.CsmPublishingProfileOptions; -import com.microsoft.azure.management.website.PublishingProfileFormat; +import com.microsoft.azure.management.appservice.CsmPublishingProfileOptions; +import com.microsoft.azure.management.appservice.PublishingProfileFormat; import com.microsoft.azure.Page; import com.microsoft.azure.PagedList; import com.microsoft.rest.ServiceCall; diff --git a/azure-mgmt-website/src/main/java/com/microsoft/azure/management/website/implementation/WebSiteManagementClientImpl.java b/azure-mgmt-appservice/src/main/java/com/microsoft/azure/management/appservice/implementation/WebSiteManagementClientImpl.java similarity index 99% rename from azure-mgmt-website/src/main/java/com/microsoft/azure/management/website/implementation/WebSiteManagementClientImpl.java rename to azure-mgmt-appservice/src/main/java/com/microsoft/azure/management/appservice/implementation/WebSiteManagementClientImpl.java index 87434e9883f2b..5c3a6d51ed167 100644 --- a/azure-mgmt-website/src/main/java/com/microsoft/azure/management/website/implementation/WebSiteManagementClientImpl.java +++ b/azure-mgmt-appservice/src/main/java/com/microsoft/azure/management/appservice/implementation/WebSiteManagementClientImpl.java @@ -6,7 +6,7 @@ * Code generated by Microsoft (R) AutoRest Code Generator. */ -package com.microsoft.azure.management.website.implementation; +package com.microsoft.azure.management.appservice.implementation; import com.google.common.reflect.TypeToken; import com.microsoft.azure.AzureClient; @@ -15,9 +15,9 @@ import com.microsoft.azure.AzureServiceResponseBuilder; import com.microsoft.azure.CloudException; import com.microsoft.azure.ListOperationCallback; -import com.microsoft.azure.management.website.CheckNameResourceTypes; -import com.microsoft.azure.management.website.ResourceNameAvailabilityRequest; -import com.microsoft.azure.management.website.SkuName; +import com.microsoft.azure.management.appservice.CheckNameResourceTypes; +import com.microsoft.azure.management.appservice.ResourceNameAvailabilityRequest; +import com.microsoft.azure.management.appservice.SkuName; import com.microsoft.azure.Page; import com.microsoft.azure.PagedList; import com.microsoft.azure.RestClient; diff --git a/azure-mgmt-website/src/main/java/com/microsoft/azure/management/website/implementation/WorkerPoolInner.java b/azure-mgmt-appservice/src/main/java/com/microsoft/azure/management/appservice/implementation/WorkerPoolInner.java similarity index 95% rename from azure-mgmt-website/src/main/java/com/microsoft/azure/management/website/implementation/WorkerPoolInner.java rename to azure-mgmt-appservice/src/main/java/com/microsoft/azure/management/appservice/implementation/WorkerPoolInner.java index c5f4d9b2e0984..0f71978ac7c06 100644 --- a/azure-mgmt-website/src/main/java/com/microsoft/azure/management/website/implementation/WorkerPoolInner.java +++ b/azure-mgmt-appservice/src/main/java/com/microsoft/azure/management/appservice/implementation/WorkerPoolInner.java @@ -6,11 +6,11 @@ * 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.ComputeModeOptions; +import com.microsoft.azure.management.appservice.ComputeModeOptions; import java.util.List; -import com.microsoft.azure.management.website.SkuDescription; +import com.microsoft.azure.management.appservice.SkuDescription; import com.fasterxml.jackson.annotation.JsonProperty; import com.microsoft.rest.serializer.JsonFlatten; import com.microsoft.azure.Resource; diff --git a/azure-mgmt-website/src/main/java/com/microsoft/azure/management/website/implementation/package-info.java b/azure-mgmt-appservice/src/main/java/com/microsoft/azure/management/appservice/implementation/package-info.java similarity index 84% rename from azure-mgmt-website/src/main/java/com/microsoft/azure/management/website/implementation/package-info.java rename to azure-mgmt-appservice/src/main/java/com/microsoft/azure/management/appservice/implementation/package-info.java index 0630537affdbd..61adb6dbc378e 100644 --- a/azure-mgmt-website/src/main/java/com/microsoft/azure/management/website/implementation/package-info.java +++ b/azure-mgmt-appservice/src/main/java/com/microsoft/azure/management/appservice/implementation/package-info.java @@ -8,4 +8,4 @@ * This package contains the implementation classes for WebSiteManagementClient. * Composite Swagger for WebSite Management Client. */ -package com.microsoft.azure.management.website.implementation; +package com.microsoft.azure.management.appservice.implementation; diff --git a/azure-mgmt-website/src/main/java/com/microsoft/azure/management/website/package-info.java b/azure-mgmt-appservice/src/main/java/com/microsoft/azure/management/appservice/package-info.java similarity index 87% rename from azure-mgmt-website/src/main/java/com/microsoft/azure/management/website/package-info.java rename to azure-mgmt-appservice/src/main/java/com/microsoft/azure/management/appservice/package-info.java index d3a75daacba12..45993eacb020f 100644 --- a/azure-mgmt-website/src/main/java/com/microsoft/azure/management/website/package-info.java +++ b/azure-mgmt-appservice/src/main/java/com/microsoft/azure/management/appservice/package-info.java @@ -8,4 +8,4 @@ * This package contains the classes for WebSiteManagementClient. * Composite Swagger for WebSite Management Client. */ -package com.microsoft.azure.management.website; +package com.microsoft.azure.management.appservice; diff --git a/azure-mgmt-website/src/test/java/com/microsoft/azure/management/website/AppServicePlansTests.java b/azure-mgmt-appservice/src/test/java/com/microsoft/azure/management/appservice/AppServicePlansTests.java similarity index 98% rename from azure-mgmt-website/src/test/java/com/microsoft/azure/management/website/AppServicePlansTests.java rename to azure-mgmt-appservice/src/test/java/com/microsoft/azure/management/appservice/AppServicePlansTests.java index ad4f2c24cc535..161164fde9e30 100644 --- a/azure-mgmt-website/src/test/java/com/microsoft/azure/management/website/AppServicePlansTests.java +++ b/azure-mgmt-appservice/src/test/java/com/microsoft/azure/management/appservice/AppServicePlansTests.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.Region; import org.junit.AfterClass; diff --git a/azure-mgmt-website/src/test/java/com/microsoft/azure/management/website/AppServiceTestBase.java b/azure-mgmt-appservice/src/test/java/com/microsoft/azure/management/appservice/AppServiceTestBase.java similarity index 93% rename from azure-mgmt-website/src/test/java/com/microsoft/azure/management/website/AppServiceTestBase.java rename to azure-mgmt-appservice/src/test/java/com/microsoft/azure/management/appservice/AppServiceTestBase.java index 9836972b9e6ec..228bd994a198e 100644 --- a/azure-mgmt-website/src/test/java/com/microsoft/azure/management/website/AppServiceTestBase.java +++ b/azure-mgmt-appservice/src/test/java/com/microsoft/azure/management/appservice/AppServiceTestBase.java @@ -4,14 +4,14 @@ * license information. */ -package com.microsoft.azure.management.website; +package com.microsoft.azure.management.appservice; import com.microsoft.azure.AzureEnvironment; import com.microsoft.azure.RestClient; import com.microsoft.azure.credentials.ApplicationTokenCredentials; import com.microsoft.azure.management.keyvault.implementation.KeyVaultManager; import com.microsoft.azure.management.resources.implementation.ResourceManager; -import com.microsoft.azure.management.website.implementation.AppServiceManager; +import com.microsoft.azure.management.appservice.implementation.AppServiceManager; import okhttp3.logging.HttpLoggingInterceptor; import java.util.concurrent.TimeUnit; diff --git a/azure-mgmt-website/src/test/java/com/microsoft/azure/management/website/CertificateOrdersTests.java b/azure-mgmt-appservice/src/test/java/com/microsoft/azure/management/appservice/CertificateOrdersTests.java similarity index 97% rename from azure-mgmt-website/src/test/java/com/microsoft/azure/management/website/CertificateOrdersTests.java rename to azure-mgmt-appservice/src/test/java/com/microsoft/azure/management/appservice/CertificateOrdersTests.java index 7707f757360b0..f3c4d156fcf0c 100644 --- a/azure-mgmt-website/src/test/java/com/microsoft/azure/management/website/CertificateOrdersTests.java +++ b/azure-mgmt-appservice/src/test/java/com/microsoft/azure/management/appservice/CertificateOrdersTests.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.Region; import org.junit.AfterClass; diff --git a/azure-mgmt-website/src/test/java/com/microsoft/azure/management/website/CertificatesTests.java b/azure-mgmt-appservice/src/test/java/com/microsoft/azure/management/appservice/CertificatesTests.java similarity index 97% rename from azure-mgmt-website/src/test/java/com/microsoft/azure/management/website/CertificatesTests.java rename to azure-mgmt-appservice/src/test/java/com/microsoft/azure/management/appservice/CertificatesTests.java index 70eafaabbdfac..d76c75b8289a1 100644 --- a/azure-mgmt-website/src/test/java/com/microsoft/azure/management/website/CertificatesTests.java +++ b/azure-mgmt-appservice/src/test/java/com/microsoft/azure/management/appservice/CertificatesTests.java @@ -4,7 +4,7 @@ * 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; diff --git a/azure-mgmt-website/src/test/java/com/microsoft/azure/management/website/DomainsTests.java b/azure-mgmt-appservice/src/test/java/com/microsoft/azure/management/appservice/DomainsTests.java similarity index 97% rename from azure-mgmt-website/src/test/java/com/microsoft/azure/management/website/DomainsTests.java rename to azure-mgmt-appservice/src/test/java/com/microsoft/azure/management/appservice/DomainsTests.java index b563d0c34d257..9bb1ca7146023 100644 --- a/azure-mgmt-website/src/test/java/com/microsoft/azure/management/website/DomainsTests.java +++ b/azure-mgmt-appservice/src/test/java/com/microsoft/azure/management/appservice/DomainsTests.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.CountryISOCode; import com.microsoft.azure.management.resources.fluentcore.arm.CountryPhoneCode; diff --git a/azure-mgmt-website/src/test/java/com/microsoft/azure/management/website/WebAppsTests.java b/azure-mgmt-appservice/src/test/java/com/microsoft/azure/management/appservice/WebAppsTests.java similarity index 97% rename from azure-mgmt-website/src/test/java/com/microsoft/azure/management/website/WebAppsTests.java rename to azure-mgmt-appservice/src/test/java/com/microsoft/azure/management/appservice/WebAppsTests.java index 82f78cd2176a1..7a3031ffaf15b 100644 --- a/azure-mgmt-website/src/test/java/com/microsoft/azure/management/website/WebAppsTests.java +++ b/azure-mgmt-appservice/src/test/java/com/microsoft/azure/management/appservice/WebAppsTests.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.ResourceGroup; import org.junit.AfterClass; diff --git a/azure-samples/pom.xml b/azure-samples/pom.xml index 5a995eabe7816..c8b44f1674f3a 100644 --- a/azure-samples/pom.xml +++ b/azure-samples/pom.xml @@ -76,7 +76,7 @@ com.microsoft.azure - azure-mgmt-website + azure-mgmt-appservice 1.0.0-beta4-SNAPSHOT diff --git a/azure-samples/src/main/java/com/microsoft/azure/management/website/samples/ManageAppService.java b/azure-samples/src/main/java/com/microsoft/azure/management/appservice/samples/ManageAppService.java similarity index 96% rename from azure-samples/src/main/java/com/microsoft/azure/management/website/samples/ManageAppService.java rename to azure-samples/src/main/java/com/microsoft/azure/management/appservice/samples/ManageAppService.java index 2e5d19e171501..af490e2cd17c9 100644 --- a/azure-samples/src/main/java/com/microsoft/azure/management/website/samples/ManageAppService.java +++ b/azure-samples/src/main/java/com/microsoft/azure/management/appservice/samples/ManageAppService.java @@ -5,7 +5,7 @@ * */ -package com.microsoft.azure.management.website.samples; +package com.microsoft.azure.management.appservice.samples; import com.microsoft.azure.management.Azure; import com.microsoft.azure.management.keyvault.Vault; @@ -14,12 +14,12 @@ import com.microsoft.azure.management.resources.fluentcore.arm.Region; import com.microsoft.azure.management.resources.fluentcore.utils.ResourceNamer; import com.microsoft.azure.management.samples.Utils; -import com.microsoft.azure.management.website.AppServiceCertificateOrder; -import com.microsoft.azure.management.website.AppServiceDomain; -import com.microsoft.azure.management.website.AppServicePricingTier; -import com.microsoft.azure.management.website.CustomHostNameDnsRecordType; -import com.microsoft.azure.management.website.DeploymentSlot; -import com.microsoft.azure.management.website.WebApp; +import com.microsoft.azure.management.appservice.AppServiceCertificateOrder; +import com.microsoft.azure.management.appservice.AppServiceDomain; +import com.microsoft.azure.management.appservice.AppServicePricingTier; +import com.microsoft.azure.management.appservice.CustomHostNameDnsRecordType; +import com.microsoft.azure.management.appservice.DeploymentSlot; +import com.microsoft.azure.management.appservice.WebApp; import okhttp3.OkHttpClient; import okhttp3.Request; import okhttp3.logging.HttpLoggingInterceptor; diff --git a/azure-samples/src/main/java/com/microsoft/azure/management/website/samples/package-info.java b/azure-samples/src/main/java/com/microsoft/azure/management/appservice/samples/package-info.java similarity index 80% rename from azure-samples/src/main/java/com/microsoft/azure/management/website/samples/package-info.java rename to azure-samples/src/main/java/com/microsoft/azure/management/appservice/samples/package-info.java index 22a373de8ca9b..94b7b7fe3a175 100644 --- a/azure-samples/src/main/java/com/microsoft/azure/management/website/samples/package-info.java +++ b/azure-samples/src/main/java/com/microsoft/azure/management/appservice/samples/package-info.java @@ -5,4 +5,4 @@ /** * This package contains the classes for azure app service samples. */ -package com.microsoft.azure.management.website.samples; +package com.microsoft.azure.management.appservice.samples; diff --git a/azure-samples/src/main/java/com/microsoft/azure/management/samples/Utils.java b/azure-samples/src/main/java/com/microsoft/azure/management/samples/Utils.java index 3560da3fc7e3c..b449fb2ce7b6c 100644 --- a/azure-samples/src/main/java/com/microsoft/azure/management/samples/Utils.java +++ b/azure-samples/src/main/java/com/microsoft/azure/management/samples/Utils.java @@ -42,16 +42,16 @@ import com.microsoft.azure.management.redis.ScheduleEntry; import com.microsoft.azure.management.storage.StorageAccount; import com.microsoft.azure.management.storage.StorageAccountKey; -import com.microsoft.azure.management.website.AppServiceCertificateOrder; -import com.microsoft.azure.management.website.AppServiceDomain; -import com.microsoft.azure.management.website.AppServicePlan; -import com.microsoft.azure.management.website.AppSetting; -import com.microsoft.azure.management.website.ConnectionString; -import com.microsoft.azure.management.website.Contact; -import com.microsoft.azure.management.website.HostNameBinding; -import com.microsoft.azure.management.website.HostNameSslState; -import com.microsoft.azure.management.website.SslState; -import com.microsoft.azure.management.website.WebAppBase; +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.AppSetting; +import com.microsoft.azure.management.appservice.ConnectionString; +import com.microsoft.azure.management.appservice.Contact; +import com.microsoft.azure.management.appservice.HostNameBinding; +import com.microsoft.azure.management.appservice.HostNameSslState; +import com.microsoft.azure.management.appservice.SslState; +import com.microsoft.azure.management.appservice.WebAppBase; import java.io.IOException; import java.util.ArrayList; diff --git a/azure/pom.xml b/azure/pom.xml index 3a6ec941e05ea..c80d859680516 100644 --- a/azure/pom.xml +++ b/azure/pom.xml @@ -106,7 +106,7 @@ com.microsoft.azure - azure-mgmt-website + azure-mgmt-appservice 1.0.0-beta4-SNAPSHOT diff --git a/azure/src/main/java/com/microsoft/azure/management/Azure.java b/azure/src/main/java/com/microsoft/azure/management/Azure.java index 0b4c02d45ef87..4863ad929274e 100644 --- a/azure/src/main/java/com/microsoft/azure/management/Azure.java +++ b/azure/src/main/java/com/microsoft/azure/management/Azure.java @@ -57,8 +57,8 @@ import com.microsoft.azure.management.storage.implementation.StorageManager; import com.microsoft.azure.management.trafficmanager.TrafficManagerProfiles; import com.microsoft.azure.management.trafficmanager.implementation.TrafficManager; -import com.microsoft.azure.management.website.WebApps; -import com.microsoft.azure.management.website.implementation.AppServiceManager; +import com.microsoft.azure.management.appservice.WebApps; +import com.microsoft.azure.management.appservice.implementation.AppServiceManager; import java.io.File; import java.io.IOException; diff --git a/gulpfile.js b/gulpfile.js index 2a63e7f28ce38..ac1812917d81a 100644 --- a/gulpfile.js +++ b/gulpfile.js @@ -55,10 +55,10 @@ var mappings = { 'package': 'com.microsoft.azure.management.network', 'args': '-FT 1' }, - 'website': { - 'dir': 'azure-mgmt-website', + 'appservice': { + 'dir': 'azure-mgmt-appservice', 'source': 'arm-web/compositeWebAppClient.json', - 'package': 'com.microsoft.azure.management.website', + 'package': 'com.microsoft.azure.management.appservice', 'args': '-FT 1' }, 'graph.rbac': { diff --git a/pom.xml b/pom.xml index df7d5279a90e4..b3648ec65cd2f 100644 --- a/pom.xml +++ b/pom.xml @@ -319,7 +319,7 @@ ./azure-mgmt-resources ./azure-mgmt-storage ./azure-mgmt-network - ./azure-mgmt-website + ./azure-mgmt-appservice ./azure-mgmt-datalake-analytics ./azure-mgmt-datalake-store ./azure-samples From be1f48252882f89c2e2d1e2bd1b849a5f6fc7105 Mon Sep 17 00:00:00 2001 From: Jianghao Lu Date: Fri, 2 Dec 2016 16:14:27 -0800 Subject: [PATCH 09/10] Fix checktyle --- .travis.yml | 2 +- .../appservice/AppServiceCertificate.java | 2 +- .../AppServiceCertificateOrder.java | 9 ++++++ .../appservice/AppServiceDomain.java | 11 ++++++++ .../appservice/AppServiceDomains.java | 2 +- .../appservice/AppServicePricingTier.java | 5 ++++ .../appservice/HostNameBinding.java | 2 +- .../appservice/HostNameSslBinding.java | 4 +-- .../management/appservice/JavaVersion.java | 2 +- .../management/appservice/WebAppBase.java | 28 +++++++++++++++++++ .../appservice/WebAppSourceControl.java | 5 ++++ .../management/appservice/WebContainer.java | 2 +- .../AppServiceCertificateOrderImpl.java | 4 +-- .../implementation/AppServiceDomainsImpl.java | 2 +- .../implementation/HostNameBindingImpl.java | 8 ++++-- .../HostNameSslBindingImpl.java | 2 ++ .../implementation/WebAppBaseImpl.java | 6 ++-- .../WebAppSourceControlImpl.java | 2 ++ .../appservice/samples/ManageAppService.java | 2 +- 19 files changed, 83 insertions(+), 17 deletions(-) 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-appservice/src/main/java/com/microsoft/azure/management/appservice/AppServiceCertificate.java b/azure-mgmt-appservice/src/main/java/com/microsoft/azure/management/appservice/AppServiceCertificate.java index 329771ded8aea..7552f2f5fa7c6 100644 --- a/azure-mgmt-appservice/src/main/java/com/microsoft/azure/management/appservice/AppServiceCertificate.java +++ b/azure-mgmt-appservice/src/main/java/com/microsoft/azure/management/appservice/AppServiceCertificate.java @@ -167,7 +167,7 @@ interface WithCertificate { */ 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-appservice/src/main/java/com/microsoft/azure/management/appservice/AppServiceCertificateOrder.java b/azure-mgmt-appservice/src/main/java/com/microsoft/azure/management/appservice/AppServiceCertificateOrder.java index 537b60bfd7981..cf1a36df317b7 100644 --- a/azure-mgmt-appservice/src/main/java/com/microsoft/azure/management/appservice/AppServiceCertificateOrder.java +++ b/azure-mgmt-appservice/src/main/java/com/microsoft/azure/management/appservice/AppServiceCertificateOrder.java @@ -123,8 +123,17 @@ 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); /************************************************************** diff --git a/azure-mgmt-appservice/src/main/java/com/microsoft/azure/management/appservice/AppServiceDomain.java b/azure-mgmt-appservice/src/main/java/com/microsoft/azure/management/appservice/AppServiceDomain.java index 01b4abc6795c2..0d40112c8df96 100644 --- a/azure-mgmt-appservice/src/main/java/com/microsoft/azure/management/appservice/AppServiceDomain.java +++ b/azure-mgmt-appservice/src/main/java/com/microsoft/azure/management/appservice/AppServiceDomain.java @@ -106,8 +106,19 @@ 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); /************************************************************** diff --git a/azure-mgmt-appservice/src/main/java/com/microsoft/azure/management/appservice/AppServiceDomains.java b/azure-mgmt-appservice/src/main/java/com/microsoft/azure/management/appservice/AppServiceDomains.java index dc694e0b348d9..198bca5d93a26 100644 --- a/azure-mgmt-appservice/src/main/java/com/microsoft/azure/management/appservice/AppServiceDomains.java +++ b/azure-mgmt-appservice/src/main/java/com/microsoft/azure/management/appservice/AppServiceDomains.java @@ -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-appservice/src/main/java/com/microsoft/azure/management/appservice/AppServicePricingTier.java b/azure-mgmt-appservice/src/main/java/com/microsoft/azure/management/appservice/AppServicePricingTier.java index aeb7fb1859b50..a12ad210ffdcb 100644 --- a/azure-mgmt-appservice/src/main/java/com/microsoft/azure/management/appservice/AppServicePricingTier.java +++ b/azure-mgmt-appservice/src/main/java/com/microsoft/azure/management/appservice/AppServicePricingTier.java @@ -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-appservice/src/main/java/com/microsoft/azure/management/appservice/HostNameBinding.java b/azure-mgmt-appservice/src/main/java/com/microsoft/azure/management/appservice/HostNameBinding.java index a62831e7ec56a..20519039d2d1a 100644 --- a/azure-mgmt-appservice/src/main/java/com/microsoft/azure/management/appservice/HostNameBinding.java +++ b/azure-mgmt-appservice/src/main/java/com/microsoft/azure/management/appservice/HostNameBinding.java @@ -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-appservice/src/main/java/com/microsoft/azure/management/appservice/HostNameSslBinding.java b/azure-mgmt-appservice/src/main/java/com/microsoft/azure/management/appservice/HostNameSslBinding.java index 1bd9557ff5cf2..32cc987b12015 100644 --- a/azure-mgmt-appservice/src/main/java/com/microsoft/azure/management/appservice/HostNameSslBinding.java +++ b/azure-mgmt-appservice/src/main/java/com/microsoft/azure/management/appservice/HostNameSslBinding.java @@ -86,7 +86,7 @@ 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 * @return the next stage of the hostname SSL binding definition */ @@ -201,7 +201,7 @@ 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 * @return the next stage of the hostname SSL binding definition */ diff --git a/azure-mgmt-appservice/src/main/java/com/microsoft/azure/management/appservice/JavaVersion.java b/azure-mgmt-appservice/src/main/java/com/microsoft/azure/management/appservice/JavaVersion.java index 849d1839fa057..08b4cc7667d26 100644 --- a/azure-mgmt-appservice/src/main/java/com/microsoft/azure/management/appservice/JavaVersion.java +++ b/azure-mgmt-appservice/src/main/java/com/microsoft/azure/management/appservice/JavaVersion.java @@ -19,7 +19,7 @@ public final class 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-appservice/src/main/java/com/microsoft/azure/management/appservice/WebAppBase.java b/azure-mgmt-appservice/src/main/java/com/microsoft/azure/management/appservice/WebAppBase.java index d79fdbb58e711..434aee93abbed 100644 --- a/azure-mgmt-appservice/src/main/java/com/microsoft/azure/management/appservice/WebAppBase.java +++ b/azure-mgmt-appservice/src/main/java/com/microsoft/azure/management/appservice/WebAppBase.java @@ -22,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, @@ -231,16 +232,41 @@ 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); /** @@ -284,6 +310,7 @@ 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.WithHostNameSslBinding, @@ -935,6 +962,7 @@ interface WithSourceControl { /** * 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, 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 index a8971811b0a05..9a206cef752ab 100644 --- 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 @@ -257,6 +257,11 @@ interface WithRepositoryType { 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. diff --git a/azure-mgmt-appservice/src/main/java/com/microsoft/azure/management/appservice/WebContainer.java b/azure-mgmt-appservice/src/main/java/com/microsoft/azure/management/appservice/WebContainer.java index 69ae4d229f6ad..a17c6181beb0c 100644 --- a/azure-mgmt-appservice/src/main/java/com/microsoft/azure/management/appservice/WebContainer.java +++ b/azure-mgmt-appservice/src/main/java/com/microsoft/azure/management/appservice/WebContainer.java @@ -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-appservice/src/main/java/com/microsoft/azure/management/appservice/implementation/AppServiceCertificateOrderImpl.java b/azure-mgmt-appservice/src/main/java/com/microsoft/azure/management/appservice/implementation/AppServiceCertificateOrderImpl.java index 9f35b1f929308..bfb97ca33bbdd 100644 --- a/azure-mgmt-appservice/src/main/java/com/microsoft/azure/management/appservice/implementation/AppServiceCertificateOrderImpl.java +++ b/azure-mgmt-appservice/src/main/java/com/microsoft/azure/management/appservice/implementation/AppServiceCertificateOrderImpl.java @@ -226,8 +226,8 @@ public Observable call(AppServiceCertificateOrder certificateOrder) { 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()); + "Please specify a non-null web app or domain to verify the domain ownership " + + "for hostname " + distinguishedName()); } } }) diff --git a/azure-mgmt-appservice/src/main/java/com/microsoft/azure/management/appservice/implementation/AppServiceDomainsImpl.java b/azure-mgmt-appservice/src/main/java/com/microsoft/azure/management/appservice/implementation/AppServiceDomainsImpl.java index abf23451b89ec..8d39c97dbadde 100644 --- a/azure-mgmt-appservice/src/main/java/com/microsoft/azure/management/appservice/implementation/AppServiceDomainsImpl.java +++ b/azure-mgmt-appservice/src/main/java/com/microsoft/azure/management/appservice/implementation/AppServiceDomainsImpl.java @@ -26,7 +26,7 @@ class AppServiceDomainsImpl DomainsInner, AppServiceManager> implements AppServiceDomains { - TopLevelDomainsInner topLevelDomainsInner; + private final TopLevelDomainsInner topLevelDomainsInner; AppServiceDomainsImpl(DomainsInner innerCollection, TopLevelDomainsInner topLevelDomainsInner, AppServiceManager manager) { super(innerCollection, manager); diff --git a/azure-mgmt-appservice/src/main/java/com/microsoft/azure/management/appservice/implementation/HostNameBindingImpl.java b/azure-mgmt-appservice/src/main/java/com/microsoft/azure/management/appservice/implementation/HostNameBindingImpl.java index 2c4d78b7af991..6547d473ebba1 100644 --- a/azure-mgmt-appservice/src/main/java/com/microsoft/azure/management/appservice/implementation/HostNameBindingImpl.java +++ b/azure-mgmt-appservice/src/main/java/com/microsoft/azure/management/appservice/implementation/HostNameBindingImpl.java @@ -28,6 +28,8 @@ /** * Implementation for {@link HostNameBinding} and its create and update interfaces. + * @param the fluent interface of the parent web app + * @param the fluent implementation of the parent web app */ class HostNameBindingImpl< FluentT extends WebAppBase, @@ -105,7 +107,7 @@ public AzureResourceType azureResourceType() { } @Override - public CustomHostNameDnsRecordType DnsRecordType() { + public CustomHostNameDnsRecordType dnsRecordType() { return inner().customHostNameDnsRecordType(); } @@ -134,7 +136,7 @@ public HostNameBindingImpl withDnsRecordType(CustomHostNam @Override public HostNameBindingImpl refresh() { if (parent instanceof DeploymentSlot) { - this.setInner(client.getHostNameBindingSlot(parent().resourceGroupName(), ((DeploymentSlot)parent).parent().name(), parent().name(), name())); + this.setInner(client.getHostNameBindingSlot(parent().resourceGroupName(), ((DeploymentSlot) parent).parent().name(), parent().name(), name())); } else { this.setInner(client.getHostNameBinding(parent().resourceGroupName(), parent().name(), name())); } @@ -207,7 +209,7 @@ public String toString() { } else { suffix = ".azurewebsites.net"; } - return name + ": " + DnsRecordType() + " " + azureResourceName() + suffix; + return name + ": " + dnsRecordType() + " " + azureResourceName() + suffix; } @Override diff --git a/azure-mgmt-appservice/src/main/java/com/microsoft/azure/management/appservice/implementation/HostNameSslBindingImpl.java b/azure-mgmt-appservice/src/main/java/com/microsoft/azure/management/appservice/implementation/HostNameSslBindingImpl.java index 1fa1170a73fe5..1d7509bd4c053 100644 --- a/azure-mgmt-appservice/src/main/java/com/microsoft/azure/management/appservice/implementation/HostNameSslBindingImpl.java +++ b/azure-mgmt-appservice/src/main/java/com/microsoft/azure/management/appservice/implementation/HostNameSslBindingImpl.java @@ -33,6 +33,8 @@ /** * Implementation for {@link HostNameSslBinding} and its create and update interfaces. + * @param the fluent interface of the parent web app + * @param the fluent implementation of the parent web app */ @Fluent class HostNameSslBindingImpl< diff --git a/azure-mgmt-appservice/src/main/java/com/microsoft/azure/management/appservice/implementation/WebAppBaseImpl.java b/azure-mgmt-appservice/src/main/java/com/microsoft/azure/management/appservice/implementation/WebAppBaseImpl.java index cc5039cec200c..e666f419fec7a 100644 --- a/azure-mgmt-appservice/src/main/java/com/microsoft/azure/management/appservice/implementation/WebAppBaseImpl.java +++ b/azure-mgmt-appservice/src/main/java/com/microsoft/azure/management/appservice/implementation/WebAppBaseImpl.java @@ -51,6 +51,8 @@ /** * The implementation for {@link WebAppBase}. + * @param the fluent interface of the web app or deployment slot + * @param the fluent implementation of the web app or deployment slot */ abstract class WebAppBaseImpl< FluentT extends WebAppBase, @@ -709,7 +711,7 @@ WebAppBaseImpl withNewHostNameSslBinding(final HostNameSsl @Override @SuppressWarnings("unchecked") public FluentImplT withManagedHostnameBindings(AppServiceDomain domain, String... hostnames) { - for(String hostname : hostnames) { + for (String hostname : hostnames) { if (hostname.equals("@") || hostname.equalsIgnoreCase(domain.name())) { defineHostnameBinding() .withAzureManagedDomain(domain) @@ -742,7 +744,7 @@ public HostNameBindingImpl defineHostnameBinding() { @Override @SuppressWarnings("unchecked") public FluentImplT withThirdPartyHostnameBinding(String domain, String... hostnames) { - for(String hostname : hostnames) { + for (String hostname : hostnames) { defineHostnameBinding() .withThirdPartyDomain(domain) .withSubDomain(hostname) diff --git a/azure-mgmt-appservice/src/main/java/com/microsoft/azure/management/appservice/implementation/WebAppSourceControlImpl.java b/azure-mgmt-appservice/src/main/java/com/microsoft/azure/management/appservice/implementation/WebAppSourceControlImpl.java index 4985ee7edbd66..04abe1510b0a4 100644 --- a/azure-mgmt-appservice/src/main/java/com/microsoft/azure/management/appservice/implementation/WebAppSourceControlImpl.java +++ b/azure-mgmt-appservice/src/main/java/com/microsoft/azure/management/appservice/implementation/WebAppSourceControlImpl.java @@ -14,6 +14,8 @@ /** * Implementation for {@link WebAppSourceControl} and its create and update interfaces. + * @param the fluent interface of the parent web app + * @param the fluent implementation of the parent web app */ @LangDefinition class WebAppSourceControlImpl< diff --git a/azure-samples/src/main/java/com/microsoft/azure/management/appservice/samples/ManageAppService.java b/azure-samples/src/main/java/com/microsoft/azure/management/appservice/samples/ManageAppService.java index af490e2cd17c9..e69dfc4db66d3 100644 --- a/azure-samples/src/main/java/com/microsoft/azure/management/appservice/samples/ManageAppService.java +++ b/azure-samples/src/main/java/com/microsoft/azure/management/appservice/samples/ManageAppService.java @@ -28,7 +28,7 @@ import java.io.IOException; /** - * Azure App Service sample for managing web apps - + * Azure App Service sample for managing web apps. * - app service plan, web app * - Create 2 web apps under the same new app service plan * - domain From c22fc760b1379cd4c630774c05d356eb42cf4b5e Mon Sep 17 00:00:00 2001 From: Jianghao Lu Date: Fri, 2 Dec 2016 17:59:02 -0800 Subject: [PATCH 10/10] Supports using existing plan from another group --- .../appservice/AppServicePlans.java | 5 +- .../azure/management/appservice/WebApp.java | 9 +- .../implementation/AppServicePlansImpl.java | 11 +- .../implementation/WebAppBaseImpl.java | 2 +- .../appservice/implementation/WebAppImpl.java | 20 +++- .../management/appservice/WebAppsTests.java | 1 - .../appservice/samples/ManageAppService.java | 101 ++++++------------ 7 files changed, 71 insertions(+), 78 deletions(-) diff --git a/azure-mgmt-appservice/src/main/java/com/microsoft/azure/management/appservice/AppServicePlans.java b/azure-mgmt-appservice/src/main/java/com/microsoft/azure/management/appservice/AppServicePlans.java index a51721845d157..c6c8958440eff 100644 --- a/azure-mgmt-appservice/src/main/java/com/microsoft/azure/management/appservice/AppServicePlans.java +++ b/azure-mgmt-appservice/src/main/java/com/microsoft/azure/management/appservice/AppServicePlans.java @@ -27,9 +27,8 @@ public interface AppServicePlans extends /** * Gets the information about a resource from Azure based on the resource name and the name of its resource group. * - * @param resourceGroupName the name of the resource group the resource is in - * @param name the name of the resource. (Note, this is not the ID) + * @param id the app service plan resource ID * @return an immutable representation of the resource */ - Observable getByGroupAsync(String resourceGroupName, String name); + Observable getByIdAsync(String id); } \ No newline at end of file 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 index 4da4dcbbad1db..4115e7785a4f9 100644 --- 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 @@ -62,11 +62,18 @@ interface WithAppServicePlan { WithRegion withNewAppServicePlan(String name); /** - * Uses an existing app service plan for the web app. + * 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); } /** diff --git a/azure-mgmt-appservice/src/main/java/com/microsoft/azure/management/appservice/implementation/AppServicePlansImpl.java b/azure-mgmt-appservice/src/main/java/com/microsoft/azure/management/appservice/implementation/AppServicePlansImpl.java index c743a97704bce..c82180674f10e 100644 --- a/azure-mgmt-appservice/src/main/java/com/microsoft/azure/management/appservice/implementation/AppServicePlansImpl.java +++ b/azure-mgmt-appservice/src/main/java/com/microsoft/azure/management/appservice/implementation/AppServicePlansImpl.java @@ -7,9 +7,10 @@ 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.appservice.AppServicePlan; import com.microsoft.azure.management.appservice.AppServicePlans; +import com.microsoft.azure.management.resources.fluentcore.arm.ResourceUtils; +import com.microsoft.azure.management.resources.fluentcore.arm.collection.implementation.GroupableResourcesImpl; import rx.Observable; import rx.functions.Func1; @@ -31,7 +32,7 @@ class AppServicePlansImpl @Override public AppServicePlan getByGroup(String groupName, String name) { - return getByGroupAsync(groupName, name).toBlocking().single(); + return wrapModel(innerCollection.get(groupName, name)); } @Override @@ -69,8 +70,10 @@ public AppServicePlanImpl define(String name) { } @Override - public Observable getByGroupAsync(String resourceGroupName, String name) { - return innerCollection.getAsync(resourceGroupName, name) + public Observable getByIdAsync(String id) { + return innerCollection.getAsync( + ResourceUtils.groupFromResourceId(id), + ResourceUtils.nameFromResourceId(id)) .map(new Func1() { @Override public AppServicePlan call(AppServicePlanInner appServicePlanInner) { diff --git a/azure-mgmt-appservice/src/main/java/com/microsoft/azure/management/appservice/implementation/WebAppBaseImpl.java b/azure-mgmt-appservice/src/main/java/com/microsoft/azure/management/appservice/implementation/WebAppBaseImpl.java index e666f419fec7a..d3c087e98edf8 100644 --- a/azure-mgmt-appservice/src/main/java/com/microsoft/azure/management/appservice/implementation/WebAppBaseImpl.java +++ b/azure-mgmt-appservice/src/main/java/com/microsoft/azure/management/appservice/implementation/WebAppBaseImpl.java @@ -431,7 +431,7 @@ public Observable createResourceAsync() { } Observable locationObs = Observable.just(inner().location()); if (inner().location() == null) { - locationObs = myManager.appServicePlans().getByGroupAsync(resourceGroupName(), inner().serverFarmId()) + locationObs = myManager.appServicePlans().getByIdAsync(inner().serverFarmId()) .map(new Func1() { @Override public String call(AppServicePlan appServicePlan) { diff --git a/azure-mgmt-appservice/src/main/java/com/microsoft/azure/management/appservice/implementation/WebAppImpl.java b/azure-mgmt-appservice/src/main/java/com/microsoft/azure/management/appservice/implementation/WebAppImpl.java index 64d6980e64eab..d5d4f04d4ce74 100644 --- a/azure-mgmt-appservice/src/main/java/com/microsoft/azure/management/appservice/implementation/WebAppImpl.java +++ b/azure-mgmt-appservice/src/main/java/com/microsoft/azure/management/appservice/implementation/WebAppImpl.java @@ -8,6 +8,8 @@ import com.google.common.base.Function; import com.google.common.collect.Maps; +import com.microsoft.azure.management.appservice.AppServicePlan; +import com.microsoft.azure.management.resources.fluentcore.arm.ResourceUtils; import com.microsoft.azure.management.resources.fluentcore.model.Wrapper; import com.microsoft.azure.management.resources.implementation.ResourceGroupInner; import com.microsoft.azure.management.appservice.AppServicePricingTier; @@ -199,7 +201,9 @@ public WebAppImpl refresh() { @Override public WebAppImpl withNewAppServicePlan(String name) { appServicePlan = (AppServicePlanImpl) myManager.appServicePlans().define(name); - inner().withServerFarmId(name); + String id = ResourceUtils.constructResourceId(myManager.subscriptionId(), + resourceGroupName(), "Microsoft.Web", "serverFarms", name, ""); + inner().withServerFarmId(id); return this; } @@ -226,7 +230,19 @@ public WebAppImpl withPricingTier(AppServicePricingTier pricingTier) { @Override public WebAppImpl withExistingAppServicePlan(String appServicePlanName) { - inner().withServerFarmId(appServicePlanName); + String id = ResourceUtils.constructResourceId(myManager.subscriptionId(), + resourceGroupName(), "Microsoft.Web", "serverFarms", appServicePlanName, ""); + inner().withServerFarmId(id); + return this; + } + + @Override + @SuppressWarnings("unchecked") + public WebAppImpl withExistingAppServicePlan(AppServicePlan appServicePlan) { + inner().withServerFarmId(appServicePlan.id()); + if (super.creatableGroup != null) { + ((Wrapper) super.creatableGroup).inner().withLocation(appServicePlan.regionName()); + } return this; } } \ No newline at end of file diff --git a/azure-mgmt-appservice/src/test/java/com/microsoft/azure/management/appservice/WebAppsTests.java b/azure-mgmt-appservice/src/test/java/com/microsoft/azure/management/appservice/WebAppsTests.java index 7a3031ffaf15b..abfa4c8c77d26 100644 --- a/azure-mgmt-appservice/src/test/java/com/microsoft/azure/management/appservice/WebAppsTests.java +++ b/azure-mgmt-appservice/src/test/java/com/microsoft/azure/management/appservice/WebAppsTests.java @@ -38,7 +38,6 @@ public void canCRUDWebApp() throws Exception { .defineSslBinding() .forHostname("pineapple.graph-webapp-319.com") .withExistingAppServiceCertificateOrder(appServiceManager.certificateOrders().getByGroup(RG_NAME, "graphwildcert")) -// .withNewKeyVault("orangecertvault") .withSniBasedSsl() .attach() .withRemoteDebuggingEnabled(RemoteVisualStudioVersion.VS2013) diff --git a/azure-samples/src/main/java/com/microsoft/azure/management/appservice/samples/ManageAppService.java b/azure-samples/src/main/java/com/microsoft/azure/management/appservice/samples/ManageAppService.java index e69dfc4db66d3..785c43cf6400e 100644 --- a/azure-samples/src/main/java/com/microsoft/azure/management/appservice/samples/ManageAppService.java +++ b/azure-samples/src/main/java/com/microsoft/azure/management/appservice/samples/ManageAppService.java @@ -8,18 +8,15 @@ package com.microsoft.azure.management.appservice.samples; import com.microsoft.azure.management.Azure; -import com.microsoft.azure.management.keyvault.Vault; -import com.microsoft.azure.management.resources.fluentcore.arm.CountryISOCode; -import com.microsoft.azure.management.resources.fluentcore.arm.CountryPhoneCode; -import com.microsoft.azure.management.resources.fluentcore.arm.Region; -import com.microsoft.azure.management.resources.fluentcore.utils.ResourceNamer; -import com.microsoft.azure.management.samples.Utils; import com.microsoft.azure.management.appservice.AppServiceCertificateOrder; import com.microsoft.azure.management.appservice.AppServiceDomain; import com.microsoft.azure.management.appservice.AppServicePricingTier; import com.microsoft.azure.management.appservice.CustomHostNameDnsRecordType; import com.microsoft.azure.management.appservice.DeploymentSlot; import com.microsoft.azure.management.appservice.WebApp; +import com.microsoft.azure.management.resources.fluentcore.arm.Region; +import com.microsoft.azure.management.resources.fluentcore.utils.ResourceNamer; +import com.microsoft.azure.management.samples.Utils; import okhttp3.OkHttpClient; import okhttp3.Request; import okhttp3.logging.HttpLoggingInterceptor; @@ -56,15 +53,17 @@ public final class ManageAppService { * @param args the parameters */ public static void main(String[] args) { + // Existing resources + final String domainName = "jsdk79877.com"; + final String certName = "wild2crt8b42374211"; + final String domainCertRg = "rgnemv24d683784f51d"; + + // New resources final String app1Name = ResourceNamer.randomResourceName("webapp1", 20); final String app2Name = ResourceNamer.randomResourceName("webapp2", 20); final String slot1Name = ResourceNamer.randomResourceName("slot1", 20); final String slot2Name = ResourceNamer.randomResourceName("slot2", 20); final String planName = ResourceNamer.randomResourceName("jplan", 15); - final String domainName = ResourceNamer.randomResourceName("jsdk", 10) + ".com"; - final String cert1Name = ResourceNamer.randomResourceName("std1crt", 20); - final String cert2Name = ResourceNamer.randomResourceName("wild2crt", 20); - final String vaultName = ResourceNamer.randomResourceName("demovault", 20); final String rgName = ResourceNamer.randomResourceName("rgNEMV", 24); try { @@ -76,7 +75,7 @@ public static void main(String[] args) { Azure azure = Azure .configure() - .withLogLevel(HttpLoggingInterceptor.Level.BODY) + .withLogLevel(HttpLoggingInterceptor.Level.BASIC) .authenticate(credFile) .withDefaultSubscription(); @@ -121,22 +120,7 @@ public static void main(String[] args) { System.out.println("Purchasing a domain " + domainName + "..."); AppServiceDomain domain = azure.appServices().domains() - .define(domainName) - .withExistingResourceGroup(rgName) - .defineRegistrantContact() - .withFirstName("Microsoft") - .withLastName("Azure") - .withEmail("azure@outlook.com") - .withAddressLine1("1 Microsoft Way") - .withCity("Redmond") - .withStateOrProvince("Washington") - .withCountry(CountryISOCode.UNITED_STATES) - .withPostalCode("98052") - .withPhoneCountryCode(CountryPhoneCode.UNITED_STATES) - .withPhoneNumber("4258828080") - .attach() - .withDomainPrivacyEnabled(true) - .create(); + .getByGroup(domainCertRg, domainName); System.out.println("Purchased domain " + domain.name()); Utils.print(domain); @@ -144,69 +128,51 @@ public static void main(String[] args) { //============================================================ // Bind domain to web app 1 - System.out.println("Binding http://app1." + domainName + " to web app " + app1Name + "..."); + System.out.println("Binding http://" + app1Name + "." + domainName + " to web app " + app1Name + "..."); app1 = app1.update() .defineHostnameBinding() .withAzureManagedDomain(domain) - .withSubDomain("app1") + .withSubDomain(app1Name) .withDnsRecordType(CustomHostNameDnsRecordType.CNAME) .attach() .apply(); - System.out.println("Finish binding http://app1." + domainName + " to web app " + app1Name + "..."); + System.out.println("Finish binding http://" + app1Name + "." + domainName + " to web app " + app1Name + "..."); Utils.print(app1); - System.out.println("CURLing http://app1." + domainName); - System.out.println(curl("http://app1." + domainName)); + System.out.println("CURLing http://" + app1Name + "." + domainName); + System.out.println(curl("http://" + app1Name + "." + domainName)); //============================================================ // Purchase a wild card SSL certificate (will be canceled for a full refund) - System.out.println("Purchasing a wildcard SSL certificate " + cert2Name + "..."); - - Vault vault = azure.vaults().getByGroup("javatestrg", "javatestautovault"); AppServiceCertificateOrder certificateOrder = azure.appServices().certificateOrders() - .define(cert2Name) - .withExistingResourceGroup(rgName) - .withHostName("*." + domainName) - .withWildcardSku() - .withDomainVerification(domain) - .withExistingKeyVault(vault) - .withValidYears(1) - .create(); + .getByGroup(domainCertRg, certName); - System.out.println("Wildcard Certificate " + cert2Name + " is ready to use."); Utils.print(certificateOrder); //============================================================ // Bind domain to web app 2 and turn on wild card SSL - System.out.println("Binding @/www/app2." + domainName + " to web app " + app2Name + "..."); + System.out.println("Binding https://" + app2Name + "." + domainName + " to web app " + app2Name + "..."); app2 = app2.update() - .withManagedHostnameBindings(domain, "app2", "@", "www") - .defineSslBinding() - .forHostname(domainName) - .withExistingAppServiceCertificateOrder(certificateOrder) - .withSniBasedSsl() - .attach() + .withManagedHostnameBindings(domain, app2Name) .defineSslBinding() - .forHostname("www." + domainName) - .withExistingAppServiceCertificateOrder(certificateOrder) - .withSniBasedSsl() - .attach() - .defineSslBinding() - .forHostname("app2." + domainName) + .forHostname(app2Name + "." + domainName) .withExistingAppServiceCertificateOrder(certificateOrder) .withSniBasedSsl() .attach() .apply(); - System.out.println("Finished binding @/www/app2." + domainName + " to web app " + app2Name + "..."); + System.out.println("Finished binding http://" + app2Name + "." + domainName + " to web app " + app2Name + "..."); Utils.print(app2); - System.out.println("CURLing https://www." + domainName); - System.out.println(curl("https://www." + domainName)); + // Make a call to warm up with web app + curl("https://" + app2Name + "." + domainName); + + System.out.println("CURLing https://" + app2Name + "." + domainName); + System.out.println(curl("https://" + app2Name + "." + domainName)); //============================================================ // Create 2 slots under web app 2 @@ -216,7 +182,7 @@ public static void main(String[] args) { DeploymentSlot slot1 = app2.deploymentSlots().define(slot1Name) .withBrandNewConfiguration() - .withManagedHostnameBindings(domain, "slot1") + .withManagedHostnameBindings(domain, slot1Name) .withAutoSwapSlotName("production") .create(); @@ -228,9 +194,9 @@ public static void main(String[] args) { DeploymentSlot slot2 = app2.deploymentSlots().define(slot2Name) .withConfigurationFromDeploymentSlot(slot1) - .withManagedHostnameBindings(domain, "slot2") + .withManagedHostnameBindings(domain, slot2Name) .defineSslBinding() - .forHostname("slot2." + domainName) + .forHostname(slot2Name + "." + domainName) .withExistingAppServiceCertificateOrder(certificateOrder) .withSniBasedSsl() .attach() @@ -249,7 +215,7 @@ public static void main(String[] args) { slot1 = slot1.update() .withAutoSwapSlotName(null) // this will not affect slot 2 .defineSslBinding() - .forHostname("slot1." + domainName) + .forHostname(slot1Name + "." + domainName) .withExistingAppServiceCertificateOrder(certificateOrder) .withSniBasedSsl() .attach() @@ -274,8 +240,11 @@ public static void main(String[] args) { System.out.println("Finished deploying public GitHub repo to slot " + slot2Name); Utils.print(slot2); - System.out.println("CURLing https://www." + domainName + ". Should contain auto-swapped slot 2 content."); - System.out.println(curl("https://www." + domainName)); + // Make a call to warm up with web app + curl("https://" + app2Name + "." + domainName); + + System.out.println("CURLing https://" + app2Name + "." + domainName + ". Should contain auto-swapped slot 2 content."); + System.out.println(curl("https://" + app2Name + "." + domainName)); } catch (Exception e) { System.err.println(e.getMessage());