Skip to content
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

Communication - Purchase Search Follow-up PR #16887

Merged
merged 5 commits into from
Oct 28, 2020
Merged

Communication - Purchase Search Follow-up PR #16887

Show file tree
Hide file tree
Changes from 2 commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
2c0aa4e
Fixed response types
jorge-beauregard Oct 27, 2020
3fbde25
Fixed EVERYTHING
jorge-beauregard Oct 27, 2020
b4eddb1
Reverted to void
jorge-beauregard Oct 27, 2020
335c7fd
Added default poll interval constant
jorge-beauregard Oct 27, 2020
10c94d5
Purchase methods are now private
jorge-beauregard Oct 28, 2020
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
8 changes: 6 additions & 2 deletions sdk/communication/azure-communication-administration/README.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -292,15 +292,19 @@ for (String phoneNumber: result.getPhoneNumbers()) {
```

### Purchase Search
<!-- embedme ./src/samples/java/com/azure/communication/administration/ReadmeSamples.java#L385-L391 -->
<!-- embedme ./src/samples/java/com/azure/communication/administration/ReadmeSamples.java#L385-L395 -->
```java
Duration duration = Duration.ofSeconds(1);
String phoneNumberSearchId = "SEARCH_ID_TO_PURCHASE";
PhoneNumberClient phoneNumberClient = createPhoneNumberClient();

SyncPoller<Void, Void> res =
SyncPoller<PhoneNumberSearch, PhoneNumberSearch> res =
phoneNumberClient.beginPurchaseSearch(phoneNumberSearchId, duration);
res.waitForCompletion();
PhoneNumberSearch result = res.getFinalResult();

System.out.println("Search Id: " + result.getSearchId());
System.out.println("Purchase status: " + result.getStatus());
```

## Contributing
Expand Down
37 changes: 21 additions & 16 deletions ...stration/src/main/java/com/azure/communication/administration/PhoneNumberAsyncClient.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -847,48 +847,53 @@ Mono<PhoneNumberSearch>> createSearchFetchResultOperation() {
*/

@ServiceMethod(returns = ReturnType.COLLECTION)
public PollerFlux<Void, Void> beginPurchaseSearch(String searchId, Duration pollInterval) {
public PollerFlux<PhoneNumberSearch,
PhoneNumberSearch> beginPurchaseSearch(String searchId, Duration pollInterval) {
Objects.requireNonNull(searchId, "'searchId' can not be null.");
Objects.requireNonNull(pollInterval, "'pollInterval' can not be null.");

if (pollInterval == null) {
pollInterval = Duration.ofSeconds(5);
}

return new PollerFlux<Void, Void>(pollInterval,
return new PollerFlux<PhoneNumberSearch, PhoneNumberSearch>(pollInterval,
purchaseSearchActivationOperation(searchId),
purchaseSearchPollOperation(searchId),
(activationResponse, pollingContext) -> Mono.error(new RuntimeException("Cancellation is not supported")),
purchaseSearchFetchResultOperation());
}

private Function<PollingContext<Void>, Mono<Void>> purchaseSearchActivationOperation(String searchId) {

private Function<PollingContext<PhoneNumberSearch>,
Mono<PhoneNumberSearch>> purchaseSearchActivationOperation(String searchId) {
return (pollingContext) -> {
Mono<Void> response = purchaseSearch(searchId);
return response;
Mono<PhoneNumberSearch> res = purchaseSearch(searchId).flatMap(agh -> {
return getSearchById(searchId);
});
return res;
};
}

private Function<PollingContext<Void>, Mono<PollResponse<Void>>>
private Function<PollingContext<PhoneNumberSearch>, Mono<PollResponse<PhoneNumberSearch>>>
purchaseSearchPollOperation(String searchId) {
return (pollingContext) -> getSearchById(searchId)
.flatMap(getSearchResponse -> {
SearchStatus statusResponse = getSearchResponse.getStatus();
if (statusResponse.equals(SearchStatus.RESERVED)
|| statusResponse.equals(SearchStatus.EXPIRED)
if (statusResponse.equals(SearchStatus.EXPIRED)
|| statusResponse.equals(SearchStatus.SUCCESS)) {
return Mono.just(new PollResponse<>(
LongRunningOperationStatus.SUCCESSFULLY_COMPLETED, null));
LongRunningOperationStatus.SUCCESSFULLY_COMPLETED, getSearchResponse));
}
if (statusResponse.equals(SearchStatus.ERROR)) {
return Mono.just(new PollResponse<>(
LongRunningOperationStatus.FAILED, null));
LongRunningOperationStatus.FAILED, getSearchResponse));
}
return Mono.just(new PollResponse<>(LongRunningOperationStatus.IN_PROGRESS, null));
return Mono.just(new PollResponse<>(LongRunningOperationStatus.IN_PROGRESS, getSearchResponse));
});
}

private Function<PollingContext<Void>,
Mono<Void>> purchaseSearchFetchResultOperation() {
private Function<PollingContext<PhoneNumberSearch>,
Mono<PhoneNumberSearch>> purchaseSearchFetchResultOperation() {
return pollingContext -> {
return Mono.empty();
return Mono.just(pollingContext.getLatestResponse().getValue());
};

}
Expand Down
2 changes: 1 addition & 1 deletion ...dministration/src/main/java/com/azure/communication/administration/PhoneNumberClient.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -550,7 +550,7 @@ public SyncPoller<PhoneNumberSearch, PhoneNumberSearch> beginCreateSearch(
* @return A {@link SyncPoller} object with the search result
*/
@ServiceMethod(returns = ReturnType.COLLECTION)
public SyncPoller<Void, Void> beginPurchaseSearch(
public SyncPoller<PhoneNumberSearch, PhoneNumberSearch> beginPurchaseSearch(
String searchId, Duration pollInterval) {
return phoneNumberAsyncClient.beginPurchaseSearch(searchId, pollInterval).getSyncPoller();
}
Expand Down
6 changes: 5 additions & 1 deletion ...administration/src/samples/java/com/azure/communication/administration/ReadmeSamples.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -386,8 +386,12 @@ public void beginPurchaseSearch() {
String phoneNumberSearchId = "SEARCH_ID_TO_PURCHASE";
PhoneNumberClient phoneNumberClient = createPhoneNumberClient();

SyncPoller<Void, Void> res =
SyncPoller<PhoneNumberSearch, PhoneNumberSearch> res =
phoneNumberClient.beginPurchaseSearch(phoneNumberSearchId, duration);
res.waitForCompletion();
PhoneNumberSearch result = res.getFinalResult();

System.out.println("Search Id: " + result.getSearchId());
System.out.println("Purchase status: " + result.getStatus());
}
}
18 changes: 9 additions & 9 deletions ...st/java/com/azure/communication/administration/PhoneNumberAsyncClientIntegrationTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -531,15 +531,15 @@ public void beginCreateSearch(HttpClient httpClient) {
@ParameterizedTest
@MethodSource("com.azure.core.test.TestBase#getHttpClients")
public void beginPurchaseSearch(HttpClient httpClient) {
Duration pollInterval = Duration.ofSeconds(5);
PollerFlux<Void, Void> poller =
this.getClient(httpClient).beginPurchaseSearch(SEARCH_ID, pollInterval);
poller.takeUntil(apr -> apr.getStatus() == LongRunningOperationStatus.SUCCESSFULLY_COMPLETED);
Mono<PhoneNumberSearch> mono = this.getClient(httpClient).getSearchById(SEARCH_ID);
StepVerifier.create(mono)
.assertNext(item -> {
assertEquals(SearchStatus.SUCCESS, item.getStatus());
});
Duration pollInterval = Duration.ofSeconds(1);
PhoneNumberAsyncClient client = this.getClient(httpClient);
PollerFlux<PhoneNumberSearch, PhoneNumberSearch> poller =
client.beginPurchaseSearch(SEARCH_ID, pollInterval);
AsyncPollResponse<PhoneNumberSearch, PhoneNumberSearch> asyncRes =
poller.takeUntil(apr -> apr.getStatus() == LongRunningOperationStatus.SUCCESSFULLY_COMPLETED)
.blockLast();
PhoneNumberSearch testResult = asyncRes.getValue();
assertEquals(SearchStatus.SUCCESS, testResult.getStatus());
}

private PhoneNumberAsyncClient getClient(HttpClient httpClient) {
Expand Down
Loading