Generated from de66598d5b247c2309c05d25f06af83dd2d306b1

Merge pull request #3 from FBettati/availableClusterCollection Modify availableClusters API to have a valid ARM collection response
Azure · Apr 22, 2019 · 6fa86f5 · 6fa86f5
1 parent 9374aea
commit 6fa86f5
Show file tree

Hide file tree

Showing 6 changed files with 45 additions and 37 deletions.
diff --git a/...va/com/microsoft/azure/management/eventhub/v2018_01_01_preview/AvailableClustersList.java b/...va/com/microsoft/azure/management/eventhub/v2018_01_01_preview/AvailableClustersList.java
@@ -12,15 +12,16 @@
 import com.microsoft.azure.arm.resources.models.HasManager;
 import com.microsoft.azure.management.eventhub.v2018_01_01_preview.implementation.EventHubManager;
 import com.microsoft.azure.management.eventhub.v2018_01_01_preview.implementation.AvailableClustersListInner;
+import java.util.List;
 import java.util.Map;
 
 /**
  * Type representing AvailableClustersList.
  */
 public interface AvailableClustersList extends HasInner<AvailableClustersListInner>, HasManager<EventHubManager> {
     /**
-     * @return the availableClusters value.
+     * @return the value value.
      */
-    Map<String, Integer> availableClusters();
+    List<Map<String, Integer>> value();
 
 }
diff --git a/...w/src/main/java/com/microsoft/azure/management/eventhub/v2018_01_01_preview/Clusters.java b/...w/src/main/java/com/microsoft/azure/management/eventhub/v2018_01_01_preview/Clusters.java
@@ -27,7 +27,7 @@ public interface Clusters extends SupportsCreating<Cluster.DefinitionStages.Blan
      * @throws IllegalArgumentException thrown if parameters fail the validation
      * @return the observable for the request
      */
