From f0e1b84f416f3e09e54483b6ae664f7de811d6fe Mon Sep 17 00:00:00 2001 From: SDKAuto Date: Wed, 11 Nov 2020 08:06:49 +0000 Subject: [PATCH] CodeGen from PR 11631 in Azure/azure-rest-api-specs Merge b9693fc9be6e0d27441d06257e5db0c65b260195 into e320555a456cbc894c5a89466defdfca45ca18a8 --- sdk/eventgrid/mgmt-v2018_01_01/pom.xml | 6 ++++-- .../v2018_01_01/EventHubEventSubscriptionDestination.java | 2 +- .../eventgrid/v2018_01_01/EventSubscriptionDestination.java | 2 +- .../v2018_01_01/WebHookEventSubscriptionDestination.java | 2 +- 4 files changed, 7 insertions(+), 5 deletions(-) diff --git a/sdk/eventgrid/mgmt-v2018_01_01/pom.xml b/sdk/eventgrid/mgmt-v2018_01_01/pom.xml index 716f8d817956..93f70d40b786 100644 --- a/sdk/eventgrid/mgmt-v2018_01_01/pom.xml +++ b/sdk/eventgrid/mgmt-v2018_01_01/pom.xml @@ -11,8 +11,8 @@ com.microsoft.azure azure-arm-parent - 1.2.0 - ../../parents/azure-arm-parent + 1.1.0 + ../../../pom.management.xml azure-mgmt-eventgrid 1.0.0-beta @@ -71,6 +71,8 @@ azure-arm-client-runtime test-jar test + + 1.6.5 diff --git a/sdk/eventgrid/mgmt-v2018_01_01/src/main/java/com/microsoft/azure/management/eventgrid/v2018_01_01/EventHubEventSubscriptionDestination.java b/sdk/eventgrid/mgmt-v2018_01_01/src/main/java/com/microsoft/azure/management/eventgrid/v2018_01_01/EventHubEventSubscriptionDestination.java index fad21465afa0..7c1722051600 100644 --- a/sdk/eventgrid/mgmt-v2018_01_01/src/main/java/com/microsoft/azure/management/eventgrid/v2018_01_01/EventHubEventSubscriptionDestination.java +++ b/sdk/eventgrid/mgmt-v2018_01_01/src/main/java/com/microsoft/azure/management/eventgrid/v2018_01_01/EventHubEventSubscriptionDestination.java @@ -16,7 +16,7 @@ /** * Information about the event hub destination for an event subscription. */ -@JsonTypeInfo(use = JsonTypeInfo.Id.NAME, include = JsonTypeInfo.As.PROPERTY, property = "endpointType") +@JsonTypeInfo(use = JsonTypeInfo.Id.NAME, include = JsonTypeInfo.As.PROPERTY, property = "endpointType", defaultImpl = EventHubEventSubscriptionDestination.class) @JsonTypeName("EventHub") @JsonFlatten public class EventHubEventSubscriptionDestination extends EventSubscriptionDestination { diff --git a/sdk/eventgrid/mgmt-v2018_01_01/src/main/java/com/microsoft/azure/management/eventgrid/v2018_01_01/EventSubscriptionDestination.java b/sdk/eventgrid/mgmt-v2018_01_01/src/main/java/com/microsoft/azure/management/eventgrid/v2018_01_01/EventSubscriptionDestination.java index 15fdde382b2d..c3f9a2822f35 100644 --- a/sdk/eventgrid/mgmt-v2018_01_01/src/main/java/com/microsoft/azure/management/eventgrid/v2018_01_01/EventSubscriptionDestination.java +++ b/sdk/eventgrid/mgmt-v2018_01_01/src/main/java/com/microsoft/azure/management/eventgrid/v2018_01_01/EventSubscriptionDestination.java @@ -15,7 +15,7 @@ /** * Information about the destination for an event subscription. */ -@JsonTypeInfo(use = JsonTypeInfo.Id.NAME, include = JsonTypeInfo.As.PROPERTY, property = "endpointType") +@JsonTypeInfo(use = JsonTypeInfo.Id.NAME, include = JsonTypeInfo.As.PROPERTY, property = "endpointType", defaultImpl = EventSubscriptionDestination.class) @JsonTypeName("EventSubscriptionDestination") @JsonSubTypes({ @JsonSubTypes.Type(name = "WebHook", value = WebHookEventSubscriptionDestination.class), diff --git a/sdk/eventgrid/mgmt-v2018_01_01/src/main/java/com/microsoft/azure/management/eventgrid/v2018_01_01/WebHookEventSubscriptionDestination.java b/sdk/eventgrid/mgmt-v2018_01_01/src/main/java/com/microsoft/azure/management/eventgrid/v2018_01_01/WebHookEventSubscriptionDestination.java index 06a21bd9d1c0..a44380505df2 100644 --- a/sdk/eventgrid/mgmt-v2018_01_01/src/main/java/com/microsoft/azure/management/eventgrid/v2018_01_01/WebHookEventSubscriptionDestination.java +++ b/sdk/eventgrid/mgmt-v2018_01_01/src/main/java/com/microsoft/azure/management/eventgrid/v2018_01_01/WebHookEventSubscriptionDestination.java @@ -16,7 +16,7 @@ /** * Information about the webhook destination for an event subscription. */ -@JsonTypeInfo(use = JsonTypeInfo.Id.NAME, include = JsonTypeInfo.As.PROPERTY, property = "endpointType") +@JsonTypeInfo(use = JsonTypeInfo.Id.NAME, include = JsonTypeInfo.As.PROPERTY, property = "endpointType", defaultImpl = WebHookEventSubscriptionDestination.class) @JsonTypeName("WebHook") @JsonFlatten public class WebHookEventSubscriptionDestination extends EventSubscriptionDestination {