test-repo-billy · openapi-bot-ppe · Oct 25, 2019 · Oct 25, 2019
diff --git a/eventgrid/resource-manager/v2019_06_01/pom.xml b/eventgrid/resource-manager/v2019_06_01/pom.xml
@@ -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>

diff --git a/...01/src/main/java/com/microsoft/azure/management/eventgrid/v2019_06_01/AdvancedFilter.java b/...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/...n/java/com/microsoft/azure/management/eventgrid/v2019_06_01/BoolEqualsAdvancedFilter.java b/...n/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/...main/java/com/microsoft/azure/management/eventgrid/v2019_06_01/DeadLetterDestination.java b/...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/...icrosoft/azure/management/eventgrid/v2019_06_01/EventHubEventSubscriptionDestination.java b/...icrosoft/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/...va/com/microsoft/azure/management/eventgrid/v2019_06_01/EventSubscriptionDestination.java b/...va/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/.../azure/management/eventgrid/v2019_06_01/HybridConnectionEventSubscriptionDestination.java b/.../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/...com/microsoft/azure/management/eventgrid/v2019_06_01/NumberGreaterThanAdvancedFilter.java b/...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/...osoft/azure/management/eventgrid/v2019_06_01/NumberGreaterThanOrEqualsAdvancedFilter.java b/...osoft/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/...ain/java/com/microsoft/azure/management/eventgrid/v2019_06_01/NumberInAdvancedFilter.java b/...ain/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/...va/com/microsoft/azure/management/eventgrid/v2019_06_01/NumberLessThanAdvancedFilter.java b/...va/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/...icrosoft/azure/management/eventgrid/v2019_06_01/NumberLessThanOrEqualsAdvancedFilter.java b/...icrosoft/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/.../java/com/microsoft/azure/management/eventgrid/v2019_06_01/NumberNotInAdvancedFilter.java b/.../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/...t/azure/management/eventgrid/v2019_06_01/ServiceBusQueueEventSubscriptionDestination.java b/...t/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/...om/microsoft/azure/management/eventgrid/v2019_06_01/StorageBlobDeadLetterDestination.java b/...om/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/...soft/azure/management/eventgrid/v2019_06_01/StorageQueueEventSubscriptionDestination.java b/...soft/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/.../com/microsoft/azure/management/eventgrid/v2019_06_01/StringBeginsWithAdvancedFilter.java b/.../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/...va/com/microsoft/azure/management/eventgrid/v2019_06_01/StringContainsAdvancedFilter.java b/...va/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/...va/com/microsoft/azure/management/eventgrid/v2019_06_01/StringEndsWithAdvancedFilter.java b/...va/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/...ain/java/com/microsoft/azure/management/eventgrid/v2019_06_01/StringInAdvancedFilter.java b/...ain/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/.../java/com/microsoft/azure/management/eventgrid/v2019_06_01/StringNotInAdvancedFilter.java b/.../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/...microsoft/azure/management/eventgrid/v2019_06_01/WebHookEventSubscriptionDestination.java b/...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/...com/microsoft/azure/management/eventgrid/v2019_06_01/implementation/DomainTopicsImpl.java b/...com/microsoft/azure/management/eventgrid/v2019_06_01/implementation/DomainTopicsImpl.java
@@ -64,10 +64,14 @@ public DomainTopic call(DomainTopicInner inner) {
     public Observable<DomainTopic> getAsync(String resourceGroupName, String domainName, String domainTopicName) {
         DomainTopicsInner client = this.inner();
         return client.getAsync(resourceGroupName, domainName, domainTopicName)
-        .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));
+                }
             }
        });
     }

diff --git 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": {