From 7321d79de49a7b7ff249ef92f7a4cd54fe14024c Mon Sep 17 00:00:00 2001
From: SDKAuto <sdkautomation@microsoft.com>
Date: Thu, 19 Aug 2021 06:39:48 +0000
Subject: [PATCH] CodeGen from PR 15710 in Azure/azure-rest-api-specs Merge
 f99bc3ce26fc03f61464636d509fb1d7c8931add into
 30d1537f0c9aa49e6e04401b1d16f612b31231e7

---
 .../azure-resourcemanager-logic/CHANGELOG.md  |   3 +-
 .../azure-resourcemanager-logic/README.md     |   4 +-
 sdk/logic/azure-resourcemanager-logic/pom.xml | 141 ++++++++++--------
 .../resourcemanager/logic/LogicManager.java   |  22 ++-
 .../logic/fluent/models/WorkflowInner.java    |   2 +
 .../logic/fluent/models/WorkflowRunInner.java |   2 +
 .../fluent/models/WorkflowTriggerInner.java   |   4 +-
 .../fluent/models/WorkflowVersionInner.java   |   2 +
 .../ApiOperationPropertiesDefinition.java     |   2 +
 .../logic/models/ApiResourceMetadata.java     |   2 +
 .../logic/models/ApiResourceProperties.java   |   2 +
 .../logic/models/KeyVaultReference.java       |   4 +-
 .../OpenAuthenticationAccessPolicies.java     |   2 +
 .../models/SwaggerCustomDynamicList.java      |   2 +
 .../SwaggerCustomDynamicProperties.java       |   2 +
 .../models/SwaggerCustomDynamicSchema.java    |   2 +
 .../SwaggerCustomDynamicTreeCommand.java      |   2 +
 .../models/SwaggerExternalDocumentation.java  |   2 +
 .../logic/models/SwaggerSchema.java           |   2 +
 .../logic/models/SwaggerXml.java              |   2 +
 .../logic/models/WorkflowOutputParameter.java |   4 +-
 .../logic/models/WorkflowReference.java       |   4 +-
 22 files changed, 138 insertions(+), 76 deletions(-)

diff --git a/sdk/logic/azure-resourcemanager-logic/CHANGELOG.md b/sdk/logic/azure-resourcemanager-logic/CHANGELOG.md
index 9ce44b02901d..02fa61c8ac7e 100644
--- a/sdk/logic/azure-resourcemanager-logic/CHANGELOG.md
+++ b/sdk/logic/azure-resourcemanager-logic/CHANGELOG.md
@@ -1,7 +1,8 @@
 # Release History
 
-## 1.0.0-beta.2 (Unreleased)
+## 1.0.0-beta.1 (2021-08-19)
 
