Skip to content

[ReleasePR sdk/eventhubs/mgmt-v2015_08_01] EventHub : 2018-01-01-preview Cluster SKU Name change #10677

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
openapi-sdkautomation wants to merge 1 commit into from
Closed

[ReleasePR sdk/eventhubs/mgmt-v2015_08_01] EventHub : 2018-01-01-preview Cluster SKU Name change #10677

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 3 additions & 1 deletion sdk/eventhubs/mgmt-v2015_08_01/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@
<parent>
<groupId>com.microsoft.azure</groupId>
<artifactId>azure-arm-parent</artifactId>
<version>1.2.0</version>
<version>1.1.0</version>
<relativePath>../../../pom.management.xml</relativePath>
</parent>
<artifactId>azure-mgmt-eventhubs</artifactId>
Expand Down Expand Up @@ -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>
Expand Down
2 changes: 1 addition & 1 deletion ...5_08_01/src/main/java/com/microsoft/azure/management/eventhubs/v2015_08_01/EventHubs.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -103,7 +103,7 @@ public interface EventHubs extends SupportsCreating<EventHubResource.DefinitionS
* @throws IllegalArgumentException thrown if parameters fail the validation
* @return the observable for the request
*/
Observable<NamespaceSharedAccessAuthorizationRuleResource> posttAuthorizationRuleAsync(String resourceGroupName, String namespaceName, String eventHubName, String authorizationRuleName);
Observable<NamespaceSharedAccessAuthorizationRuleResource> postAuthorizationRuleAsync(String resourceGroupName, String namespaceName, String eventHubName, String authorizationRuleName);

