Skip to content

[AutoPR storagesync/resource-manager] Microsoft.StorageSync - Fixing issue and known problems with preview spec #2654

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
AutorestCI wants to merge 1 commit into from
Closed

[AutoPR storagesync/resource-manager] Microsoft.StorageSync - Fixing issue and known problems with preview spec #2654

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
16 changes: 8 additions & 8 deletions ...sync/src/main/java/com/microsoft/azure/management/storagesync/TriggerRolloverRequest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,26 +17,26 @@ public class TriggerRolloverRequest {
/**
* Certificate Data.
*/
@JsonProperty(value = "serverCertificate")
private String serverCertificate;
@JsonProperty(value = "certificateData")
private String certificateData;

/**
* Get certificate Data.
*
* @return the serverCertificate value
* @return the certificateData value
*/
public String serverCertificate() {
return this.serverCertificate;
public String certificateData() {
return this.certificateData;
}

/**
* Set certificate Data.
*
* @param serverCertificate the serverCertificate value to set
* @param certificateData the certificateData value to set
* @return the TriggerRolloverRequest object itself.
*/
public TriggerRolloverRequest withServerCertificate(String serverCertificate) {
this.serverCertificate = serverCertificate;
public TriggerRolloverRequest withCertificateData(String certificateData) {
this.certificateData = certificateData;
return this;
}

Expand Down
56 changes: 28 additions & 28 deletions ...ava/com/microsoft/azure/management/storagesync/implementation/RegisteredServersInner.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -708,9 +708,9 @@ public Observable<ServiceResponseWithHeaders<Void, RegisteredServersTriggerRollo
if (this.client.apiVersion() == null) {
throw new IllegalArgumentException("Parameter this.client.apiVersion() is required and cannot be null.");
}
final String serverCertificate = null;
final String certificateData = null;
TriggerRolloverRequest parameters = new TriggerRolloverRequest();
parameters.withServerCertificate(null);
parameters.withCertificateData(null);
Observable<Response<ResponseBody>> observable = service.triggerRollover(this.client.subscriptionId(), resourceGroupName, storageSyncServiceName, serverId, this.client.apiVersion(), this.client.acceptLanguage(), parameters, this.client.userAgent());
return client.getAzureClient().getPostOrDeleteResultWithHeadersAsync(observable, new TypeToken<Void>() { }.getType(), RegisteredServersTriggerRolloverHeaders.class);
}
Expand All @@ -720,13 +720,13 @@ public Observable<ServiceResponseWithHeaders<Void, RegisteredServersTriggerRollo
* @param resourceGroupName The name of the resource group. The name is case insensitive.
* @param storageSyncServiceName Name of Storage Sync Service resource.
* @param serverId Server Id
* @param serverCertificate Certificate Data
* @param certificateData Certificate Data
* @throws IllegalArgumentException thrown if parameters fail the validation
* @throws StorageSyncErrorException thrown if the request is rejected by server
* @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent
*/
public void triggerRollover(String resourceGroupName, String storageSyncServiceName, String serverId, String serverCertificate) {
triggerRolloverWithServiceResponseAsync(resourceGroupName, storageSyncServiceName, serverId, serverCertificate).toBlocking().last().body();
public void triggerRollover(String resourceGroupName, String storageSyncServiceName, String serverId, String certificateData) {
triggerRolloverWithServiceResponseAsync(resourceGroupName, storageSyncServiceName, serverId, certificateData).toBlocking().last().body();
}

/**
Expand All @@ -735,13 +735,13 @@ public void triggerRollover(String resourceGroupName, String storageSyncServiceN
* @param resourceGroupName The name of the resource group. The name is case insensitive.
* @param storageSyncServiceName Name of Storage Sync Service resource.
* @param serverId Server Id
* @param serverCertificate Certificate Data
* @param certificateData Certificate Data
* @param serviceCallback the async ServiceCallback to handle successful and failed responses.
* @throws IllegalArgumentException thrown if parameters fail the validation
* @return the {@link ServiceFuture} object
*/
public ServiceFuture<Void> triggerRolloverAsync(String resourceGroupName, String storageSyncServiceName, String serverId, String serverCertificate, final ServiceCallback<Void> serviceCallback) {
return ServiceFuture.fromHeaderResponse(triggerRolloverWithServiceResponseAsync(resourceGroupName, storageSyncServiceName, serverId, serverCertificate), serviceCallback);
public ServiceFuture<Void> triggerRolloverAsync(String resourceGroupName, String storageSyncServiceName, String serverId, String certificateData, final ServiceCallback<Void> serviceCallback) {
return ServiceFuture.fromHeaderResponse(triggerRolloverWithServiceResponseAsync(resourceGroupName, storageSyncServiceName, serverId, certificateData), serviceCallback);
}

/**
Expand All @@ -750,12 +750,12 @@ public ServiceFuture<Void> triggerRolloverAsync(String resourceGroupName, String
* @param resourceGroupName The name of the resource group. The name is case insensitive.
* @param storageSyncServiceName Name of Storage Sync Service resource.
* @param serverId Server Id
* @param serverCertificate Certificate Data
* @param certificateData Certificate Data
* @throws IllegalArgumentException thrown if parameters fail the validation
* @return the observable for the request
*/
public Observable<Void> triggerRolloverAsync(String resourceGroupName, String storageSyncServiceName, String serverId, String serverCertificate) {
return triggerRolloverWithServiceResponseAsync(resourceGroupName, storageSyncServiceName, serverId, serverCertificate).map(new Func1<ServiceResponseWithHeaders<Void, RegisteredServersTriggerRolloverHeaders>, Void>() {
public Observable<Void> triggerRolloverAsync(String resourceGroupName, String storageSyncServiceName, String serverId, String certificateData) {
return triggerRolloverWithServiceResponseAsync(resourceGroupName, storageSyncServiceName, serverId, certificateData).map(new Func1<ServiceResponseWithHeaders<Void, RegisteredServersTriggerRolloverHeaders>, Void>() {
@Override
public Void call(ServiceResponseWithHeaders<Void, RegisteredServersTriggerRolloverHeaders> response) {
return response.body();
Expand All @@ -769,11 +769,11 @@ public Void call(ServiceResponseWithHeaders<Void, RegisteredServersTriggerRollov
* @param resourceGroupName The name of the resource group. The name is case insensitive.
* @param storageSyncServiceName Name of Storage Sync Service resource.
* @param serverId Server Id
* @param serverCertificate Certificate Data
* @param certificateData Certificate Data
* @throws IllegalArgumentException thrown if parameters fail the validation
* @return the observable for the request
*/
public Observable<ServiceResponseWithHeaders<Void, RegisteredServersTriggerRolloverHeaders>> triggerRolloverWithServiceResponseAsync(String resourceGroupName, String storageSyncServiceName, String serverId, String serverCertificate) {
public Observable<ServiceResponseWithHeaders<Void, RegisteredServersTriggerRolloverHeaders>> triggerRolloverWithServiceResponseAsync(String resourceGroupName, String storageSyncServiceName, String serverId, String certificateData) {
if (this.client.subscriptionId() == null) {
throw new IllegalArgumentException("Parameter this.client.subscriptionId() is required and cannot be null.");
}
Expand All @@ -790,7 +790,7 @@ public Observable<ServiceResponseWithHeaders<Void, RegisteredServersTriggerRollo
throw new IllegalArgumentException("Parameter this.client.apiVersion() is required and cannot be null.");
}
TriggerRolloverRequest parameters = new TriggerRolloverRequest();
parameters.withServerCertificate(serverCertificate);
parameters.withCertificateData(certificateData);
Observable<Response<ResponseBody>> observable = service.triggerRollover(this.client.subscriptionId(), resourceGroupName, storageSyncServiceName, serverId, this.client.apiVersion(), this.client.acceptLanguage(), parameters, this.client.userAgent());
return client.getAzureClient().getPostOrDeleteResultWithHeadersAsync(observable, new TypeToken<Void>() { }.getType(), RegisteredServersTriggerRolloverHeaders.class);
}
Expand Down Expand Up @@ -866,9 +866,9 @@ public Observable<ServiceResponseWithHeaders<Void, RegisteredServersTriggerRollo
if (this.client.apiVersion() == null) {
throw new IllegalArgumentException("Parameter this.client.apiVersion() is required and cannot be null.");
}
final String serverCertificate = null;
final String certificateData = null;
TriggerRolloverRequest parameters = new TriggerRolloverRequest();
parameters.withServerCertificate(null);
parameters.withCertificateData(null);
return service.beginTriggerRollover(this.client.subscriptionId(), resourceGroupName, storageSyncServiceName, serverId, this.client.apiVersion(), this.client.acceptLanguage(), parameters, this.client.userAgent())
.flatMap(new Func1<Response<ResponseBody>, Observable<ServiceResponseWithHeaders<Void, RegisteredServersTriggerRolloverHeaders>>>() {
@Override
Expand All @@ -889,13 +889,13 @@ public Observable<ServiceResponseWithHeaders<Void, RegisteredServersTriggerRollo
* @param resourceGroupName The name of the resource group. The name is case insensitive.
* @param storageSyncServiceName Name of Storage Sync Service resource.
* @param serverId Server Id
* @param serverCertificate Certificate Data
* @param certificateData Certificate Data
* @throws IllegalArgumentException thrown if parameters fail the validation
* @throws StorageSyncErrorException thrown if the request is rejected by server
* @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent
*/
public void beginTriggerRollover(String resourceGroupName, String storageSyncServiceName, String serverId, String serverCertificate) {
beginTriggerRolloverWithServiceResponseAsync(resourceGroupName, storageSyncServiceName, serverId, serverCertificate).toBlocking().single().body();
public void beginTriggerRollover(String resourceGroupName, String storageSyncServiceName, String serverId, String certificateData) {
beginTriggerRolloverWithServiceResponseAsync(resourceGroupName, storageSyncServiceName, serverId, certificateData).toBlocking().single().body();
}

/**
Expand All @@ -904,13 +904,13 @@ public void beginTriggerRollover(String resourceGroupName, String storageSyncSer
* @param resourceGroupName The name of the resource group. The name is case insensitive.
* @param storageSyncServiceName Name of Storage Sync Service resource.
* @param serverId Server Id
* @param serverCertificate Certificate Data
* @param certificateData Certificate Data
* @param serviceCallback the async ServiceCallback to handle successful and failed responses.
* @throws IllegalArgumentException thrown if parameters fail the validation
* @return the {@link ServiceFuture} object
*/
public ServiceFuture<Void> beginTriggerRolloverAsync(String resourceGroupName, String storageSyncServiceName, String serverId, String serverCertificate, final ServiceCallback<Void> serviceCallback) {
return ServiceFuture.fromHeaderResponse(beginTriggerRolloverWithServiceResponseAsync(resourceGroupName, storageSyncServiceName, serverId, serverCertificate), serviceCallback);
public ServiceFuture<Void> beginTriggerRolloverAsync(String resourceGroupName, String storageSyncServiceName, String serverId, String certificateData, final ServiceCallback<Void> serviceCallback) {
return ServiceFuture.fromHeaderResponse(beginTriggerRolloverWithServiceResponseAsync(resourceGroupName, storageSyncServiceName, serverId, certificateData), serviceCallback);
}

/**
Expand All @@ -919,12 +919,12 @@ public ServiceFuture<Void> beginTriggerRolloverAsync(String resourceGroupName, S
* @param resourceGroupName The name of the resource group. The name is case insensitive.
* @param storageSyncServiceName Name of Storage Sync Service resource.
* @param serverId Server Id
* @param serverCertificate Certificate Data
* @param certificateData Certificate Data
* @throws IllegalArgumentException thrown if parameters fail the validation
* @return the {@link ServiceResponseWithHeaders} object if successful.
*/
public Observable<Void> beginTriggerRolloverAsync(String resourceGroupName, String storageSyncServiceName, String serverId, String serverCertificate) {
return beginTriggerRolloverWithServiceResponseAsync(resourceGroupName, storageSyncServiceName, serverId, serverCertificate).map(new Func1<ServiceResponseWithHeaders<Void, RegisteredServersTriggerRolloverHeaders>, Void>() {
public Observable<Void> beginTriggerRolloverAsync(String resourceGroupName, String storageSyncServiceName, String serverId, String certificateData) {
return beginTriggerRolloverWithServiceResponseAsync(resourceGroupName, storageSyncServiceName, serverId, certificateData).map(new Func1<ServiceResponseWithHeaders<Void, RegisteredServersTriggerRolloverHeaders>, Void>() {
@Override
public Void call(ServiceResponseWithHeaders<Void, RegisteredServersTriggerRolloverHeaders> response) {
return response.body();
Expand All @@ -938,11 +938,11 @@ public Void call(ServiceResponseWithHeaders<Void, RegisteredServersTriggerRollov
* @param resourceGroupName The name of the resource group. The name is case insensitive.
* @param storageSyncServiceName Name of Storage Sync Service resource.
* @param serverId Server Id
* @param serverCertificate Certificate Data
* @param certificateData Certificate Data
* @throws IllegalArgumentException thrown if parameters fail the validation
* @return the {@link ServiceResponseWithHeaders} object if successful.
*/
public Observable<ServiceResponseWithHeaders<Void, RegisteredServersTriggerRolloverHeaders>> beginTriggerRolloverWithServiceResponseAsync(String resourceGroupName, String storageSyncServiceName, String serverId, String serverCertificate) {
public Observable<ServiceResponseWithHeaders<Void, RegisteredServersTriggerRolloverHeaders>> beginTriggerRolloverWithServiceResponseAsync(String resourceGroupName, String storageSyncServiceName, String serverId, String certificateData) {
if (this.client.subscriptionId() == null) {
throw new IllegalArgumentException("Parameter this.client.subscriptionId() is required and cannot be null.");
}
Expand All @@ -959,7 +959,7 @@ public Observable<ServiceResponseWithHeaders<Void, RegisteredServersTriggerRollo
throw new IllegalArgumentException("Parameter this.client.apiVersion() is required and cannot be null.");
}
TriggerRolloverRequest parameters = new TriggerRolloverRequest();
parameters.withServerCertificate(serverCertificate);
parameters.withCertificateData(certificateData);
return service.beginTriggerRollover(this.client.subscriptionId(), resourceGroupName, storageSyncServiceName, serverId, this.client.apiVersion(), this.client.acceptLanguage(), parameters, this.client.userAgent())
.flatMap(new Func1<Response<ResponseBody>, Observable<ServiceResponseWithHeaders<Void, RegisteredServersTriggerRolloverHeaders>>>() {
@Override
Expand Down
2 changes: 1 addition & 1 deletion ...icrosoft/azure/management/storagesync/implementation/StorageSyncManagementClientImpl.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -229,7 +229,7 @@ public WorkflowsInner workflows() {
* @param credentials the management credentials for Azure
*/
public StorageSyncManagementClientImpl(ServiceClientCredentials credentials) {
this("https://management.azure.com", credentials);
this("https://azure.microsoft.com", credentials);
}

/**
Expand Down