Skip to content

Commit 4c80043

Browse files
authored
AzureKeyCredential to KeyCredential (Azure#37682)
* AzureKeyCredential to KeyCredential * Make exceptionPolicy methods public
1 parent 108f886 commit 4c80043

File tree

3 files changed

+17
-18
lines changed

3 files changed

+17
-18
lines changed

sdk/communication/azure-communication-jobrouter/src/main/java/com/azure/communication/jobrouter/JobRouterAdministrationAsyncClient.java

Lines changed: 10 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -18,6 +18,7 @@
1818
import com.azure.communication.jobrouter.models.CreateExceptionPolicyOptions;
1919
import com.azure.communication.jobrouter.models.CreateQueueOptions;
2020
import com.azure.communication.jobrouter.models.DistributionPolicy;
21+
import com.azure.communication.jobrouter.models.ExceptionPolicy;
2122
import com.azure.communication.jobrouter.models.RouterQueue;
2223
import com.azure.core.annotation.Generated;
2324
import com.azure.core.annotation.ReturnType;
@@ -1393,13 +1394,12 @@ public Mono<Void> deleteClassificationPolicy(String classificationPolicyId) {
13931394
* @return a policy that defines actions to execute when exception are triggered on successful completion of
13941395
* {@link Mono}.
13951396
*/
1396-
@Generated
13971397
@ServiceMethod(returns = ReturnType.SINGLE)
1398-
Mono<ExceptionPolicyInternal> getExceptionPolicy(String exceptionPolicyId) {
1398+
public Mono<ExceptionPolicy> getExceptionPolicy(String exceptionPolicyId) {
13991399
// Generated convenience method for getExceptionPolicyWithResponse
14001400
RequestOptions requestOptions = new RequestOptions();
14011401
return getExceptionPolicyWithResponse(exceptionPolicyId, requestOptions).flatMap(FluxUtil::toMono)
1402-
.map(protocolMethodData -> protocolMethodData.toObject(ExceptionPolicyInternal.class));
1402+
.map(protocolMethodData -> protocolMethodData.toObject(ExceptionPolicy.class));
14031403
}
14041404

14051405
/**
@@ -1412,22 +1412,20 @@ Mono<ExceptionPolicyInternal> getExceptionPolicy(String exceptionPolicyId) {
14121412
* @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent.
14131413
* @return paged collection of ExceptionPolicy items as paginated response with {@link PagedFlux}.
14141414
*/
1415-
@Generated
14161415
@ServiceMethod(returns = ReturnType.COLLECTION)
1417-
PagedFlux<ExceptionPolicyInternal> listExceptionPolicies() {
1416+
public PagedFlux<ExceptionPolicy> listExceptionPolicies() {
14181417
// Generated convenience method for listExceptionPolicies
14191418
RequestOptions requestOptions = new RequestOptions();
14201419
PagedFlux<BinaryData> pagedFluxResponse = listExceptionPolicies(requestOptions);
14211420
return PagedFlux.create(() -> (continuationToken, pageSize) -> {
14221421
Flux<PagedResponse<BinaryData>> flux = (continuationToken == null) ? pagedFluxResponse.byPage().take(1)
14231422
: pagedFluxResponse.byPage(continuationToken).take(1);
1424-
return flux
1425-
.map(pagedResponse -> new PagedResponseBase<Void, ExceptionPolicyInternal>(pagedResponse.getRequest(),
1426-
pagedResponse.getStatusCode(), pagedResponse.getHeaders(),
1427-
pagedResponse.getValue().stream()
1428-
.map(protocolMethodData -> protocolMethodData.toObject(ExceptionPolicyInternal.class))
1429-
.collect(Collectors.toList()),
1430-
pagedResponse.getContinuationToken(), null));
1423+
return flux.map(pagedResponse -> new PagedResponseBase<Void, ExceptionPolicy>(pagedResponse.getRequest(),
1424+
pagedResponse.getStatusCode(), pagedResponse.getHeaders(),
1425+
pagedResponse.getValue().stream()
1426+
.map(protocolMethodData -> protocolMethodData.toObject(ExceptionPolicy.class))
1427+
.collect(Collectors.toList()),
1428+
pagedResponse.getContinuationToken(), null));
14311429
});
14321430
}
14331431

sdk/communication/azure-communication-jobrouter/src/main/java/com/azure/communication/jobrouter/JobRouterAdministrationClientBuilder.java

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@
1010
import com.azure.core.client.traits.ConfigurationTrait;
1111
import com.azure.core.client.traits.EndpointTrait;
1212
import com.azure.core.client.traits.HttpTrait;
13-
import com.azure.core.credential.AzureKeyCredential;
13+
import com.azure.core.credential.KeyCredential;
1414
import com.azure.core.credential.TokenCredential;
1515
import com.azure.core.http.HttpClient;
1616
import com.azure.core.http.HttpHeaderName;
@@ -65,7 +65,7 @@ public final class JobRouterAdministrationClientBuilder implements HttpTrait<Job
6565

6666
private CommunicationConnectionString connectionString;
6767

68-
private AzureKeyCredential credential;
68+
private KeyCredential credential;
6969

7070
/**
7171
* Create an instance of the JobRouterAdministrationClientBuilder.
@@ -315,7 +315,7 @@ public JobRouterAdministrationClient buildClient() {
315315
*/
316316
public JobRouterAdministrationClientBuilder connectionString(String connectionString) {
317317
this.connectionString = new CommunicationConnectionString(connectionString);
318-
this.credential(new AzureKeyCredential(this.connectionString.getAccessKey()));
318+
this.credential(new KeyCredential(this.connectionString.getAccessKey()));
319319
this.endpoint(this.connectionString.getEndpoint());
320320
return this;
321321
}
@@ -340,7 +340,7 @@ public JobRouterAdministrationClientBuilder credential(TokenCredential tokenCred
340340
* @param credential valid credential as a string
341341
* @return the updated RouterAdministrationClientBuilder object
342342
*/
343-
public JobRouterAdministrationClientBuilder credential(AzureKeyCredential credential) {
343+
public JobRouterAdministrationClientBuilder credential(KeyCredential credential) {
344344
this.credential = Objects.requireNonNull(credential, "'credential' cannot be null.");
345345
return this;
346346
}

sdk/communication/azure-communication-jobrouter/src/main/java/com/azure/communication/jobrouter/JobRouterClientBuilder.java

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -11,6 +11,7 @@
1111
import com.azure.core.client.traits.EndpointTrait;
1212
import com.azure.core.client.traits.HttpTrait;
1313
import com.azure.core.credential.AzureKeyCredential;
14+
import com.azure.core.credential.KeyCredential;
1415
import com.azure.core.credential.TokenCredential;
1516
import com.azure.core.http.HttpClient;
1617
import com.azure.core.http.HttpHeaderName;
@@ -62,7 +63,7 @@ public final class JobRouterClientBuilder implements HttpTrait<JobRouterClientBu
6263

6364
private TokenCredential tokenCredential;
6465

65-
private AzureKeyCredential credential;
66+
private KeyCredential credential;
6667

6768
private CommunicationConnectionString connectionString;
6869

@@ -326,7 +327,7 @@ public JobRouterClientBuilder credential(TokenCredential tokenCredential) {
326327
* @param credential valid credential as a string
327328
* @return the updated RouterClientBuilder object
328329
*/
329-
public JobRouterClientBuilder credential(AzureKeyCredential credential) {
330+
public JobRouterClientBuilder credential(KeyCredential credential) {
330331
this.credential = Objects.requireNonNull(credential, "'credential' cannot be null.");
331332
return this;
332333
}

0 commit comments

Comments
 (0)