/**
* Gets the ACS and SAS connection strings for the Event Hub.
Expand Down
10 changes: 7 additions & 3 deletions ...m/microsoft/azure/management/eventhubs/v2015_08_01/implementation/ConsumerGroupsImpl.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -64,10 +64,14 @@ public ConsumerGroupResource call(ConsumerGroupResourceInner inner) {
public Observable<ConsumerGroupResource> getAsync(String resourceGroupName, String namespaceName, String eventHubName, String consumerGroupName) {
ConsumerGroupsInner client = this.inner();
return client.getAsync(resourceGroupName, namespaceName, eventHubName, consumerGroupName)
.map(new Func1<ConsumerGroupResourceInner, ConsumerGroupResource>() {
.flatMap(new Func1<ConsumerGroupResourceInner, Observable<ConsumerGroupResource>>() {
@Override
public ConsumerGroupResource call(ConsumerGroupResourceInner inner) {
return wrapModel(inner);
public Observable<ConsumerGroupResource> call(ConsumerGroupResourceInner inner) {
if (inner == null) {
return Observable.empty();
} else {
return Observable.just((ConsumerGroupResource)wrapModel(inner));
}
}
});
}
Expand Down
24 changes: 16 additions & 8 deletions ...va/com/microsoft/azure/management/eventhubs/v2015_08_01/implementation/EventHubsImpl.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -67,10 +67,14 @@ public EventHubResource call(EventHubResourceInner inner) {
public Observable<EventHubResource> getAsync(String resourceGroupName, String namespaceName, String eventHubName) {
EventHubsInner client = this.inner();
return client.getAsync(resourceGroupName, namespaceName, eventHubName)
.map(new Func1<EventHubResourceInner, EventHubResource>() {
.flatMap(new Func1<EventHubResourceInner, Observable<EventHubResource>>() {
@Override
public EventHubResource call(EventHubResourceInner inner) {
return wrapModel(inner);
public Observable<EventHubResource> call(EventHubResourceInner inner) {
if (inner == null) {
return Observable.empty();
} else {
return Observable.just((EventHubResource)wrapModel(inner));
}
}
});
}
Expand Down Expand Up @@ -107,10 +111,14 @@ private Observable<SharedAccessAuthorizationRuleResourceInner> getSharedAccessAu
public Observable<EventhubNamespaceSharedAccessAuthorizationRuleResource> getAuthorizationRuleAsync(String resourceGroupName, String namespaceName, String eventHubName, String authorizationRuleName) {
EventHubsInner client = this.inner();
return client.getAuthorizationRuleAsync(resourceGroupName, namespaceName, eventHubName, authorizationRuleName)
.map(new Func1<SharedAccessAuthorizationRuleResourceInner, EventhubNamespaceSharedAccessAuthorizationRuleResource>() {
.flatMap(new Func1<SharedAccessAuthorizationRuleResourceInner, Observable<EventhubNamespaceSharedAccessAuthorizationRuleResource>>() {
@Override
public EventhubNamespaceSharedAccessAuthorizationRuleResource call(SharedAccessAuthorizationRuleResourceInner inner) {
return wrapEventhubNamespaceSharedAccessAuthorizationRuleResourceModel(inner);
public Observable<EventhubNamespaceSharedAccessAuthorizationRuleResource> call(SharedAccessAuthorizationRuleResourceInner inner) {
if (inner == null) {
return Observable.empty();
} else {
return Observable.just((EventhubNamespaceSharedAccessAuthorizationRuleResource)wrapEventhubNamespaceSharedAccessAuthorizationRuleResourceModel(inner));
}
}
});
}
Expand Down Expand Up @@ -140,9 +148,9 @@ public Completable deleteAuthorizationRuleAsync(String resourceGroupName, String
}

@Override
public Observable<NamespaceSharedAccessAuthorizationRuleResource> posttAuthorizationRuleAsync(String resourceGroupName, String namespaceName, String eventHubName, String authorizationRuleName) {
public Observable<NamespaceSharedAccessAuthorizationRuleResource> postAuthorizationRuleAsync(String resourceGroupName, String namespaceName, String eventHubName, String authorizationRuleName) {
EventHubsInner client = this.inner();
return client.posttAuthorizationRuleAsync(resourceGroupName, namespaceName, eventHubName, authorizationRuleName)
return client.postAuthorizationRuleAsync(resourceGroupName, namespaceName, eventHubName, authorizationRuleName)
.map(new Func1<SharedAccessAuthorizationRuleResourceInner, NamespaceSharedAccessAuthorizationRuleResource>() {
@Override
public NamespaceSharedAccessAuthorizationRuleResource call(SharedAccessAuthorizationRuleResourceInner inner) {
Expand Down
24 changes: 12 additions & 12 deletions ...a/com/microsoft/azure/management/eventhubs/v2015_08_01/implementation/EventHubsInner.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -94,9 +94,9 @@ interface EventHubsService {
@GET("subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.EventHub/namespaces/{namespaceName}/eventhubs/{eventHubName}/authorizationRules/{authorizationRuleName}")
Observable<Response<ResponseBody>> getAuthorizationRule(@Path("resourceGroupName") String resourceGroupName, @Path("namespaceName") String namespaceName, @Path("eventHubName") String eventHubName, @Path("authorizationRuleName") String authorizationRuleName, @Path("subscriptionId") String subscriptionId, @Query("api-version") String apiVersion, @Header("accept-language") String acceptLanguage, @Header("User-Agent") String userAgent);

@Headers({ "Content-Type: application/json; charset=utf-8", "x-ms-logging-context: com.microsoft.azure.management.eventhubs.v2015_08_01.EventHubs posttAuthorizationRule" })
@Headers({ "Content-Type: application/json; charset=utf-8", "x-ms-logging-context: com.microsoft.azure.management.eventhubs.v2015_08_01.EventHubs postAuthorizationRule" })
@POST("subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.EventHub/namespaces/{namespaceName}/eventhubs/{eventHubName}/authorizationRules/{authorizationRuleName}")
Observable<Response<ResponseBody>> posttAuthorizationRule(@Path("resourceGroupName") String resourceGroupName, @Path("namespaceName") String namespaceName, @Path("eventHubName") String eventHubName, @Path("authorizationRuleName") String authorizationRuleName, @Path("subscriptionId") String subscriptionId, @Query("api-version") String apiVersion, @Header("accept-language") String acceptLanguage, @Header("User-Agent") String userAgent);
Observable<Response<ResponseBody>> postAuthorizationRule(@Path("resourceGroupName") String resourceGroupName, @Path("namespaceName") String namespaceName, @Path("eventHubName") String eventHubName, @Path("authorizationRuleName") String authorizationRuleName, @Path("subscriptionId") String subscriptionId, @Query("api-version") String apiVersion, @Header("accept-language") String acceptLanguage, @Header("User-Agent") String userAgent);

@Headers({ "Content-Type: application/json; charset=utf-8", "x-ms-logging-context: com.microsoft.azure.management.eventhubs.v2015_08_01.EventHubs deleteAuthorizationRule" })
@HTTP(path = "subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.EventHub/namespaces/{namespaceName}/eventhubs/{eventHubName}/authorizationRules/{authorizationRuleName}", method = "DELETE", hasBody = true)
Expand Down Expand Up @@ -881,8 +881,8 @@ private ServiceResponse<SharedAccessAuthorizationRuleResourceInner> getAuthoriza
* @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent
* @return the SharedAccessAuthorizationRuleResourceInner object if successful.
*/
public SharedAccessAuthorizationRuleResourceInner posttAuthorizationRule(String resourceGroupName, String namespaceName, String eventHubName, String authorizationRuleName) {
return posttAuthorizationRuleWithServiceResponseAsync(resourceGroupName, namespaceName, eventHubName, authorizationRuleName).toBlocking().single().body();
public SharedAccessAuthorizationRuleResourceInner postAuthorizationRule(String resourceGroupName, String namespaceName, String eventHubName, String authorizationRuleName) {
return postAuthorizationRuleWithServiceResponseAsync(resourceGroupName, namespaceName, eventHubName, authorizationRuleName).toBlocking().single().body();
}

/**
Expand All @@ -896,8 +896,8 @@ public SharedAccessAuthorizationRuleResourceInner posttAuthorizationRule(String
* @throws IllegalArgumentException thrown if parameters fail the validation
* @return the {@link ServiceFuture} object
*/
public ServiceFuture<SharedAccessAuthorizationRuleResourceInner> posttAuthorizationRuleAsync(String resourceGroupName, String namespaceName, String eventHubName, String authorizationRuleName, final ServiceCallback<SharedAccessAuthorizationRuleResourceInner> serviceCallback) {
return ServiceFuture.fromResponse(posttAuthorizationRuleWithServiceResponseAsync(resourceGroupName, namespaceName, eventHubName, authorizationRuleName), serviceCallback);
public ServiceFuture<SharedAccessAuthorizationRuleResourceInner> postAuthorizationRuleAsync(String resourceGroupName, String namespaceName, String eventHubName, String authorizationRuleName, final ServiceCallback<SharedAccessAuthorizationRuleResourceInner> serviceCallback) {
return ServiceFuture.fromResponse(postAuthorizationRuleWithServiceResponseAsync(resourceGroupName, namespaceName, eventHubName, authorizationRuleName), serviceCallback);
}

/**
Expand All @@ -910,8 +910,8 @@ public ServiceFuture<SharedAccessAuthorizationRuleResourceInner> posttAuthorizat
* @throws IllegalArgumentException thrown if parameters fail the validation
* @return the observable to the SharedAccessAuthorizationRuleResourceInner object
*/
public Observable<SharedAccessAuthorizationRuleResourceInner> posttAuthorizationRuleAsync(String resourceGroupName, String namespaceName, String eventHubName, String authorizationRuleName) {
return posttAuthorizationRuleWithServiceResponseAsync(resourceGroupName, namespaceName, eventHubName, authorizationRuleName).map(new Func1<ServiceResponse<SharedAccessAuthorizationRuleResourceInner>, SharedAccessAuthorizationRuleResourceInner>() {
public Observable<SharedAccessAuthorizationRuleResourceInner> postAuthorizationRuleAsync(String resourceGroupName, String namespaceName, String eventHubName, String authorizationRuleName) {
return postAuthorizationRuleWithServiceResponseAsync(resourceGroupName, namespaceName, eventHubName, authorizationRuleName).map(new Func1<ServiceResponse<SharedAccessAuthorizationRuleResourceInner>, SharedAccessAuthorizationRuleResourceInner>() {
@Override
public SharedAccessAuthorizationRuleResourceInner call(ServiceResponse<SharedAccessAuthorizationRuleResourceInner> response) {
return response.body();
Expand All @@ -929,7 +929,7 @@ public SharedAccessAuthorizationRuleResourceInner call(ServiceResponse<SharedAcc
* @throws IllegalArgumentException thrown if parameters fail the validation
* @return the observable to the SharedAccessAuthorizationRuleResourceInner object
*/
public Observable<ServiceResponse<SharedAccessAuthorizationRuleResourceInner>> posttAuthorizationRuleWithServiceResponseAsync(String resourceGroupName, String namespaceName, String eventHubName, String authorizationRuleName) {
public Observable<ServiceResponse<SharedAccessAuthorizationRuleResourceInner>> postAuthorizationRuleWithServiceResponseAsync(String resourceGroupName, String namespaceName, String eventHubName, String authorizationRuleName) {
if (resourceGroupName == null) {
throw new IllegalArgumentException("Parameter resourceGroupName is required and cannot be null.");
}
Expand All @@ -948,12 +948,12 @@ public Observable<ServiceResponse<SharedAccessAuthorizationRuleResourceInner>> p
if (this.client.apiVersion() == null) {
throw new IllegalArgumentException("Parameter this.client.apiVersion() is required and cannot be null.");
}
return service.posttAuthorizationRule(resourceGroupName, namespaceName, eventHubName, authorizationRuleName, this.client.subscriptionId(), this.client.apiVersion(), this.client.acceptLanguage(), this.client.userAgent())
return service.postAuthorizationRule(resourceGroupName, namespaceName, eventHubName, authorizationRuleName, this.client.subscriptionId(), this.client.apiVersion(), this.client.acceptLanguage(), this.client.userAgent())
.flatMap(new Func1<Response<ResponseBody>, Observable<ServiceResponse<SharedAccessAuthorizationRuleResourceInner>>>() {
@Override
public Observable<ServiceResponse<SharedAccessAuthorizationRuleResourceInner>> call(Response<ResponseBody> response) {
try {
ServiceResponse<SharedAccessAuthorizationRuleResourceInner> clientResponse = posttAuthorizationRuleDelegate(response);
ServiceResponse<SharedAccessAuthorizationRuleResourceInner> clientResponse = postAuthorizationRuleDelegate(response);
return Observable.just(clientResponse);
} catch (Throwable t) {
return Observable.error(t);
Expand All @@ -962,7 +962,7 @@ public Observable<ServiceResponse<SharedAccessAuthorizationRuleResourceInner>> c
});
}

private ServiceResponse<SharedAccessAuthorizationRuleResourceInner> posttAuthorizationRuleDelegate(Response<ResponseBody> response) throws CloudException, IOException, IllegalArgumentException {
private ServiceResponse<SharedAccessAuthorizationRuleResourceInner> postAuthorizationRuleDelegate(Response<ResponseBody> response) throws CloudException, IOException, IllegalArgumentException {
return this.client.restClient().responseBuilderFactory().<SharedAccessAuthorizationRuleResourceInner, CloudException>newInstance(this.client.serializerAdapter())
.register(200, new TypeToken<SharedAccessAuthorizationRuleResourceInner>() { }.getType())
.registerError(CloudException.class)
Expand Down
10 changes: 7 additions & 3 deletions ...a/com/microsoft/azure/management/eventhubs/v2015_08_01/implementation/NamespacesImpl.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -175,10 +175,14 @@ private Observable<SharedAccessAuthorizationRuleResourceInner> getSharedAccessAu
public Observable<NamespaceSharedAccessAuthorizationRuleResource> getAuthorizationRuleAsync(String resourceGroupName, String namespaceName, String authorizationRuleName) {
NamespacesInner client = this.inner();
return client.getAuthorizationRuleAsync(resourceGroupName, namespaceName, authorizationRuleName)
.map(new Func1<SharedAccessAuthorizationRuleResourceInner, NamespaceSharedAccessAuthorizationRuleResource>() {
.flatMap(new Func1<SharedAccessAuthorizationRuleResourceInner, Observable<NamespaceSharedAccessAuthorizationRuleResource>>() {
@Override
public NamespaceSharedAccessAuthorizationRuleResource call(SharedAccessAuthorizationRuleResourceInner inner) {
return wrapNamespaceSharedAccessAuthorizationRuleResourceModel(inner);
public Observable<NamespaceSharedAccessAuthorizationRuleResource> call(SharedAccessAuthorizationRuleResourceInner inner) {
if (inner == null) {
return Observable.empty();
} else {
return Observable.just((NamespaceSharedAccessAuthorizationRuleResource)wrapNamespaceSharedAccessAuthorizationRuleResourceModel(inner));
}
}
});
}
Expand Down