[AutoPR sdk/eventgrid/mgmt-v2018_09_15_preview] Update EventGrid 2020-04-01-preview swagger to fix couple of bug fixes.

sdk/eventgrid/mgmt-v2018_09_15_preview/pom.xml

@@ -11,7 +11,7 @@
     <parent>
         <groupId>com.microsoft.azure</groupId>
         <artifactId>azure-arm-parent</artifactId>
-        <version>1.2.0</version>
+        <version>1.1.0</version>
         <relativePath>../../../pom.management.xml</relativePath>
     </parent>
     <artifactId>azure-mgmt-eventgrid</artifactId>
@@ -71,6 +71,8 @@
             <artifactId>azure-arm-client-runtime</artifactId>
             <type>test-jar</type>
             <scope>test</scope>
+            <!--Below version for test jar needs to be removed, this will be done as part of v1-runtime 1.6.7-->
+            <version>1.6.5</version>
         </dependency>
     </dependencies>
     <build>

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),

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 {
     /**

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)

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 {

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),

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 {

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)

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 {

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 {
     /**

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 {
     /**

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 {
     /**

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 {
     /**

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 {
     /**

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 {
     /**

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 {

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 {

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 {
     /**

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 {
     /**

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 {
     /**

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 {
     /**

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 {
     /**

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 {

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<DomainTopic> getAsync(String resourceGroupName, String domainName, String topicName) {
         DomainTopicsInner client = this.inner();
         return client.getAsync(resourceGroupName, domainName, topicName)
-        .map(new Func1<DomainTopicInner, DomainTopic>() {
+        .flatMap(new Func1<DomainTopicInner, Observable<DomainTopic>>() {
             @Override
-            public DomainTopic call(DomainTopicInner inner) {
-                return wrapModel(inner);
+            public Observable<DomainTopic> call(DomainTopicInner inner) {
+                if (inner == null) {
+                    return Observable.empty();
+                } else {
+                    return Observable.just((DomainTopic)wrapModel(inner));
+                }
             }
        });
     }