diff --git a/sdk/cdn/mgmt-v2020_04_15/pom.xml b/sdk/cdn/mgmt-v2020_04_15/pom.xml index 566efdbc956b..5c4a37905c7e 100644 --- a/sdk/cdn/mgmt-v2020_04_15/pom.xml +++ b/sdk/cdn/mgmt-v2020_04_15/pom.xml @@ -11,8 +11,8 @@ com.microsoft.azure azure-arm-parent - 1.3.2 - ../../parents/azure-arm-parent/pom.xml + 1.1.0 + ../../../pom.management.xml azure-mgmt-cdn 1.0.0-beta diff --git a/sdk/cdn/mgmt-v2020_04_15/src/main/java/com/microsoft/azure/management/cdn/v2020_04_15/Algorithm.java b/sdk/cdn/mgmt-v2020_04_15/src/main/java/com/microsoft/azure/management/cdn/v2020_04_15/Algorithm.java new file mode 100644 index 000000000000..d15dfa0fc85f --- /dev/null +++ b/sdk/cdn/mgmt-v2020_04_15/src/main/java/com/microsoft/azure/management/cdn/v2020_04_15/Algorithm.java @@ -0,0 +1,38 @@ +/** + * 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.cdn.v2020_04_15; + +import java.util.Collection; +import com.fasterxml.jackson.annotation.JsonCreator; +import com.microsoft.rest.ExpandableStringEnum; + +/** + * Defines values for Algorithm. + */ +public final class Algorithm extends ExpandableStringEnum { + /** Static value SHA256 for Algorithm. */ + public static final Algorithm SHA256 = fromString("SHA256"); + + /** + * Creates or finds a Algorithm from its string representation. + * @param name a name to look for + * @return the corresponding Algorithm + */ + @JsonCreator + public static Algorithm fromString(String name) { + return fromString(name, Algorithm.class); + } + + /** + * @return known Algorithm values + */ + public static Collection values() { + return values(Algorithm.class); + } +} diff --git a/sdk/cdn/mgmt-v2020_04_15/src/main/java/com/microsoft/azure/management/cdn/v2020_04_15/DeliveryRuleAction.java b/sdk/cdn/mgmt-v2020_04_15/src/main/java/com/microsoft/azure/management/cdn/v2020_04_15/DeliveryRuleAction.java index f0edd8bea219..b7667b82f2aa 100644 --- a/sdk/cdn/mgmt-v2020_04_15/src/main/java/com/microsoft/azure/management/cdn/v2020_04_15/DeliveryRuleAction.java +++ b/sdk/cdn/mgmt-v2020_04_15/src/main/java/com/microsoft/azure/management/cdn/v2020_04_15/DeliveryRuleAction.java @@ -19,6 +19,7 @@ @JsonTypeName("DeliveryRuleAction") @JsonSubTypes({ @JsonSubTypes.Type(name = "UrlRedirect", value = UrlRedirectAction.class), + @JsonSubTypes.Type(name = "UrlSigning", value = UrlSigningAction.class), @JsonSubTypes.Type(name = "UrlRewrite", value = UrlRewriteAction.class), @JsonSubTypes.Type(name = "ModifyRequestHeader", value = DeliveryRuleRequestHeaderAction.class), @JsonSubTypes.Type(name = "ModifyResponseHeader", value = DeliveryRuleResponseHeaderAction.class), diff --git a/sdk/cdn/mgmt-v2020_04_15/src/main/java/com/microsoft/azure/management/cdn/v2020_04_15/Endpoint.java b/sdk/cdn/mgmt-v2020_04_15/src/main/java/com/microsoft/azure/management/cdn/v2020_04_15/Endpoint.java index 9100ea1e35d3..49f749de0887 100644 --- a/sdk/cdn/mgmt-v2020_04_15/src/main/java/com/microsoft/azure/management/cdn/v2020_04_15/Endpoint.java +++ b/sdk/cdn/mgmt-v2020_04_15/src/main/java/com/microsoft/azure/management/cdn/v2020_04_15/Endpoint.java @@ -137,7 +137,7 @@ public interface Endpoint extends HasInner, Indexable, Refreshabl /** * @return the urlSigningKeys value. */ - UrlSigningKey urlSigningKeys(); + List urlSigningKeys(); /** * @return the webApplicationFirewallPolicyLink value. @@ -374,7 +374,7 @@ interface WithUrlSigningKeys { * @param urlSigningKeys List of keys used to validate the signed URL hashes * @return the next definition stage */ - WithCreate withUrlSigningKeys(UrlSigningKey urlSigningKeys); + WithCreate withUrlSigningKeys(List urlSigningKeys); } /** @@ -572,7 +572,7 @@ interface WithUrlSigningKeys { * @param urlSigningKeys List of keys used to validate the signed URL hashes * @return the next update stage */ - Update withUrlSigningKeys(UrlSigningKey urlSigningKeys); + Update withUrlSigningKeys(List urlSigningKeys); } /** diff --git a/sdk/cdn/mgmt-v2020_04_15/src/main/java/com/microsoft/azure/management/cdn/v2020_04_15/EndpointUpdateParameters.java b/sdk/cdn/mgmt-v2020_04_15/src/main/java/com/microsoft/azure/management/cdn/v2020_04_15/EndpointUpdateParameters.java index a845f04efa3e..0f11682372ec 100644 --- a/sdk/cdn/mgmt-v2020_04_15/src/main/java/com/microsoft/azure/management/cdn/v2020_04_15/EndpointUpdateParameters.java +++ b/sdk/cdn/mgmt-v2020_04_15/src/main/java/com/microsoft/azure/management/cdn/v2020_04_15/EndpointUpdateParameters.java @@ -121,7 +121,7 @@ public class EndpointUpdateParameters { * List of keys used to validate the signed URL hashes. */ @JsonProperty(value = "properties.urlSigningKeys") - private UrlSigningKey urlSigningKeys; + private List urlSigningKeys; /** * A policy that specifies the delivery rules to be used for an endpoint. @@ -381,7 +381,7 @@ public EndpointUpdateParameters withDefaultOriginGroup(ResourceReference default * * @return the urlSigningKeys value */ - public UrlSigningKey urlSigningKeys() { + public List urlSigningKeys() { return this.urlSigningKeys; } @@ -391,7 +391,7 @@ public UrlSigningKey urlSigningKeys() { * @param urlSigningKeys the urlSigningKeys value to set * @return the EndpointUpdateParameters object itself. */ - public EndpointUpdateParameters withUrlSigningKeys(UrlSigningKey urlSigningKeys) { + public EndpointUpdateParameters withUrlSigningKeys(List urlSigningKeys) { this.urlSigningKeys = urlSigningKeys; return this; } diff --git a/sdk/cdn/mgmt-v2020_04_15/src/main/java/com/microsoft/azure/management/cdn/v2020_04_15/Origin.java b/sdk/cdn/mgmt-v2020_04_15/src/main/java/com/microsoft/azure/management/cdn/v2020_04_15/Origin.java index f2a14ede354a..e545b37d8ab9 100644 --- a/sdk/cdn/mgmt-v2020_04_15/src/main/java/com/microsoft/azure/management/cdn/v2020_04_15/Origin.java +++ b/sdk/cdn/mgmt-v2020_04_15/src/main/java/com/microsoft/azure/management/cdn/v2020_04_15/Origin.java @@ -17,7 +17,6 @@ import com.microsoft.azure.arm.model.Creatable; import com.microsoft.azure.arm.resources.models.HasManager; import com.microsoft.azure.management.cdn.v2020_04_15.implementation.CdnManager; -import java.util.Map; /** * Type representing Origin. @@ -48,11 +47,6 @@ public interface Origin extends HasInner, Indexable, Refreshable, Indexable, Refreshable tags(); - /** * @return the type value. */ @@ -121,7 +110,7 @@ public interface Origin extends HasInner, Indexable, Refreshable tags); - } - /** * The stage of the origin definition allowing to specify Weight. */ @@ -309,13 +274,13 @@ interface WithWeight { * the resource to be created (via {@link WithCreate#create()}), but also allows * for any other optional settings to be specified. */ - interface WithCreate extends Creatable, DefinitionStages.WithEnabled, DefinitionStages.WithHostName, DefinitionStages.WithHttpPort, DefinitionStages.WithHttpsPort, DefinitionStages.WithOriginHostHeader, DefinitionStages.WithPriority, DefinitionStages.WithPrivateLinkAlias, DefinitionStages.WithPrivateLinkApprovalMessage, DefinitionStages.WithPrivateLinkLocation, DefinitionStages.WithPrivateLinkResourceId, DefinitionStages.WithTags, DefinitionStages.WithWeight { + interface WithCreate extends Creatable, DefinitionStages.WithEnabled, DefinitionStages.WithHostName, DefinitionStages.WithHttpPort, DefinitionStages.WithHttpsPort, DefinitionStages.WithOriginHostHeader, DefinitionStages.WithPriority, DefinitionStages.WithPrivateLinkAlias, DefinitionStages.WithPrivateLinkApprovalMessage, DefinitionStages.WithPrivateLinkLocation, DefinitionStages.WithPrivateLinkResourceId, DefinitionStages.WithWeight { } } /** * The template for a Origin update operation, containing all the settings that can be modified. */ - interface Update extends Appliable, UpdateStages.WithEnabled, UpdateStages.WithHostName, UpdateStages.WithHttpPort, UpdateStages.WithHttpsPort, UpdateStages.WithOriginHostHeader, UpdateStages.WithPriority, UpdateStages.WithPrivateLinkAlias, UpdateStages.WithPrivateLinkApprovalMessage, UpdateStages.WithPrivateLinkLocation, UpdateStages.WithPrivateLinkResourceId, UpdateStages.WithTags, UpdateStages.WithWeight { + interface Update extends Appliable, UpdateStages.WithEnabled, UpdateStages.WithHostName, UpdateStages.WithHttpPort, UpdateStages.WithHttpsPort, UpdateStages.WithOriginHostHeader, UpdateStages.WithPriority, UpdateStages.WithPrivateLinkAlias, UpdateStages.WithPrivateLinkApprovalMessage, UpdateStages.WithPrivateLinkLocation, UpdateStages.WithPrivateLinkResourceId, UpdateStages.WithWeight { } /** @@ -442,18 +407,6 @@ interface WithPrivateLinkResourceId { Update withPrivateLinkResourceId(String privateLinkResourceId); } - /** - * The stage of the origin update allowing to specify Tags. - */ - interface WithTags { - /** - * Specifies tags. - * @param tags Origin tags - * @return the next update stage - */ - Update withTags(Map tags); - } - /** * The stage of the origin update allowing to specify Weight. */ diff --git a/sdk/cdn/mgmt-v2020_04_15/src/main/java/com/microsoft/azure/management/cdn/v2020_04_15/OriginUpdateParameters.java b/sdk/cdn/mgmt-v2020_04_15/src/main/java/com/microsoft/azure/management/cdn/v2020_04_15/OriginUpdateParameters.java index c42e00d25ca0..37f5bef1e9fe 100644 --- a/sdk/cdn/mgmt-v2020_04_15/src/main/java/com/microsoft/azure/management/cdn/v2020_04_15/OriginUpdateParameters.java +++ b/sdk/cdn/mgmt-v2020_04_15/src/main/java/com/microsoft/azure/management/cdn/v2020_04_15/OriginUpdateParameters.java @@ -8,7 +8,6 @@ package com.microsoft.azure.management.cdn.v2020_04_15; -import java.util.Map; import com.fasterxml.jackson.annotation.JsonProperty; import com.microsoft.rest.serializer.JsonFlatten; @@ -17,12 +16,6 @@ */ @JsonFlatten public class OriginUpdateParameters { - /** - * Origin tags. - */ - @JsonProperty(value = "tags") - private Map tags; - /** * The address of the origin. Domain names, IPv4 addresses, and IPv6 * addresses are supported.This should be unique across all origins in an @@ -102,26 +95,6 @@ public class OriginUpdateParameters { @JsonProperty(value = "properties.privateLinkApprovalMessage") private String privateLinkApprovalMessage; - /** - * Get origin tags. - * - * @return the tags value - */ - public Map tags() { - return this.tags; - } - - /** - * Set origin tags. - * - * @param tags the tags value to set - * @return the OriginUpdateParameters object itself. - */ - public OriginUpdateParameters withTags(Map tags) { - this.tags = tags; - return this; - } - /** * Get the address of the origin. Domain names, IPv4 addresses, and IPv6 addresses are supported.This should be unique across all origins in an endpoint. * diff --git a/sdk/cdn/mgmt-v2020_04_15/src/main/java/com/microsoft/azure/management/cdn/v2020_04_15/ParamIndicator.java b/sdk/cdn/mgmt-v2020_04_15/src/main/java/com/microsoft/azure/management/cdn/v2020_04_15/ParamIndicator.java new file mode 100644 index 000000000000..ef3fade66916 --- /dev/null +++ b/sdk/cdn/mgmt-v2020_04_15/src/main/java/com/microsoft/azure/management/cdn/v2020_04_15/ParamIndicator.java @@ -0,0 +1,44 @@ +/** + * 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.cdn.v2020_04_15; + +import java.util.Collection; +import com.fasterxml.jackson.annotation.JsonCreator; +import com.microsoft.rest.ExpandableStringEnum; + +/** + * Defines values for ParamIndicator. + */ +public final class ParamIndicator extends ExpandableStringEnum { + /** Static value Expires for ParamIndicator. */ + public static final ParamIndicator EXPIRES = fromString("Expires"); + + /** Static value KeyId for ParamIndicator. */ + public static final ParamIndicator KEY_ID = fromString("KeyId"); + + /** Static value Signature for ParamIndicator. */ + public static final ParamIndicator SIGNATURE = fromString("Signature"); + + /** + * Creates or finds a ParamIndicator from its string representation. + * @param name a name to look for + * @return the corresponding ParamIndicator + */ + @JsonCreator + public static ParamIndicator fromString(String name) { + return fromString(name, ParamIndicator.class); + } + + /** + * @return known ParamIndicator values + */ + public static Collection values() { + return values(ParamIndicator.class); + } +} diff --git a/sdk/cdn/mgmt-v2020_04_15/src/main/java/com/microsoft/azure/management/cdn/v2020_04_15/UrlSigningAction.java b/sdk/cdn/mgmt-v2020_04_15/src/main/java/com/microsoft/azure/management/cdn/v2020_04_15/UrlSigningAction.java new file mode 100644 index 000000000000..45134c97d8c2 --- /dev/null +++ b/sdk/cdn/mgmt-v2020_04_15/src/main/java/com/microsoft/azure/management/cdn/v2020_04_15/UrlSigningAction.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.cdn.v2020_04_15; + +import com.fasterxml.jackson.annotation.JsonProperty; +import com.fasterxml.jackson.annotation.JsonTypeInfo; +import com.fasterxml.jackson.annotation.JsonTypeName; + +/** + * Defines the url signing action for the delivery rule. + */ +@JsonTypeInfo(use = JsonTypeInfo.Id.NAME, include = JsonTypeInfo.As.PROPERTY, property = "name", defaultImpl = UrlSigningAction.class) +@JsonTypeName("UrlSigning") +public class UrlSigningAction extends DeliveryRuleAction { + /** + * Defines the parameters for the action. + */ + @JsonProperty(value = "parameters", required = true) + private UrlSigningActionParameters parameters; + + /** + * Get defines the parameters for the action. + * + * @return the parameters value + */ + public UrlSigningActionParameters parameters() { + return this.parameters; + } + + /** + * Set defines the parameters for the action. + * + * @param parameters the parameters value to set + * @return the UrlSigningAction object itself. + */ + public UrlSigningAction withParameters(UrlSigningActionParameters parameters) { + this.parameters = parameters; + return this; + } + +} diff --git a/sdk/cdn/mgmt-v2020_04_15/src/main/java/com/microsoft/azure/management/cdn/v2020_04_15/UrlSigningActionParameters.java b/sdk/cdn/mgmt-v2020_04_15/src/main/java/com/microsoft/azure/management/cdn/v2020_04_15/UrlSigningActionParameters.java index 9967ab664217..96f893b79bfb 100644 --- a/sdk/cdn/mgmt-v2020_04_15/src/main/java/com/microsoft/azure/management/cdn/v2020_04_15/UrlSigningActionParameters.java +++ b/sdk/cdn/mgmt-v2020_04_15/src/main/java/com/microsoft/azure/management/cdn/v2020_04_15/UrlSigningActionParameters.java @@ -15,6 +15,13 @@ * Defines the parameters for the Url Signing action. */ public class UrlSigningActionParameters { + /** + * Possible values include: + * '#Microsoft.Azure.Cdn.Models.DeliveryRuleUrlSigningActionParameters'. + */ + @JsonProperty(value = "@odata\\.type") + private String odatatype; + /** * Id reference of the key to be used to verify the hash and should be * defined in UrlSigningKeys. @@ -26,7 +33,7 @@ public class UrlSigningActionParameters { * Algorithm to use for URL signing. Possible values include: 'SHA256'. */ @JsonProperty(value = "algorithm") - private String algorithm; + private Algorithm algorithm; /** * Defines which query string parameters in the url to be considered for @@ -42,6 +49,26 @@ public class UrlSigningActionParameters { @JsonProperty(value = "ipSubnets") private List ipSubnets; + /** + * Get possible values include: '#Microsoft.Azure.Cdn.Models.DeliveryRuleUrlSigningActionParameters'. + * + * @return the odatatype value + */ + public String odatatype() { + return this.odatatype; + } + + /** + * Set possible values include: '#Microsoft.Azure.Cdn.Models.DeliveryRuleUrlSigningActionParameters'. + * + * @param odatatype the odatatype value to set + * @return the UrlSigningActionParameters object itself. + */ + public UrlSigningActionParameters withOdatatype(String odatatype) { + this.odatatype = odatatype; + return this; + } + /** * Get id reference of the key to be used to verify the hash and should be defined in UrlSigningKeys. * @@ -67,7 +94,7 @@ public UrlSigningActionParameters withKeyId(String keyId) { * * @return the algorithm value */ - public String algorithm() { + public Algorithm algorithm() { return this.algorithm; } @@ -77,7 +104,7 @@ public String algorithm() { * @param algorithm the algorithm value to set * @return the UrlSigningActionParameters object itself. */ - public UrlSigningActionParameters withAlgorithm(String algorithm) { + public UrlSigningActionParameters withAlgorithm(Algorithm algorithm) { this.algorithm = algorithm; return this; } diff --git a/sdk/cdn/mgmt-v2020_04_15/src/main/java/com/microsoft/azure/management/cdn/v2020_04_15/UrlSigningParamIdentifier.java b/sdk/cdn/mgmt-v2020_04_15/src/main/java/com/microsoft/azure/management/cdn/v2020_04_15/UrlSigningParamIdentifier.java index 0e29c04a5890..3f081acbb52e 100644 --- a/sdk/cdn/mgmt-v2020_04_15/src/main/java/com/microsoft/azure/management/cdn/v2020_04_15/UrlSigningParamIdentifier.java +++ b/sdk/cdn/mgmt-v2020_04_15/src/main/java/com/microsoft/azure/management/cdn/v2020_04_15/UrlSigningParamIdentifier.java @@ -16,10 +16,10 @@ public class UrlSigningParamIdentifier { /** * Indicates the purpose of the parameter. Possible values include: - * 'expires', 'keyId', 'signature'. + * 'Expires', 'KeyId', 'Signature'. */ @JsonProperty(value = "paramIndicator", required = true) - private String paramIndicator; + private ParamIndicator paramIndicator; /** * Parameter name. @@ -28,21 +28,21 @@ public class UrlSigningParamIdentifier { private String paramName; /** - * Get indicates the purpose of the parameter. Possible values include: 'expires', 'keyId', 'signature'. + * Get indicates the purpose of the parameter. Possible values include: 'Expires', 'KeyId', 'Signature'. * * @return the paramIndicator value */ - public String paramIndicator() { + public ParamIndicator paramIndicator() { return this.paramIndicator; } /** - * Set indicates the purpose of the parameter. Possible values include: 'expires', 'keyId', 'signature'. + * Set indicates the purpose of the parameter. Possible values include: 'Expires', 'KeyId', 'Signature'. * * @param paramIndicator the paramIndicator value to set * @return the UrlSigningParamIdentifier object itself. */ - public UrlSigningParamIdentifier withParamIndicator(String paramIndicator) { + public UrlSigningParamIdentifier withParamIndicator(ParamIndicator paramIndicator) { this.paramIndicator = paramIndicator; return this; } diff --git a/sdk/cdn/mgmt-v2020_04_15/src/main/java/com/microsoft/azure/management/cdn/v2020_04_15/implementation/CdnManagementClientImpl.java b/sdk/cdn/mgmt-v2020_04_15/src/main/java/com/microsoft/azure/management/cdn/v2020_04_15/implementation/CdnManagementClientImpl.java index 26241f99e83e..96f02ab9e154 100644 --- a/sdk/cdn/mgmt-v2020_04_15/src/main/java/com/microsoft/azure/management/cdn/v2020_04_15/implementation/CdnManagementClientImpl.java +++ b/sdk/cdn/mgmt-v2020_04_15/src/main/java/com/microsoft/azure/management/cdn/v2020_04_15/implementation/CdnManagementClientImpl.java @@ -83,52 +83,6 @@ public String apiVersion() { return this.apiVersion; } - /** Azure Subscription ID. */ - private String subscriptionId1; - - /** - * Gets Azure Subscription ID. - * - * @return the subscriptionId1 value. - */ - public String subscriptionId1() { - return this.subscriptionId1; - } - - /** - * Sets Azure Subscription ID. - * - * @param subscriptionId1 the subscriptionId1 value. - * @return the service client itself - */ - public CdnManagementClientImpl withSubscriptionId1(String subscriptionId1) { - this.subscriptionId1 = subscriptionId1; - return this; - } - - /** Version of the API to be used with the client request. Current version is 2017-04-02. */ - private String apiVersion1; - - /** - * Gets Version of the API to be used with the client request. Current version is 2017-04-02. - * - * @return the apiVersion1 value. - */ - public String apiVersion1() { - return this.apiVersion1; - } - - /** - * Sets Version of the API to be used with the client request. Current version is 2017-04-02. - * - * @param apiVersion1 the apiVersion1 value. - * @return the service client itself - */ - public CdnManagementClientImpl withApiVersion1(String apiVersion1) { - this.apiVersion1 = apiVersion1; - return this; - } - /** The preferred language for the response. */ private String acceptLanguage; diff --git a/sdk/cdn/mgmt-v2020_04_15/src/main/java/com/microsoft/azure/management/cdn/v2020_04_15/implementation/EndpointImpl.java b/sdk/cdn/mgmt-v2020_04_15/src/main/java/com/microsoft/azure/management/cdn/v2020_04_15/implementation/EndpointImpl.java index f6a902d088db..6faa0b26de7b 100644 --- a/sdk/cdn/mgmt-v2020_04_15/src/main/java/com/microsoft/azure/management/cdn/v2020_04_15/implementation/EndpointImpl.java +++ b/sdk/cdn/mgmt-v2020_04_15/src/main/java/com/microsoft/azure/management/cdn/v2020_04_15/implementation/EndpointImpl.java @@ -214,7 +214,7 @@ public String type() { } @Override - public UrlSigningKey urlSigningKeys() { + public List urlSigningKeys() { return this.inner().urlSigningKeys(); } @@ -379,7 +379,7 @@ public EndpointImpl withTags(Map tags) { } @Override - public EndpointImpl withUrlSigningKeys(UrlSigningKey urlSigningKeys) { + public EndpointImpl withUrlSigningKeys(List urlSigningKeys) { if (isInCreateMode()) { this.inner().withUrlSigningKeys(urlSigningKeys); } else { diff --git a/sdk/cdn/mgmt-v2020_04_15/src/main/java/com/microsoft/azure/management/cdn/v2020_04_15/implementation/EndpointInner.java b/sdk/cdn/mgmt-v2020_04_15/src/main/java/com/microsoft/azure/management/cdn/v2020_04_15/implementation/EndpointInner.java index d52e9e881477..874039fbe0ce 100644 --- a/sdk/cdn/mgmt-v2020_04_15/src/main/java/com/microsoft/azure/management/cdn/v2020_04_15/implementation/EndpointInner.java +++ b/sdk/cdn/mgmt-v2020_04_15/src/main/java/com/microsoft/azure/management/cdn/v2020_04_15/implementation/EndpointInner.java @@ -127,7 +127,7 @@ public class EndpointInner extends Resource { * List of keys used to validate the signed URL hashes. */ @JsonProperty(value = "properties.urlSigningKeys") - private UrlSigningKey urlSigningKeys; + private List urlSigningKeys; /** * A policy that specifies the delivery rules to be used for an endpoint. @@ -400,7 +400,7 @@ public EndpointInner withDefaultOriginGroup(ResourceReference defaultOriginGroup * * @return the urlSigningKeys value */ - public UrlSigningKey urlSigningKeys() { + public List urlSigningKeys() { return this.urlSigningKeys; } @@ -410,7 +410,7 @@ public UrlSigningKey urlSigningKeys() { * @param urlSigningKeys the urlSigningKeys value to set * @return the EndpointInner object itself. */ - public EndpointInner withUrlSigningKeys(UrlSigningKey urlSigningKeys) { + public EndpointInner withUrlSigningKeys(List urlSigningKeys) { this.urlSigningKeys = urlSigningKeys; return this; } diff --git a/sdk/cdn/mgmt-v2020_04_15/src/main/java/com/microsoft/azure/management/cdn/v2020_04_15/implementation/OriginImpl.java b/sdk/cdn/mgmt-v2020_04_15/src/main/java/com/microsoft/azure/management/cdn/v2020_04_15/implementation/OriginImpl.java index 0fe4606f4189..da4b6ec7ae54 100644 --- a/sdk/cdn/mgmt-v2020_04_15/src/main/java/com/microsoft/azure/management/cdn/v2020_04_15/implementation/OriginImpl.java +++ b/sdk/cdn/mgmt-v2020_04_15/src/main/java/com/microsoft/azure/management/cdn/v2020_04_15/implementation/OriginImpl.java @@ -12,7 +12,6 @@ import com.microsoft.azure.arm.model.implementation.CreatableUpdatableImpl; import rx.Observable; import com.microsoft.azure.management.cdn.v2020_04_15.OriginUpdateParameters; -import java.util.Map; import com.microsoft.azure.management.cdn.v2020_04_15.OriginResourceState; import com.microsoft.azure.management.cdn.v2020_04_15.PrivateEndpointStatus; import rx.functions.Func1; @@ -121,11 +120,6 @@ public String id() { return this.inner().id(); } - @Override - public String location() { - return this.inner().location(); - } - @Override public String name() { return this.inner().name(); @@ -176,11 +170,6 @@ public OriginResourceState resourceState() { return this.inner().resourceState(); } - @Override - public Map tags() { - return this.inner().getTags(); - } - @Override public String type() { return this.inner().type(); @@ -199,12 +188,6 @@ public OriginImpl withExistingEndpoint(String resourceGroupName, String profileN return this; } - @Override - public OriginImpl withLocation(String location) { - this.inner().withLocation(location); - return this; - } - @Override public OriginImpl withEnabled(Boolean enabled) { if (isInCreateMode()) { @@ -305,16 +288,6 @@ public OriginImpl withPrivateLinkResourceId(String privateLinkResourceId) { return this; } - @Override - public OriginImpl withTags(Map tags) { - if (isInCreateMode()) { - this.inner().withTags(tags); - } else { - this.updateParameter.withTags(tags); - } - return this; - } - @Override public OriginImpl withWeight(Integer weight) { if (isInCreateMode()) { diff --git a/sdk/cdn/mgmt-v2020_04_15/src/main/java/com/microsoft/azure/management/cdn/v2020_04_15/implementation/OriginInner.java b/sdk/cdn/mgmt-v2020_04_15/src/main/java/com/microsoft/azure/management/cdn/v2020_04_15/implementation/OriginInner.java index 2cc594763603..143d2c83e249 100644 --- a/sdk/cdn/mgmt-v2020_04_15/src/main/java/com/microsoft/azure/management/cdn/v2020_04_15/implementation/OriginInner.java +++ b/sdk/cdn/mgmt-v2020_04_15/src/main/java/com/microsoft/azure/management/cdn/v2020_04_15/implementation/OriginInner.java @@ -12,7 +12,7 @@ import com.microsoft.azure.management.cdn.v2020_04_15.PrivateEndpointStatus; import com.fasterxml.jackson.annotation.JsonProperty; import com.microsoft.rest.serializer.JsonFlatten; -import com.microsoft.azure.Resource; +import com.microsoft.azure.ProxyResource; /** * CDN origin is the source of the content being delivered via CDN. When the @@ -20,7 +20,7 @@ * cached, they attempt to fetch it from one or more of the configured origins. */ @JsonFlatten -public class OriginInner extends Resource { +public class OriginInner extends ProxyResource { /** * The address of the origin. Domain names, IPv4 addresses, and IPv6 * addresses are supported.This should be unique across all origins in an