Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
Original file line number Diff line number Diff line change
Expand Up @@ -17,26 +17,26 @@ public class TriggerRolloverRequest {
/**
* Certificate Data.
*/
@JsonProperty(value = "certificateData")
private String certificateData;
@JsonProperty(value = "serverCertificate")
private String serverCertificate;

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

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

Expand Down
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 certificateData = null;
final String serverCertificate = null;
TriggerRolloverRequest parameters = new TriggerRolloverRequest();
parameters.withCertificateData(null);
parameters.withServerCertificate(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 certificateData Certificate Data
* @param serverCertificate 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 certificateData) {
triggerRolloverWithServiceResponseAsync(resourceGroupName, storageSyncServiceName, serverId, certificateData).toBlocking().last().body();
public void triggerRollover(String resourceGroupName, String storageSyncServiceName, String serverId, String serverCertificate) {
triggerRolloverWithServiceResponseAsync(resourceGroupName, storageSyncServiceName, serverId, serverCertificate).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 certificateData Certificate Data
* @param serverCertificate 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 certificateData, final ServiceCallback<Void> serviceCallback) {
return ServiceFuture.fromHeaderResponse(triggerRolloverWithServiceResponseAsync(resourceGroupName, storageSyncServiceName, serverId, certificateData), serviceCallback);
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);
}

/**
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 certificateData Certificate Data
* @param serverCertificate 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 certificateData) {
return triggerRolloverWithServiceResponseAsync(resourceGroupName, storageSyncServiceName, serverId, certificateData).map(new Func1<ServiceResponseWithHeaders<Void, RegisteredServersTriggerRolloverHeaders>, Void>() {
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>() {
@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 certificateData Certificate Data
* @param serverCertificate 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 certificateData) {
public Observable<ServiceResponseWithHeaders<Void, RegisteredServersTriggerRolloverHeaders>> triggerRolloverWithServiceResponseAsync(String resourceGroupName, String storageSyncServiceName, String serverId, String serverCertificate) {
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.withCertificateData(certificateData);
parameters.withServerCertificate(serverCertificate);
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 certificateData = null;
final String serverCertificate = null;
TriggerRolloverRequest parameters = new TriggerRolloverRequest();
parameters.withCertificateData(null);
parameters.withServerCertificate(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 certificateData Certificate Data
* @param serverCertificate 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 certificateData) {
beginTriggerRolloverWithServiceResponseAsync(resourceGroupName, storageSyncServiceName, serverId, certificateData).toBlocking().single().body();
public void beginTriggerRollover(String resourceGroupName, String storageSyncServiceName, String serverId, String serverCertificate) {
beginTriggerRolloverWithServiceResponseAsync(resourceGroupName, storageSyncServiceName, serverId, serverCertificate).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 certificateData Certificate Data
* @param serverCertificate 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 certificateData, final ServiceCallback<Void> serviceCallback) {
return ServiceFuture.fromHeaderResponse(beginTriggerRolloverWithServiceResponseAsync(resourceGroupName, storageSyncServiceName, serverId, certificateData), serviceCallback);
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);
}

/**
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 certificateData Certificate Data
* @param serverCertificate 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 certificateData) {
return beginTriggerRolloverWithServiceResponseAsync(resourceGroupName, storageSyncServiceName, serverId, certificateData).map(new Func1<ServiceResponseWithHeaders<Void, RegisteredServersTriggerRolloverHeaders>, Void>() {
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>() {
@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 certificateData Certificate Data
* @param serverCertificate 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 certificateData) {
public Observable<ServiceResponseWithHeaders<Void, RegisteredServersTriggerRolloverHeaders>> beginTriggerRolloverWithServiceResponseAsync(String resourceGroupName, String storageSyncServiceName, String serverId, String serverCertificate) {
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.withCertificateData(certificateData);
parameters.withServerCertificate(serverCertificate);
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
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://azure.microsoft.com", credentials);
this("https://management.azure.com", credentials);
}

/**
Expand Down