-    Observable<Map<String, Integer>> listAvailableClustersAsync();
+    Observable<AvailableClustersList> listAvailableClustersAsync();
 
     /**
      * List all Event Hubs Namespace IDs in an Event Hubs Dedicated Cluster.

diff --git a/...ure/management/eventhub/v2018_01_01_preview/implementation/AvailableClustersListImpl.java b/...ure/management/eventhub/v2018_01_01_preview/implementation/AvailableClustersListImpl.java
@@ -10,6 +10,7 @@
 
 import com.microsoft.azure.management.eventhub.v2018_01_01_preview.AvailableClustersList;
 import com.microsoft.azure.arm.model.implementation.WrapperImpl;
+import java.util.List;
 import java.util.Map;
 
 class AvailableClustersListImpl extends WrapperImpl<AvailableClustersListInner> implements AvailableClustersList {
@@ -25,8 +26,8 @@ public EventHubManager manager() {
     }
 
     @Override
-    public Map<String, Integer> availableClusters() {
-        return this.inner().availableClusters();
+    public List<Map<String, Integer>> value() {
+        return this.inner().value();
     }
 
 }
diff --git a/...re/management/eventhub/v2018_01_01_preview/implementation/AvailableClustersListInner.java b/...re/management/eventhub/v2018_01_01_preview/implementation/AvailableClustersListInner.java
@@ -8,38 +8,38 @@
 
 package com.microsoft.azure.management.eventhub.v2018_01_01_preview.implementation;
 
+import java.util.List;
 import java.util.Map;
 import com.fasterxml.jackson.annotation.JsonProperty;
 
 /**
- * Enumeration of the pre-provisioned Event Hubs Cluster count per region with
- * clusters readily available.
+ * The response of the List Available Clusters operation.
  */
 public class AvailableClustersListInner {
     /**
-     * Pre-provisioned Event Hubs Cluster count per region with such clusters
-     * available.
+     * The count of readily available and pre-provisioned Event Hubs Clusters
+     * per region.
      */
-    @JsonProperty(value = "availableClusters")
-    private Map<String, Integer> availableClusters;
+    @JsonProperty(value = "value")
+    private List<Map<String, Integer>> value;
 
     /**
-     * Get pre-provisioned Event Hubs Cluster count per region with such clusters available.
+     * Get the count of readily available and pre-provisioned Event Hubs Clusters per region.
      *
-     * @return the availableClusters value
+     * @return the value value
      */
-    public Map<String, Integer> availableClusters() {
-        return this.availableClusters;
+    public List<Map<String, Integer>> value() {
+        return this.value;
     }
 
     /**
-     * Set pre-provisioned Event Hubs Cluster count per region with such clusters available.
+     * Set the count of readily available and pre-provisioned Event Hubs Clusters per region.
      *
-     * @param availableClusters the availableClusters value to set
+     * @param value the value value to set
      * @return the AvailableClustersListInner object itself.
      */
-    public AvailableClustersListInner withAvailableClusters(Map<String, Integer> availableClusters) {
-        this.availableClusters = availableClusters;
+    public AvailableClustersListInner withValue(List<Map<String, Integer>> value) {
+        this.value = value;
         return this;
     }
 

diff --git a/.../microsoft/azure/management/eventhub/v2018_01_01_preview/implementation/ClustersImpl.java b/.../microsoft/azure/management/eventhub/v2018_01_01_preview/implementation/ClustersImpl.java
@@ -22,6 +22,7 @@
 import rx.functions.Func1;
 import com.microsoft.azure.PagedList;
 import com.microsoft.azure.Page;
+import com.microsoft.azure.management.eventhub.v2018_01_01_preview.AvailableClustersList;
 import com.microsoft.azure.management.eventhub.v2018_01_01_preview.EHNamespaceIdListResult;
 
 class ClustersImpl extends GroupableResourcesCoreImpl<Cluster, ClusterImpl, ClusterInner, ClustersInner, EventHubManager>  implements Clusters {
@@ -103,10 +104,16 @@ public ClusterImpl define(String name) {
     }
 
     @Override
-    public Observable<Map<String, Integer>> listAvailableClustersAsync() {
+    public Observable<AvailableClustersList> listAvailableClustersAsync() {
         ClustersInner client = this.inner();
         return client.listAvailableClustersAsync()
-    ;}
+        .map(new Func1<AvailableClustersListInner, AvailableClustersList>() {
+            @Override
+            public AvailableClustersList call(AvailableClustersListInner inner) {
+                return new AvailableClustersListImpl(inner, manager());
+            }
+        });
+    }
 
     @Override
     protected ClusterImpl wrapModel(ClusterInner inner) {

diff --git a/...microsoft/azure/management/eventhub/v2018_01_01_preview/implementation/ClustersInner.java b/...microsoft/azure/management/eventhub/v2018_01_01_preview/implementation/ClustersInner.java
@@ -23,7 +23,6 @@
 import com.microsoft.rest.Validator;
 import java.io.IOException;
 import java.util.List;
-import java.util.Map;
 import okhttp3.ResponseBody;
 import retrofit2.http.Body;
 import retrofit2.http.GET;
@@ -117,9 +116,9 @@ interface ClustersService {
      * @throws IllegalArgumentException thrown if parameters fail the validation
      * @throws ErrorResponseException thrown if the request is rejected by server
      * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent
-     * @return the Map&lt;String, Integer&gt; object if successful.
+     * @return the AvailableClustersListInner object if successful.
      */
-    public Map<String, Integer> listAvailableClusters() {
+    public AvailableClustersListInner listAvailableClusters() {
         return listAvailableClustersWithServiceResponseAsync().toBlocking().single().body();
     }
 
@@ -130,20 +129,20 @@ public Map<String, Integer> listAvailableClusters() {
      * @throws IllegalArgumentException thrown if parameters fail the validation
      * @return the {@link ServiceFuture} object
      */
-    public ServiceFuture<Map<String, Integer>> listAvailableClustersAsync(final ServiceCallback<Map<String, Integer>> serviceCallback) {
+    public ServiceFuture<AvailableClustersListInner> listAvailableClustersAsync(final ServiceCallback<AvailableClustersListInner> serviceCallback) {
         return ServiceFuture.fromResponse(listAvailableClustersWithServiceResponseAsync(), serviceCallback);
     }
 
     /**
      * List the quantity of available pre-provisioned Event Hubs Clusters, indexed by Azure region.
      *
      * @throws IllegalArgumentException thrown if parameters fail the validation
-     * @return the observable to the Map&lt;String, Integer&gt; object
+     * @return the observable to the AvailableClustersListInner object
      */
-    public Observable<Map<String, Integer>> listAvailableClustersAsync() {
-        return listAvailableClustersWithServiceResponseAsync().map(new Func1<ServiceResponse<Map<String, Integer>>, Map<String, Integer>>() {
+    public Observable<AvailableClustersListInner> listAvailableClustersAsync() {
+        return listAvailableClustersWithServiceResponseAsync().map(new Func1<ServiceResponse<AvailableClustersListInner>, AvailableClustersListInner>() {
             @Override
-            public Map<String, Integer> call(ServiceResponse<Map<String, Integer>> response) {
+            public AvailableClustersListInner call(ServiceResponse<AvailableClustersListInner> response) {
                 return response.body();
             }
         });
@@ -153,18 +152,18 @@ public Map<String, Integer> call(ServiceResponse<Map<String, Integer>> response)
      * List the quantity of available pre-provisioned Event Hubs Clusters, indexed by Azure region.
      *
      * @throws IllegalArgumentException thrown if parameters fail the validation
-     * @return the observable to the Map&lt;String, Integer&gt; object
+     * @return the observable to the AvailableClustersListInner object
      */
-    public Observable<ServiceResponse<Map<String, Integer>>> listAvailableClustersWithServiceResponseAsync() {
+    public Observable<ServiceResponse<AvailableClustersListInner>> listAvailableClustersWithServiceResponseAsync() {
         if (this.client.apiVersion() == null) {
             throw new IllegalArgumentException("Parameter this.client.apiVersion() is required and cannot be null.");
         }
         return service.listAvailableClusters(this.client.apiVersion(), this.client.acceptLanguage(), this.client.userAgent())
-            .flatMap(new Func1<Response<ResponseBody>, Observable<ServiceResponse<Map<String, Integer>>>>() {
+            .flatMap(new Func1<Response<ResponseBody>, Observable<ServiceResponse<AvailableClustersListInner>>>() {
                 @Override
-                public Observable<ServiceResponse<Map<String, Integer>>> call(Response<ResponseBody> response) {
+                public Observable<ServiceResponse<AvailableClustersListInner>> call(Response<ResponseBody> response) {
                     try {
-                        ServiceResponse<Map<String, Integer>> clientResponse = listAvailableClustersDelegate(response);
+                        ServiceResponse<AvailableClustersListInner> clientResponse = listAvailableClustersDelegate(response);
                         return Observable.just(clientResponse);
                     } catch (Throwable t) {
                         return Observable.error(t);
@@ -173,9 +172,9 @@ public Observable<ServiceResponse<Map<String, Integer>>> call(Response<ResponseB
             });
     }
 
-    private ServiceResponse<Map<String, Integer>> listAvailableClustersDelegate(Response<ResponseBody> response) throws ErrorResponseException, IOException, IllegalArgumentException {
-        return this.client.restClient().responseBuilderFactory().<Map<String, Integer>, ErrorResponseException>newInstance(this.client.serializerAdapter())
-                .register(200, new TypeToken<Map<String, Integer>>() { }.getType())
+    private ServiceResponse<AvailableClustersListInner> listAvailableClustersDelegate(Response<ResponseBody> response) throws ErrorResponseException, IOException, IllegalArgumentException {
+        return this.client.restClient().responseBuilderFactory().<AvailableClustersListInner, ErrorResponseException>newInstance(this.client.serializerAdapter())
+                .register(200, new TypeToken<AvailableClustersListInner>() { }.getType())
                 .registerError(ErrorResponseException.class)
                 .build(response);
     }