CodeGen from PR 16152 in Azure/azure-rest-api-specs

[Hub Generated] Public private branch 'dev-storagecache-Microsoft.StorageCache-2021-09-01' (Azure#16152) * Adds base for updating Microsoft.StorageCache from version stable/2021-05-01 to version 2021-09-01 * Updates readme * Updates API version in new specs and examples * 2021-09-01 API * Fix LintDiff Co-authored-by: rebecca337 <[email protected]> Co-authored-by: Rebecca Dupuis <[email protected]>
AzureSDKAutomation · Sep 30, 2021 · 843b9ad · 843b9ad
1 parent 4935311
commit 843b9ad
Show file tree

Hide file tree

Showing 42 changed files with 323 additions and 1,657 deletions.
diff --git a/sdk/storagecache/azure-resourcemanager-storagecache/CHANGELOG.md b/sdk/storagecache/azure-resourcemanager-storagecache/CHANGELOG.md
@@ -1,7 +1,8 @@
 # Release History
 
-## 1.0.0-beta.4 (Unreleased)
+## 1.0.0-beta.1 (2021-09-30)
 
+- Azure Resource Manager StorageCache client library for Java. This package contains Microsoft Azure SDK for StorageCache Management SDK. A Storage Cache provides scalable caching service for NAS clients, serving data from either NFSv3 or Blob at-rest storage (referred to as "Storage Targets"). These operations allow you to manage Caches. Package tag package-2021-09. 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.3 (2021-08-03)
 

diff --git a/sdk/storagecache/azure-resourcemanager-storagecache/README.md b/sdk/storagecache/azure-resourcemanager-storagecache/README.md
@@ -2,7 +2,7 @@
 
 Azure Resource Manager StorageCache client library for Java.
 
-This package contains Microsoft Azure SDK for StorageCache Management SDK. A Storage Cache provides scalable caching service for NAS clients, serving data from either NFSv3 or Blob at-rest storage (referred to as "Storage Targets"). These operations allow you to manage Caches. Package tag package-2021-05. For documentation on how to use this package, please see [Azure Management Libraries for Java](https://aka.ms/azsdk/java/mgmt).
+This package contains Microsoft Azure SDK for StorageCache Management SDK. A Storage Cache provides scalable caching service for NAS clients, serving data from either NFSv3 or Blob at-rest storage (referred to as "Storage Targets"). These operations allow you to manage Caches. Package tag package-2021-09. For documentation on how to use this package, please see [Azure Management Libraries for Java](https://aka.ms/azsdk/java/mgmt).
 
 ## We'd love to hear your feedback
 
@@ -32,7 +32,7 @@ Various documentation is available to help you get started
 <dependency>
     <groupId>com.azure.resourcemanager</groupId>
     <artifactId>azure-resourcemanager-storagecache</artifactId>
-    <version>1.0.0-beta.3</version>
+    <version>1.0.0-beta.4</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/storagecache/azure-resourcemanager-storagecache/SAMPLE.md)
 
 
 ## Troubleshooting

diff --git a/sdk/storagecache/azure-resourcemanager-storagecache/pom.xml b/sdk/storagecache/azure-resourcemanager-storagecache/pom.xml
@@ -13,7 +13,7 @@
   <packaging>jar</packaging>
 
   <name>Microsoft Azure SDK for StorageCache Management</name>
-  <description>This package contains Microsoft Azure SDK for StorageCache Management SDK. For documentation on how to use this package, please see https://aka.ms/azsdk/java/mgmt. A Storage Cache provides scalable caching service for NAS clients, serving data from either NFSv3 or Blob at-rest storage (referred to as "Storage Targets"). These operations allow you to manage Caches. Package tag package-2021-05.</description>
+  <description>This package contains Microsoft Azure SDK for StorageCache Management SDK. For documentation on how to use this package, please see https://aka.ms/azsdk/java/mgmt. A Storage Cache provides scalable caching service for NAS clients, serving data from either NFSv3 or Blob at-rest storage (referred to as "Storage Targets"). These operations allow you to manage Caches. Package tag package-2021-09.</description>
   <url>https://github.com/Azure/azure-sdk-for-java</url>
 
   <licenses>

diff --git a/...toragecache/src/main/java/com/azure/resourcemanager/storagecache/StorageCacheManager.java b/...toragecache/src/main/java/com/azure/resourcemanager/storagecache/StorageCacheManager.java
@@ -198,7 +198,7 @@ public StorageCacheManager authenticate(TokenCredential credential, AzureProfile
                 .append("-")
                 .append("com.azure.resourcemanager.storagecache")
                 .append("/")
-                .append("1.0.0-beta.3");
+                .append("1.0.0-beta.1");
             if (!Configuration.getGlobalConfiguration().get("AZURE_TELEMETRY_DISABLED", false)) {
                 userAgentBuilder
                     .append(" (")

diff --git a/...-storagecache/src/main/java/com/azure/resourcemanager/storagecache/fluent/SkusClient.java b/...-storagecache/src/main/java/com/azure/resourcemanager/storagecache/fluent/SkusClient.java
@@ -17,7 +17,7 @@ public interface SkusClient {
      *
      * @throws com.azure.core.management.exception.ManagementException thrown if the request is rejected by server.
      * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent.
-     * @return the list of StorageCache.
+     * @return the list of StorageCache.Cache SKUs available to this subscription.
      */
     @ServiceMethod(returns = ReturnType.COLLECTION)
     PagedIterable<ResourceSkuInner> list();
@@ -29,7 +29,7 @@ public interface SkusClient {
      * @throws IllegalArgumentException thrown if parameters fail the validation.
      * @throws com.azure.core.management.exception.ManagementException thrown if the request is rejected by server.
      * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent.
-     * @return the list of StorageCache.
+     * @return the list of StorageCache.Cache SKUs available to this subscription.
      */
     @ServiceMethod(returns = ReturnType.COLLECTION)
     PagedIterable<ResourceSkuInner> list(Context context);

diff --git a/...src/main/java/com/azure/resourcemanager/storagecache/fluent/models/ApiOperationInner.java b/...src/main/java/com/azure/resourcemanager/storagecache/fluent/models/ApiOperationInner.java
@@ -5,6 +5,7 @@
 package com.azure.resourcemanager.storagecache.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.storagecache.models.ApiOperationDisplay;
 import com.azure.resourcemanager.storagecache.models.ApiOperationPropertiesServiceSpecification;
@@ -15,8 +16,9 @@
  * REST API operation description: see
  * https://github.com/Azure/azure-rest-api-specs/blob/master/documentation/openapi-authoring-automated-guidelines.md#r3023-operationsapiimplementation.
  */
+@JsonFlatten
 @Fluent
-public final class ApiOperationInner {
+public class ApiOperationInner {
     @JsonIgnore private final ClientLogger logger = new ClientLogger(ApiOperationInner.class);
 
     /*
@@ -44,10 +46,10 @@ public final class ApiOperationInner {
     private String name;
 
     /*
-     * Additional details about an operation.
+     * Specification of the all the metrics provided for a resource type.
      */
-    @JsonProperty(value = "properties")
-    private ApiOperationProperties innerProperties;
+    @JsonProperty(value = "properties.serviceSpecification")
+    private ApiOperationPropertiesServiceSpecification serviceSpecification;
 
     /**
      * Get the display property: The object that represents the operation.
@@ -129,22 +131,13 @@ public ApiOperationInner withName(String name) {
         return this;
     }
 
-    /**
-     * Get the innerProperties property: Additional details about an operation.
-     *
-     * @return the innerProperties value.
-     */
-    private ApiOperationProperties innerProperties() {
-        return this.innerProperties;
-    }
-
     /**
      * Get the serviceSpecification property: Specification of the all the metrics provided for a resource type.
      *
      * @return the serviceSpecification value.
      */
     public ApiOperationPropertiesServiceSpecification serviceSpecification() {
-        return this.innerProperties() == null ? null : this.innerProperties().serviceSpecification();
+        return this.serviceSpecification;
     }
 
     /**
@@ -154,10 +147,7 @@ public ApiOperationPropertiesServiceSpecification serviceSpecification() {
      * @return the ApiOperationInner object itself.
      */
     public ApiOperationInner withServiceSpecification(ApiOperationPropertiesServiceSpecification serviceSpecification) {
-        if (this.innerProperties() == null) {
-            this.innerProperties = new ApiOperationProperties();
-        }
-        this.innerProperties().withServiceSpecification(serviceSpecification);
+        this.serviceSpecification = serviceSpecification;
         return this;
     }
 
@@ -170,8 +160,8 @@ public void validate() {
         if (display() != null) {
             display().validate();
         }
-        if (innerProperties() != null) {
-            innerProperties().validate();
+        if (serviceSpecification() != null) {
+            serviceSpecification().validate();
         }
     }
 }
diff --git a/...ain/java/com/azure/resourcemanager/storagecache/fluent/models/ApiOperationProperties.java b/...ain/java/com/azure/resourcemanager/storagecache/fluent/models/ApiOperationProperties.java
diff --git a/...src/main/java/com/azure/resourcemanager/storagecache/fluent/models/AscOperationInner.java b/...src/main/java/com/azure/resourcemanager/storagecache/fluent/models/AscOperationInner.java
@@ -5,15 +5,18 @@
 package com.azure.resourcemanager.storagecache.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.storagecache.models.ErrorResponse;
 import com.fasterxml.jackson.annotation.JsonIgnore;
+import com.fasterxml.jackson.annotation.JsonInclude;
 import com.fasterxml.jackson.annotation.JsonProperty;
 import java.util.Map;
 
 /** The status of operation. */
+@JsonFlatten
 @Fluent
-public final class AscOperationInner {
+public class AscOperationInner {
     @JsonIgnore private final ClientLogger logger = new ClientLogger(AscOperationInner.class);
 
     /*
@@ -53,10 +56,11 @@ public final class AscOperationInner {
     private ErrorResponse error;
 
     /*
-     * Additional operation-specific properties
+     * Additional operation-specific output.
      */
-    @JsonProperty(value = "properties")
-    private AscOperationProperties innerProperties;
+    @JsonProperty(value = "properties.output")
+    @JsonInclude(value = JsonInclude.Include.NON_NULL, content = JsonInclude.Include.ALWAYS)
+    private Map<String, Object> output;
 
     /**
      * Get the id property: The operation Id.
@@ -178,22 +182,13 @@ public AscOperationInner withError(ErrorResponse error) {
         return this;
     }
 
-    /**
-     * Get the innerProperties property: Additional operation-specific properties.
-     *
-     * @return the innerProperties value.
-     */
-    private AscOperationProperties innerProperties() {
-        return this.innerProperties;
-    }
-
     /**
      * Get the output property: Additional operation-specific output.
      *
      * @return the output value.
      */
     public Map<String, Object> output() {
-        return this.innerProperties() == null ? null : this.innerProperties().output();
+        return this.output;
     }
 
     /**
@@ -203,10 +198,7 @@ public Map<String, Object> output() {
      * @return the AscOperationInner object itself.
      */
     public AscOperationInner withOutput(Map<String, Object> output) {
-        if (this.innerProperties() == null) {
-            this.innerProperties = new AscOperationProperties();
-        }
-        this.innerProperties().withOutput(output);
+        this.output = output;
         return this;
     }
 
@@ -219,8 +211,5 @@ public void validate() {
         if (error() != null) {
             error().validate();
         }
-        if (innerProperties() != null) {
-            innerProperties().validate();
-        }
     }
 }
diff --git a/...ain/java/com/azure/resourcemanager/storagecache/fluent/models/AscOperationProperties.java b/...ain/java/com/azure/resourcemanager/storagecache/fluent/models/AscOperationProperties.java