From 3c99f062c56483c3834ea7a1f55d9a7b37bb84a9 Mon Sep 17 00:00:00 2001 From: SDK Automation Date: Mon, 30 Mar 2020 19:52:05 +0000 Subject: [PATCH] Generated from 99fc83e48076ac8ded1096dff1df7aa2d72b044c fix example for approved eenum --- sdk/eventgrid/mgmt-v2018_09_15_preview/pom.xml | 4 +++- .../eventgrid/v2018_09_15_preview/AdvancedFilter.java | 2 +- .../v2018_09_15_preview/BoolEqualsAdvancedFilter.java | 2 +- .../v2018_09_15_preview/DeadLetterDestination.java | 2 +- .../EventHubEventSubscriptionDestination.java | 2 +- .../EventSubscriptionDestination.java | 2 +- .../HybridConnectionEventSubscriptionDestination.java | 2 +- .../v2018_09_15_preview/InputSchemaMapping.java | 2 +- .../v2018_09_15_preview/JsonInputSchemaMapping.java | 2 +- .../NumberGreaterThanAdvancedFilter.java | 2 +- .../NumberGreaterThanOrEqualsAdvancedFilter.java | 2 +- .../v2018_09_15_preview/NumberInAdvancedFilter.java | 2 +- .../NumberLessThanAdvancedFilter.java | 2 +- .../NumberLessThanOrEqualsAdvancedFilter.java | 2 +- .../v2018_09_15_preview/NumberNotInAdvancedFilter.java | 2 +- .../StorageBlobDeadLetterDestination.java | 2 +- .../StorageQueueEventSubscriptionDestination.java | 2 +- .../StringBeginsWithAdvancedFilter.java | 2 +- .../StringContainsAdvancedFilter.java | 2 +- .../StringEndsWithAdvancedFilter.java | 2 +- .../v2018_09_15_preview/StringInAdvancedFilter.java | 2 +- .../v2018_09_15_preview/StringNotInAdvancedFilter.java | 2 +- .../WebHookEventSubscriptionDestination.java | 2 +- .../implementation/DomainTopicsImpl.java | 10 +++++++--- 24 files changed, 32 insertions(+), 26 deletions(-) diff --git a/sdk/eventgrid/mgmt-v2018_09_15_preview/pom.xml b/sdk/eventgrid/mgmt-v2018_09_15_preview/pom.xml index abec09603c593..b3430f6ad0839 100644 --- a/sdk/eventgrid/mgmt-v2018_09_15_preview/pom.xml +++ b/sdk/eventgrid/mgmt-v2018_09_15_preview/pom.xml @@ -11,7 +11,7 @@ com.microsoft.azure azure-arm-parent - 1.2.0 + 1.1.0 ../../../pom.management.xml azure-mgmt-eventgrid @@ -71,6 +71,8 @@ azure-arm-client-runtime test-jar test + + 1.6.5 diff --git a/sdk/eventgrid/mgmt-v2018_09_15_preview/src/main/java/com/microsoft/azure/management/eventgrid/v2018_09_15_preview/AdvancedFilter.java b/sdk/eventgrid/mgmt-v2018_09_15_preview/src/main/java/com/microsoft/azure/management/eventgrid/v2018_09_15_preview/AdvancedFilter.java index cd441279b05c9..332a8ee5974e4 100644 --- a/sdk/eventgrid/mgmt-v2018_09_15_preview/src/main/java/com/microsoft/azure/management/eventgrid/v2018_09_15_preview/AdvancedFilter.java +++ b/sdk/eventgrid/mgmt-v2018_09_15_preview/src/main/java/com/microsoft/azure/management/eventgrid/v2018_09_15_preview/AdvancedFilter.java @@ -17,7 +17,7 @@ * Represents an advanced filter that can be used to filter events based on * various event envelope/data fields. */ -@JsonTypeInfo(use = JsonTypeInfo.Id.NAME, include = JsonTypeInfo.As.PROPERTY, property = "operatorType") +@JsonTypeInfo(use = JsonTypeInfo.Id.NAME, include = JsonTypeInfo.As.PROPERTY, property = "operatorType", defaultImpl = AdvancedFilter.class) @JsonTypeName("AdvancedFilter") @JsonSubTypes({ @JsonSubTypes.Type(name = "NumberIn", value = NumberInAdvancedFilter.class), diff --git a/sdk/eventgrid/mgmt-v2018_09_15_preview/src/main/java/com/microsoft/azure/management/eventgrid/v2018_09_15_preview/BoolEqualsAdvancedFilter.java b/sdk/eventgrid/mgmt-v2018_09_15_preview/src/main/java/com/microsoft/azure/management/eventgrid/v2018_09_15_preview/BoolEqualsAdvancedFilter.java index 5646dbe7ca466..d119e4301b4bc 100644 --- a/sdk/eventgrid/mgmt-v2018_09_15_preview/src/main/java/com/microsoft/azure/management/eventgrid/v2018_09_15_preview/BoolEqualsAdvancedFilter.java +++ b/sdk/eventgrid/mgmt-v2018_09_15_preview/src/main/java/com/microsoft/azure/management/eventgrid/v2018_09_15_preview/BoolEqualsAdvancedFilter.java @@ -15,7 +15,7 @@ /** * BoolEquals Filter. */ -@JsonTypeInfo(use = JsonTypeInfo.Id.NAME, include = JsonTypeInfo.As.PROPERTY, property = "operatorType") +@JsonTypeInfo(use = JsonTypeInfo.Id.NAME, include = JsonTypeInfo.As.PROPERTY, property = "operatorType", defaultImpl = BoolEqualsAdvancedFilter.class) @JsonTypeName("BoolEquals") public class BoolEqualsAdvancedFilter extends AdvancedFilter { /** diff --git a/sdk/eventgrid/mgmt-v2018_09_15_preview/src/main/java/com/microsoft/azure/management/eventgrid/v2018_09_15_preview/DeadLetterDestination.java b/sdk/eventgrid/mgmt-v2018_09_15_preview/src/main/java/com/microsoft/azure/management/eventgrid/v2018_09_15_preview/DeadLetterDestination.java index 4f09e518f507c..c4fb852cde2af 100644 --- a/sdk/eventgrid/mgmt-v2018_09_15_preview/src/main/java/com/microsoft/azure/management/eventgrid/v2018_09_15_preview/DeadLetterDestination.java +++ b/sdk/eventgrid/mgmt-v2018_09_15_preview/src/main/java/com/microsoft/azure/management/eventgrid/v2018_09_15_preview/DeadLetterDestination.java @@ -19,7 +19,7 @@ * StorageBlobDeadLetterDestination is the only class that derives from this * class. */ -@JsonTypeInfo(use = JsonTypeInfo.Id.NAME, include = JsonTypeInfo.As.PROPERTY, property = "endpointType") +@JsonTypeInfo(use = JsonTypeInfo.Id.NAME, include = JsonTypeInfo.As.PROPERTY, property = "endpointType", defaultImpl = DeadLetterDestination.class) @JsonTypeName("DeadLetterDestination") @JsonSubTypes({ @JsonSubTypes.Type(name = "StorageBlob", value = StorageBlobDeadLetterDestination.class) diff --git a/sdk/eventgrid/mgmt-v2018_09_15_preview/src/main/java/com/microsoft/azure/management/eventgrid/v2018_09_15_preview/EventHubEventSubscriptionDestination.java b/sdk/eventgrid/mgmt-v2018_09_15_preview/src/main/java/com/microsoft/azure/management/eventgrid/v2018_09_15_preview/EventHubEventSubscriptionDestination.java index 61aeb907d5baa..773cdcd966c03 100644 --- a/sdk/eventgrid/mgmt-v2018_09_15_preview/src/main/java/com/microsoft/azure/management/eventgrid/v2018_09_15_preview/EventHubEventSubscriptionDestination.java +++ b/sdk/eventgrid/mgmt-v2018_09_15_preview/src/main/java/com/microsoft/azure/management/eventgrid/v2018_09_15_preview/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_09_15_preview/src/main/java/com/microsoft/azure/management/eventgrid/v2018_09_15_preview/EventSubscriptionDestination.java b/sdk/eventgrid/mgmt-v2018_09_15_preview/src/main/java/com/microsoft/azure/management/eventgrid/v2018_09_15_preview/EventSubscriptionDestination.java index 0fb27d7391761..24459411413fb 100644 --- a/sdk/eventgrid/mgmt-v2018_09_15_preview/src/main/java/com/microsoft/azure/management/eventgrid/v2018_09_15_preview/EventSubscriptionDestination.java +++ b/sdk/eventgrid/mgmt-v2018_09_15_preview/src/main/java/com/microsoft/azure/management/eventgrid/v2018_09_15_preview/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_09_15_preview/src/main/java/com/microsoft/azure/management/eventgrid/v2018_09_15_preview/HybridConnectionEventSubscriptionDestination.java b/sdk/eventgrid/mgmt-v2018_09_15_preview/src/main/java/com/microsoft/azure/management/eventgrid/v2018_09_15_preview/HybridConnectionEventSubscriptionDestination.java index d8ba65c4f076d..ec77092cbd530 100644 --- a/sdk/eventgrid/mgmt-v2018_09_15_preview/src/main/java/com/microsoft/azure/management/eventgrid/v2018_09_15_preview/HybridConnectionEventSubscriptionDestination.java +++ b/sdk/eventgrid/mgmt-v2018_09_15_preview/src/main/java/com/microsoft/azure/management/eventgrid/v2018_09_15_preview/HybridConnectionEventSubscriptionDestination.java @@ -17,7 +17,7 @@ * Information about the HybridConnection 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 = HybridConnectionEventSubscriptionDestination.class) @JsonTypeName("HybridConnection") @JsonFlatten public class HybridConnectionEventSubscriptionDestination extends EventSubscriptionDestination { diff --git a/sdk/eventgrid/mgmt-v2018_09_15_preview/src/main/java/com/microsoft/azure/management/eventgrid/v2018_09_15_preview/InputSchemaMapping.java b/sdk/eventgrid/mgmt-v2018_09_15_preview/src/main/java/com/microsoft/azure/management/eventgrid/v2018_09_15_preview/InputSchemaMapping.java index eb00aa9fe6e5a..182225e0f3c17 100644 --- a/sdk/eventgrid/mgmt-v2018_09_15_preview/src/main/java/com/microsoft/azure/management/eventgrid/v2018_09_15_preview/InputSchemaMapping.java +++ b/sdk/eventgrid/mgmt-v2018_09_15_preview/src/main/java/com/microsoft/azure/management/eventgrid/v2018_09_15_preview/InputSchemaMapping.java @@ -18,7 +18,7 @@ * custom input schema. Currently, the only supported type of * InputSchemaMapping is 'JsonInputSchemaMapping'. */ -@JsonTypeInfo(use = JsonTypeInfo.Id.NAME, include = JsonTypeInfo.As.PROPERTY, property = "inputSchemaMappingType") +@JsonTypeInfo(use = JsonTypeInfo.Id.NAME, include = JsonTypeInfo.As.PROPERTY, property = "inputSchemaMappingType", defaultImpl = InputSchemaMapping.class) @JsonTypeName("InputSchemaMapping") @JsonSubTypes({ @JsonSubTypes.Type(name = "Json", value = JsonInputSchemaMapping.class) diff --git a/sdk/eventgrid/mgmt-v2018_09_15_preview/src/main/java/com/microsoft/azure/management/eventgrid/v2018_09_15_preview/JsonInputSchemaMapping.java b/sdk/eventgrid/mgmt-v2018_09_15_preview/src/main/java/com/microsoft/azure/management/eventgrid/v2018_09_15_preview/JsonInputSchemaMapping.java index 000bfeffe0a9b..94ecc6b7895f2 100644 --- a/sdk/eventgrid/mgmt-v2018_09_15_preview/src/main/java/com/microsoft/azure/management/eventgrid/v2018_09_15_preview/JsonInputSchemaMapping.java +++ b/sdk/eventgrid/mgmt-v2018_09_15_preview/src/main/java/com/microsoft/azure/management/eventgrid/v2018_09_15_preview/JsonInputSchemaMapping.java @@ -18,7 +18,7 @@ * be used to map properties from a custom input JSON schema to the Event Grid * event schema. */ -@JsonTypeInfo(use = JsonTypeInfo.Id.NAME, include = JsonTypeInfo.As.PROPERTY, property = "inputSchemaMappingType") +@JsonTypeInfo(use = JsonTypeInfo.Id.NAME, include = JsonTypeInfo.As.PROPERTY, property = "inputSchemaMappingType", defaultImpl = JsonInputSchemaMapping.class) @JsonTypeName("Json") @JsonFlatten public class JsonInputSchemaMapping extends InputSchemaMapping { diff --git a/sdk/eventgrid/mgmt-v2018_09_15_preview/src/main/java/com/microsoft/azure/management/eventgrid/v2018_09_15_preview/NumberGreaterThanAdvancedFilter.java b/sdk/eventgrid/mgmt-v2018_09_15_preview/src/main/java/com/microsoft/azure/management/eventgrid/v2018_09_15_preview/NumberGreaterThanAdvancedFilter.java index ff842e4b98d71..4084c2d8dc35f 100644 --- a/sdk/eventgrid/mgmt-v2018_09_15_preview/src/main/java/com/microsoft/azure/management/eventgrid/v2018_09_15_preview/NumberGreaterThanAdvancedFilter.java +++ b/sdk/eventgrid/mgmt-v2018_09_15_preview/src/main/java/com/microsoft/azure/management/eventgrid/v2018_09_15_preview/NumberGreaterThanAdvancedFilter.java @@ -15,7 +15,7 @@ /** * NumberGreaterThan Filter. */ -@JsonTypeInfo(use = JsonTypeInfo.Id.NAME, include = JsonTypeInfo.As.PROPERTY, property = "operatorType") +@JsonTypeInfo(use = JsonTypeInfo.Id.NAME, include = JsonTypeInfo.As.PROPERTY, property = "operatorType", defaultImpl = NumberGreaterThanAdvancedFilter.class) @JsonTypeName("NumberGreaterThan") public class NumberGreaterThanAdvancedFilter extends AdvancedFilter { /** diff --git a/sdk/eventgrid/mgmt-v2018_09_15_preview/src/main/java/com/microsoft/azure/management/eventgrid/v2018_09_15_preview/NumberGreaterThanOrEqualsAdvancedFilter.java b/sdk/eventgrid/mgmt-v2018_09_15_preview/src/main/java/com/microsoft/azure/management/eventgrid/v2018_09_15_preview/NumberGreaterThanOrEqualsAdvancedFilter.java index b79a7ee701d2c..e98737687dc8f 100644 --- a/sdk/eventgrid/mgmt-v2018_09_15_preview/src/main/java/com/microsoft/azure/management/eventgrid/v2018_09_15_preview/NumberGreaterThanOrEqualsAdvancedFilter.java +++ b/sdk/eventgrid/mgmt-v2018_09_15_preview/src/main/java/com/microsoft/azure/management/eventgrid/v2018_09_15_preview/NumberGreaterThanOrEqualsAdvancedFilter.java @@ -15,7 +15,7 @@ /** * NumberGreaterThanOrEquals Filter. */ -@JsonTypeInfo(use = JsonTypeInfo.Id.NAME, include = JsonTypeInfo.As.PROPERTY, property = "operatorType") +@JsonTypeInfo(use = JsonTypeInfo.Id.NAME, include = JsonTypeInfo.As.PROPERTY, property = "operatorType", defaultImpl = NumberGreaterThanOrEqualsAdvancedFilter.class) @JsonTypeName("NumberGreaterThanOrEquals") public class NumberGreaterThanOrEqualsAdvancedFilter extends AdvancedFilter { /** diff --git a/sdk/eventgrid/mgmt-v2018_09_15_preview/src/main/java/com/microsoft/azure/management/eventgrid/v2018_09_15_preview/NumberInAdvancedFilter.java b/sdk/eventgrid/mgmt-v2018_09_15_preview/src/main/java/com/microsoft/azure/management/eventgrid/v2018_09_15_preview/NumberInAdvancedFilter.java index c807d70f4cdda..d5a29147ab134 100644 --- a/sdk/eventgrid/mgmt-v2018_09_15_preview/src/main/java/com/microsoft/azure/management/eventgrid/v2018_09_15_preview/NumberInAdvancedFilter.java +++ b/sdk/eventgrid/mgmt-v2018_09_15_preview/src/main/java/com/microsoft/azure/management/eventgrid/v2018_09_15_preview/NumberInAdvancedFilter.java @@ -16,7 +16,7 @@ /** * NumberIn filter. */ -@JsonTypeInfo(use = JsonTypeInfo.Id.NAME, include = JsonTypeInfo.As.PROPERTY, property = "operatorType") +@JsonTypeInfo(use = JsonTypeInfo.Id.NAME, include = JsonTypeInfo.As.PROPERTY, property = "operatorType", defaultImpl = NumberInAdvancedFilter.class) @JsonTypeName("NumberIn") public class NumberInAdvancedFilter extends AdvancedFilter { /** diff --git a/sdk/eventgrid/mgmt-v2018_09_15_preview/src/main/java/com/microsoft/azure/management/eventgrid/v2018_09_15_preview/NumberLessThanAdvancedFilter.java b/sdk/eventgrid/mgmt-v2018_09_15_preview/src/main/java/com/microsoft/azure/management/eventgrid/v2018_09_15_preview/NumberLessThanAdvancedFilter.java index 822c739c740b5..0b9f3310e0411 100644 --- a/sdk/eventgrid/mgmt-v2018_09_15_preview/src/main/java/com/microsoft/azure/management/eventgrid/v2018_09_15_preview/NumberLessThanAdvancedFilter.java +++ b/sdk/eventgrid/mgmt-v2018_09_15_preview/src/main/java/com/microsoft/azure/management/eventgrid/v2018_09_15_preview/NumberLessThanAdvancedFilter.java @@ -15,7 +15,7 @@ /** * NumberLessThan Filter. */ -@JsonTypeInfo(use = JsonTypeInfo.Id.NAME, include = JsonTypeInfo.As.PROPERTY, property = "operatorType") +@JsonTypeInfo(use = JsonTypeInfo.Id.NAME, include = JsonTypeInfo.As.PROPERTY, property = "operatorType", defaultImpl = NumberLessThanAdvancedFilter.class) @JsonTypeName("NumberLessThan") public class NumberLessThanAdvancedFilter extends AdvancedFilter { /** diff --git a/sdk/eventgrid/mgmt-v2018_09_15_preview/src/main/java/com/microsoft/azure/management/eventgrid/v2018_09_15_preview/NumberLessThanOrEqualsAdvancedFilter.java b/sdk/eventgrid/mgmt-v2018_09_15_preview/src/main/java/com/microsoft/azure/management/eventgrid/v2018_09_15_preview/NumberLessThanOrEqualsAdvancedFilter.java index bb22cfb48c2d4..f47e6ea42e94f 100644 --- a/sdk/eventgrid/mgmt-v2018_09_15_preview/src/main/java/com/microsoft/azure/management/eventgrid/v2018_09_15_preview/NumberLessThanOrEqualsAdvancedFilter.java +++ b/sdk/eventgrid/mgmt-v2018_09_15_preview/src/main/java/com/microsoft/azure/management/eventgrid/v2018_09_15_preview/NumberLessThanOrEqualsAdvancedFilter.java @@ -15,7 +15,7 @@ /** * NumberLessThanOrEquals Filter. */ -@JsonTypeInfo(use = JsonTypeInfo.Id.NAME, include = JsonTypeInfo.As.PROPERTY, property = "operatorType") +@JsonTypeInfo(use = JsonTypeInfo.Id.NAME, include = JsonTypeInfo.As.PROPERTY, property = "operatorType", defaultImpl = NumberLessThanOrEqualsAdvancedFilter.class) @JsonTypeName("NumberLessThanOrEquals") public class NumberLessThanOrEqualsAdvancedFilter extends AdvancedFilter { /** diff --git a/sdk/eventgrid/mgmt-v2018_09_15_preview/src/main/java/com/microsoft/azure/management/eventgrid/v2018_09_15_preview/NumberNotInAdvancedFilter.java b/sdk/eventgrid/mgmt-v2018_09_15_preview/src/main/java/com/microsoft/azure/management/eventgrid/v2018_09_15_preview/NumberNotInAdvancedFilter.java index 0df08c402ac78..4f3878930b9e2 100644 --- a/sdk/eventgrid/mgmt-v2018_09_15_preview/src/main/java/com/microsoft/azure/management/eventgrid/v2018_09_15_preview/NumberNotInAdvancedFilter.java +++ b/sdk/eventgrid/mgmt-v2018_09_15_preview/src/main/java/com/microsoft/azure/management/eventgrid/v2018_09_15_preview/NumberNotInAdvancedFilter.java @@ -16,7 +16,7 @@ /** * NumberNotIn Filter. */ -@JsonTypeInfo(use = JsonTypeInfo.Id.NAME, include = JsonTypeInfo.As.PROPERTY, property = "operatorType") +@JsonTypeInfo(use = JsonTypeInfo.Id.NAME, include = JsonTypeInfo.As.PROPERTY, property = "operatorType", defaultImpl = NumberNotInAdvancedFilter.class) @JsonTypeName("NumberNotIn") public class NumberNotInAdvancedFilter extends AdvancedFilter { /** diff --git a/sdk/eventgrid/mgmt-v2018_09_15_preview/src/main/java/com/microsoft/azure/management/eventgrid/v2018_09_15_preview/StorageBlobDeadLetterDestination.java b/sdk/eventgrid/mgmt-v2018_09_15_preview/src/main/java/com/microsoft/azure/management/eventgrid/v2018_09_15_preview/StorageBlobDeadLetterDestination.java index e42e3dc53ab24..4d5cc00a5cd82 100644 --- a/sdk/eventgrid/mgmt-v2018_09_15_preview/src/main/java/com/microsoft/azure/management/eventgrid/v2018_09_15_preview/StorageBlobDeadLetterDestination.java +++ b/sdk/eventgrid/mgmt-v2018_09_15_preview/src/main/java/com/microsoft/azure/management/eventgrid/v2018_09_15_preview/StorageBlobDeadLetterDestination.java @@ -16,7 +16,7 @@ /** * Information about the storage blob based dead letter destination. */ -@JsonTypeInfo(use = JsonTypeInfo.Id.NAME, include = JsonTypeInfo.As.PROPERTY, property = "endpointType") +@JsonTypeInfo(use = JsonTypeInfo.Id.NAME, include = JsonTypeInfo.As.PROPERTY, property = "endpointType", defaultImpl = StorageBlobDeadLetterDestination.class) @JsonTypeName("StorageBlob") @JsonFlatten public class StorageBlobDeadLetterDestination extends DeadLetterDestination { diff --git a/sdk/eventgrid/mgmt-v2018_09_15_preview/src/main/java/com/microsoft/azure/management/eventgrid/v2018_09_15_preview/StorageQueueEventSubscriptionDestination.java b/sdk/eventgrid/mgmt-v2018_09_15_preview/src/main/java/com/microsoft/azure/management/eventgrid/v2018_09_15_preview/StorageQueueEventSubscriptionDestination.java index 2727bb6b782ff..38c334a22a87e 100644 --- a/sdk/eventgrid/mgmt-v2018_09_15_preview/src/main/java/com/microsoft/azure/management/eventgrid/v2018_09_15_preview/StorageQueueEventSubscriptionDestination.java +++ b/sdk/eventgrid/mgmt-v2018_09_15_preview/src/main/java/com/microsoft/azure/management/eventgrid/v2018_09_15_preview/StorageQueueEventSubscriptionDestination.java @@ -16,7 +16,7 @@ /** * Information about the storage queue 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 = StorageQueueEventSubscriptionDestination.class) @JsonTypeName("StorageQueue") @JsonFlatten public class StorageQueueEventSubscriptionDestination extends EventSubscriptionDestination { diff --git a/sdk/eventgrid/mgmt-v2018_09_15_preview/src/main/java/com/microsoft/azure/management/eventgrid/v2018_09_15_preview/StringBeginsWithAdvancedFilter.java b/sdk/eventgrid/mgmt-v2018_09_15_preview/src/main/java/com/microsoft/azure/management/eventgrid/v2018_09_15_preview/StringBeginsWithAdvancedFilter.java index d700129d98bc2..aeb67f28f2ffe 100644 --- a/sdk/eventgrid/mgmt-v2018_09_15_preview/src/main/java/com/microsoft/azure/management/eventgrid/v2018_09_15_preview/StringBeginsWithAdvancedFilter.java +++ b/sdk/eventgrid/mgmt-v2018_09_15_preview/src/main/java/com/microsoft/azure/management/eventgrid/v2018_09_15_preview/StringBeginsWithAdvancedFilter.java @@ -16,7 +16,7 @@ /** * StringBeginsWith Filter. */ -@JsonTypeInfo(use = JsonTypeInfo.Id.NAME, include = JsonTypeInfo.As.PROPERTY, property = "operatorType") +@JsonTypeInfo(use = JsonTypeInfo.Id.NAME, include = JsonTypeInfo.As.PROPERTY, property = "operatorType", defaultImpl = StringBeginsWithAdvancedFilter.class) @JsonTypeName("StringBeginsWith") public class StringBeginsWithAdvancedFilter extends AdvancedFilter { /** diff --git a/sdk/eventgrid/mgmt-v2018_09_15_preview/src/main/java/com/microsoft/azure/management/eventgrid/v2018_09_15_preview/StringContainsAdvancedFilter.java b/sdk/eventgrid/mgmt-v2018_09_15_preview/src/main/java/com/microsoft/azure/management/eventgrid/v2018_09_15_preview/StringContainsAdvancedFilter.java index 15718833a966b..0ebb5fb738280 100644 --- a/sdk/eventgrid/mgmt-v2018_09_15_preview/src/main/java/com/microsoft/azure/management/eventgrid/v2018_09_15_preview/StringContainsAdvancedFilter.java +++ b/sdk/eventgrid/mgmt-v2018_09_15_preview/src/main/java/com/microsoft/azure/management/eventgrid/v2018_09_15_preview/StringContainsAdvancedFilter.java @@ -16,7 +16,7 @@ /** * StringContains Filter. */ -@JsonTypeInfo(use = JsonTypeInfo.Id.NAME, include = JsonTypeInfo.As.PROPERTY, property = "operatorType") +@JsonTypeInfo(use = JsonTypeInfo.Id.NAME, include = JsonTypeInfo.As.PROPERTY, property = "operatorType", defaultImpl = StringContainsAdvancedFilter.class) @JsonTypeName("StringContains") public class StringContainsAdvancedFilter extends AdvancedFilter { /** diff --git a/sdk/eventgrid/mgmt-v2018_09_15_preview/src/main/java/com/microsoft/azure/management/eventgrid/v2018_09_15_preview/StringEndsWithAdvancedFilter.java b/sdk/eventgrid/mgmt-v2018_09_15_preview/src/main/java/com/microsoft/azure/management/eventgrid/v2018_09_15_preview/StringEndsWithAdvancedFilter.java index 93a0b48a29697..ebb4b5e72159a 100644 --- a/sdk/eventgrid/mgmt-v2018_09_15_preview/src/main/java/com/microsoft/azure/management/eventgrid/v2018_09_15_preview/StringEndsWithAdvancedFilter.java +++ b/sdk/eventgrid/mgmt-v2018_09_15_preview/src/main/java/com/microsoft/azure/management/eventgrid/v2018_09_15_preview/StringEndsWithAdvancedFilter.java @@ -16,7 +16,7 @@ /** * StringEndsWith Filter. */ -@JsonTypeInfo(use = JsonTypeInfo.Id.NAME, include = JsonTypeInfo.As.PROPERTY, property = "operatorType") +@JsonTypeInfo(use = JsonTypeInfo.Id.NAME, include = JsonTypeInfo.As.PROPERTY, property = "operatorType", defaultImpl = StringEndsWithAdvancedFilter.class) @JsonTypeName("StringEndsWith") public class StringEndsWithAdvancedFilter extends AdvancedFilter { /** diff --git a/sdk/eventgrid/mgmt-v2018_09_15_preview/src/main/java/com/microsoft/azure/management/eventgrid/v2018_09_15_preview/StringInAdvancedFilter.java b/sdk/eventgrid/mgmt-v2018_09_15_preview/src/main/java/com/microsoft/azure/management/eventgrid/v2018_09_15_preview/StringInAdvancedFilter.java index 188577ec85b60..b4d2d412c08d5 100644 --- a/sdk/eventgrid/mgmt-v2018_09_15_preview/src/main/java/com/microsoft/azure/management/eventgrid/v2018_09_15_preview/StringInAdvancedFilter.java +++ b/sdk/eventgrid/mgmt-v2018_09_15_preview/src/main/java/com/microsoft/azure/management/eventgrid/v2018_09_15_preview/StringInAdvancedFilter.java @@ -16,7 +16,7 @@ /** * StringIn Filter. */ -@JsonTypeInfo(use = JsonTypeInfo.Id.NAME, include = JsonTypeInfo.As.PROPERTY, property = "operatorType") +@JsonTypeInfo(use = JsonTypeInfo.Id.NAME, include = JsonTypeInfo.As.PROPERTY, property = "operatorType", defaultImpl = StringInAdvancedFilter.class) @JsonTypeName("StringIn") public class StringInAdvancedFilter extends AdvancedFilter { /** diff --git a/sdk/eventgrid/mgmt-v2018_09_15_preview/src/main/java/com/microsoft/azure/management/eventgrid/v2018_09_15_preview/StringNotInAdvancedFilter.java b/sdk/eventgrid/mgmt-v2018_09_15_preview/src/main/java/com/microsoft/azure/management/eventgrid/v2018_09_15_preview/StringNotInAdvancedFilter.java index af83836d01314..100adef54bee4 100644 --- a/sdk/eventgrid/mgmt-v2018_09_15_preview/src/main/java/com/microsoft/azure/management/eventgrid/v2018_09_15_preview/StringNotInAdvancedFilter.java +++ b/sdk/eventgrid/mgmt-v2018_09_15_preview/src/main/java/com/microsoft/azure/management/eventgrid/v2018_09_15_preview/StringNotInAdvancedFilter.java @@ -16,7 +16,7 @@ /** * StringNotIn Filter. */ -@JsonTypeInfo(use = JsonTypeInfo.Id.NAME, include = JsonTypeInfo.As.PROPERTY, property = "operatorType") +@JsonTypeInfo(use = JsonTypeInfo.Id.NAME, include = JsonTypeInfo.As.PROPERTY, property = "operatorType", defaultImpl = StringNotInAdvancedFilter.class) @JsonTypeName("StringNotIn") public class StringNotInAdvancedFilter extends AdvancedFilter { /** diff --git a/sdk/eventgrid/mgmt-v2018_09_15_preview/src/main/java/com/microsoft/azure/management/eventgrid/v2018_09_15_preview/WebHookEventSubscriptionDestination.java b/sdk/eventgrid/mgmt-v2018_09_15_preview/src/main/java/com/microsoft/azure/management/eventgrid/v2018_09_15_preview/WebHookEventSubscriptionDestination.java index a64ef136d0e49..ea705f390bb45 100644 --- a/sdk/eventgrid/mgmt-v2018_09_15_preview/src/main/java/com/microsoft/azure/management/eventgrid/v2018_09_15_preview/WebHookEventSubscriptionDestination.java +++ b/sdk/eventgrid/mgmt-v2018_09_15_preview/src/main/java/com/microsoft/azure/management/eventgrid/v2018_09_15_preview/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 { diff --git a/sdk/eventgrid/mgmt-v2018_09_15_preview/src/main/java/com/microsoft/azure/management/eventgrid/v2018_09_15_preview/implementation/DomainTopicsImpl.java b/sdk/eventgrid/mgmt-v2018_09_15_preview/src/main/java/com/microsoft/azure/management/eventgrid/v2018_09_15_preview/implementation/DomainTopicsImpl.java index 270c006d8e258..8c8bbba045479 100644 --- a/sdk/eventgrid/mgmt-v2018_09_15_preview/src/main/java/com/microsoft/azure/management/eventgrid/v2018_09_15_preview/implementation/DomainTopicsImpl.java +++ b/sdk/eventgrid/mgmt-v2018_09_15_preview/src/main/java/com/microsoft/azure/management/eventgrid/v2018_09_15_preview/implementation/DomainTopicsImpl.java @@ -54,10 +54,14 @@ public DomainTopic call(DomainTopicInner inner) { public Observable getAsync(String resourceGroupName, String domainName, String topicName) { DomainTopicsInner client = this.inner(); return client.getAsync(resourceGroupName, domainName, topicName) - .map(new Func1() { + .flatMap(new Func1>() { @Override - public DomainTopic call(DomainTopicInner inner) { - return wrapModel(inner); + public Observable call(DomainTopicInner inner) { + if (inner == null) { + return Observable.empty(); + } else { + return Observable.just((DomainTopic)wrapModel(inner)); + } } }); }