diff --git a/sdk/eventgrid/mgmt-v2018_09_15_preview/pom.xml b/sdk/eventgrid/mgmt-v2018_09_15_preview/pom.xml index c117e2820755..b3430f6ad083 100644 --- a/sdk/eventgrid/mgmt-v2018_09_15_preview/pom.xml +++ b/sdk/eventgrid/mgmt-v2018_09_15_preview/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_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 cd441279b05c..332a8ee5974e 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 5646dbe7ca46..d119e4301b4b 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 4f09e518f507..c4fb852cde2a 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 61aeb907d5ba..773cdcd966c0 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 0fb27d739176..24459411413f 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 d8ba65c4f076..ec77092cbd53 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 eb00aa9fe6e5..182225e0f3c1 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 000bfeffe0a9..94ecc6b7895f 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 ff842e4b98d7..4084c2d8dc35 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 b79a7ee701d2..e98737687dc8 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 c807d70f4cdd..d5a29147ab13 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 822c739c740b..0b9f3310e041 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 bb22cfb48c2d..f47e6ea42e94 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 0df08c402ac7..4f3878930b9e 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 e42e3dc53ab2..4d5cc00a5cd8 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 2727bb6b782f..38c334a22a87 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 d700129d98bc..aeb67f28f2ff 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 15718833a966..0ebb5fb73828 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 93a0b48a2969..ebb4b5e72159 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 188577ec85b6..b4d2d412c08d 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 af83836d0131..100adef54bee 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 a64ef136d0e4..ea705f390bb4 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 270c006d8e25..8c8bbba04547 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)); + } } }); }