[AutoPR azure-resourcemanager-synapse] Merge main into securityinsights 2021-10-01 dev branch

sdk/synapse/azure-resourcemanager-synapse/CHANGELOG.md

@@ -1,6 +1,8 @@
 # Release History
 
-## 1.0.0-beta.3 (Unreleased)
+## 1.0.0-beta.1 (2021-09-22)
+
+- Azure Resource Manager Synapse client library for Java. This package contains Microsoft Azure SDK for Synapse Management SDK. Azure Synapse Analytics Management Client. Package tag package-composite-v1. For documentation on how to use this package, please see [Azure Management Libraries for Java](https://aka.ms/azsdk/java/mgmt).
 
 ### Features Added
 

sdk/synapse/azure-resourcemanager-synapse/README.md

@@ -32,7 +32,7 @@ Various documentation is available to help you get started
 <dependency>
     <groupId>com.azure.resourcemanager</groupId>
     <artifactId>azure-resourcemanager-synapse</artifactId>
-    <version>1.0.0-beta.2</version>
+    <version>1.0.0-beta.3</version>
 </dependency>
 ```
 [//]: # ({x-version-update-end})
@@ -74,7 +74,6 @@ See [API design][design] for general introduction on design and key concepts on
 
 ## Examples
 
-[Code snippets and samples](https://github.com/Azure/azure-sdk-for-java/blob/main/sdk/synapse/azure-resourcemanager-synapse/SAMPLE.md)
 
 
 ## Troubleshooting

sdk/synapse/azure-resourcemanager-synapse/src/main/java/com/azure/resourcemanager/synapse/SynapseManager.java

@@ -422,7 +422,7 @@ public SynapseManager authenticate(TokenCredential credential, AzureProfile prof
                 .append("-")
                 .append("com.azure.resourcemanager.synapse")
                 .append("/")
-                .append("1.0.0-beta.2");
+                .append("1.0.0-beta.1");
             if (!Configuration.getGlobalConfiguration().get("AZURE_TELEMETRY_DISABLED", false)) {
                 userAgentBuilder
                     .append(" (")

sdk/synapse/azure-resourcemanager-synapse/src/main/java/com/azure/resourcemanager/synapse/fluent/models/AvailableRpOperationInner.java

@@ -5,15 +5,17 @@
 package com.azure.resourcemanager.synapse.fluent.models;
 
 import com.azure.core.annotation.Fluent;
+import com.azure.core.annotation.JsonFlatten;
 import com.azure.core.util.logging.ClientLogger;
 import com.azure.resourcemanager.synapse.models.AvailableRpOperationDisplayInfo;
 import com.azure.resourcemanager.synapse.models.OperationMetaServiceSpecification;
 import com.fasterxml.jackson.annotation.JsonIgnore;
 import com.fasterxml.jackson.annotation.JsonProperty;
 
 /** An operation that is available in this resource provider. */
+@JsonFlatten
 @Fluent
-public final class AvailableRpOperationInner {
+public class AvailableRpOperationInner {
     @JsonIgnore private final ClientLogger logger = new ClientLogger(AvailableRpOperationInner.class);
 
     /*
@@ -34,18 +36,18 @@ public final class AvailableRpOperationInner {
     @JsonProperty(value = "name")
     private String name;
 
-    /*
-     * Operation properties
-     */
-    @JsonProperty(value = "properties")
-    private OperationMetaPropertyInfo innerProperties;
-
     /*
      * Operation origin
      */
     @JsonProperty(value = "origin")
     private String origin;
 
+    /*
+     * Operation service specification
+     */
+    @JsonProperty(value = "properties.serviceSpecification")
+    private OperationMetaServiceSpecification serviceSpecification;
+
     /**
      * Get the display property: Display properties of the operation.
      *
@@ -106,15 +108,6 @@ public AvailableRpOperationInner withName(String name) {
         return this;
     }
 
-    /**
-     * Get the innerProperties property: Operation properties.
-     *
-     * @return the innerProperties value.
-     */
-    private OperationMetaPropertyInfo innerProperties() {
-        return this.innerProperties;
-    }
-
     /**
      * Get the origin property: Operation origin.
      *
@@ -141,7 +134,7 @@ public AvailableRpOperationInner withOrigin(String origin) {
      * @return the serviceSpecification value.
      */
     public OperationMetaServiceSpecification serviceSpecification() {
-        return this.innerProperties() == null ? null : this.innerProperties().serviceSpecification();
+        return this.serviceSpecification;
     }
 
     /**
@@ -151,10 +144,7 @@ public OperationMetaServiceSpecification serviceSpecification() {
      * @return the AvailableRpOperationInner object itself.
      */
     public AvailableRpOperationInner withServiceSpecification(OperationMetaServiceSpecification serviceSpecification) {
-        if (this.innerProperties() == null) {
-            this.innerProperties = new OperationMetaPropertyInfo();
-        }
-        this.innerProperties().withServiceSpecification(serviceSpecification);
+        this.serviceSpecification = serviceSpecification;
         return this;
     }
 
@@ -167,8 +157,8 @@ public void validate() {
         if (display() != null) {
             display().validate();
         }
-        if (innerProperties() != null) {
-            innerProperties().validate();
+        if (serviceSpecification() != null) {
+            serviceSpecification().validate();
         }
     }
 }

sdk/synapse/azure-resourcemanager-synapse/src/main/java/com/azure/resourcemanager/synapse/fluent/models/AzureADOnlyAuthenticationInner.java

@@ -5,6 +5,7 @@
 package com.azure.resourcemanager.synapse.fluent.models;
 
 import com.azure.core.annotation.Fluent;
+import com.azure.core.annotation.JsonFlatten;
 import com.azure.core.management.ProxyResource;
 import com.azure.core.util.logging.ClientLogger;
 import com.azure.resourcemanager.synapse.models.StateValue;
@@ -13,32 +14,36 @@
 import java.time.OffsetDateTime;
 
 /** Azure Active Directory Only Authentication Info. */
+@JsonFlatten
 @Fluent
-public final class AzureADOnlyAuthenticationInner extends ProxyResource {
+public class AzureADOnlyAuthenticationInner extends ProxyResource {
     @JsonIgnore private final ClientLogger logger = new ClientLogger(AzureADOnlyAuthenticationInner.class);
 
     /*
-     * azureADOnlyAuthentication resource properties
+     * Azure Active Directory only Authentication enabled.
      */
-    @JsonProperty(value = "properties")
-    private AzureADOnlyAuthenticationProperties innerProperties;
+    @JsonProperty(value = "properties.azureADOnlyAuthentication")
+    private Boolean azureADOnlyAuthentication;
 
-    /**
-     * Get the innerProperties property: azureADOnlyAuthentication resource properties.
-     *
-     * @return the innerProperties value.
+    /*
+     * property configuration state
      */
-    private AzureADOnlyAuthenticationProperties innerProperties() {
-        return this.innerProperties;
-    }
+    @JsonProperty(value = "properties.state", access = JsonProperty.Access.WRITE_ONLY)
+    private StateValue state;
+
+    /*
+     * property configuration date
+     */
+    @JsonProperty(value = "properties.creationDate", access = JsonProperty.Access.WRITE_ONLY)
+    private OffsetDateTime creationDate;
 
     /**
      * Get the azureADOnlyAuthentication property: Azure Active Directory only Authentication enabled.
      *
      * @return the azureADOnlyAuthentication value.
      */
     public Boolean azureADOnlyAuthentication() {
-        return this.innerProperties() == null ? null : this.innerProperties().azureADOnlyAuthentication();
+        return this.azureADOnlyAuthentication;
     }
 
     /**
@@ -48,10 +53,7 @@ public Boolean azureADOnlyAuthentication() {
      * @return the AzureADOnlyAuthenticationInner object itself.
      */
     public AzureADOnlyAuthenticationInner withAzureADOnlyAuthentication(Boolean azureADOnlyAuthentication) {
-        if (this.innerProperties() == null) {
-            this.innerProperties = new AzureADOnlyAuthenticationProperties();
-        }
-        this.innerProperties().withAzureADOnlyAuthentication(azureADOnlyAuthentication);
+        this.azureADOnlyAuthentication = azureADOnlyAuthentication;
         return this;
     }
 
@@ -61,7 +63,7 @@ public AzureADOnlyAuthenticationInner withAzureADOnlyAuthentication(Boolean azur
      * @return the state value.
      */
     public StateValue state() {
-        return this.innerProperties() == null ? null : this.innerProperties().state();
+        return this.state;
     }
 
     /**
@@ -70,7 +72,7 @@ public StateValue state() {
      * @return the creationDate value.
      */
     public OffsetDateTime creationDate() {
-        return this.innerProperties() == null ? null : this.innerProperties().creationDate();
+        return this.creationDate;
     }
 
     /**
@@ -79,8 +81,5 @@ public OffsetDateTime creationDate() {
      * @throws IllegalArgumentException thrown if the instance is not valid.
      */
     public void validate() {
-        if (innerProperties() != null) {
-            innerProperties().validate();
-        }
     }
 }