+- Azure Resource Manager Logic client library for Java. This package contains Microsoft Azure SDK for Logic Management SDK. REST API for Azure Logic Apps. Package tag package-2019-05. For documentation on how to use this package, please see [Azure Management Libraries for Java](https://aka.ms/azsdk/java/mgmt).
 
 ## 1.0.0-beta.1 (2021-04-16)
 
diff --git a/sdk/logic/azure-resourcemanager-logic/README.md b/sdk/logic/azure-resourcemanager-logic/README.md
index 3b4aedf6791b..55d730cfe916 100644
--- a/sdk/logic/azure-resourcemanager-logic/README.md
+++ b/sdk/logic/azure-resourcemanager-logic/README.md
@@ -32,7 +32,7 @@ Various documentation is available to help you get started
 <dependency>
     <groupId>com.azure.resourcemanager</groupId>
     <artifactId>azure-resourcemanager-logic</artifactId>
-    <version>1.0.0-beta.1</version>
+    <version>1.0.0-beta.2</version>
 </dependency>
 ```
 [//]: # ({x-version-update-end})
@@ -74,6 +74,8 @@ See [API design][design] for general introduction on design and key concepts on
 
 ## Examples
 
+
+
 ## Troubleshooting
 
 ## Next steps
diff --git a/sdk/logic/azure-resourcemanager-logic/pom.xml b/sdk/logic/azure-resourcemanager-logic/pom.xml
index 02dcc77a7799..0791be2fa6d6 100644
--- a/sdk/logic/azure-resourcemanager-logic/pom.xml
+++ b/sdk/logic/azure-resourcemanager-logic/pom.xml
@@ -1,67 +1,86 @@
 <project xmlns="http://maven.apache.org/POM/4.0.0" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
-    <modelVersion>4.0.0</modelVersion>
-    <parent>
-        <groupId>com.azure</groupId>
-        <artifactId>azure-client-sdk-parent</artifactId>
-        <version>1.7.0</version> <!-- {x-version-update;com.azure:azure-client-sdk-parent;current} -->
-        <relativePath>../../parents/azure-client-sdk-parent</relativePath>
-    </parent>
+  <modelVersion>4.0.0</modelVersion>
+  <parent>
+    <groupId>com.azure</groupId>
+    <artifactId>azure-client-sdk-parent</artifactId>
+    <version>1.7.0</version> <!-- {x-version-update;com.azure:azure-client-sdk-parent;current} -->
+    <relativePath>../../parents/azure-client-sdk-parent</relativePath>
+  </parent>
 
-    <groupId>com.azure.resourcemanager</groupId>
-    <artifactId>azure-resourcemanager-logic</artifactId>
-    <version>1.0.0-beta.2</version> <!-- {x-version-update;com.azure.resourcemanager:azure-resourcemanager-logic;current} -->
-    <packaging>jar</packaging>
+  <groupId>com.azure.resourcemanager</groupId>
+  <artifactId>azure-resourcemanager-logic</artifactId>
+  <version>1.0.0-beta.2</version> <!-- {x-version-update;com.azure.resourcemanager:azure-resourcemanager-logic;current} -->
+  <packaging>jar</packaging>
 
-    <name>Microsoft Azure SDK for Logic Management</name>
-    <description>This package contains Microsoft Azure SDK for Logic Management SDK. For documentation on how to use this package, please see https://aka.ms/azsdk/java/mgmt. REST API for Azure Logic Apps. Package tag package-2019-05.</description>
-    <url>https://github.com/Azure/azure-sdk-for-java</url>
+  <name>Microsoft Azure SDK for Logic Management</name>
+  <description>This package contains Microsoft Azure SDK for Logic Management SDK. For documentation on how to use this package, please see https://aka.ms/azsdk/java/mgmt. REST API for Azure Logic Apps. Package tag package-2019-05.</description>
+  <url>https://github.com/Azure/azure-sdk-for-java</url>
 
-    <licenses>
-        <license>
-            <name>The MIT License (MIT)</name>
-            <url>http://opensource.org/licenses/MIT</url>
-            <distribution>repo</distribution>
-        </license>
-    </licenses>
+  <licenses>
+    <license>
+      <name>The MIT License (MIT)</name>
+      <url>http://opensource.org/licenses/MIT</url>
+      <distribution>repo</distribution>
+    </license>
+  </licenses>
 
-    <scm>
-        <url>https://github.com/Azure/azure-sdk-for-java</url>
-        <connection>scm:git:git@github.com:Azure/azure-sdk-for-java.git</connection>
-        <developerConnection>scm:git:git@github.com:Azure/azure-sdk-for-java.git</developerConnection>
-        <tag>HEAD</tag>
-    </scm>
-    <developers>
-        <developer>
-            <id>microsoft</id>
-            <name>Microsoft</name>
-        </developer>
-    </developers>
-    <properties>
-        <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
-        <legal><![CDATA[[INFO] Any downloads listed may be third party software.  Microsoft grants you no rights for third party software.]]></legal>
-    </properties>
-    <dependencies>
-        <dependency>
-            <groupId>com.azure</groupId>
-            <artifactId>azure-core</artifactId>
-            <version>1.19.0</version> <!-- {x-version-update;com.azure:azure-core;dependency} -->
-        </dependency>
-        <dependency>
-            <groupId>com.azure</groupId>
-            <artifactId>azure-core-management</artifactId>
-            <version>1.4.0</version> <!-- {x-version-update;com.azure:azure-core-management;dependency} -->
-        </dependency>
-    </dependencies>
-    <build>
-        <plugins>
-            <plugin>
-                <groupId>org.jacoco</groupId>
-                <artifactId>jacoco-maven-plugin</artifactId>
-                <version>0.8.5</version> <!-- {x-version-update;org.jacoco:jacoco-maven-plugin;external_dependency} -->
-                <configuration>
-                    <skip>true</skip>
-                </configuration>
-            </plugin>
-        </plugins>
-    </build>
+  <scm>
+    <url>https://github.com/Azure/azure-sdk-for-java</url>
+    <connection>scm:git:git@github.com:Azure/azure-sdk-for-java.git</connection>
+    <developerConnection>scm:git:git@github.com:Azure/azure-sdk-for-java.git</developerConnection>
+    <tag>HEAD</tag>
+  </scm>
+  <developers>
+    <developer>
+      <id>microsoft</id>
+      <name>Microsoft</name>
+    </developer>
+  </developers>
+  <properties>
+    <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
+    <legal><![CDATA[[INFO] Any downloads listed may be third party software.  Microsoft grants you no rights for third party software.]]></legal>
+  </properties>
+  <dependencies>
+    <dependency>
+      <groupId>com.azure</groupId>
+      <artifactId>azure-core</artifactId>
+      <version>1.19.0</version> <!-- {x-version-update;com.azure:azure-core;dependency} -->
+    </dependency>
+    <dependency>
+      <groupId>com.azure</groupId>
+      <artifactId>azure-core-management</artifactId>
+      <version>1.4.0</version> <!-- {x-version-update;com.azure:azure-core-management;dependency} -->
+    </dependency>
+  </dependencies>
+  <build>
+    <plugins>
+      <plugin>
+        <groupId>org.jacoco</groupId>
+        <artifactId>jacoco-maven-plugin</artifactId>
+        <version>0.8.5</version> <!-- {x-version-update;org.jacoco:jacoco-maven-plugin;external_dependency} -->
+        <configuration>
+          <skip>true</skip>
+        </configuration>
+      </plugin>
+      <plugin>
+        <groupId>org.revapi</groupId>
+        <artifactId>revapi-maven-plugin</artifactId>
+        <version>0.11.2</version> <!-- {x-version-update;org.revapi:revapi-maven-plugin;external_dependency} -->
+        <configuration>
+          <analysisConfiguration>
+            <revapi.ignore>
+              <item>
+                <code>java.method.addedToInterface</code>
+              </item>
+              <item>
+                <regex>true</regex>
+                <code>.*</code>
+                <package>com\.azure\.resourcemanager(\.[^.]+)+\.fluent(\.[^.]+)*</package>
+              </item>
+            </revapi.ignore>
+          </analysisConfiguration>
+        </configuration>
+      </plugin>
+    </plugins>
+  </build>
 </project>
diff --git a/sdk/logic/azure-resourcemanager-logic/src/main/java/com/azure/resourcemanager/logic/LogicManager.java b/sdk/logic/azure-resourcemanager-logic/src/main/java/com/azure/resourcemanager/logic/LogicManager.java
index a41e824594a7..402f55d05ce4 100644
--- a/sdk/logic/azure-resourcemanager-logic/src/main/java/com/azure/resourcemanager/logic/LogicManager.java
+++ b/sdk/logic/azure-resourcemanager-logic/src/main/java/com/azure/resourcemanager/logic/LogicManager.java
@@ -9,7 +9,6 @@
 import com.azure.core.http.HttpPipeline;
 import com.azure.core.http.HttpPipelineBuilder;
 import com.azure.core.http.policy.AddDatePolicy;
-import com.azure.core.http.policy.BearerTokenAuthenticationPolicy;
 import com.azure.core.http.policy.HttpLogOptions;
 import com.azure.core.http.policy.HttpLoggingPolicy;
 import com.azure.core.http.policy.HttpPipelinePolicy;
@@ -17,6 +16,7 @@
 import com.azure.core.http.policy.RequestIdPolicy;
 import com.azure.core.http.policy.RetryPolicy;
 import com.azure.core.http.policy.UserAgentPolicy;
+import com.azure.core.management.http.policy.ArmChallengeAuthenticationPolicy;
 import com.azure.core.management.profile.AzureProfile;
 import com.azure.core.util.Configuration;
 import com.azure.core.util.logging.ClientLogger;
@@ -181,6 +181,7 @@ public static final class Configurable {
         private HttpClient httpClient;
         private HttpLogOptions httpLogOptions;
         private final List<HttpPipelinePolicy> policies = new ArrayList<>();
+        private final List<String> scopes = new ArrayList<>();
         private RetryPolicy retryPolicy;
         private Duration defaultPollInterval;
 
@@ -220,6 +221,17 @@ public Configurable withPolicy(HttpPipelinePolicy policy) {
             return this;
         }
 
+        /**
+         * Adds the scope to permission sets.
+         *
+         * @param scope the scope.
+         * @return the configurable object itself.
+         */
+        public Configurable withScope(String scope) {
+            this.scopes.add(Objects.requireNonNull(scope, "'scope' cannot be null."));
+            return this;
+        }
+
         /**
          * Sets the retry policy to the HTTP pipeline.
          *
@@ -276,6 +288,9 @@ public LogicManager authenticate(TokenCredential credential, AzureProfile profil
                 userAgentBuilder.append(" (auto-generated)");
             }
 
+            if (scopes.isEmpty()) {
+                scopes.add(profile.getEnvironment().getManagementEndpoint() + "/.default");
+            }
             if (retryPolicy == null) {
                 retryPolicy = new RetryPolicy("Retry-After", ChronoUnit.SECONDS);
             }
@@ -285,10 +300,7 @@ public LogicManager authenticate(TokenCredential credential, AzureProfile profil
             HttpPolicyProviders.addBeforeRetryPolicies(policies);
             policies.add(retryPolicy);
             policies.add(new AddDatePolicy());
-            policies
-                .add(
-                    new BearerTokenAuthenticationPolicy(
-                        credential, profile.getEnvironment().getManagementEndpoint() + "/.default"));
+            policies.add(new ArmChallengeAuthenticationPolicy(credential, scopes.toArray(new String[0])));
             policies.addAll(this.policies);
             HttpPolicyProviders.addAfterRetryPolicies(policies);
             policies.add(new HttpLoggingPolicy(httpLogOptions));
diff --git a/sdk/logic/azure-resourcemanager-logic/src/main/java/com/azure/resourcemanager/logic/fluent/models/WorkflowInner.java b/sdk/logic/azure-resourcemanager-logic/src/main/java/com/azure/resourcemanager/logic/fluent/models/WorkflowInner.java
index 699a05ca0b98..6109ed7800e8 100644
--- a/sdk/logic/azure-resourcemanager-logic/src/main/java/com/azure/resourcemanager/logic/fluent/models/WorkflowInner.java
+++ b/sdk/logic/azure-resourcemanager-logic/src/main/java/com/azure/resourcemanager/logic/fluent/models/WorkflowInner.java
@@ -16,6 +16,7 @@
 import com.azure.resourcemanager.logic.models.WorkflowProvisioningState;
 import com.azure.resourcemanager.logic.models.WorkflowState;
 import com.fasterxml.jackson.annotation.JsonIgnore;
+import com.fasterxml.jackson.annotation.JsonInclude;
 import com.fasterxml.jackson.annotation.JsonProperty;
 import java.time.OffsetDateTime;
 import java.util.Map;
@@ -102,6 +103,7 @@ public class WorkflowInner extends Resource {
      * The parameters.
      */
     @JsonProperty(value = "properties.parameters")
+    @JsonInclude(value = JsonInclude.Include.NON_NULL, content = JsonInclude.Include.ALWAYS)
     private Map<String, WorkflowParameter> parameters;
 
     /**
diff --git a/sdk/logic/azure-resourcemanager-logic/src/main/java/com/azure/resourcemanager/logic/fluent/models/WorkflowRunInner.java b/sdk/logic/azure-resourcemanager-logic/src/main/java/com/azure/resourcemanager/logic/fluent/models/WorkflowRunInner.java
index a39bbc2ae79a..725212c231e7 100644
--- a/sdk/logic/azure-resourcemanager-logic/src/main/java/com/azure/resourcemanager/logic/fluent/models/WorkflowRunInner.java
+++ b/sdk/logic/azure-resourcemanager-logic/src/main/java/com/azure/resourcemanager/logic/fluent/models/WorkflowRunInner.java
@@ -14,6 +14,7 @@
 import com.azure.resourcemanager.logic.models.WorkflowRunTrigger;
 import com.azure.resourcemanager.logic.models.WorkflowStatus;
 import com.fasterxml.jackson.annotation.JsonIgnore;
+import com.fasterxml.jackson.annotation.JsonInclude;
 import com.fasterxml.jackson.annotation.JsonProperty;
 import java.time.OffsetDateTime;
 import java.util.Map;
@@ -100,6 +101,7 @@ public class WorkflowRunInner extends SubResource {
      * Gets the outputs.
      */
     @JsonProperty(value = "properties.outputs", access = JsonProperty.Access.WRITE_ONLY)
+    @JsonInclude(value = JsonInclude.Include.NON_NULL, content = JsonInclude.Include.ALWAYS)
     private Map<String, WorkflowOutputParameter> outputs;
 
     /*
diff --git a/sdk/logic/azure-resourcemanager-logic/src/main/java/com/azure/resourcemanager/logic/fluent/models/WorkflowTriggerInner.java b/sdk/logic/azure-resourcemanager-logic/src/main/java/com/azure/resourcemanager/logic/fluent/models/WorkflowTriggerInner.java
index e895ca7ae2d3..c603cb944d6e 100644
--- a/sdk/logic/azure-resourcemanager-logic/src/main/java/com/azure/resourcemanager/logic/fluent/models/WorkflowTriggerInner.java
+++ b/sdk/logic/azure-resourcemanager-logic/src/main/java/com/azure/resourcemanager/logic/fluent/models/WorkflowTriggerInner.java
@@ -4,7 +4,7 @@
 
 package com.azure.resourcemanager.logic.fluent.models;
 
-import com.azure.core.annotation.Immutable;
+import com.azure.core.annotation.Fluent;
 import com.azure.core.annotation.JsonFlatten;
 import com.azure.core.management.SubResource;
 import com.azure.core.util.logging.ClientLogger;
@@ -19,7 +19,7 @@
 
 /** The workflow trigger. */
 @JsonFlatten
-@Immutable
+@Fluent
 public class WorkflowTriggerInner extends SubResource {
     @JsonIgnore private final ClientLogger logger = new ClientLogger(WorkflowTriggerInner.class);
 
diff --git a/sdk/logic/azure-resourcemanager-logic/src/main/java/com/azure/resourcemanager/logic/fluent/models/WorkflowVersionInner.java b/sdk/logic/azure-resourcemanager-logic/src/main/java/com/azure/resourcemanager/logic/fluent/models/WorkflowVersionInner.java
index 3c39c7855d00..f3a6588b0eb3 100644
--- a/sdk/logic/azure-resourcemanager-logic/src/main/java/com/azure/resourcemanager/logic/fluent/models/WorkflowVersionInner.java
+++ b/sdk/logic/azure-resourcemanager-logic/src/main/java/com/azure/resourcemanager/logic/fluent/models/WorkflowVersionInner.java
@@ -16,6 +16,7 @@
 import com.azure.resourcemanager.logic.models.WorkflowProvisioningState;
 import com.azure.resourcemanager.logic.models.WorkflowState;
 import com.fasterxml.jackson.annotation.JsonIgnore;
+import com.fasterxml.jackson.annotation.JsonInclude;
 import com.fasterxml.jackson.annotation.JsonProperty;
 import java.time.OffsetDateTime;
 import java.util.Map;
@@ -96,6 +97,7 @@ public class WorkflowVersionInner extends Resource {
      * The parameters.
      */
     @JsonProperty(value = "properties.parameters")
+    @JsonInclude(value = JsonInclude.Include.NON_NULL, content = JsonInclude.Include.ALWAYS)
     private Map<String, WorkflowParameter> parameters;
 
     /**
diff --git a/sdk/logic/azure-resourcemanager-logic/src/main/java/com/azure/resourcemanager/logic/models/ApiOperationPropertiesDefinition.java b/sdk/logic/azure-resourcemanager-logic/src/main/java/com/azure/resourcemanager/logic/models/ApiOperationPropertiesDefinition.java
index 2092e2800fc4..53149f8389be 100644
--- a/sdk/logic/azure-resourcemanager-logic/src/main/java/com/azure/resourcemanager/logic/models/ApiOperationPropertiesDefinition.java
+++ b/sdk/logic/azure-resourcemanager-logic/src/main/java/com/azure/resourcemanager/logic/models/ApiOperationPropertiesDefinition.java
@@ -7,6 +7,7 @@
 import com.azure.core.annotation.Fluent;
 import com.azure.core.util.logging.ClientLogger;
 import com.fasterxml.jackson.annotation.JsonIgnore;
+import com.fasterxml.jackson.annotation.JsonInclude;
 import com.fasterxml.jackson.annotation.JsonProperty;
 import java.util.Map;
 
@@ -73,6 +74,7 @@ public final class ApiOperationPropertiesDefinition {
      * The operation responses definition schemas.
      */
     @JsonProperty(value = "responsesDefinition")
+    @JsonInclude(value = JsonInclude.Include.NON_NULL, content = JsonInclude.Include.ALWAYS)
     private Map<String, SwaggerSchema> responsesDefinition;
 
     /*
diff --git a/sdk/logic/azure-resourcemanager-logic/src/main/java/com/azure/resourcemanager/logic/models/ApiResourceMetadata.java b/sdk/logic/azure-resourcemanager-logic/src/main/java/com/azure/resourcemanager/logic/models/ApiResourceMetadata.java
index 453d757b220b..801ebdd2c6ac 100644
--- a/sdk/logic/azure-resourcemanager-logic/src/main/java/com/azure/resourcemanager/logic/models/ApiResourceMetadata.java
+++ b/sdk/logic/azure-resourcemanager-logic/src/main/java/com/azure/resourcemanager/logic/models/ApiResourceMetadata.java
@@ -7,6 +7,7 @@
 import com.azure.core.annotation.Fluent;
 import com.azure.core.util.logging.ClientLogger;
 import com.fasterxml.jackson.annotation.JsonIgnore;
+import com.fasterxml.jackson.annotation.JsonInclude;
 import com.fasterxml.jackson.annotation.JsonProperty;
 import java.util.Map;
 
@@ -37,6 +38,7 @@ public final class ApiResourceMetadata {
      * The tags.
      */
     @JsonProperty(value = "tags")
+    @JsonInclude(value = JsonInclude.Include.NON_NULL, content = JsonInclude.Include.ALWAYS)
     private Map<String, String> tags;
 
     /*
diff --git a/sdk/logic/azure-resourcemanager-logic/src/main/java/com/azure/resourcemanager/logic/models/ApiResourceProperties.java b/sdk/logic/azure-resourcemanager-logic/src/main/java/com/azure/resourcemanager/logic/models/ApiResourceProperties.java
index 1ce23b2f6090..9f4c6ac481c5 100644
--- a/sdk/logic/azure-resourcemanager-logic/src/main/java/com/azure/resourcemanager/logic/models/ApiResourceProperties.java
+++ b/sdk/logic/azure-resourcemanager-logic/src/main/java/com/azure/resourcemanager/logic/models/ApiResourceProperties.java
@@ -7,6 +7,7 @@
 import com.azure.core.annotation.Fluent;
 import com.azure.core.util.logging.ClientLogger;
 import com.fasterxml.jackson.annotation.JsonIgnore;
+import com.fasterxml.jackson.annotation.JsonInclude;
 import com.fasterxml.jackson.annotation.JsonProperty;
 import java.util.List;
 import java.util.Map;
@@ -26,6 +27,7 @@ public final class ApiResourceProperties {
      * The connection parameters.
      */
     @JsonProperty(value = "connectionParameters")
+    @JsonInclude(value = JsonInclude.Include.NON_NULL, content = JsonInclude.Include.ALWAYS)
     private Map<String, Object> connectionParameters;
 
     /*
diff --git a/sdk/logic/azure-resourcemanager-logic/src/main/java/com/azure/resourcemanager/logic/models/KeyVaultReference.java b/sdk/logic/azure-resourcemanager-logic/src/main/java/com/azure/resourcemanager/logic/models/KeyVaultReference.java
index cff916576f89..6db3fa13fe01 100644
--- a/sdk/logic/azure-resourcemanager-logic/src/main/java/com/azure/resourcemanager/logic/models/KeyVaultReference.java
+++ b/sdk/logic/azure-resourcemanager-logic/src/main/java/com/azure/resourcemanager/logic/models/KeyVaultReference.java
@@ -4,12 +4,12 @@
 
 package com.azure.resourcemanager.logic.models;
 
-import com.azure.core.annotation.Immutable;
+import com.azure.core.annotation.Fluent;
 import com.azure.core.util.logging.ClientLogger;
 import com.fasterxml.jackson.annotation.JsonIgnore;
 
 /** The key vault reference. */
-@Immutable
+@Fluent
 public final class KeyVaultReference extends ResourceReference {
     @JsonIgnore private final ClientLogger logger = new ClientLogger(KeyVaultReference.class);
 
diff --git a/sdk/logic/azure-resourcemanager-logic/src/main/java/com/azure/resourcemanager/logic/models/OpenAuthenticationAccessPolicies.java b/sdk/logic/azure-resourcemanager-logic/src/main/java/com/azure/resourcemanager/logic/models/OpenAuthenticationAccessPolicies.java
index 46058d1a36e0..ea57e86e8c80 100644
--- a/sdk/logic/azure-resourcemanager-logic/src/main/java/com/azure/resourcemanager/logic/models/OpenAuthenticationAccessPolicies.java
+++ b/sdk/logic/azure-resourcemanager-logic/src/main/java/com/azure/resourcemanager/logic/models/OpenAuthenticationAccessPolicies.java
@@ -7,6 +7,7 @@
 import com.azure.core.annotation.Fluent;
 import com.azure.core.util.logging.ClientLogger;
 import com.fasterxml.jackson.annotation.JsonIgnore;
+import com.fasterxml.jackson.annotation.JsonInclude;
 import com.fasterxml.jackson.annotation.JsonProperty;
 import java.util.Map;
 
@@ -19,6 +20,7 @@ public final class OpenAuthenticationAccessPolicies {
      * Open authentication policies.
      */
     @JsonProperty(value = "policies")
+    @JsonInclude(value = JsonInclude.Include.NON_NULL, content = JsonInclude.Include.ALWAYS)
     private Map<String, OpenAuthenticationAccessPolicy> policies;
 
     /**
diff --git a/sdk/logic/azure-resourcemanager-logic/src/main/java/com/azure/resourcemanager/logic/models/SwaggerCustomDynamicList.java b/sdk/logic/azure-resourcemanager-logic/src/main/java/com/azure/resourcemanager/logic/models/SwaggerCustomDynamicList.java
index 37a7b756db44..31912fb16d24 100644
--- a/sdk/logic/azure-resourcemanager-logic/src/main/java/com/azure/resourcemanager/logic/models/SwaggerCustomDynamicList.java
+++ b/sdk/logic/azure-resourcemanager-logic/src/main/java/com/azure/resourcemanager/logic/models/SwaggerCustomDynamicList.java
@@ -7,6 +7,7 @@
 import com.azure.core.annotation.Fluent;
 import com.azure.core.util.logging.ClientLogger;
 import com.fasterxml.jackson.annotation.JsonIgnore;
+import com.fasterxml.jackson.annotation.JsonInclude;
 import com.fasterxml.jackson.annotation.JsonProperty;
 import java.util.Map;
 
@@ -50,6 +51,7 @@ public final class SwaggerCustomDynamicList {
      * The parameters.
      */
     @JsonProperty(value = "parameters")
+    @JsonInclude(value = JsonInclude.Include.NON_NULL, content = JsonInclude.Include.ALWAYS)
     private Map<String, SwaggerCustomDynamicProperties> parameters;
 
     /**
diff --git a/sdk/logic/azure-resourcemanager-logic/src/main/java/com/azure/resourcemanager/logic/models/SwaggerCustomDynamicProperties.java b/sdk/logic/azure-resourcemanager-logic/src/main/java/com/azure/resourcemanager/logic/models/SwaggerCustomDynamicProperties.java
index fa97ff9585a9..ac4b11442e60 100644
--- a/sdk/logic/azure-resourcemanager-logic/src/main/java/com/azure/resourcemanager/logic/models/SwaggerCustomDynamicProperties.java
+++ b/sdk/logic/azure-resourcemanager-logic/src/main/java/com/azure/resourcemanager/logic/models/SwaggerCustomDynamicProperties.java
@@ -7,6 +7,7 @@
 import com.azure.core.annotation.Fluent;
 import com.azure.core.util.logging.ClientLogger;
 import com.fasterxml.jackson.annotation.JsonIgnore;
+import com.fasterxml.jackson.annotation.JsonInclude;
 import com.fasterxml.jackson.annotation.JsonProperty;
 import java.util.Map;
 
@@ -31,6 +32,7 @@ public final class SwaggerCustomDynamicProperties {
      * The operation parameters.
      */
     @JsonProperty(value = "parameters")
+    @JsonInclude(value = JsonInclude.Include.NON_NULL, content = JsonInclude.Include.ALWAYS)
     private Map<String, SwaggerCustomDynamicProperties> parameters;
 
     /**
diff --git a/sdk/logic/azure-resourcemanager-logic/src/main/java/com/azure/resourcemanager/logic/models/SwaggerCustomDynamicSchema.java b/sdk/logic/azure-resourcemanager-logic/src/main/java/com/azure/resourcemanager/logic/models/SwaggerCustomDynamicSchema.java
index 3d845d072801..0b83a34d7714 100644
--- a/sdk/logic/azure-resourcemanager-logic/src/main/java/com/azure/resourcemanager/logic/models/SwaggerCustomDynamicSchema.java
+++ b/sdk/logic/azure-resourcemanager-logic/src/main/java/com/azure/resourcemanager/logic/models/SwaggerCustomDynamicSchema.java
@@ -7,6 +7,7 @@
 import com.azure.core.annotation.Fluent;
 import com.azure.core.util.logging.ClientLogger;
 import com.fasterxml.jackson.annotation.JsonIgnore;
+import com.fasterxml.jackson.annotation.JsonInclude;
 import com.fasterxml.jackson.annotation.JsonProperty;
 import java.util.Map;
 
@@ -31,6 +32,7 @@ public final class SwaggerCustomDynamicSchema {
      * The operation parameters.
      */
     @JsonProperty(value = "parameters")
+    @JsonInclude(value = JsonInclude.Include.NON_NULL, content = JsonInclude.Include.ALWAYS)
     private Map<String, Object> parameters;
 
     /**
diff --git a/sdk/logic/azure-resourcemanager-logic/src/main/java/com/azure/resourcemanager/logic/models/SwaggerCustomDynamicTreeCommand.java b/sdk/logic/azure-resourcemanager-logic/src/main/java/com/azure/resourcemanager/logic/models/SwaggerCustomDynamicTreeCommand.java
index d6750653f2a8..371dec7251d0 100644
--- a/sdk/logic/azure-resourcemanager-logic/src/main/java/com/azure/resourcemanager/logic/models/SwaggerCustomDynamicTreeCommand.java
+++ b/sdk/logic/azure-resourcemanager-logic/src/main/java/com/azure/resourcemanager/logic/models/SwaggerCustomDynamicTreeCommand.java
@@ -7,6 +7,7 @@
 import com.azure.core.annotation.Fluent;
 import com.azure.core.util.logging.ClientLogger;
 import com.fasterxml.jackson.annotation.JsonIgnore;
+import com.fasterxml.jackson.annotation.JsonInclude;
 import com.fasterxml.jackson.annotation.JsonProperty;
 import java.util.Map;
 
@@ -61,6 +62,7 @@ public final class SwaggerCustomDynamicTreeCommand {
      * Dictionary of <SwaggerCustomDynamicTreeParameter>
      */
     @JsonProperty(value = "parameters")
+    @JsonInclude(value = JsonInclude.Include.NON_NULL, content = JsonInclude.Include.ALWAYS)
     private Map<String, SwaggerCustomDynamicTreeParameter> parameters;
 
     /**
diff --git a/sdk/logic/azure-resourcemanager-logic/src/main/java/com/azure/resourcemanager/logic/models/SwaggerExternalDocumentation.java b/sdk/logic/azure-resourcemanager-logic/src/main/java/com/azure/resourcemanager/logic/models/SwaggerExternalDocumentation.java
index f81a8c27ed05..a0f644634f05 100644
--- a/sdk/logic/azure-resourcemanager-logic/src/main/java/com/azure/resourcemanager/logic/models/SwaggerExternalDocumentation.java
+++ b/sdk/logic/azure-resourcemanager-logic/src/main/java/com/azure/resourcemanager/logic/models/SwaggerExternalDocumentation.java
@@ -7,6 +7,7 @@
 import com.azure.core.annotation.Fluent;
 import com.azure.core.util.logging.ClientLogger;
 import com.fasterxml.jackson.annotation.JsonIgnore;
+import com.fasterxml.jackson.annotation.JsonInclude;
 import com.fasterxml.jackson.annotation.JsonProperty;
 import java.util.Map;
 
@@ -31,6 +32,7 @@ public final class SwaggerExternalDocumentation {
      * The vendor extensions.
      */
     @JsonProperty(value = "extensions")
+    @JsonInclude(value = JsonInclude.Include.NON_NULL, content = JsonInclude.Include.ALWAYS)
     private Map<String, Object> extensions;
 
     /**
diff --git a/sdk/logic/azure-resourcemanager-logic/src/main/java/com/azure/resourcemanager/logic/models/SwaggerSchema.java b/sdk/logic/azure-resourcemanager-logic/src/main/java/com/azure/resourcemanager/logic/models/SwaggerSchema.java
index 7595790dea14..fde6429faa3b 100644
--- a/sdk/logic/azure-resourcemanager-logic/src/main/java/com/azure/resourcemanager/logic/models/SwaggerSchema.java
+++ b/sdk/logic/azure-resourcemanager-logic/src/main/java/com/azure/resourcemanager/logic/models/SwaggerSchema.java
@@ -7,6 +7,7 @@
 import com.azure.core.annotation.Fluent;
 import com.azure.core.util.logging.ClientLogger;
 import com.fasterxml.jackson.annotation.JsonIgnore;
+import com.fasterxml.jackson.annotation.JsonInclude;
 import com.fasterxml.jackson.annotation.JsonProperty;
 import java.util.List;
 import java.util.Map;
@@ -44,6 +45,7 @@ public final class SwaggerSchema {
      * The object properties
      */
     @JsonProperty(value = "properties")
+    @JsonInclude(value = JsonInclude.Include.NON_NULL, content = JsonInclude.Include.ALWAYS)
     private Map<String, SwaggerSchema> properties;
 
     /*
diff --git a/sdk/logic/azure-resourcemanager-logic/src/main/java/com/azure/resourcemanager/logic/models/SwaggerXml.java b/sdk/logic/azure-resourcemanager-logic/src/main/java/com/azure/resourcemanager/logic/models/SwaggerXml.java
index 0f817babca8c..3e3ae7331665 100644
--- a/sdk/logic/azure-resourcemanager-logic/src/main/java/com/azure/resourcemanager/logic/models/SwaggerXml.java
+++ b/sdk/logic/azure-resourcemanager-logic/src/main/java/com/azure/resourcemanager/logic/models/SwaggerXml.java
@@ -7,6 +7,7 @@
 import com.azure.core.annotation.Fluent;
 import com.azure.core.util.logging.ClientLogger;
 import com.fasterxml.jackson.annotation.JsonIgnore;
+import com.fasterxml.jackson.annotation.JsonInclude;
 import com.fasterxml.jackson.annotation.JsonProperty;
 import java.util.Map;
 
@@ -50,6 +51,7 @@ public final class SwaggerXml {
      * The vendor extensions.
      */
     @JsonProperty(value = "extensions")
+    @JsonInclude(value = JsonInclude.Include.NON_NULL, content = JsonInclude.Include.ALWAYS)
     private Map<String, Object> extensions;
 
     /**
diff --git a/sdk/logic/azure-resourcemanager-logic/src/main/java/com/azure/resourcemanager/logic/models/WorkflowOutputParameter.java b/sdk/logic/azure-resourcemanager-logic/src/main/java/com/azure/resourcemanager/logic/models/WorkflowOutputParameter.java
index 0ee56c0bb8ad..a359f5b4de18 100644
--- a/sdk/logic/azure-resourcemanager-logic/src/main/java/com/azure/resourcemanager/logic/models/WorkflowOutputParameter.java
+++ b/sdk/logic/azure-resourcemanager-logic/src/main/java/com/azure/resourcemanager/logic/models/WorkflowOutputParameter.java
@@ -4,13 +4,13 @@
 
 package com.azure.resourcemanager.logic.models;
 
-import com.azure.core.annotation.Immutable;
+import com.azure.core.annotation.Fluent;
 import com.azure.core.util.logging.ClientLogger;
 import com.fasterxml.jackson.annotation.JsonIgnore;
 import com.fasterxml.jackson.annotation.JsonProperty;
 
 /** The workflow output parameter. */
-@Immutable
+@Fluent
 public final class WorkflowOutputParameter extends WorkflowParameter {
     @JsonIgnore private final ClientLogger logger = new ClientLogger(WorkflowOutputParameter.class);
 
diff --git a/sdk/logic/azure-resourcemanager-logic/src/main/java/com/azure/resourcemanager/logic/models/WorkflowReference.java b/sdk/logic/azure-resourcemanager-logic/src/main/java/com/azure/resourcemanager/logic/models/WorkflowReference.java
index 2ac416bab5a1..13d13183c0e0 100644
--- a/sdk/logic/azure-resourcemanager-logic/src/main/java/com/azure/resourcemanager/logic/models/WorkflowReference.java
+++ b/sdk/logic/azure-resourcemanager-logic/src/main/java/com/azure/resourcemanager/logic/models/WorkflowReference.java
@@ -4,12 +4,12 @@
 
 package com.azure.resourcemanager.logic.models;
 
-import com.azure.core.annotation.Immutable;
+import com.azure.core.annotation.Fluent;
 import com.azure.core.util.logging.ClientLogger;
 import com.fasterxml.jackson.annotation.JsonIgnore;
 
 /** The workflow reference. */
-@Immutable
+@Fluent
 public final class WorkflowReference extends ResourceReference {
     @JsonIgnore private final ClientLogger logger = new ClientLogger(WorkflowReference.class);