diff --git a/eventgrid/resource-manager/v2019_06_01/pom.xml b/eventgrid/resource-manager/v2019_06_01/pom.xml
index f1b0378a539c9..498c6949b1723 100644
--- a/eventgrid/resource-manager/v2019_06_01/pom.xml
+++ b/eventgrid/resource-manager/v2019_06_01/pom.xml
@@ -71,6 +71,8 @@
azure-arm-client-runtime
test-jar
test
+
+ 1.6.5
diff --git a/eventgrid/resource-manager/v2019_06_01/src/main/java/com/microsoft/azure/management/eventgrid/v2019_06_01/AdvancedFilter.java b/eventgrid/resource-manager/v2019_06_01/src/main/java/com/microsoft/azure/management/eventgrid/v2019_06_01/AdvancedFilter.java
index c1d79533e6fd2..7f5196d4ffae9 100644
--- a/eventgrid/resource-manager/v2019_06_01/src/main/java/com/microsoft/azure/management/eventgrid/v2019_06_01/AdvancedFilter.java
+++ b/eventgrid/resource-manager/v2019_06_01/src/main/java/com/microsoft/azure/management/eventgrid/v2019_06_01/AdvancedFilter.java
@@ -20,7 +20,7 @@
* BoolEqualsAdvancedFilter, NumberInAdvancedFilter, StringEqualsAdvancedFilter
* etc. depending on the type of the key based on which you want to filter.
*/
-@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/eventgrid/resource-manager/v2019_06_01/src/main/java/com/microsoft/azure/management/eventgrid/v2019_06_01/BoolEqualsAdvancedFilter.java b/eventgrid/resource-manager/v2019_06_01/src/main/java/com/microsoft/azure/management/eventgrid/v2019_06_01/BoolEqualsAdvancedFilter.java
index 2a204bcc38143..fc9992f987382 100644
--- a/eventgrid/resource-manager/v2019_06_01/src/main/java/com/microsoft/azure/management/eventgrid/v2019_06_01/BoolEqualsAdvancedFilter.java
+++ b/eventgrid/resource-manager/v2019_06_01/src/main/java/com/microsoft/azure/management/eventgrid/v2019_06_01/BoolEqualsAdvancedFilter.java
@@ -15,7 +15,7 @@
/**
* BoolEquals Advanced 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/eventgrid/resource-manager/v2019_06_01/src/main/java/com/microsoft/azure/management/eventgrid/v2019_06_01/DeadLetterDestination.java b/eventgrid/resource-manager/v2019_06_01/src/main/java/com/microsoft/azure/management/eventgrid/v2019_06_01/DeadLetterDestination.java
index a9b6736f4b605..d80d2d56088b6 100644
--- a/eventgrid/resource-manager/v2019_06_01/src/main/java/com/microsoft/azure/management/eventgrid/v2019_06_01/DeadLetterDestination.java
+++ b/eventgrid/resource-manager/v2019_06_01/src/main/java/com/microsoft/azure/management/eventgrid/v2019_06_01/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/eventgrid/resource-manager/v2019_06_01/src/main/java/com/microsoft/azure/management/eventgrid/v2019_06_01/EventHubEventSubscriptionDestination.java b/eventgrid/resource-manager/v2019_06_01/src/main/java/com/microsoft/azure/management/eventgrid/v2019_06_01/EventHubEventSubscriptionDestination.java
index 9f489e8373927..85e8fb39ef9b3 100644
--- a/eventgrid/resource-manager/v2019_06_01/src/main/java/com/microsoft/azure/management/eventgrid/v2019_06_01/EventHubEventSubscriptionDestination.java
+++ b/eventgrid/resource-manager/v2019_06_01/src/main/java/com/microsoft/azure/management/eventgrid/v2019_06_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/eventgrid/resource-manager/v2019_06_01/src/main/java/com/microsoft/azure/management/eventgrid/v2019_06_01/EventSubscriptionDestination.java b/eventgrid/resource-manager/v2019_06_01/src/main/java/com/microsoft/azure/management/eventgrid/v2019_06_01/EventSubscriptionDestination.java
index 38c0d9ffbe16f..5228f21096e86 100644
--- a/eventgrid/resource-manager/v2019_06_01/src/main/java/com/microsoft/azure/management/eventgrid/v2019_06_01/EventSubscriptionDestination.java
+++ b/eventgrid/resource-manager/v2019_06_01/src/main/java/com/microsoft/azure/management/eventgrid/v2019_06_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/eventgrid/resource-manager/v2019_06_01/src/main/java/com/microsoft/azure/management/eventgrid/v2019_06_01/HybridConnectionEventSubscriptionDestination.java b/eventgrid/resource-manager/v2019_06_01/src/main/java/com/microsoft/azure/management/eventgrid/v2019_06_01/HybridConnectionEventSubscriptionDestination.java
index 789e070ab93e1..78f9a7fd7ec10 100644
--- a/eventgrid/resource-manager/v2019_06_01/src/main/java/com/microsoft/azure/management/eventgrid/v2019_06_01/HybridConnectionEventSubscriptionDestination.java
+++ b/eventgrid/resource-manager/v2019_06_01/src/main/java/com/microsoft/azure/management/eventgrid/v2019_06_01/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/eventgrid/resource-manager/v2019_06_01/src/main/java/com/microsoft/azure/management/eventgrid/v2019_06_01/NumberGreaterThanAdvancedFilter.java b/eventgrid/resource-manager/v2019_06_01/src/main/java/com/microsoft/azure/management/eventgrid/v2019_06_01/NumberGreaterThanAdvancedFilter.java
index 20dd2d9a91f60..280cefa3718dd 100644
--- a/eventgrid/resource-manager/v2019_06_01/src/main/java/com/microsoft/azure/management/eventgrid/v2019_06_01/NumberGreaterThanAdvancedFilter.java
+++ b/eventgrid/resource-manager/v2019_06_01/src/main/java/com/microsoft/azure/management/eventgrid/v2019_06_01/NumberGreaterThanAdvancedFilter.java
@@ -15,7 +15,7 @@
/**
* NumberGreaterThan Advanced 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/eventgrid/resource-manager/v2019_06_01/src/main/java/com/microsoft/azure/management/eventgrid/v2019_06_01/NumberGreaterThanOrEqualsAdvancedFilter.java b/eventgrid/resource-manager/v2019_06_01/src/main/java/com/microsoft/azure/management/eventgrid/v2019_06_01/NumberGreaterThanOrEqualsAdvancedFilter.java
index d4a730252254f..c87c9d39bdd42 100644
--- a/eventgrid/resource-manager/v2019_06_01/src/main/java/com/microsoft/azure/management/eventgrid/v2019_06_01/NumberGreaterThanOrEqualsAdvancedFilter.java
+++ b/eventgrid/resource-manager/v2019_06_01/src/main/java/com/microsoft/azure/management/eventgrid/v2019_06_01/NumberGreaterThanOrEqualsAdvancedFilter.java
@@ -15,7 +15,7 @@
/**
* NumberGreaterThanOrEquals Advanced 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/eventgrid/resource-manager/v2019_06_01/src/main/java/com/microsoft/azure/management/eventgrid/v2019_06_01/NumberInAdvancedFilter.java b/eventgrid/resource-manager/v2019_06_01/src/main/java/com/microsoft/azure/management/eventgrid/v2019_06_01/NumberInAdvancedFilter.java
index 127fc9930d0a5..10caead7ea85f 100644
--- a/eventgrid/resource-manager/v2019_06_01/src/main/java/com/microsoft/azure/management/eventgrid/v2019_06_01/NumberInAdvancedFilter.java
+++ b/eventgrid/resource-manager/v2019_06_01/src/main/java/com/microsoft/azure/management/eventgrid/v2019_06_01/NumberInAdvancedFilter.java
@@ -16,7 +16,7 @@
/**
* NumberIn Advanced 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/eventgrid/resource-manager/v2019_06_01/src/main/java/com/microsoft/azure/management/eventgrid/v2019_06_01/NumberLessThanAdvancedFilter.java b/eventgrid/resource-manager/v2019_06_01/src/main/java/com/microsoft/azure/management/eventgrid/v2019_06_01/NumberLessThanAdvancedFilter.java
index 5558f5ec5b5aa..e87e5a6992b53 100644
--- a/eventgrid/resource-manager/v2019_06_01/src/main/java/com/microsoft/azure/management/eventgrid/v2019_06_01/NumberLessThanAdvancedFilter.java
+++ b/eventgrid/resource-manager/v2019_06_01/src/main/java/com/microsoft/azure/management/eventgrid/v2019_06_01/NumberLessThanAdvancedFilter.java
@@ -15,7 +15,7 @@
/**
* NumberLessThan Advanced 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/eventgrid/resource-manager/v2019_06_01/src/main/java/com/microsoft/azure/management/eventgrid/v2019_06_01/NumberLessThanOrEqualsAdvancedFilter.java b/eventgrid/resource-manager/v2019_06_01/src/main/java/com/microsoft/azure/management/eventgrid/v2019_06_01/NumberLessThanOrEqualsAdvancedFilter.java
index 37616d2bb928f..4d26f4e39de7b 100644
--- a/eventgrid/resource-manager/v2019_06_01/src/main/java/com/microsoft/azure/management/eventgrid/v2019_06_01/NumberLessThanOrEqualsAdvancedFilter.java
+++ b/eventgrid/resource-manager/v2019_06_01/src/main/java/com/microsoft/azure/management/eventgrid/v2019_06_01/NumberLessThanOrEqualsAdvancedFilter.java
@@ -15,7 +15,7 @@
/**
* NumberLessThanOrEquals Advanced 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/eventgrid/resource-manager/v2019_06_01/src/main/java/com/microsoft/azure/management/eventgrid/v2019_06_01/NumberNotInAdvancedFilter.java b/eventgrid/resource-manager/v2019_06_01/src/main/java/com/microsoft/azure/management/eventgrid/v2019_06_01/NumberNotInAdvancedFilter.java
index 2ee37a477b034..bf17bae766ea7 100644
--- a/eventgrid/resource-manager/v2019_06_01/src/main/java/com/microsoft/azure/management/eventgrid/v2019_06_01/NumberNotInAdvancedFilter.java
+++ b/eventgrid/resource-manager/v2019_06_01/src/main/java/com/microsoft/azure/management/eventgrid/v2019_06_01/NumberNotInAdvancedFilter.java
@@ -16,7 +16,7 @@
/**
* NumberNotIn Advanced 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/eventgrid/resource-manager/v2019_06_01/src/main/java/com/microsoft/azure/management/eventgrid/v2019_06_01/ServiceBusQueueEventSubscriptionDestination.java b/eventgrid/resource-manager/v2019_06_01/src/main/java/com/microsoft/azure/management/eventgrid/v2019_06_01/ServiceBusQueueEventSubscriptionDestination.java
index 3931e57e44626..46cb3cab5862f 100644
--- a/eventgrid/resource-manager/v2019_06_01/src/main/java/com/microsoft/azure/management/eventgrid/v2019_06_01/ServiceBusQueueEventSubscriptionDestination.java
+++ b/eventgrid/resource-manager/v2019_06_01/src/main/java/com/microsoft/azure/management/eventgrid/v2019_06_01/ServiceBusQueueEventSubscriptionDestination.java
@@ -16,7 +16,7 @@
/**
* Information about the service bus 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 = ServiceBusQueueEventSubscriptionDestination.class)
@JsonTypeName("ServiceBusQueue")
@JsonFlatten
public class ServiceBusQueueEventSubscriptionDestination extends EventSubscriptionDestination {
diff --git a/eventgrid/resource-manager/v2019_06_01/src/main/java/com/microsoft/azure/management/eventgrid/v2019_06_01/StorageBlobDeadLetterDestination.java b/eventgrid/resource-manager/v2019_06_01/src/main/java/com/microsoft/azure/management/eventgrid/v2019_06_01/StorageBlobDeadLetterDestination.java
index be844e2557106..2b35df8d800aa 100644
--- a/eventgrid/resource-manager/v2019_06_01/src/main/java/com/microsoft/azure/management/eventgrid/v2019_06_01/StorageBlobDeadLetterDestination.java
+++ b/eventgrid/resource-manager/v2019_06_01/src/main/java/com/microsoft/azure/management/eventgrid/v2019_06_01/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/eventgrid/resource-manager/v2019_06_01/src/main/java/com/microsoft/azure/management/eventgrid/v2019_06_01/StorageQueueEventSubscriptionDestination.java b/eventgrid/resource-manager/v2019_06_01/src/main/java/com/microsoft/azure/management/eventgrid/v2019_06_01/StorageQueueEventSubscriptionDestination.java
index fc858c7ef9ec2..986a97aa87eed 100644
--- a/eventgrid/resource-manager/v2019_06_01/src/main/java/com/microsoft/azure/management/eventgrid/v2019_06_01/StorageQueueEventSubscriptionDestination.java
+++ b/eventgrid/resource-manager/v2019_06_01/src/main/java/com/microsoft/azure/management/eventgrid/v2019_06_01/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/eventgrid/resource-manager/v2019_06_01/src/main/java/com/microsoft/azure/management/eventgrid/v2019_06_01/StringBeginsWithAdvancedFilter.java b/eventgrid/resource-manager/v2019_06_01/src/main/java/com/microsoft/azure/management/eventgrid/v2019_06_01/StringBeginsWithAdvancedFilter.java
index 221276cd67422..332db80ad8749 100644
--- a/eventgrid/resource-manager/v2019_06_01/src/main/java/com/microsoft/azure/management/eventgrid/v2019_06_01/StringBeginsWithAdvancedFilter.java
+++ b/eventgrid/resource-manager/v2019_06_01/src/main/java/com/microsoft/azure/management/eventgrid/v2019_06_01/StringBeginsWithAdvancedFilter.java
@@ -16,7 +16,7 @@
/**
* StringBeginsWith Advanced 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/eventgrid/resource-manager/v2019_06_01/src/main/java/com/microsoft/azure/management/eventgrid/v2019_06_01/StringContainsAdvancedFilter.java b/eventgrid/resource-manager/v2019_06_01/src/main/java/com/microsoft/azure/management/eventgrid/v2019_06_01/StringContainsAdvancedFilter.java
index b961ddba151f4..da331b9a7848f 100644
--- a/eventgrid/resource-manager/v2019_06_01/src/main/java/com/microsoft/azure/management/eventgrid/v2019_06_01/StringContainsAdvancedFilter.java
+++ b/eventgrid/resource-manager/v2019_06_01/src/main/java/com/microsoft/azure/management/eventgrid/v2019_06_01/StringContainsAdvancedFilter.java
@@ -16,7 +16,7 @@
/**
* StringContains Advanced 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/eventgrid/resource-manager/v2019_06_01/src/main/java/com/microsoft/azure/management/eventgrid/v2019_06_01/StringEndsWithAdvancedFilter.java b/eventgrid/resource-manager/v2019_06_01/src/main/java/com/microsoft/azure/management/eventgrid/v2019_06_01/StringEndsWithAdvancedFilter.java
index bf97cfeee3463..319145d3003be 100644
--- a/eventgrid/resource-manager/v2019_06_01/src/main/java/com/microsoft/azure/management/eventgrid/v2019_06_01/StringEndsWithAdvancedFilter.java
+++ b/eventgrid/resource-manager/v2019_06_01/src/main/java/com/microsoft/azure/management/eventgrid/v2019_06_01/StringEndsWithAdvancedFilter.java
@@ -16,7 +16,7 @@
/**
* StringEndsWith Advanced 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/eventgrid/resource-manager/v2019_06_01/src/main/java/com/microsoft/azure/management/eventgrid/v2019_06_01/StringInAdvancedFilter.java b/eventgrid/resource-manager/v2019_06_01/src/main/java/com/microsoft/azure/management/eventgrid/v2019_06_01/StringInAdvancedFilter.java
index 152c5ad3cca79..f70e0bf39f86d 100644
--- a/eventgrid/resource-manager/v2019_06_01/src/main/java/com/microsoft/azure/management/eventgrid/v2019_06_01/StringInAdvancedFilter.java
+++ b/eventgrid/resource-manager/v2019_06_01/src/main/java/com/microsoft/azure/management/eventgrid/v2019_06_01/StringInAdvancedFilter.java
@@ -16,7 +16,7 @@
/**
* StringIn Advanced 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/eventgrid/resource-manager/v2019_06_01/src/main/java/com/microsoft/azure/management/eventgrid/v2019_06_01/StringNotInAdvancedFilter.java b/eventgrid/resource-manager/v2019_06_01/src/main/java/com/microsoft/azure/management/eventgrid/v2019_06_01/StringNotInAdvancedFilter.java
index a7706cc408bbe..4463b4d934ec9 100644
--- a/eventgrid/resource-manager/v2019_06_01/src/main/java/com/microsoft/azure/management/eventgrid/v2019_06_01/StringNotInAdvancedFilter.java
+++ b/eventgrid/resource-manager/v2019_06_01/src/main/java/com/microsoft/azure/management/eventgrid/v2019_06_01/StringNotInAdvancedFilter.java
@@ -16,7 +16,7 @@
/**
* StringNotIn Advanced 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/eventgrid/resource-manager/v2019_06_01/src/main/java/com/microsoft/azure/management/eventgrid/v2019_06_01/WebHookEventSubscriptionDestination.java b/eventgrid/resource-manager/v2019_06_01/src/main/java/com/microsoft/azure/management/eventgrid/v2019_06_01/WebHookEventSubscriptionDestination.java
index e33909fc8e826..b30d512cade1d 100644
--- a/eventgrid/resource-manager/v2019_06_01/src/main/java/com/microsoft/azure/management/eventgrid/v2019_06_01/WebHookEventSubscriptionDestination.java
+++ b/eventgrid/resource-manager/v2019_06_01/src/main/java/com/microsoft/azure/management/eventgrid/v2019_06_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 {
diff --git a/eventgrid/resource-manager/v2019_06_01/src/main/java/com/microsoft/azure/management/eventgrid/v2019_06_01/implementation/DomainTopicsImpl.java b/eventgrid/resource-manager/v2019_06_01/src/main/java/com/microsoft/azure/management/eventgrid/v2019_06_01/implementation/DomainTopicsImpl.java
index 02baf0c56cc1e..cd94dde3b1f6c 100644
--- a/eventgrid/resource-manager/v2019_06_01/src/main/java/com/microsoft/azure/management/eventgrid/v2019_06_01/implementation/DomainTopicsImpl.java
+++ b/eventgrid/resource-manager/v2019_06_01/src/main/java/com/microsoft/azure/management/eventgrid/v2019_06_01/implementation/DomainTopicsImpl.java
@@ -64,10 +64,14 @@ public DomainTopic call(DomainTopicInner inner) {
public Observable getAsync(String resourceGroupName, String domainName, String domainTopicName) {
DomainTopicsInner client = this.inner();
return client.getAsync(resourceGroupName, domainName, domainTopicName)
- .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));
+ }
}
});
}
diff --git a/swagger_to_sdk_config.json b/swagger_to_sdk_config.json
index afc88f9313de5..143b2e76ed7b5 100644
--- a/swagger_to_sdk_config.json
+++ b/swagger_to_sdk_config.json
@@ -6,7 +6,8 @@
"verbose": "",
"sdkrel:azure-libraries-for-java-folder": ".",
"multiapi": "",
- "use": "@microsoft.azure/autorest.java@preview"
+ "use": "@microsoft.azure/autorest.java@preview",
+ "java.clear-output-folder": ""
},
"version": "0.2.0",
"advanced_options": {