From 39ed5c79984c650dff63bb037a06b4090e627de7 Mon Sep 17 00:00:00 2001 From: Arif Saikat <71465659+arifsaikat-microsoft@users.noreply.github.com> Date: Mon, 14 Jun 2021 16:22:55 -0700 Subject: [PATCH 01/11] first commit --- .../azure/communication/callingserver/CallingServerClient.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sdk/communication/azure-communication-callingserver/src/main/java/com/azure/communication/callingserver/CallingServerClient.java b/sdk/communication/azure-communication-callingserver/src/main/java/com/azure/communication/callingserver/CallingServerClient.java index d4cc6795e6517..adc0284c08513 100644 --- a/sdk/communication/azure-communication-callingserver/src/main/java/com/azure/communication/callingserver/CallingServerClient.java +++ b/sdk/communication/azure-communication-callingserver/src/main/java/com/azure/communication/callingserver/CallingServerClient.java @@ -113,7 +113,7 @@ public Response joinWithResponse( * Get CallConnection object * * @param callConnectionId The call connection id. - * @return CallConnection + * @return CallConnection. */ public CallConnection getCallConnection(String callConnectionId) { return callingServerAsyncClient.getCallConnectionInternal(callConnectionId); From 3430944366b32c5b7ba453582fd9bb2759ae5409 Mon Sep 17 00:00:00 2001 From: Arif Saikat <71465659+arifsaikat-microsoft@users.noreply.github.com> Date: Tue, 15 Jun 2021 13:29:30 -0700 Subject: [PATCH 02/11] apply new name changes (#22298) * name changes and refactoring * name changes and refactoring --- .../callingserver/CallConnection.java | 5 +- .../callingserver/CallConnectionAsync.java | 57 +-- .../CallingServerAsyncClient.java | 20 +- .../callingserver/ServerCall.java | 11 +- .../callingserver/ServerCallAsync.java | 70 ++-- .../implementation/CallConnectionsImpl.java | 221 +++++------ .../implementation/ServerCallsImpl.java | 343 +++++++++--------- .../CallConnectionRequestConverter.java | 8 +- .../CallingServerErrorConverter.java | 8 +- ...ncelAllMediaOperationsResultConverter.java | 2 +- .../InviteParticipantRequestConverter.java | 16 +- .../converters/JoinCallRequestConverter.java | 4 +- .../converters/PlayAudioResultConverter.java | 2 +- ...equest.java => AddParticipantRequest.java} | 41 +-- ...=> AddParticipantResultEventInternal.java} | 22 +- .../models/AddParticipantResultInternal.java | 38 ++ ...rnal.java => CallParticipantInternal.java} | 14 +- ...a => CallRecordingPropertiesInternal.java} | 14 +- ...CallRecordingStateChangeEventInternal.java | 6 +- ...ancelAllMediaOperationsResultInternal.java | 40 +- .../models/CommunicationErrorResponse.java | 38 ++ ... CommunicationErrorResponseException.java} | 17 +- .../models/CreateCallRequest.java | 8 +- .../models/JoinCallRequest.java | 8 +- .../ParticipantsUpdatedEventInternal.java | 6 +- .../models/PlayAudioResultEventInternal.java | 6 +- .../models/PlayAudioResultInternal.java | 40 +- .../models/AddParticipantResult.java | 33 ++ .../models/CallConnectionState.java | 34 +- .../callingserver/models/CallModality.java | 34 -- ...sult.java => CallRecordingProperties.java} | 4 +- .../CancelAllMediaOperationsResult.java | 18 +- .../models/CreateCallOptions.java | 8 +- .../callingserver/models/JoinCallOptions.java | 17 +- .../callingserver/models/MediaType.java | 34 ++ .../callingserver/models/PlayAudioResult.java | 18 +- ...nt.java => AddParticipantResultEvent.java} | 26 +- .../events/ParticipantsUpdatedEvent.java | 10 +- ...gServerAsyncClientJavaDocCodeSnippets.java | 4 +- ...allingServerClientJavaDocCodeSnippets.java | 4 +- .../ConversationClientReadmeSamples.java | 4 +- .../callingserver/ReadmeSamples.java | 4 +- .../CallConnectionAsyncLiveTests.java | 25 +- .../CallConnectionLiveTests.java | 25 +- .../callingserver/CallingServerTestBase.java | 12 +- .../callingserver/CallingServerTestUtils.java | 22 +- .../ServerCallAsyncLiveTests.java | 19 +- .../callingserver/ServerCallLiveTests.java | 19 +- ...reatePlayCancelHangupScenarioAsync[1].json | 4 +- ...celHangupScenarioWithResponseAsync[1].json | 4 +- ...ayCancelHangupScenarioWithResponse[1].json | 4 +- ....runCreatePlayCancelHangupScenario[1].json | 4 +- ...iveTests.runPlayAudioFunctionAsync[1].json | 2 +- ...PlayAudioFunctionWithResponseAsync[1].json | 2 +- ...s.runPlayAudioFunctionWithResponse[1].json | 2 +- ...CallLiveTests.runPlayAudioFunction[1].json | 2 +- .../swagger/README.md | 19 +- 57 files changed, 821 insertions(+), 661 deletions(-) rename sdk/communication/azure-communication-callingserver/src/main/java/com/azure/communication/callingserver/implementation/models/{InviteParticipantsRequest.java => AddParticipantRequest.java} (64%) rename sdk/communication/azure-communication-callingserver/src/main/java/com/azure/communication/callingserver/implementation/models/{InviteParticipantsResultEventInternal.java => AddParticipantResultEventInternal.java} (69%) create mode 100644 sdk/communication/azure-communication-callingserver/src/main/java/com/azure/communication/callingserver/implementation/models/AddParticipantResultInternal.java rename sdk/communication/azure-communication-callingserver/src/main/java/com/azure/communication/callingserver/implementation/models/{CommunicationParticipantInternal.java => CallParticipantInternal.java} (79%) rename sdk/communication/azure-communication-callingserver/src/main/java/com/azure/communication/callingserver/implementation/models/{CallRecordingStateResultInternal.java => CallRecordingPropertiesInternal.java} (62%) create mode 100644 sdk/communication/azure-communication-callingserver/src/main/java/com/azure/communication/callingserver/implementation/models/CommunicationErrorResponse.java rename sdk/communication/azure-communication-callingserver/src/main/java/com/azure/communication/callingserver/implementation/models/{CommunicationErrorException.java => CommunicationErrorResponseException.java} (58%) create mode 100644 sdk/communication/azure-communication-callingserver/src/main/java/com/azure/communication/callingserver/models/AddParticipantResult.java delete mode 100644 sdk/communication/azure-communication-callingserver/src/main/java/com/azure/communication/callingserver/models/CallModality.java rename sdk/communication/azure-communication-callingserver/src/main/java/com/azure/communication/callingserver/models/{CallRecordingStateResult.java => CallRecordingProperties.java} (88%) create mode 100644 sdk/communication/azure-communication-callingserver/src/main/java/com/azure/communication/callingserver/models/MediaType.java rename sdk/communication/azure-communication-callingserver/src/main/java/com/azure/communication/callingserver/models/events/{InviteParticipantResultEvent.java => AddParticipantResultEvent.java} (68%) diff --git a/sdk/communication/azure-communication-callingserver/src/main/java/com/azure/communication/callingserver/CallConnection.java b/sdk/communication/azure-communication-callingserver/src/main/java/com/azure/communication/callingserver/CallConnection.java index c7efc1b675e50..48ec1f5fc7c2f 100644 --- a/sdk/communication/azure-communication-callingserver/src/main/java/com/azure/communication/callingserver/CallConnection.java +++ b/sdk/communication/azure-communication-callingserver/src/main/java/com/azure/communication/callingserver/CallConnection.java @@ -3,6 +3,7 @@ package com.azure.communication.callingserver; +import com.azure.communication.callingserver.models.AddParticipantResult; import com.azure.communication.callingserver.models.CancelAllMediaOperationsResult; import com.azure.communication.callingserver.models.PlayAudioOptions; import com.azure.communication.callingserver.models.PlayAudioResult; @@ -182,7 +183,7 @@ public Response cancelAllMediaOperationsWithResp * @return response for a successful add participant request. */ @ServiceMethod(returns = ReturnType.SINGLE) - public Void addParticipant( + public AddParticipantResult addParticipant( CommunicationIdentifier participant, String alternateCallerId, String operationContext) { @@ -200,7 +201,7 @@ public Void addParticipant( * @return response for a successful add participant request. */ @ServiceMethod(returns = ReturnType.SINGLE) - public Response addParticipantWithResponse( + public Response addParticipantWithResponse( CommunicationIdentifier participant, String alternateCallerId, String operationContext, diff --git a/sdk/communication/azure-communication-callingserver/src/main/java/com/azure/communication/callingserver/CallConnectionAsync.java b/sdk/communication/azure-communication-callingserver/src/main/java/com/azure/communication/callingserver/CallConnectionAsync.java index d618e563bd28d..95438d8260736 100644 --- a/sdk/communication/azure-communication-callingserver/src/main/java/com/azure/communication/callingserver/CallConnectionAsync.java +++ b/sdk/communication/azure-communication-callingserver/src/main/java/com/azure/communication/callingserver/CallConnectionAsync.java @@ -3,20 +3,16 @@ package com.azure.communication.callingserver; -import static com.azure.core.util.FluxUtil.monoError; -import static com.azure.core.util.FluxUtil.withContext; - -import java.util.Objects; - import com.azure.communication.callingserver.implementation.CallConnectionsImpl; -import com.azure.communication.callingserver.implementation.converters.InviteParticipantRequestConverter; -import com.azure.communication.callingserver.implementation.converters.CancelAllMediaOperationsResultConverter; import com.azure.communication.callingserver.implementation.converters.CallingServerErrorConverter; +import com.azure.communication.callingserver.implementation.converters.CancelAllMediaOperationsResultConverter; +import com.azure.communication.callingserver.implementation.converters.InviteParticipantRequestConverter; import com.azure.communication.callingserver.implementation.converters.PlayAudioResultConverter; -import com.azure.communication.callingserver.implementation.models.CommunicationErrorException; +import com.azure.communication.callingserver.implementation.models.AddParticipantRequest; import com.azure.communication.callingserver.implementation.models.CancelAllMediaOperationsRequest; -import com.azure.communication.callingserver.implementation.models.InviteParticipantsRequest; +import com.azure.communication.callingserver.implementation.models.CommunicationErrorResponseException; import com.azure.communication.callingserver.implementation.models.PlayAudioRequest; +import com.azure.communication.callingserver.models.AddParticipantResult; import com.azure.communication.callingserver.models.CancelAllMediaOperationsResult; import com.azure.communication.callingserver.models.PlayAudioOptions; import com.azure.communication.callingserver.models.PlayAudioResult; @@ -27,9 +23,13 @@ import com.azure.core.http.rest.SimpleResponse; import com.azure.core.util.Context; import com.azure.core.util.logging.ClientLogger; - import reactor.core.publisher.Mono; +import java.util.Objects; + +import static com.azure.core.util.FluxUtil.monoError; +import static com.azure.core.util.FluxUtil.withContext; + /** * Async client that supports call connection operations. */ @@ -132,7 +132,7 @@ Mono playAudioInternal(String audioFileUri, PlayAudioOptions pl Mono playAudioInternal(PlayAudioRequest playAudioRequest) { try { return callConnectionInternal.playAudioAsync(callConnectionId, playAudioRequest) - .onErrorMap(CommunicationErrorException.class, CallingServerErrorConverter::translateException) + .onErrorMap(CommunicationErrorResponseException.class, CallingServerErrorConverter::translateException) .flatMap(result -> Mono.just(PlayAudioResultConverter.convert(result))); } catch (RuntimeException ex) { return monoError(logger, ex); @@ -236,7 +236,7 @@ Mono> playAudioWithResponseInternal( contextValue = context == null ? contextValue : context; return callConnectionInternal .playAudioWithResponseAsync(callConnectionId, playAudioRequest, contextValue) - .onErrorMap(CommunicationErrorException.class, CallingServerErrorConverter::translateException) + .onErrorMap(CommunicationErrorResponseException.class, CallingServerErrorConverter::translateException) .map(response -> new SimpleResponse<>(response, PlayAudioResultConverter.convert(response.getValue()))); }); @@ -254,7 +254,7 @@ Mono> playAudioWithResponseInternal( public Mono hangup() { try { return callConnectionInternal.hangupCallAsync(callConnectionId) - .onErrorMap(CommunicationErrorException.class, CallingServerErrorConverter::translateException); + .onErrorMap(CommunicationErrorResponseException.class, CallingServerErrorConverter::translateException); } catch (RuntimeException ex) { return monoError(logger, ex); } @@ -275,7 +275,7 @@ Mono> hangupWithResponse(Context context) { return withContext(contextValue -> { contextValue = context == null ? contextValue : context; return callConnectionInternal.hangupCallWithResponseAsync(callConnectionId, contextValue) - .onErrorMap(CommunicationErrorException.class, CallingServerErrorConverter::translateException); + .onErrorMap(CommunicationErrorResponseException.class, CallingServerErrorConverter::translateException); }); } catch (RuntimeException ex) { return monoError(logger, ex); @@ -295,7 +295,7 @@ public Mono cancelAllMediaOperations(String oper CancelAllMediaOperationsRequest request = new CancelAllMediaOperationsRequest(); request.setOperationContext(operationContext); return callConnectionInternal.cancelAllMediaOperationsAsync(callConnectionId, request) - .onErrorMap(CommunicationErrorException.class, CallingServerErrorConverter::translateException) + .onErrorMap(CommunicationErrorResponseException.class, CallingServerErrorConverter::translateException) .flatMap(result -> Mono.just(CancelAllMediaOperationsResultConverter.convert(result))); } catch (RuntimeException ex) { return monoError(logger, ex); @@ -324,7 +324,7 @@ Mono> cancelAllMediaOperationsWithRespo contextValue = context == null ? contextValue : context; return callConnectionInternal .cancelAllMediaOperationsWithResponseAsync(callConnectionId, request, contextValue) - .onErrorMap(CommunicationErrorException.class, CallingServerErrorConverter::translateException) + .onErrorMap(CommunicationErrorResponseException.class, CallingServerErrorConverter::translateException) .map(response -> new SimpleResponse<>(response, CancelAllMediaOperationsResultConverter.convert(response.getValue()))); }); @@ -343,18 +343,19 @@ Mono> cancelAllMediaOperationsWithRespo * @return response for a successful add participant request. */ @ServiceMethod(returns = ReturnType.SINGLE) - public Mono addParticipant( + public Mono addParticipant( CommunicationIdentifier participant, String alternateCallerId, String operationContext) { try { Objects.requireNonNull(participant, "'participant' cannot be null."); - InviteParticipantsRequest request = InviteParticipantRequestConverter.convert(participant, + AddParticipantRequest request = InviteParticipantRequestConverter.convert(participant, alternateCallerId, operationContext, null); - return callConnectionInternal.inviteParticipantsAsync(callConnectionId, request) - .onErrorMap(CommunicationErrorException.class, CallingServerErrorConverter::translateException); + return callConnectionInternal.addParticipantAsync(callConnectionId, request) + .onErrorMap(CommunicationErrorResponseException.class, CallingServerErrorConverter::translateException) + .flatMap(result -> Mono.just(new AddParticipantResult(result.getParticipantId()))); } catch (RuntimeException ex) { return monoError(logger, ex); } @@ -370,28 +371,30 @@ public Mono addParticipant( * @return response for a successful add participant request. */ @ServiceMethod(returns = ReturnType.SINGLE) - public Mono> addParticipantWithResponse( + public Mono> addParticipantWithResponse( CommunicationIdentifier participant, String alternateCallerId, String operationContext) { return addParticipantWithResponse(participant, alternateCallerId, operationContext, null); } - Mono> addParticipantWithResponse( + Mono> addParticipantWithResponse( CommunicationIdentifier participant, String alternateCallerId, String operationContext, Context context) { try { Objects.requireNonNull(participant, "'participant' cannot be null."); - InviteParticipantsRequest request = + AddParticipantRequest request = InviteParticipantRequestConverter .convert(participant, alternateCallerId, operationContext, null); return withContext(contextValue -> { contextValue = context == null ? contextValue : context; return callConnectionInternal - .inviteParticipantsWithResponseAsync(callConnectionId, request, contextValue) - .onErrorMap(CommunicationErrorException.class, CallingServerErrorConverter::translateException); + .addParticipantWithResponseAsync(callConnectionId, request, contextValue) + .onErrorMap(CommunicationErrorResponseException.class, CallingServerErrorConverter::translateException) + .map(response -> + new SimpleResponse<>(response, new AddParticipantResult(response.getValue().getParticipantId()))); }); } catch (RuntimeException ex) { return monoError(logger, ex); @@ -408,7 +411,7 @@ Mono> addParticipantWithResponse( public Mono removeParticipant(String participantId) { try { return callConnectionInternal.removeParticipantAsync(callConnectionId, participantId) - .onErrorMap(CommunicationErrorException.class, CallingServerErrorConverter::translateException); + .onErrorMap(CommunicationErrorResponseException.class, CallingServerErrorConverter::translateException); } catch (RuntimeException ex) { return monoError(logger, ex); } @@ -431,7 +434,7 @@ Mono> removeParticipantWithResponse(String participantId, Context contextValue = context == null ? contextValue : context; return callConnectionInternal .removeParticipantWithResponseAsync(callConnectionId, participantId, contextValue) - .onErrorMap(CommunicationErrorException.class, CallingServerErrorConverter::translateException); + .onErrorMap(CommunicationErrorResponseException.class, CallingServerErrorConverter::translateException); }); } catch (RuntimeException ex) { return monoError(logger, ex); diff --git a/sdk/communication/azure-communication-callingserver/src/main/java/com/azure/communication/callingserver/CallingServerAsyncClient.java b/sdk/communication/azure-communication-callingserver/src/main/java/com/azure/communication/callingserver/CallingServerAsyncClient.java index eb8a1d240a9d6..d82f0c541b0a9 100644 --- a/sdk/communication/azure-communication-callingserver/src/main/java/com/azure/communication/callingserver/CallingServerAsyncClient.java +++ b/sdk/communication/azure-communication-callingserver/src/main/java/com/azure/communication/callingserver/CallingServerAsyncClient.java @@ -7,9 +7,9 @@ import com.azure.communication.callingserver.implementation.CallConnectionsImpl; import com.azure.communication.callingserver.implementation.ServerCallsImpl; import com.azure.communication.callingserver.implementation.converters.CallConnectionRequestConverter; -import com.azure.communication.callingserver.implementation.converters.JoinCallRequestConverter; import com.azure.communication.callingserver.implementation.converters.CallingServerErrorConverter; -import com.azure.communication.callingserver.implementation.models.CommunicationErrorException; +import com.azure.communication.callingserver.implementation.converters.JoinCallRequestConverter; +import com.azure.communication.callingserver.implementation.models.CommunicationErrorResponseException; import com.azure.communication.callingserver.implementation.models.CreateCallRequest; import com.azure.communication.callingserver.models.CreateCallOptions; import com.azure.communication.callingserver.models.JoinCallOptions; @@ -90,7 +90,7 @@ public Mono createCallConnection( Objects.requireNonNull(createCallOptions, "'createCallOptions' cannot be null."); CreateCallRequest request = CallConnectionRequestConverter.convert(source, targets, createCallOptions); return callConnectionInternal.createCallAsync(request) - .onErrorMap(CommunicationErrorException.class, CallingServerErrorConverter::translateException) + .onErrorMap(CommunicationErrorResponseException.class, CallingServerErrorConverter::translateException) .flatMap(response -> Mono.just(new CallConnectionAsync(response.getCallConnectionId(), callConnectionInternal))); } catch (RuntimeException ex) { return monoError(logger, ex); @@ -116,7 +116,7 @@ public Mono> createCallConnectionWithResponse( Objects.requireNonNull(createCallOptions, "'CreateCallOptions' cannot be null."); CreateCallRequest request = CallConnectionRequestConverter.convert(source, targets, createCallOptions); return callConnectionInternal.createCallWithResponseAsync(request) - .onErrorMap(CommunicationErrorException.class, CallingServerErrorConverter::translateException) + .onErrorMap(CommunicationErrorResponseException.class, CallingServerErrorConverter::translateException) .map(response -> new SimpleResponse<>(response, new CallConnectionAsync(response.getValue().getCallConnectionId(), callConnectionInternal))); } catch (RuntimeException ex) { return monoError(logger, ex); @@ -133,7 +133,7 @@ Mono createCallConnectionInternal( Objects.requireNonNull(createCallOptions, "'createCallOptions' cannot be null."); CreateCallRequest request = CallConnectionRequestConverter.convert(source, targets, createCallOptions); return callConnectionInternal.createCallAsync(request) - .onErrorMap(CommunicationErrorException.class, CallingServerErrorConverter::translateException) + .onErrorMap(CommunicationErrorResponseException.class, CallingServerErrorConverter::translateException) .flatMap(response -> Mono.just(new CallConnection(new CallConnectionAsync(response.getCallConnectionId(), callConnectionInternal)))); } catch (RuntimeException ex) { return monoError(logger, ex); @@ -153,7 +153,7 @@ Mono> createCallConnectionWithResponseInternal( return withContext(contextValue -> { contextValue = context == null ? contextValue : context; return callConnectionInternal.createCallWithResponseAsync(request, contextValue) - .onErrorMap(CommunicationErrorException.class, CallingServerErrorConverter::translateException) + .onErrorMap(CommunicationErrorResponseException.class, CallingServerErrorConverter::translateException) .map(response -> new SimpleResponse<>(response, new CallConnection(new CallConnectionAsync(response.getValue().getCallConnectionId(), callConnectionInternal)))); }); @@ -180,7 +180,7 @@ public Mono join( Objects.requireNonNull(joinCallOptions, "'joinCallOptions' cannot be null."); return serverCallInternal .joinCallAsync(serverCallId, JoinCallRequestConverter.convert(source, joinCallOptions)) - .onErrorMap(CommunicationErrorException.class, CallingServerErrorConverter::translateException) + .onErrorMap(CommunicationErrorResponseException.class, CallingServerErrorConverter::translateException) .flatMap(response -> Mono.just(new CallConnectionAsync(response.getCallConnectionId(), callConnectionInternal))); } catch (RuntimeException ex) { return monoError(logger, ex); @@ -205,7 +205,7 @@ public Mono join( Objects.requireNonNull(joinCallOptions, "'joinCallOptions' cannot be null."); return serverCallInternal. joinCallWithResponseAsync(serverCallId, JoinCallRequestConverter.convert(source, joinCallOptions)) - .onErrorMap(CommunicationErrorException.class, CallingServerErrorConverter::translateException) + .onErrorMap(CommunicationErrorResponseException.class, CallingServerErrorConverter::translateException) .map(response -> new SimpleResponse<>(response, new CallConnectionAsync(response.getValue().getCallConnectionId(), callConnectionInternal))); } catch (RuntimeException ex) { @@ -222,7 +222,7 @@ Mono joinInternal( Objects.requireNonNull(joinCallOptions, "'joinCallOptions' cannot be null."); return serverCallInternal .joinCallAsync(serverCallId, JoinCallRequestConverter.convert(source, joinCallOptions)) - .onErrorMap(CommunicationErrorException.class, CallingServerErrorConverter::translateException) + .onErrorMap(CommunicationErrorResponseException.class, CallingServerErrorConverter::translateException) .flatMap(response -> Mono.just(new CallConnection(new CallConnectionAsync(response.getCallConnectionId(), callConnectionInternal)))); @@ -244,7 +244,7 @@ Mono joinInternal( contextValue = context == null ? contextValue : context; return serverCallInternal .joinCallWithResponseAsync(serverCallId, JoinCallRequestConverter.convert(source, joinCallOptions), contextValue) - .onErrorMap(CommunicationErrorException.class, CallingServerErrorConverter::translateException) + .onErrorMap(CommunicationErrorResponseException.class, CallingServerErrorConverter::translateException) .map(response -> new SimpleResponse<>( response, diff --git a/sdk/communication/azure-communication-callingserver/src/main/java/com/azure/communication/callingserver/ServerCall.java b/sdk/communication/azure-communication-callingserver/src/main/java/com/azure/communication/callingserver/ServerCall.java index 653db215187f7..b86fd08ddae4c 100644 --- a/sdk/communication/azure-communication-callingserver/src/main/java/com/azure/communication/callingserver/ServerCall.java +++ b/sdk/communication/azure-communication-callingserver/src/main/java/com/azure/communication/callingserver/ServerCall.java @@ -3,7 +3,8 @@ package com.azure.communication.callingserver; -import com.azure.communication.callingserver.models.CallRecordingStateResult; +import com.azure.communication.callingserver.models.AddParticipantResult; +import com.azure.communication.callingserver.models.CallRecordingProperties; import com.azure.communication.callingserver.models.PlayAudioOptions; import com.azure.communication.callingserver.models.PlayAudioResult; import com.azure.communication.callingserver.models.StartCallRecordingResult; @@ -43,7 +44,7 @@ public String getServerCallId() { * @return response for a successful add participant request. */ @ServiceMethod(returns = ReturnType.SINGLE) - public Void addParticipant( + public AddParticipantResult addParticipant( CommunicationIdentifier participant, String callBackUri, String alternateCallerId, @@ -63,7 +64,7 @@ public Void addParticipant( * @return response for a successful add participant request. */ @ServiceMethod(returns = ReturnType.SINGLE) - public Response addParticipantWithResponse( + public Response addParticipantWithResponse( CommunicationIdentifier participant, String callBackUri, String alternateCallerId, @@ -201,7 +202,7 @@ public Response resumeRecordingWithResponse(String recordingId, Context co * @return response for a successful get recording state request. */ @ServiceMethod(returns = ReturnType.SINGLE) - public CallRecordingStateResult getRecordingState(String recordingId) { + public CallRecordingProperties getRecordingState(String recordingId) { return serverCallAsync.getRecordingState(recordingId).block(); } @@ -213,7 +214,7 @@ public CallRecordingStateResult getRecordingState(String recordingId) { * @return response for a successful get recording state request. */ @ServiceMethod(returns = ReturnType.SINGLE) - public Response getRecordingStateWithResponse(String recordingId, Context context) { + public Response getRecordingStateWithResponse(String recordingId, Context context) { return serverCallAsync.getRecordingStateWithResponse(recordingId, context).block(); } diff --git a/sdk/communication/azure-communication-callingserver/src/main/java/com/azure/communication/callingserver/ServerCallAsync.java b/sdk/communication/azure-communication-callingserver/src/main/java/com/azure/communication/callingserver/ServerCallAsync.java index 067bec9db3baa..4734edc974bd9 100644 --- a/sdk/communication/azure-communication-callingserver/src/main/java/com/azure/communication/callingserver/ServerCallAsync.java +++ b/sdk/communication/azure-communication-callingserver/src/main/java/com/azure/communication/callingserver/ServerCallAsync.java @@ -7,11 +7,12 @@ import com.azure.communication.callingserver.implementation.converters.CallingServerErrorConverter; import com.azure.communication.callingserver.implementation.converters.InviteParticipantRequestConverter; import com.azure.communication.callingserver.implementation.converters.PlayAudioResultConverter; -import com.azure.communication.callingserver.implementation.models.CommunicationErrorException; -import com.azure.communication.callingserver.implementation.models.InviteParticipantsRequest; +import com.azure.communication.callingserver.implementation.models.AddParticipantRequest; +import com.azure.communication.callingserver.implementation.models.CommunicationErrorResponseException; import com.azure.communication.callingserver.implementation.models.PlayAudioRequest; import com.azure.communication.callingserver.implementation.models.StartCallRecordingRequest; -import com.azure.communication.callingserver.models.CallRecordingStateResult; +import com.azure.communication.callingserver.models.AddParticipantResult; +import com.azure.communication.callingserver.models.CallRecordingProperties; import com.azure.communication.callingserver.models.PlayAudioOptions; import com.azure.communication.callingserver.models.PlayAudioResult; import com.azure.communication.callingserver.models.StartCallRecordingResult; @@ -65,20 +66,21 @@ public String getServerCallId() { * @return response for a successful add participant request. */ @ServiceMethod(returns = ReturnType.SINGLE) - public Mono addParticipant( + public Mono addParticipant( CommunicationIdentifier participant, String callBackUri, String alternateCallerId, String operationContext) { try { Objects.requireNonNull(participant, "'participant' cannot be null."); - InviteParticipantsRequest request = + AddParticipantRequest request = InviteParticipantRequestConverter.convert(participant, alternateCallerId, operationContext, callBackUri); - return serverCallInternal.inviteParticipantsAsync(serverCallId, request) - .onErrorMap(CommunicationErrorException.class, CallingServerErrorConverter::translateException); + return serverCallInternal.addParticipantAsync(serverCallId, request) + .onErrorMap(CommunicationErrorResponseException.class, CallingServerErrorConverter::translateException) + .flatMap(result -> Mono.just(new AddParticipantResult(result.getParticipantId()))); } catch (RuntimeException ex) { return monoError(logger, ex); } @@ -95,7 +97,7 @@ public Mono addParticipant( * @return response for a successful add participant request. */ @ServiceMethod(returns = ReturnType.SINGLE) - public Mono> addParticipantWithResponse( + public Mono> addParticipantWithResponse( CommunicationIdentifier participant, String callBackUri, String alternateCallerId, @@ -107,7 +109,7 @@ public Mono> addParticipantWithResponse( null); } - Mono> addParticipantWithResponse( + Mono> addParticipantWithResponse( CommunicationIdentifier participant, String callBackUri, String alternateCallerId, @@ -115,7 +117,7 @@ Mono> addParticipantWithResponse( Context context) { try { Objects.requireNonNull(participant, "'participant' cannot be null."); - InviteParticipantsRequest request = + AddParticipantRequest request = InviteParticipantRequestConverter.convert(participant, alternateCallerId, operationContext, @@ -123,8 +125,10 @@ Mono> addParticipantWithResponse( return withContext(contextValue -> { contextValue = context == null ? contextValue : context; return serverCallInternal - .inviteParticipantsWithResponseAsync(serverCallId, request, contextValue) - .onErrorMap(CommunicationErrorException.class, CallingServerErrorConverter::translateException); + .addParticipantWithResponseAsync(serverCallId, request, contextValue) + .onErrorMap(CommunicationErrorResponseException.class, CallingServerErrorConverter::translateException) + .map(response -> + new SimpleResponse<>(response, new AddParticipantResult(response.getValue().getParticipantId()))); }); } catch (RuntimeException ex) { return monoError(logger, ex); @@ -141,7 +145,7 @@ Mono> addParticipantWithResponse( public Mono removeParticipant(String participantId) { try { return serverCallInternal.removeParticipantAsync(serverCallId, participantId) - .onErrorMap(CommunicationErrorException.class, CallingServerErrorConverter::translateException); + .onErrorMap(CommunicationErrorResponseException.class, CallingServerErrorConverter::translateException); } catch (RuntimeException ex) { return monoError(logger, ex); } @@ -164,7 +168,7 @@ Mono> removeParticipantWithResponse(String participantId, Context contextValue = context == null ? contextValue : context; return serverCallInternal .removeParticipantWithResponseAsync(serverCallId, participantId, contextValue) - .onErrorMap(CommunicationErrorException.class, CallingServerErrorConverter::translateException); + .onErrorMap(CommunicationErrorResponseException.class, CallingServerErrorConverter::translateException); }); } catch (RuntimeException ex) { return monoError(logger, ex); @@ -188,7 +192,7 @@ public Mono startRecording(String recordingStateCallba StartCallRecordingRequest request = new StartCallRecordingRequest(); request.setRecordingStateCallbackUri(recordingStateCallbackUri); return serverCallInternal.startRecordingAsync(serverCallId, request) - .onErrorMap(CommunicationErrorException.class, CallingServerErrorConverter::translateException) + .onErrorMap(CommunicationErrorResponseException.class, CallingServerErrorConverter::translateException) .flatMap(result -> Mono.just(new StartCallRecordingResult(result.getRecordingId()))); } catch (RuntimeException ex) { return monoError(logger, ex); @@ -223,7 +227,7 @@ Mono> startRecordingWithResponse( contextValue = context == null ? contextValue : context; return serverCallInternal .startRecordingWithResponseAsync(serverCallId, request, contextValue) - .onErrorMap(CommunicationErrorException.class, CallingServerErrorConverter::translateException) + .onErrorMap(CommunicationErrorResponseException.class, CallingServerErrorConverter::translateException) .map(response -> new SimpleResponse<>(response, new StartCallRecordingResult(response.getValue().getRecordingId()))); }); @@ -244,7 +248,7 @@ Mono> startRecordingWithResponse( public Mono stopRecording(String recordingId) { try { return serverCallInternal.stopRecordingAsync(serverCallId, recordingId) - .onErrorMap(CommunicationErrorException.class, CallingServerErrorConverter::translateException); + .onErrorMap(CommunicationErrorResponseException.class, CallingServerErrorConverter::translateException); } catch (RuntimeException ex) { return monoError(logger, ex); } @@ -267,7 +271,7 @@ Mono> stopRecordingWithResponse(String recordingId, Context conte contextValue = context == null ? contextValue : context; return serverCallInternal .stopRecordingWithResponseAsync(serverCallId, recordingId, contextValue) - .onErrorMap(CommunicationErrorException.class, CallingServerErrorConverter::translateException); + .onErrorMap(CommunicationErrorResponseException.class, CallingServerErrorConverter::translateException); }); } catch (RuntimeException ex) { return monoError(logger, ex); @@ -284,7 +288,7 @@ Mono> stopRecordingWithResponse(String recordingId, Context conte public Mono pauseRecording(String recordingId) { try { return serverCallInternal.pauseRecordingAsync(serverCallId, recordingId) - .onErrorMap(CommunicationErrorException.class, CallingServerErrorConverter::translateException); + .onErrorMap(CommunicationErrorResponseException.class, CallingServerErrorConverter::translateException); } catch (RuntimeException ex) { return monoError(logger, ex); } @@ -307,7 +311,7 @@ Mono> pauseRecordingWithResponse(String recordingId, Context cont contextValue = context == null ? contextValue : context; return serverCallInternal .pauseRecordingWithResponseAsync(serverCallId, recordingId, contextValue) - .onErrorMap(CommunicationErrorException.class, CallingServerErrorConverter::translateException); + .onErrorMap(CommunicationErrorResponseException.class, CallingServerErrorConverter::translateException); }); } catch (RuntimeException ex) { return monoError(logger, ex); @@ -324,7 +328,7 @@ Mono> pauseRecordingWithResponse(String recordingId, Context cont public Mono resumeRecording(String recordingId) { try { return serverCallInternal.resumeRecordingAsync(serverCallId, recordingId) - .onErrorMap(CommunicationErrorException.class, CallingServerErrorConverter::translateException); + .onErrorMap(CommunicationErrorResponseException.class, CallingServerErrorConverter::translateException); } catch (RuntimeException ex) { return monoError(logger, ex); } @@ -347,7 +351,7 @@ Mono> resumeRecordingWithResponse(String recordingId, Context con contextValue = context == null ? contextValue : context; return serverCallInternal .resumeRecordingWithResponseAsync(serverCallId, recordingId, contextValue) - .onErrorMap(CommunicationErrorException.class, CallingServerErrorConverter::translateException); + .onErrorMap(CommunicationErrorResponseException.class, CallingServerErrorConverter::translateException); }); } catch (RuntimeException ex) { return monoError(logger, ex); @@ -361,11 +365,11 @@ Mono> resumeRecordingWithResponse(String recordingId, Context con * @return response for a successful get recording state request. */ @ServiceMethod(returns = ReturnType.SINGLE) - public Mono getRecordingState(String recordingId) { + public Mono getRecordingState(String recordingId) { try { - return serverCallInternal.recordingStateAsync(serverCallId, recordingId) - .onErrorMap(CommunicationErrorException.class, CallingServerErrorConverter::translateException) - .flatMap(result -> Mono.just(new CallRecordingStateResult(result.getRecordingState()))); + return serverCallInternal.getRecordingPropertiesAsync(serverCallId, recordingId) + .onErrorMap(CommunicationErrorResponseException.class, CallingServerErrorConverter::translateException) + .flatMap(result -> Mono.just(new CallRecordingProperties(result.getRecordingState()))); } catch (RuntimeException ex) { return monoError(logger, ex); } @@ -378,19 +382,19 @@ public Mono getRecordingState(String recordingId) { * @return response for a successful get recording state request. */ @ServiceMethod(returns = ReturnType.SINGLE) - public Mono> getRecordingStateWithResponse(String recordingId) { + public Mono> getRecordingStateWithResponse(String recordingId) { return getRecordingStateWithResponse(recordingId, null); } - Mono> getRecordingStateWithResponse(String recordingId, Context context) { + Mono> getRecordingStateWithResponse(String recordingId, Context context) { try { return withContext(contextValue -> { contextValue = context == null ? contextValue : context; return serverCallInternal - .recordingStateWithResponseAsync(serverCallId, recordingId, contextValue) - .onErrorMap(CommunicationErrorException.class, CallingServerErrorConverter::translateException) + .getRecordingPropertiesWithResponseAsync(serverCallId, recordingId, contextValue) + .onErrorMap(CommunicationErrorResponseException.class, CallingServerErrorConverter::translateException) .map(response -> - new SimpleResponse<>(response, new CallRecordingStateResult(response.getValue().getRecordingState()))); + new SimpleResponse<>(response, new CallRecordingProperties(response.getValue().getRecordingState()))); }); } catch (RuntimeException ex) { return monoError(logger, ex); @@ -477,7 +481,7 @@ Mono playAudioInternal(String audioFileUri, PlayAudioOptions pl Mono playAudioInternal(PlayAudioRequest playAudioRequest) { try { return serverCallInternal.playAudioAsync(serverCallId, playAudioRequest) - .onErrorMap(CommunicationErrorException.class, CallingServerErrorConverter::translateException) + .onErrorMap(CommunicationErrorResponseException.class, CallingServerErrorConverter::translateException) .flatMap(result -> Mono.just(PlayAudioResultConverter.convert(result))); } catch (RuntimeException ex) { return monoError(logger, ex); @@ -574,7 +578,7 @@ Mono> playAudioWithResponse(PlayAudioRequest playAudio contextValue = context == null ? contextValue : context; return serverCallInternal .playAudioWithResponseAsync(serverCallId, playAudioRequest, contextValue) - .onErrorMap(CommunicationErrorException.class, CallingServerErrorConverter::translateException) + .onErrorMap(CommunicationErrorResponseException.class, CallingServerErrorConverter::translateException) .map(response -> new SimpleResponse<>(response, PlayAudioResultConverter.convert(response.getValue()))); }); diff --git a/sdk/communication/azure-communication-callingserver/src/main/java/com/azure/communication/callingserver/implementation/CallConnectionsImpl.java b/sdk/communication/azure-communication-callingserver/src/main/java/com/azure/communication/callingserver/implementation/CallConnectionsImpl.java index 7593a6c1d74aa..44595d8253871 100644 --- a/sdk/communication/azure-communication-callingserver/src/main/java/com/azure/communication/callingserver/implementation/CallConnectionsImpl.java +++ b/sdk/communication/azure-communication-callingserver/src/main/java/com/azure/communication/callingserver/implementation/CallConnectionsImpl.java @@ -4,12 +4,13 @@ package com.azure.communication.callingserver.implementation; +import com.azure.communication.callingserver.implementation.models.AddParticipantRequest; +import com.azure.communication.callingserver.implementation.models.AddParticipantResultInternal; import com.azure.communication.callingserver.implementation.models.CancelAllMediaOperationsRequest; import com.azure.communication.callingserver.implementation.models.CancelAllMediaOperationsResultInternal; -import com.azure.communication.callingserver.implementation.models.CommunicationErrorException; +import com.azure.communication.callingserver.implementation.models.CommunicationErrorResponseException; import com.azure.communication.callingserver.implementation.models.CreateCallRequest; import com.azure.communication.callingserver.implementation.models.CreateCallResultInternal; -import com.azure.communication.callingserver.implementation.models.InviteParticipantsRequest; import com.azure.communication.callingserver.implementation.models.PlayAudioRequest; import com.azure.communication.callingserver.implementation.models.PlayAudioResultInternal; import com.azure.core.annotation.BodyParam; @@ -59,7 +60,7 @@ public final class CallConnectionsImpl { private interface CallConnectionsService { @Post("/calling/callConnections") @ExpectedResponses({201}) - @UnexpectedResponseExceptionType(CommunicationErrorException.class) + @UnexpectedResponseExceptionType(CommunicationErrorResponseException.class) Mono> createCall( @HostParam("endpoint") String endpoint, @QueryParam("api-version") String apiVersion, @@ -69,7 +70,7 @@ Mono> createCall( @Post("/calling/callConnections/{callConnectionId}/:hangup") @ExpectedResponses({202}) - @UnexpectedResponseExceptionType(CommunicationErrorException.class) + @UnexpectedResponseExceptionType(CommunicationErrorResponseException.class) Mono> hangupCall( @HostParam("endpoint") String endpoint, @PathParam("callConnectionId") String callConnectionId, @@ -79,7 +80,7 @@ Mono> hangupCall( @Post("/calling/callConnections/{callConnectionId}/:playAudio") @ExpectedResponses({202}) - @UnexpectedResponseExceptionType(CommunicationErrorException.class) + @UnexpectedResponseExceptionType(CommunicationErrorResponseException.class) Mono> playAudio( @HostParam("endpoint") String endpoint, @PathParam("callConnectionId") String callConnectionId, @@ -90,7 +91,7 @@ Mono> playAudio( @Post("/calling/callConnections/{callConnectionId}/:cancelAllMediaOperations") @ExpectedResponses({200}) - @UnexpectedResponseExceptionType(CommunicationErrorException.class) + @UnexpectedResponseExceptionType(CommunicationErrorResponseException.class) Mono> cancelAllMediaOperations( @HostParam("endpoint") String endpoint, @PathParam("callConnectionId") String callConnectionId, @@ -101,18 +102,18 @@ Mono> cancelAllMediaOperations( @Post("/calling/callConnections/{callConnectionId}/participants") @ExpectedResponses({202}) - @UnexpectedResponseExceptionType(CommunicationErrorException.class) - Mono> inviteParticipants( + @UnexpectedResponseExceptionType(CommunicationErrorResponseException.class) + Mono> addParticipant( @HostParam("endpoint") String endpoint, @PathParam("callConnectionId") String callConnectionId, @QueryParam("api-version") String apiVersion, - @BodyParam("application/json") InviteParticipantsRequest inviteParticipantsRequest, + @BodyParam("application/json") AddParticipantRequest addParticipantRequest, @HeaderParam("Accept") String accept, Context context); @Delete("/calling/callConnections/{callConnectionId}/participants/{participantId}") @ExpectedResponses({202}) - @UnexpectedResponseExceptionType(CommunicationErrorException.class) + @UnexpectedResponseExceptionType(CommunicationErrorResponseException.class) Mono> removeParticipant( @HostParam("endpoint") String endpoint, @PathParam("callConnectionId") String callConnectionId, @@ -127,7 +128,7 @@ Mono> removeParticipant( * * @param callRequest Create call request. * @throws IllegalArgumentException thrown if parameters fail the validation. - * @throws CommunicationErrorException thrown if the request is rejected by server. + * @throws CommunicationErrorResponseException thrown if the request is rejected by server. * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent. * @return the response payload of the create call operation. */ @@ -146,7 +147,7 @@ public Mono> createCallWithResponseAsync(Crea * @param callRequest Create call request. * @param context The context to associate with this operation. * @throws IllegalArgumentException thrown if parameters fail the validation. - * @throws CommunicationErrorException thrown if the request is rejected by server. + * @throws CommunicationErrorResponseException thrown if the request is rejected by server. * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent. * @return the response payload of the create call operation. */ @@ -162,7 +163,7 @@ public Mono> createCallWithResponseAsync( * * @param callRequest Create call request. * @throws IllegalArgumentException thrown if parameters fail the validation. - * @throws CommunicationErrorException thrown if the request is rejected by server. + * @throws CommunicationErrorResponseException thrown if the request is rejected by server. * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent. * @return the response payload of the create call operation. */ @@ -185,7 +186,7 @@ public Mono createCallAsync(CreateCallRequest callRequ * @param callRequest Create call request. * @param context The context to associate with this operation. * @throws IllegalArgumentException thrown if parameters fail the validation. - * @throws CommunicationErrorException thrown if the request is rejected by server. + * @throws CommunicationErrorResponseException thrown if the request is rejected by server. * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent. * @return the response payload of the create call operation. */ @@ -207,7 +208,7 @@ public Mono createCallAsync(CreateCallRequest callRequ * * @param callRequest Create call request. * @throws IllegalArgumentException thrown if parameters fail the validation. - * @throws CommunicationErrorException thrown if the request is rejected by server. + * @throws CommunicationErrorResponseException thrown if the request is rejected by server. * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent. * @return the response payload of the create call operation. */ @@ -222,7 +223,7 @@ public CreateCallResultInternal createCall(CreateCallRequest callRequest) { * @param callRequest Create call request. * @param context The context to associate with this operation. * @throws IllegalArgumentException thrown if parameters fail the validation. - * @throws CommunicationErrorException thrown if the request is rejected by server. + * @throws CommunicationErrorResponseException thrown if the request is rejected by server. * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent. * @return the response payload of the create call operation. */ @@ -232,11 +233,11 @@ public Response createCallWithResponse(CreateCallReque } /** - * Hangup a call. + * Hangup the call. * * @param callConnectionId The call connection id. * @throws IllegalArgumentException thrown if parameters fail the validation. - * @throws CommunicationErrorException thrown if the request is rejected by server. + * @throws CommunicationErrorResponseException thrown if the request is rejected by server. * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent. * @return the completion. */ @@ -254,12 +255,12 @@ public Mono> hangupCallWithResponseAsync(String callConnectionId) } /** - * Hangup a call. + * Hangup the call. * * @param callConnectionId The call connection id. * @param context The context to associate with this operation. * @throws IllegalArgumentException thrown if parameters fail the validation. - * @throws CommunicationErrorException thrown if the request is rejected by server. + * @throws CommunicationErrorResponseException thrown if the request is rejected by server. * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent. * @return the completion. */ @@ -271,11 +272,11 @@ public Mono> hangupCallWithResponseAsync(String callConnectionId, } /** - * Hangup a call. + * Hangup the call. * * @param callConnectionId The call connection id. * @throws IllegalArgumentException thrown if parameters fail the validation. - * @throws CommunicationErrorException thrown if the request is rejected by server. + * @throws CommunicationErrorResponseException thrown if the request is rejected by server. * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent. * @return the completion. */ @@ -285,12 +286,12 @@ public Mono hangupCallAsync(String callConnectionId) { } /** - * Hangup a call. + * Hangup the call. * * @param callConnectionId The call connection id. * @param context The context to associate with this operation. * @throws IllegalArgumentException thrown if parameters fail the validation. - * @throws CommunicationErrorException thrown if the request is rejected by server. + * @throws CommunicationErrorResponseException thrown if the request is rejected by server. * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent. * @return the completion. */ @@ -300,11 +301,11 @@ public Mono hangupCallAsync(String callConnectionId, Context context) { } /** - * Hangup a call. + * Hangup the call. * * @param callConnectionId The call connection id. * @throws IllegalArgumentException thrown if parameters fail the validation. - * @throws CommunicationErrorException thrown if the request is rejected by server. + * @throws CommunicationErrorResponseException thrown if the request is rejected by server. * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent. */ @ServiceMethod(returns = ReturnType.SINGLE) @@ -313,12 +314,12 @@ public void hangupCall(String callConnectionId) { } /** - * Hangup a call. + * Hangup the call. * * @param callConnectionId The call connection id. * @param context The context to associate with this operation. * @throws IllegalArgumentException thrown if parameters fail the validation. - * @throws CommunicationErrorException thrown if the request is rejected by server. + * @throws CommunicationErrorResponseException thrown if the request is rejected by server. * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent. * @return the response. */ @@ -328,12 +329,12 @@ public Response hangupCallWithResponse(String callConnectionId, Context co } /** - * Play audio in a call. + * Play audio in the call. * * @param callConnectionId The call connection id. * @param request Play audio request. * @throws IllegalArgumentException thrown if parameters fail the validation. - * @throws CommunicationErrorException thrown if the request is rejected by server. + * @throws CommunicationErrorResponseException thrown if the request is rejected by server. * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent. * @return the response payload for play audio operation. */ @@ -353,13 +354,13 @@ public Mono> playAudioWithResponseAsync( } /** - * Play audio in a call. + * Play audio in the call. * * @param callConnectionId The call connection id. * @param request Play audio request. * @param context The context to associate with this operation. * @throws IllegalArgumentException thrown if parameters fail the validation. - * @throws CommunicationErrorException thrown if the request is rejected by server. + * @throws CommunicationErrorResponseException thrown if the request is rejected by server. * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent. * @return the response payload for play audio operation. */ @@ -372,12 +373,12 @@ public Mono> playAudioWithResponseAsync( } /** - * Play audio in a call. + * Play audio in the call. * * @param callConnectionId The call connection id. * @param request Play audio request. * @throws IllegalArgumentException thrown if parameters fail the validation. - * @throws CommunicationErrorException thrown if the request is rejected by server. + * @throws CommunicationErrorResponseException thrown if the request is rejected by server. * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent. * @return the response payload for play audio operation. */ @@ -395,13 +396,13 @@ public Mono playAudioAsync(String callConnectionId, Pla } /** - * Play audio in a call. + * Play audio in the call. * * @param callConnectionId The call connection id. * @param request Play audio request. * @param context The context to associate with this operation. * @throws IllegalArgumentException thrown if parameters fail the validation. - * @throws CommunicationErrorException thrown if the request is rejected by server. + * @throws CommunicationErrorResponseException thrown if the request is rejected by server. * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent. * @return the response payload for play audio operation. */ @@ -420,12 +421,12 @@ public Mono playAudioAsync( } /** - * Play audio in a call. + * Play audio in the call. * * @param callConnectionId The call connection id. * @param request Play audio request. * @throws IllegalArgumentException thrown if parameters fail the validation. - * @throws CommunicationErrorException thrown if the request is rejected by server. + * @throws CommunicationErrorResponseException thrown if the request is rejected by server. * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent. * @return the response payload for play audio operation. */ @@ -435,13 +436,13 @@ public PlayAudioResultInternal playAudio(String callConnectionId, PlayAudioReque } /** - * Play audio in a call. + * Play audio in the call. * * @param callConnectionId The call connection id. * @param request Play audio request. * @param context The context to associate with this operation. * @throws IllegalArgumentException thrown if parameters fail the validation. - * @throws CommunicationErrorException thrown if the request is rejected by server. + * @throws CommunicationErrorResponseException thrown if the request is rejected by server. * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent. * @return the response payload for play audio operation. */ @@ -457,7 +458,7 @@ public Response playAudioWithResponse( * @param callConnectionId The call connection id. * @param cancelAllMediaOperationRequest The cancel all media operations context. * @throws IllegalArgumentException thrown if parameters fail the validation. - * @throws CommunicationErrorException thrown if the request is rejected by server. + * @throws CommunicationErrorResponseException thrown if the request is rejected by server. * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent. * @return the response payload of the cancel all media operations. */ @@ -483,7 +484,7 @@ public Mono> cancelAllMediaOper * @param cancelAllMediaOperationRequest The cancel all media operations context. * @param context The context to associate with this operation. * @throws IllegalArgumentException thrown if parameters fail the validation. - * @throws CommunicationErrorException thrown if the request is rejected by server. + * @throws CommunicationErrorResponseException thrown if the request is rejected by server. * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent. * @return the response payload of the cancel all media operations. */ @@ -506,7 +507,7 @@ public Mono> cancelAllMediaOper * @param callConnectionId The call connection id. * @param cancelAllMediaOperationRequest The cancel all media operations context. * @throws IllegalArgumentException thrown if parameters fail the validation. - * @throws CommunicationErrorException thrown if the request is rejected by server. + * @throws CommunicationErrorResponseException thrown if the request is rejected by server. * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent. * @return the response payload of the cancel all media operations. */ @@ -531,7 +532,7 @@ public Mono cancelAllMediaOperationsAsyn * @param cancelAllMediaOperationRequest The cancel all media operations context. * @param context The context to associate with this operation. * @throws IllegalArgumentException thrown if parameters fail the validation. - * @throws CommunicationErrorException thrown if the request is rejected by server. + * @throws CommunicationErrorResponseException thrown if the request is rejected by server. * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent. * @return the response payload of the cancel all media operations. */ @@ -555,7 +556,7 @@ public Mono cancelAllMediaOperationsAsyn * @param callConnectionId The call connection id. * @param cancelAllMediaOperationRequest The cancel all media operations context. * @throws IllegalArgumentException thrown if parameters fail the validation. - * @throws CommunicationErrorException thrown if the request is rejected by server. + * @throws CommunicationErrorResponseException thrown if the request is rejected by server. * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent. * @return the response payload of the cancel all media operations. */ @@ -572,7 +573,7 @@ public CancelAllMediaOperationsResultInternal cancelAllMediaOperations( * @param cancelAllMediaOperationRequest The cancel all media operations context. * @param context The context to associate with this operation. * @throws IllegalArgumentException thrown if parameters fail the validation. - * @throws CommunicationErrorException thrown if the request is rejected by server. + * @throws CommunicationErrorResponseException thrown if the request is rejected by server. * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent. * @return the response payload of the cancel all media operations. */ @@ -584,127 +585,143 @@ public Response cancelAllMediaOperations } /** - * Invite participants to the call. + * Add a participant to the call. * * @param callConnectionId The call connection id. - * @param inviteParticipantsRequest Invite participant request. + * @param addParticipantRequest Add participant request. * @throws IllegalArgumentException thrown if parameters fail the validation. - * @throws CommunicationErrorException thrown if the request is rejected by server. + * @throws CommunicationErrorResponseException thrown if the request is rejected by server. * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent. - * @return the completion. + * @return the add participant result. */ @ServiceMethod(returns = ReturnType.SINGLE) - public Mono> inviteParticipantsWithResponseAsync( - String callConnectionId, InviteParticipantsRequest inviteParticipantsRequest) { + public Mono> addParticipantWithResponseAsync( + String callConnectionId, AddParticipantRequest addParticipantRequest) { final String accept = "application/json"; return FluxUtil.withContext( context -> - service.inviteParticipants( + service.addParticipant( this.client.getEndpoint(), callConnectionId, this.client.getApiVersion(), - inviteParticipantsRequest, + addParticipantRequest, accept, context)); } /** - * Invite participants to the call. + * Add a participant to the call. * * @param callConnectionId The call connection id. - * @param inviteParticipantsRequest Invite participant request. + * @param addParticipantRequest Add participant request. * @param context The context to associate with this operation. * @throws IllegalArgumentException thrown if parameters fail the validation. - * @throws CommunicationErrorException thrown if the request is rejected by server. + * @throws CommunicationErrorResponseException thrown if the request is rejected by server. * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent. - * @return the completion. + * @return the add participant result. */ @ServiceMethod(returns = ReturnType.SINGLE) - public Mono> inviteParticipantsWithResponseAsync( - String callConnectionId, InviteParticipantsRequest inviteParticipantsRequest, Context context) { + public Mono> addParticipantWithResponseAsync( + String callConnectionId, AddParticipantRequest addParticipantRequest, Context context) { final String accept = "application/json"; - return service.inviteParticipants( + return service.addParticipant( this.client.getEndpoint(), callConnectionId, this.client.getApiVersion(), - inviteParticipantsRequest, + addParticipantRequest, accept, context); } /** - * Invite participants to the call. + * Add a participant to the call. * * @param callConnectionId The call connection id. - * @param inviteParticipantsRequest Invite participant request. + * @param addParticipantRequest Add participant request. * @throws IllegalArgumentException thrown if parameters fail the validation. - * @throws CommunicationErrorException thrown if the request is rejected by server. + * @throws CommunicationErrorResponseException thrown if the request is rejected by server. * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent. - * @return the completion. + * @return the add participant result. */ @ServiceMethod(returns = ReturnType.SINGLE) - public Mono inviteParticipantsAsync( - String callConnectionId, InviteParticipantsRequest inviteParticipantsRequest) { - return inviteParticipantsWithResponseAsync(callConnectionId, inviteParticipantsRequest) - .flatMap((Response res) -> Mono.empty()); + public Mono addParticipantAsync( + String callConnectionId, AddParticipantRequest addParticipantRequest) { + return addParticipantWithResponseAsync(callConnectionId, addParticipantRequest) + .flatMap( + (Response res) -> { + if (res.getValue() != null) { + return Mono.just(res.getValue()); + } else { + return Mono.empty(); + } + }); } /** - * Invite participants to the call. + * Add a participant to the call. * * @param callConnectionId The call connection id. - * @param inviteParticipantsRequest Invite participant request. + * @param addParticipantRequest Add participant request. * @param context The context to associate with this operation. * @throws IllegalArgumentException thrown if parameters fail the validation. - * @throws CommunicationErrorException thrown if the request is rejected by server. + * @throws CommunicationErrorResponseException thrown if the request is rejected by server. * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent. - * @return the completion. + * @return the add participant result. */ @ServiceMethod(returns = ReturnType.SINGLE) - public Mono inviteParticipantsAsync( - String callConnectionId, InviteParticipantsRequest inviteParticipantsRequest, Context context) { - return inviteParticipantsWithResponseAsync(callConnectionId, inviteParticipantsRequest, context) - .flatMap((Response res) -> Mono.empty()); + public Mono addParticipantAsync( + String callConnectionId, AddParticipantRequest addParticipantRequest, Context context) { + return addParticipantWithResponseAsync(callConnectionId, addParticipantRequest, context) + .flatMap( + (Response res) -> { + if (res.getValue() != null) { + return Mono.just(res.getValue()); + } else { + return Mono.empty(); + } + }); } /** - * Invite participants to the call. + * Add a participant to the call. * * @param callConnectionId The call connection id. - * @param inviteParticipantsRequest Invite participant request. + * @param addParticipantRequest Add participant request. * @throws IllegalArgumentException thrown if parameters fail the validation. - * @throws CommunicationErrorException thrown if the request is rejected by server. + * @throws CommunicationErrorResponseException thrown if the request is rejected by server. * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent. + * @return the add participant result. */ @ServiceMethod(returns = ReturnType.SINGLE) - public void inviteParticipants(String callConnectionId, InviteParticipantsRequest inviteParticipantsRequest) { - inviteParticipantsAsync(callConnectionId, inviteParticipantsRequest).block(); + public AddParticipantResultInternal addParticipant( + String callConnectionId, AddParticipantRequest addParticipantRequest) { + return addParticipantAsync(callConnectionId, addParticipantRequest).block(); } /** - * Invite participants to the call. + * Add a participant to the call. * * @param callConnectionId The call connection id. - * @param inviteParticipantsRequest Invite participant request. + * @param addParticipantRequest Add participant request. * @param context The context to associate with this operation. * @throws IllegalArgumentException thrown if parameters fail the validation. - * @throws CommunicationErrorException thrown if the request is rejected by server. + * @throws CommunicationErrorResponseException thrown if the request is rejected by server. * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent. - * @return the response. + * @return the add participant result. */ @ServiceMethod(returns = ReturnType.SINGLE) - public Response inviteParticipantsWithResponse( - String callConnectionId, InviteParticipantsRequest inviteParticipantsRequest, Context context) { - return inviteParticipantsWithResponseAsync(callConnectionId, inviteParticipantsRequest, context).block(); + public Response addParticipantWithResponse( + String callConnectionId, AddParticipantRequest addParticipantRequest, Context context) { + return addParticipantWithResponseAsync(callConnectionId, addParticipantRequest, context).block(); } /** - * Remove participant from the call. + * Remove a participant from the call. * * @param callConnectionId The call connection id. * @param participantId The participant id. * @throws IllegalArgumentException thrown if parameters fail the validation. - * @throws CommunicationErrorException thrown if the request is rejected by server. + * @throws CommunicationErrorResponseException thrown if the request is rejected by server. * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent. * @return the completion. */ @@ -723,13 +740,13 @@ public Mono> removeParticipantWithResponseAsync(String callConnec } /** - * Remove participant from the call. + * Remove a participant from the call. * * @param callConnectionId The call connection id. * @param participantId The participant id. * @param context The context to associate with this operation. * @throws IllegalArgumentException thrown if parameters fail the validation. - * @throws CommunicationErrorException thrown if the request is rejected by server. + * @throws CommunicationErrorResponseException thrown if the request is rejected by server. * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent. * @return the completion. */ @@ -747,12 +764,12 @@ public Mono> removeParticipantWithResponseAsync( } /** - * Remove participant from the call. + * Remove a participant from the call. * * @param callConnectionId The call connection id. * @param participantId The participant id. * @throws IllegalArgumentException thrown if parameters fail the validation. - * @throws CommunicationErrorException thrown if the request is rejected by server. + * @throws CommunicationErrorResponseException thrown if the request is rejected by server. * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent. * @return the completion. */ @@ -763,13 +780,13 @@ public Mono removeParticipantAsync(String callConnectionId, String partici } /** - * Remove participant from the call. + * Remove a participant from the call. * * @param callConnectionId The call connection id. * @param participantId The participant id. * @param context The context to associate with this operation. * @throws IllegalArgumentException thrown if parameters fail the validation. - * @throws CommunicationErrorException thrown if the request is rejected by server. + * @throws CommunicationErrorResponseException thrown if the request is rejected by server. * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent. * @return the completion. */ @@ -780,12 +797,12 @@ public Mono removeParticipantAsync(String callConnectionId, String partici } /** - * Remove participant from the call. + * Remove a participant from the call. * * @param callConnectionId The call connection id. * @param participantId The participant id. * @throws IllegalArgumentException thrown if parameters fail the validation. - * @throws CommunicationErrorException thrown if the request is rejected by server. + * @throws CommunicationErrorResponseException thrown if the request is rejected by server. * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent. */ @ServiceMethod(returns = ReturnType.SINGLE) @@ -794,13 +811,13 @@ public void removeParticipant(String callConnectionId, String participantId) { } /** - * Remove participant from the call. + * Remove a participant from the call. * * @param callConnectionId The call connection id. * @param participantId The participant id. * @param context The context to associate with this operation. * @throws IllegalArgumentException thrown if parameters fail the validation. - * @throws CommunicationErrorException thrown if the request is rejected by server. + * @throws CommunicationErrorResponseException thrown if the request is rejected by server. * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent. * @return the response. */ diff --git a/sdk/communication/azure-communication-callingserver/src/main/java/com/azure/communication/callingserver/implementation/ServerCallsImpl.java b/sdk/communication/azure-communication-callingserver/src/main/java/com/azure/communication/callingserver/implementation/ServerCallsImpl.java index ed3b628daa51d..fb49229aaf609 100644 --- a/sdk/communication/azure-communication-callingserver/src/main/java/com/azure/communication/callingserver/implementation/ServerCallsImpl.java +++ b/sdk/communication/azure-communication-callingserver/src/main/java/com/azure/communication/callingserver/implementation/ServerCallsImpl.java @@ -4,9 +4,10 @@ package com.azure.communication.callingserver.implementation; -import com.azure.communication.callingserver.implementation.models.CallRecordingStateResultInternal; -import com.azure.communication.callingserver.implementation.models.CommunicationErrorException; -import com.azure.communication.callingserver.implementation.models.InviteParticipantsRequest; +import com.azure.communication.callingserver.implementation.models.AddParticipantRequest; +import com.azure.communication.callingserver.implementation.models.AddParticipantResultInternal; +import com.azure.communication.callingserver.implementation.models.CallRecordingPropertiesInternal; +import com.azure.communication.callingserver.implementation.models.CommunicationErrorResponseException; import com.azure.communication.callingserver.implementation.models.JoinCallRequest; import com.azure.communication.callingserver.implementation.models.JoinCallResultInternal; import com.azure.communication.callingserver.implementation.models.PlayAudioRequest; @@ -61,18 +62,18 @@ public final class ServerCallsImpl { private interface ServerCallsService { @Post("/calling/serverCalls/{serverCallId}/participants") @ExpectedResponses({202}) - @UnexpectedResponseExceptionType(CommunicationErrorException.class) - Mono> inviteParticipants( + @UnexpectedResponseExceptionType(CommunicationErrorResponseException.class) + Mono> addParticipant( @HostParam("endpoint") String endpoint, @PathParam("serverCallId") String serverCallId, @QueryParam("api-version") String apiVersion, - @BodyParam("application/json") InviteParticipantsRequest inviteParticipantsRequest, + @BodyParam("application/json") AddParticipantRequest addParticipantRequest, @HeaderParam("Accept") String accept, Context context); @Delete("/calling/serverCalls/{serverCallId}/participants/{participantId}") @ExpectedResponses({202}) - @UnexpectedResponseExceptionType(CommunicationErrorException.class) + @UnexpectedResponseExceptionType(CommunicationErrorResponseException.class) Mono> removeParticipant( @HostParam("endpoint") String endpoint, @PathParam("serverCallId") String serverCallId, @@ -83,7 +84,7 @@ Mono> removeParticipant( @Post("/calling/serverCalls/{serverCallId}/recordings") @ExpectedResponses({200}) - @UnexpectedResponseExceptionType(CommunicationErrorException.class) + @UnexpectedResponseExceptionType(CommunicationErrorResponseException.class) Mono> startRecording( @HostParam("endpoint") String endpoint, @PathParam("serverCallId") String serverCallId, @@ -94,8 +95,8 @@ Mono> startRecording( @Get("/calling/serverCalls/{serverCallId}/recordings/{recordingId}") @ExpectedResponses({200}) - @UnexpectedResponseExceptionType(CommunicationErrorException.class) - Mono> recordingState( + @UnexpectedResponseExceptionType(CommunicationErrorResponseException.class) + Mono> getRecordingProperties( @HostParam("endpoint") String endpoint, @PathParam("serverCallId") String serverCallId, @PathParam("recordingId") String recordingId, @@ -105,7 +106,7 @@ Mono> recordingState( @Delete("/calling/serverCalls/{serverCallId}/recordings/{recordingId}") @ExpectedResponses({200}) - @UnexpectedResponseExceptionType(CommunicationErrorException.class) + @UnexpectedResponseExceptionType(CommunicationErrorResponseException.class) Mono> stopRecording( @HostParam("endpoint") String endpoint, @PathParam("serverCallId") String serverCallId, @@ -116,7 +117,7 @@ Mono> stopRecording( @Post("/calling/serverCalls/{serverCallId}/recordings/{recordingId}/:pause") @ExpectedResponses({200}) - @UnexpectedResponseExceptionType(CommunicationErrorException.class) + @UnexpectedResponseExceptionType(CommunicationErrorResponseException.class) Mono> pauseRecording( @HostParam("endpoint") String endpoint, @PathParam("serverCallId") String serverCallId, @@ -127,7 +128,7 @@ Mono> pauseRecording( @Post("/calling/serverCalls/{serverCallId}/recordings/{recordingId}/:resume") @ExpectedResponses({200}) - @UnexpectedResponseExceptionType(CommunicationErrorException.class) + @UnexpectedResponseExceptionType(CommunicationErrorResponseException.class) Mono> resumeRecording( @HostParam("endpoint") String endpoint, @PathParam("serverCallId") String serverCallId, @@ -138,7 +139,7 @@ Mono> resumeRecording( @Post("/calling/serverCalls/{serverCallId}/:join") @ExpectedResponses({202}) - @UnexpectedResponseExceptionType(CommunicationErrorException.class) + @UnexpectedResponseExceptionType(CommunicationErrorResponseException.class) Mono> joinCall( @HostParam("endpoint") String endpoint, @PathParam("serverCallId") String serverCallId, @@ -149,7 +150,7 @@ Mono> joinCall( @Post("/calling/serverCalls/{serverCallId}/:playAudio") @ExpectedResponses({202}) - @UnexpectedResponseExceptionType(CommunicationErrorException.class) + @UnexpectedResponseExceptionType(CommunicationErrorResponseException.class) Mono> playAudio( @HostParam("endpoint") String endpoint, @PathParam("serverCallId") String serverCallId, @@ -160,118 +161,134 @@ Mono> playAudio( } /** - * Invite participants to the call. + * Add a participant to the call. * * @param serverCallId The server call id. - * @param inviteParticipantsRequest The invite participant request. + * @param addParticipantRequest The add participant request. * @throws IllegalArgumentException thrown if parameters fail the validation. - * @throws CommunicationErrorException thrown if the request is rejected by server. + * @throws CommunicationErrorResponseException thrown if the request is rejected by server. * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent. - * @return the completion. + * @return the add participant result. */ @ServiceMethod(returns = ReturnType.SINGLE) - public Mono> inviteParticipantsWithResponseAsync( - String serverCallId, InviteParticipantsRequest inviteParticipantsRequest) { + public Mono> addParticipantWithResponseAsync( + String serverCallId, AddParticipantRequest addParticipantRequest) { final String accept = "application/json"; return FluxUtil.withContext( context -> - service.inviteParticipants( + service.addParticipant( this.client.getEndpoint(), serverCallId, this.client.getApiVersion(), - inviteParticipantsRequest, + addParticipantRequest, accept, context)); } /** - * Invite participants to the call. + * Add a participant to the call. * * @param serverCallId The server call id. - * @param inviteParticipantsRequest The invite participant request. + * @param addParticipantRequest The add participant request. * @param context The context to associate with this operation. * @throws IllegalArgumentException thrown if parameters fail the validation. - * @throws CommunicationErrorException thrown if the request is rejected by server. + * @throws CommunicationErrorResponseException thrown if the request is rejected by server. * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent. - * @return the completion. + * @return the add participant result. */ @ServiceMethod(returns = ReturnType.SINGLE) - public Mono> inviteParticipantsWithResponseAsync( - String serverCallId, InviteParticipantsRequest inviteParticipantsRequest, Context context) { + public Mono> addParticipantWithResponseAsync( + String serverCallId, AddParticipantRequest addParticipantRequest, Context context) { final String accept = "application/json"; - return service.inviteParticipants( + return service.addParticipant( this.client.getEndpoint(), serverCallId, this.client.getApiVersion(), - inviteParticipantsRequest, + addParticipantRequest, accept, context); } /** - * Invite participants to the call. + * Add a participant to the call. * * @param serverCallId The server call id. - * @param inviteParticipantsRequest The invite participant request. + * @param addParticipantRequest The add participant request. * @throws IllegalArgumentException thrown if parameters fail the validation. - * @throws CommunicationErrorException thrown if the request is rejected by server. + * @throws CommunicationErrorResponseException thrown if the request is rejected by server. * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent. - * @return the completion. + * @return the add participant result. */ @ServiceMethod(returns = ReturnType.SINGLE) - public Mono inviteParticipantsAsync( - String serverCallId, InviteParticipantsRequest inviteParticipantsRequest) { - return inviteParticipantsWithResponseAsync(serverCallId, inviteParticipantsRequest) - .flatMap((Response res) -> Mono.empty()); + public Mono addParticipantAsync( + String serverCallId, AddParticipantRequest addParticipantRequest) { + return addParticipantWithResponseAsync(serverCallId, addParticipantRequest) + .flatMap( + (Response res) -> { + if (res.getValue() != null) { + return Mono.just(res.getValue()); + } else { + return Mono.empty(); + } + }); } /** - * Invite participants to the call. + * Add a participant to the call. * * @param serverCallId The server call id. - * @param inviteParticipantsRequest The invite participant request. + * @param addParticipantRequest The add participant request. * @param context The context to associate with this operation. * @throws IllegalArgumentException thrown if parameters fail the validation. - * @throws CommunicationErrorException thrown if the request is rejected by server. + * @throws CommunicationErrorResponseException thrown if the request is rejected by server. * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent. - * @return the completion. + * @return the add participant result. */ @ServiceMethod(returns = ReturnType.SINGLE) - public Mono inviteParticipantsAsync( - String serverCallId, InviteParticipantsRequest inviteParticipantsRequest, Context context) { - return inviteParticipantsWithResponseAsync(serverCallId, inviteParticipantsRequest, context) - .flatMap((Response res) -> Mono.empty()); + public Mono addParticipantAsync( + String serverCallId, AddParticipantRequest addParticipantRequest, Context context) { + return addParticipantWithResponseAsync(serverCallId, addParticipantRequest, context) + .flatMap( + (Response res) -> { + if (res.getValue() != null) { + return Mono.just(res.getValue()); + } else { + return Mono.empty(); + } + }); } /** - * Invite participants to the call. + * Add a participant to the call. * * @param serverCallId The server call id. - * @param inviteParticipantsRequest The invite participant request. + * @param addParticipantRequest The add participant request. * @throws IllegalArgumentException thrown if parameters fail the validation. - * @throws CommunicationErrorException thrown if the request is rejected by server. + * @throws CommunicationErrorResponseException thrown if the request is rejected by server. * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent. + * @return the add participant result. */ @ServiceMethod(returns = ReturnType.SINGLE) - public void inviteParticipants(String serverCallId, InviteParticipantsRequest inviteParticipantsRequest) { - inviteParticipantsAsync(serverCallId, inviteParticipantsRequest).block(); + public AddParticipantResultInternal addParticipant( + String serverCallId, AddParticipantRequest addParticipantRequest) { + return addParticipantAsync(serverCallId, addParticipantRequest).block(); } /** - * Invite participants to the call. + * Add a participant to the call. * * @param serverCallId The server call id. - * @param inviteParticipantsRequest The invite participant request. + * @param addParticipantRequest The add participant request. * @param context The context to associate with this operation. * @throws IllegalArgumentException thrown if parameters fail the validation. - * @throws CommunicationErrorException thrown if the request is rejected by server. + * @throws CommunicationErrorResponseException thrown if the request is rejected by server. * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent. - * @return the response. + * @return the add participant result. */ @ServiceMethod(returns = ReturnType.SINGLE) - public Response inviteParticipantsWithResponse( - String serverCallId, InviteParticipantsRequest inviteParticipantsRequest, Context context) { - return inviteParticipantsWithResponseAsync(serverCallId, inviteParticipantsRequest, context).block(); + public Response addParticipantWithResponse( + String serverCallId, AddParticipantRequest addParticipantRequest, Context context) { + return addParticipantWithResponseAsync(serverCallId, addParticipantRequest, context).block(); } /** @@ -280,7 +297,7 @@ public Response inviteParticipantsWithResponse( * @param serverCallId Server call id. * @param participantId Participant id. * @throws IllegalArgumentException thrown if parameters fail the validation. - * @throws CommunicationErrorException thrown if the request is rejected by server. + * @throws CommunicationErrorResponseException thrown if the request is rejected by server. * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent. * @return the completion. */ @@ -305,7 +322,7 @@ public Mono> removeParticipantWithResponseAsync(String serverCall * @param participantId Participant id. * @param context The context to associate with this operation. * @throws IllegalArgumentException thrown if parameters fail the validation. - * @throws CommunicationErrorException thrown if the request is rejected by server. + * @throws CommunicationErrorResponseException thrown if the request is rejected by server. * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent. * @return the completion. */ @@ -323,7 +340,7 @@ public Mono> removeParticipantWithResponseAsync( * @param serverCallId Server call id. * @param participantId Participant id. * @throws IllegalArgumentException thrown if parameters fail the validation. - * @throws CommunicationErrorException thrown if the request is rejected by server. + * @throws CommunicationErrorResponseException thrown if the request is rejected by server. * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent. * @return the completion. */ @@ -340,7 +357,7 @@ public Mono removeParticipantAsync(String serverCallId, String participant * @param participantId Participant id. * @param context The context to associate with this operation. * @throws IllegalArgumentException thrown if parameters fail the validation. - * @throws CommunicationErrorException thrown if the request is rejected by server. + * @throws CommunicationErrorResponseException thrown if the request is rejected by server. * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent. * @return the completion. */ @@ -356,7 +373,7 @@ public Mono removeParticipantAsync(String serverCallId, String participant * @param serverCallId Server call id. * @param participantId Participant id. * @throws IllegalArgumentException thrown if parameters fail the validation. - * @throws CommunicationErrorException thrown if the request is rejected by server. + * @throws CommunicationErrorResponseException thrown if the request is rejected by server. * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent. */ @ServiceMethod(returns = ReturnType.SINGLE) @@ -371,7 +388,7 @@ public void removeParticipant(String serverCallId, String participantId) { * @param participantId Participant id. * @param context The context to associate with this operation. * @throws IllegalArgumentException thrown if parameters fail the validation. - * @throws CommunicationErrorException thrown if the request is rejected by server. + * @throws CommunicationErrorResponseException thrown if the request is rejected by server. * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent. * @return the response. */ @@ -381,12 +398,12 @@ public Response removeParticipantWithResponse(String serverCallId, String } /** - * Start call recording request. + * Start recording of the call. * * @param serverCallId The server call id. * @param request The request body of start call recording request. * @throws IllegalArgumentException thrown if parameters fail the validation. - * @throws CommunicationErrorException thrown if the request is rejected by server. + * @throws CommunicationErrorResponseException thrown if the request is rejected by server. * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent. * @return the response payload of start call recording operation. */ @@ -406,13 +423,13 @@ public Mono> startRecordingWithRespon } /** - * Start call recording request. + * Start recording of the call. * * @param serverCallId The server call id. * @param request The request body of start call recording request. * @param context The context to associate with this operation. * @throws IllegalArgumentException thrown if parameters fail the validation. - * @throws CommunicationErrorException thrown if the request is rejected by server. + * @throws CommunicationErrorResponseException thrown if the request is rejected by server. * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent. * @return the response payload of start call recording operation. */ @@ -425,12 +442,12 @@ public Mono> startRecordingWithRespon } /** - * Start call recording request. + * Start recording of the call. * * @param serverCallId The server call id. * @param request The request body of start call recording request. * @throws IllegalArgumentException thrown if parameters fail the validation. - * @throws CommunicationErrorException thrown if the request is rejected by server. + * @throws CommunicationErrorResponseException thrown if the request is rejected by server. * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent. * @return the response payload of start call recording operation. */ @@ -449,13 +466,13 @@ public Mono startRecordingAsync( } /** - * Start call recording request. + * Start recording of the call. * * @param serverCallId The server call id. * @param request The request body of start call recording request. * @param context The context to associate with this operation. * @throws IllegalArgumentException thrown if parameters fail the validation. - * @throws CommunicationErrorException thrown if the request is rejected by server. + * @throws CommunicationErrorResponseException thrown if the request is rejected by server. * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent. * @return the response payload of start call recording operation. */ @@ -474,12 +491,12 @@ public Mono startRecordingAsync( } /** - * Start call recording request. + * Start recording of the call. * * @param serverCallId The server call id. * @param request The request body of start call recording request. * @throws IllegalArgumentException thrown if parameters fail the validation. - * @throws CommunicationErrorException thrown if the request is rejected by server. + * @throws CommunicationErrorResponseException thrown if the request is rejected by server. * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent. * @return the response payload of start call recording operation. */ @@ -489,13 +506,13 @@ public StartCallRecordingResultInternal startRecording(String serverCallId, Star } /** - * Start call recording request. + * Start recording of the call. * * @param serverCallId The server call id. * @param request The request body of start call recording request. * @param context The context to associate with this operation. * @throws IllegalArgumentException thrown if parameters fail the validation. - * @throws CommunicationErrorException thrown if the request is rejected by server. + * @throws CommunicationErrorResponseException thrown if the request is rejected by server. * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent. * @return the response payload of start call recording operation. */ @@ -506,22 +523,22 @@ public Response startRecordingWithResponse( } /** - * Get call recording state. + * Get call recording properties. * * @param serverCallId The server call id. * @param recordingId The recording id. * @throws IllegalArgumentException thrown if parameters fail the validation. - * @throws CommunicationErrorException thrown if the request is rejected by server. + * @throws CommunicationErrorResponseException thrown if the request is rejected by server. * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent. - * @return call recording state. + * @return call recording properties. */ @ServiceMethod(returns = ReturnType.SINGLE) - public Mono> recordingStateWithResponseAsync( + public Mono> getRecordingPropertiesWithResponseAsync( String serverCallId, String recordingId) { final String accept = "application/json"; return FluxUtil.withContext( context -> - service.recordingState( + service.getRecordingProperties( this.client.getEndpoint(), serverCallId, recordingId, @@ -531,39 +548,39 @@ public Mono> recordingStateWithRespon } /** - * Get call recording state. + * Get call recording properties. * * @param serverCallId The server call id. * @param recordingId The recording id. * @param context The context to associate with this operation. * @throws IllegalArgumentException thrown if parameters fail the validation. - * @throws CommunicationErrorException thrown if the request is rejected by server. + * @throws CommunicationErrorResponseException thrown if the request is rejected by server. * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent. - * @return call recording state. + * @return call recording properties. */ @ServiceMethod(returns = ReturnType.SINGLE) - public Mono> recordingStateWithResponseAsync( + public Mono> getRecordingPropertiesWithResponseAsync( String serverCallId, String recordingId, Context context) { final String accept = "application/json"; - return service.recordingState( + return service.getRecordingProperties( this.client.getEndpoint(), serverCallId, recordingId, this.client.getApiVersion(), accept, context); } /** - * Get call recording state. + * Get call recording properties. * * @param serverCallId The server call id. * @param recordingId The recording id. * @throws IllegalArgumentException thrown if parameters fail the validation. - * @throws CommunicationErrorException thrown if the request is rejected by server. + * @throws CommunicationErrorResponseException thrown if the request is rejected by server. * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent. - * @return call recording state. + * @return call recording properties. */ @ServiceMethod(returns = ReturnType.SINGLE) - public Mono recordingStateAsync(String serverCallId, String recordingId) { - return recordingStateWithResponseAsync(serverCallId, recordingId) + public Mono getRecordingPropertiesAsync(String serverCallId, String recordingId) { + return getRecordingPropertiesWithResponseAsync(serverCallId, recordingId) .flatMap( - (Response res) -> { + (Response res) -> { if (res.getValue() != null) { return Mono.just(res.getValue()); } else { @@ -573,22 +590,22 @@ public Mono recordingStateAsync(String serverC } /** - * Get call recording state. + * Get call recording properties. * * @param serverCallId The server call id. * @param recordingId The recording id. * @param context The context to associate with this operation. * @throws IllegalArgumentException thrown if parameters fail the validation. - * @throws CommunicationErrorException thrown if the request is rejected by server. + * @throws CommunicationErrorResponseException thrown if the request is rejected by server. * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent. - * @return call recording state. + * @return call recording properties. */ @ServiceMethod(returns = ReturnType.SINGLE) - public Mono recordingStateAsync( + public Mono getRecordingPropertiesAsync( String serverCallId, String recordingId, Context context) { - return recordingStateWithResponseAsync(serverCallId, recordingId, context) + return getRecordingPropertiesWithResponseAsync(serverCallId, recordingId, context) .flatMap( - (Response res) -> { + (Response res) -> { if (res.getValue() != null) { return Mono.just(res.getValue()); } else { @@ -598,44 +615,44 @@ public Mono recordingStateAsync( } /** - * Get call recording state. + * Get call recording properties. * * @param serverCallId The server call id. * @param recordingId The recording id. * @throws IllegalArgumentException thrown if parameters fail the validation. - * @throws CommunicationErrorException thrown if the request is rejected by server. + * @throws CommunicationErrorResponseException thrown if the request is rejected by server. * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent. - * @return call recording state. + * @return call recording properties. */ @ServiceMethod(returns = ReturnType.SINGLE) - public CallRecordingStateResultInternal recordingState(String serverCallId, String recordingId) { - return recordingStateAsync(serverCallId, recordingId).block(); + public CallRecordingPropertiesInternal getRecordingProperties(String serverCallId, String recordingId) { + return getRecordingPropertiesAsync(serverCallId, recordingId).block(); } /** - * Get call recording state. + * Get call recording properties. * * @param serverCallId The server call id. * @param recordingId The recording id. * @param context The context to associate with this operation. * @throws IllegalArgumentException thrown if parameters fail the validation. - * @throws CommunicationErrorException thrown if the request is rejected by server. + * @throws CommunicationErrorResponseException thrown if the request is rejected by server. * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent. - * @return call recording state. + * @return call recording properties. */ @ServiceMethod(returns = ReturnType.SINGLE) - public Response recordingStateWithResponse( + public Response getRecordingPropertiesWithResponse( String serverCallId, String recordingId, Context context) { - return recordingStateWithResponseAsync(serverCallId, recordingId, context).block(); + return getRecordingPropertiesWithResponseAsync(serverCallId, recordingId, context).block(); } /** - * Stop recording a call. + * Stop recording the call. * * @param serverCallId The server call id. * @param recordingId The recording id. * @throws IllegalArgumentException thrown if parameters fail the validation. - * @throws CommunicationErrorException thrown if the request is rejected by server. + * @throws CommunicationErrorResponseException thrown if the request is rejected by server. * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent. * @return the completion. */ @@ -654,13 +671,13 @@ public Mono> stopRecordingWithResponseAsync(String serverCallId, } /** - * Stop recording a call. + * Stop recording the call. * * @param serverCallId The server call id. * @param recordingId The recording id. * @param context The context to associate with this operation. * @throws IllegalArgumentException thrown if parameters fail the validation. - * @throws CommunicationErrorException thrown if the request is rejected by server. + * @throws CommunicationErrorResponseException thrown if the request is rejected by server. * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent. * @return the completion. */ @@ -673,12 +690,12 @@ public Mono> stopRecordingWithResponseAsync( } /** - * Stop recording a call. + * Stop recording the call. * * @param serverCallId The server call id. * @param recordingId The recording id. * @throws IllegalArgumentException thrown if parameters fail the validation. - * @throws CommunicationErrorException thrown if the request is rejected by server. + * @throws CommunicationErrorResponseException thrown if the request is rejected by server. * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent. * @return the completion. */ @@ -688,13 +705,13 @@ public Mono stopRecordingAsync(String serverCallId, String recordingId) { } /** - * Stop recording a call. + * Stop recording the call. * * @param serverCallId The server call id. * @param recordingId The recording id. * @param context The context to associate with this operation. * @throws IllegalArgumentException thrown if parameters fail the validation. - * @throws CommunicationErrorException thrown if the request is rejected by server. + * @throws CommunicationErrorResponseException thrown if the request is rejected by server. * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent. * @return the completion. */ @@ -705,12 +722,12 @@ public Mono stopRecordingAsync(String serverCallId, String recordingId, Co } /** - * Stop recording a call. + * Stop recording the call. * * @param serverCallId The server call id. * @param recordingId The recording id. * @throws IllegalArgumentException thrown if parameters fail the validation. - * @throws CommunicationErrorException thrown if the request is rejected by server. + * @throws CommunicationErrorResponseException thrown if the request is rejected by server. * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent. */ @ServiceMethod(returns = ReturnType.SINGLE) @@ -719,13 +736,13 @@ public void stopRecording(String serverCallId, String recordingId) { } /** - * Stop recording a call. + * Stop recording the call. * * @param serverCallId The server call id. * @param recordingId The recording id. * @param context The context to associate with this operation. * @throws IllegalArgumentException thrown if parameters fail the validation. - * @throws CommunicationErrorException thrown if the request is rejected by server. + * @throws CommunicationErrorResponseException thrown if the request is rejected by server. * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent. * @return the response. */ @@ -735,12 +752,12 @@ public Response stopRecordingWithResponse(String serverCallId, String reco } /** - * Pause recording a call. + * Pause recording the call. * * @param serverCallId The server call id. * @param recordingId The recording id. * @throws IllegalArgumentException thrown if parameters fail the validation. - * @throws CommunicationErrorException thrown if the request is rejected by server. + * @throws CommunicationErrorResponseException thrown if the request is rejected by server. * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent. * @return the completion. */ @@ -759,13 +776,13 @@ public Mono> pauseRecordingWithResponseAsync(String serverCallId, } /** - * Pause recording a call. + * Pause recording the call. * * @param serverCallId The server call id. * @param recordingId The recording id. * @param context The context to associate with this operation. * @throws IllegalArgumentException thrown if parameters fail the validation. - * @throws CommunicationErrorException thrown if the request is rejected by server. + * @throws CommunicationErrorResponseException thrown if the request is rejected by server. * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent. * @return the completion. */ @@ -778,12 +795,12 @@ public Mono> pauseRecordingWithResponseAsync( } /** - * Pause recording a call. + * Pause recording the call. * * @param serverCallId The server call id. * @param recordingId The recording id. * @throws IllegalArgumentException thrown if parameters fail the validation. - * @throws CommunicationErrorException thrown if the request is rejected by server. + * @throws CommunicationErrorResponseException thrown if the request is rejected by server. * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent. * @return the completion. */ @@ -793,13 +810,13 @@ public Mono pauseRecordingAsync(String serverCallId, String recordingId) { } /** - * Pause recording a call. + * Pause recording the call. * * @param serverCallId The server call id. * @param recordingId The recording id. * @param context The context to associate with this operation. * @throws IllegalArgumentException thrown if parameters fail the validation. - * @throws CommunicationErrorException thrown if the request is rejected by server. + * @throws CommunicationErrorResponseException thrown if the request is rejected by server. * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent. * @return the completion. */ @@ -810,12 +827,12 @@ public Mono pauseRecordingAsync(String serverCallId, String recordingId, C } /** - * Pause recording a call. + * Pause recording the call. * * @param serverCallId The server call id. * @param recordingId The recording id. * @throws IllegalArgumentException thrown if parameters fail the validation. - * @throws CommunicationErrorException thrown if the request is rejected by server. + * @throws CommunicationErrorResponseException thrown if the request is rejected by server. * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent. */ @ServiceMethod(returns = ReturnType.SINGLE) @@ -824,13 +841,13 @@ public void pauseRecording(String serverCallId, String recordingId) { } /** - * Pause recording a call. + * Pause recording the call. * * @param serverCallId The server call id. * @param recordingId The recording id. * @param context The context to associate with this operation. * @throws IllegalArgumentException thrown if parameters fail the validation. - * @throws CommunicationErrorException thrown if the request is rejected by server. + * @throws CommunicationErrorResponseException thrown if the request is rejected by server. * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent. * @return the response. */ @@ -840,12 +857,12 @@ public Response pauseRecordingWithResponse(String serverCallId, String rec } /** - * Resume recording a call. + * Resume recording the call. * * @param serverCallId The server call id. * @param recordingId The recording id. * @throws IllegalArgumentException thrown if parameters fail the validation. - * @throws CommunicationErrorException thrown if the request is rejected by server. + * @throws CommunicationErrorResponseException thrown if the request is rejected by server. * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent. * @return the completion. */ @@ -864,13 +881,13 @@ public Mono> resumeRecordingWithResponseAsync(String serverCallId } /** - * Resume recording a call. + * Resume recording the call. * * @param serverCallId The server call id. * @param recordingId The recording id. * @param context The context to associate with this operation. * @throws IllegalArgumentException thrown if parameters fail the validation. - * @throws CommunicationErrorException thrown if the request is rejected by server. + * @throws CommunicationErrorResponseException thrown if the request is rejected by server. * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent. * @return the completion. */ @@ -883,12 +900,12 @@ public Mono> resumeRecordingWithResponseAsync( } /** - * Resume recording a call. + * Resume recording the call. * * @param serverCallId The server call id. * @param recordingId The recording id. * @throws IllegalArgumentException thrown if parameters fail the validation. - * @throws CommunicationErrorException thrown if the request is rejected by server. + * @throws CommunicationErrorResponseException thrown if the request is rejected by server. * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent. * @return the completion. */ @@ -899,13 +916,13 @@ public Mono resumeRecordingAsync(String serverCallId, String recordingId) } /** - * Resume recording a call. + * Resume recording the call. * * @param serverCallId The server call id. * @param recordingId The recording id. * @param context The context to associate with this operation. * @throws IllegalArgumentException thrown if parameters fail the validation. - * @throws CommunicationErrorException thrown if the request is rejected by server. + * @throws CommunicationErrorResponseException thrown if the request is rejected by server. * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent. * @return the completion. */ @@ -916,12 +933,12 @@ public Mono resumeRecordingAsync(String serverCallId, String recordingId, } /** - * Resume recording a call. + * Resume recording the call. * * @param serverCallId The server call id. * @param recordingId The recording id. * @throws IllegalArgumentException thrown if parameters fail the validation. - * @throws CommunicationErrorException thrown if the request is rejected by server. + * @throws CommunicationErrorResponseException thrown if the request is rejected by server. * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent. */ @ServiceMethod(returns = ReturnType.SINGLE) @@ -930,13 +947,13 @@ public void resumeRecording(String serverCallId, String recordingId) { } /** - * Resume recording a call. + * Resume recording the call. * * @param serverCallId The server call id. * @param recordingId The recording id. * @param context The context to associate with this operation. * @throws IllegalArgumentException thrown if parameters fail the validation. - * @throws CommunicationErrorException thrown if the request is rejected by server. + * @throws CommunicationErrorResponseException thrown if the request is rejected by server. * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent. * @return the response. */ @@ -951,7 +968,7 @@ public Response resumeRecordingWithResponse(String serverCallId, String re * @param serverCallId The server call id. * @param callRequest The join call request. * @throws IllegalArgumentException thrown if parameters fail the validation. - * @throws CommunicationErrorException thrown if the request is rejected by server. + * @throws CommunicationErrorResponseException thrown if the request is rejected by server. * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent. * @return the response payload of the join call operation. */ @@ -977,7 +994,7 @@ public Mono> joinCallWithResponseAsync( * @param callRequest The join call request. * @param context The context to associate with this operation. * @throws IllegalArgumentException thrown if parameters fail the validation. - * @throws CommunicationErrorException thrown if the request is rejected by server. + * @throws CommunicationErrorResponseException thrown if the request is rejected by server. * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent. * @return the response payload of the join call operation. */ @@ -995,7 +1012,7 @@ public Mono> joinCallWithResponseAsync( * @param serverCallId The server call id. * @param callRequest The join call request. * @throws IllegalArgumentException thrown if parameters fail the validation. - * @throws CommunicationErrorException thrown if the request is rejected by server. + * @throws CommunicationErrorResponseException thrown if the request is rejected by server. * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent. * @return the response payload of the join call operation. */ @@ -1019,7 +1036,7 @@ public Mono joinCallAsync(String serverCallId, JoinCallR * @param callRequest The join call request. * @param context The context to associate with this operation. * @throws IllegalArgumentException thrown if parameters fail the validation. - * @throws CommunicationErrorException thrown if the request is rejected by server. + * @throws CommunicationErrorResponseException thrown if the request is rejected by server. * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent. * @return the response payload of the join call operation. */ @@ -1043,7 +1060,7 @@ public Mono joinCallAsync( * @param serverCallId The server call id. * @param callRequest The join call request. * @throws IllegalArgumentException thrown if parameters fail the validation. - * @throws CommunicationErrorException thrown if the request is rejected by server. + * @throws CommunicationErrorResponseException thrown if the request is rejected by server. * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent. * @return the response payload of the join call operation. */ @@ -1059,7 +1076,7 @@ public JoinCallResultInternal joinCall(String serverCallId, JoinCallRequest call * @param callRequest The join call request. * @param context The context to associate with this operation. * @throws IllegalArgumentException thrown if parameters fail the validation. - * @throws CommunicationErrorException thrown if the request is rejected by server. + * @throws CommunicationErrorResponseException thrown if the request is rejected by server. * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent. * @return the response payload of the join call operation. */ @@ -1070,12 +1087,12 @@ public Response joinCallWithResponse( } /** - * Play audio in a call. + * Play audio in the call. * * @param serverCallId The server call id. * @param request Play audio request. * @throws IllegalArgumentException thrown if parameters fail the validation. - * @throws CommunicationErrorException thrown if the request is rejected by server. + * @throws CommunicationErrorResponseException thrown if the request is rejected by server. * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent. * @return the response payload for play audio operation. */ @@ -1095,13 +1112,13 @@ public Mono> playAudioWithResponseAsync( } /** - * Play audio in a call. + * Play audio in the call. * * @param serverCallId The server call id. * @param request Play audio request. * @param context The context to associate with this operation. * @throws IllegalArgumentException thrown if parameters fail the validation. - * @throws CommunicationErrorException thrown if the request is rejected by server. + * @throws CommunicationErrorResponseException thrown if the request is rejected by server. * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent. * @return the response payload for play audio operation. */ @@ -1114,12 +1131,12 @@ public Mono> playAudioWithResponseAsync( } /** - * Play audio in a call. + * Play audio in the call. * * @param serverCallId The server call id. * @param request Play audio request. * @throws IllegalArgumentException thrown if parameters fail the validation. - * @throws CommunicationErrorException thrown if the request is rejected by server. + * @throws CommunicationErrorResponseException thrown if the request is rejected by server. * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent. * @return the response payload for play audio operation. */ @@ -1137,13 +1154,13 @@ public Mono playAudioAsync(String serverCallId, PlayAud } /** - * Play audio in a call. + * Play audio in the call. * * @param serverCallId The server call id. * @param request Play audio request. * @param context The context to associate with this operation. * @throws IllegalArgumentException thrown if parameters fail the validation. - * @throws CommunicationErrorException thrown if the request is rejected by server. + * @throws CommunicationErrorResponseException thrown if the request is rejected by server. * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent. * @return the response payload for play audio operation. */ @@ -1162,12 +1179,12 @@ public Mono playAudioAsync( } /** - * Play audio in a call. + * Play audio in the call. * * @param serverCallId The server call id. * @param request Play audio request. * @throws IllegalArgumentException thrown if parameters fail the validation. - * @throws CommunicationErrorException thrown if the request is rejected by server. + * @throws CommunicationErrorResponseException thrown if the request is rejected by server. * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent. * @return the response payload for play audio operation. */ @@ -1177,13 +1194,13 @@ public PlayAudioResultInternal playAudio(String serverCallId, PlayAudioRequest r } /** - * Play audio in a call. + * Play audio in the call. * * @param serverCallId The server call id. * @param request Play audio request. * @param context The context to associate with this operation. * @throws IllegalArgumentException thrown if parameters fail the validation. - * @throws CommunicationErrorException thrown if the request is rejected by server. + * @throws CommunicationErrorResponseException thrown if the request is rejected by server. * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent. * @return the response payload for play audio operation. */ diff --git a/sdk/communication/azure-communication-callingserver/src/main/java/com/azure/communication/callingserver/implementation/converters/CallConnectionRequestConverter.java b/sdk/communication/azure-communication-callingserver/src/main/java/com/azure/communication/callingserver/implementation/converters/CallConnectionRequestConverter.java index 49d5357d607b3..02b870911de19 100644 --- a/sdk/communication/azure-communication-callingserver/src/main/java/com/azure/communication/callingserver/implementation/converters/CallConnectionRequestConverter.java +++ b/sdk/communication/azure-communication-callingserver/src/main/java/com/azure/communication/callingserver/implementation/converters/CallConnectionRequestConverter.java @@ -5,9 +5,9 @@ import com.azure.communication.callingserver.implementation.models.CreateCallRequest; import com.azure.communication.callingserver.implementation.models.PhoneNumberIdentifierModel; -import com.azure.communication.callingserver.models.CallModality; import com.azure.communication.callingserver.models.CreateCallOptions; import com.azure.communication.callingserver.models.EventSubscriptionType; +import com.azure.communication.callingserver.models.MediaType; import com.azure.communication.common.CommunicationIdentifier; import java.util.ArrayList; @@ -44,9 +44,9 @@ public static CreateCallRequest convert( return createCallRequest; } - List requestedMediaTypes = new LinkedList<>(); - for (CallModality modality : createCallOptions.getRequestedMediaTypes()) { - requestedMediaTypes.add(CallModality.fromString(modality.toString())); + List requestedMediaTypes = new LinkedList<>(); + for (MediaType mediaType : createCallOptions.getRequestedMediaTypes()) { + requestedMediaTypes.add(MediaType.fromString(mediaType.toString())); } List requestedCallEvents = new LinkedList<>(); diff --git a/sdk/communication/azure-communication-callingserver/src/main/java/com/azure/communication/callingserver/implementation/converters/CallingServerErrorConverter.java b/sdk/communication/azure-communication-callingserver/src/main/java/com/azure/communication/callingserver/implementation/converters/CallingServerErrorConverter.java index 4099ec4e20963..9e3a28049601c 100644 --- a/sdk/communication/azure-communication-callingserver/src/main/java/com/azure/communication/callingserver/implementation/converters/CallingServerErrorConverter.java +++ b/sdk/communication/azure-communication-callingserver/src/main/java/com/azure/communication/callingserver/implementation/converters/CallingServerErrorConverter.java @@ -4,7 +4,7 @@ package com.azure.communication.callingserver.implementation.converters; import com.azure.communication.callingserver.implementation.models.CommunicationError; -import com.azure.communication.callingserver.implementation.models.CommunicationErrorException; +import com.azure.communication.callingserver.implementation.models.CommunicationErrorResponseException; import com.azure.communication.callingserver.models.CallingServerError; import com.azure.communication.callingserver.models.CallingServerErrorException; @@ -44,12 +44,12 @@ public static CallingServerError convert(CommunicationError communicationError) } /** - * Maps from {@link CommunicationErrorException} to {@link CallingServerErrorException}. + * Maps from {@link CommunicationErrorResponseException} to {@link CallingServerErrorException}. */ - public static CallingServerErrorException translateException(CommunicationErrorException exception) { + public static CallingServerErrorException translateException(CommunicationErrorResponseException exception) { CallingServerError error = null; if (exception.getValue() != null) { - error = CallingServerErrorConverter.convert(exception.getValue()); + error = CallingServerErrorConverter.convert(exception.getValue().getError()); } return new CallingServerErrorException(exception.getMessage(), exception.getResponse(), error); } diff --git a/sdk/communication/azure-communication-callingserver/src/main/java/com/azure/communication/callingserver/implementation/converters/CancelAllMediaOperationsResultConverter.java b/sdk/communication/azure-communication-callingserver/src/main/java/com/azure/communication/callingserver/implementation/converters/CancelAllMediaOperationsResultConverter.java index 76a4dff8b8417..be2794bef2867 100644 --- a/sdk/communication/azure-communication-callingserver/src/main/java/com/azure/communication/callingserver/implementation/converters/CancelAllMediaOperationsResultConverter.java +++ b/sdk/communication/azure-communication-callingserver/src/main/java/com/azure/communication/callingserver/implementation/converters/CancelAllMediaOperationsResultConverter.java @@ -20,7 +20,7 @@ public static CancelAllMediaOperationsResult convert(CancelAllMediaOperationsRes } return new CancelAllMediaOperationsResult( - resultInternal.getId(), + resultInternal.getOperationId(), resultInternal.getStatus(), resultInternal.getOperationContext(), ResultInfoConverter.convert(resultInternal.getResultInfo())); diff --git a/sdk/communication/azure-communication-callingserver/src/main/java/com/azure/communication/callingserver/implementation/converters/InviteParticipantRequestConverter.java b/sdk/communication/azure-communication-callingserver/src/main/java/com/azure/communication/callingserver/implementation/converters/InviteParticipantRequestConverter.java index 90eb327a56b01..ddce0648ba0d9 100644 --- a/sdk/communication/azure-communication-callingserver/src/main/java/com/azure/communication/callingserver/implementation/converters/InviteParticipantRequestConverter.java +++ b/sdk/communication/azure-communication-callingserver/src/main/java/com/azure/communication/callingserver/implementation/converters/InviteParticipantRequestConverter.java @@ -3,23 +3,20 @@ package com.azure.communication.callingserver.implementation.converters; -import com.azure.communication.callingserver.implementation.models.InviteParticipantsRequest; +import com.azure.communication.callingserver.implementation.models.AddParticipantRequest; import com.azure.communication.callingserver.implementation.models.PhoneNumberIdentifierModel; import com.azure.communication.common.CommunicationIdentifier; import com.azure.communication.common.PhoneNumberIdentifier; -import java.util.Collections; -import java.util.LinkedList; - /** - * A converter for {@link InviteParticipantsRequest} + * A converter for {@link AddParticipantRequest} */ public final class InviteParticipantRequestConverter { /** - * Converts to {@link InviteParticipantsRequest}. + * Converts to {@link AddParticipantRequest}. */ - public static InviteParticipantsRequest convert( + public static AddParticipantRequest convert( CommunicationIdentifier participant, String alternateCallerId, String operationContext, @@ -33,9 +30,8 @@ public static InviteParticipantsRequest convert( : CommunicationIdentifierConverter .convert(new PhoneNumberIdentifier(alternateCallerId)).getPhoneNumber(); - return new InviteParticipantsRequest() - .setParticipants(new LinkedList<>(Collections - .singletonList(CommunicationIdentifierConverter.convert(participant)))) + return new AddParticipantRequest() + .setParticipant(CommunicationIdentifierConverter.convert(participant)) .setAlternateCallerId(phoneNumberIdentifierModel) .setOperationContext(operationContext) .setCallbackUri(callBackUri); diff --git a/sdk/communication/azure-communication-callingserver/src/main/java/com/azure/communication/callingserver/implementation/converters/JoinCallRequestConverter.java b/sdk/communication/azure-communication-callingserver/src/main/java/com/azure/communication/callingserver/implementation/converters/JoinCallRequestConverter.java index ffacfb51c67b5..22f8a1f30602f 100644 --- a/sdk/communication/azure-communication-callingserver/src/main/java/com/azure/communication/callingserver/implementation/converters/JoinCallRequestConverter.java +++ b/sdk/communication/azure-communication-callingserver/src/main/java/com/azure/communication/callingserver/implementation/converters/JoinCallRequestConverter.java @@ -4,9 +4,9 @@ package com.azure.communication.callingserver.implementation.converters; import com.azure.communication.callingserver.implementation.models.JoinCallRequest; -import com.azure.communication.callingserver.models.CallModality; import com.azure.communication.callingserver.models.EventSubscriptionType; import com.azure.communication.callingserver.models.JoinCallOptions; +import com.azure.communication.callingserver.models.MediaType; import com.azure.communication.common.CommunicationIdentifier; import java.util.ArrayList; @@ -36,7 +36,7 @@ public static JoinCallRequest convert(CommunicationIdentifier source, JoinCallOp joinCallRequest.setSubject(joinCallOptions.getSubject()); joinCallRequest.setCallbackUri(joinCallOptions.getCallbackUri()); - List requestedModalities = new ArrayList<>(); + List requestedModalities = new ArrayList<>(); Collections.addAll(requestedModalities, joinCallOptions.getRequestedMediaTypes()); joinCallRequest.setRequestedMediaTypes(requestedModalities); diff --git a/sdk/communication/azure-communication-callingserver/src/main/java/com/azure/communication/callingserver/implementation/converters/PlayAudioResultConverter.java b/sdk/communication/azure-communication-callingserver/src/main/java/com/azure/communication/callingserver/implementation/converters/PlayAudioResultConverter.java index 80d27380b8900..4c75f293b6da5 100644 --- a/sdk/communication/azure-communication-callingserver/src/main/java/com/azure/communication/callingserver/implementation/converters/PlayAudioResultConverter.java +++ b/sdk/communication/azure-communication-callingserver/src/main/java/com/azure/communication/callingserver/implementation/converters/PlayAudioResultConverter.java @@ -20,7 +20,7 @@ public static PlayAudioResult convert(PlayAudioResultInternal playAudioResultInt } return new PlayAudioResult( - playAudioResultInternal.getId(), + playAudioResultInternal.getOperationId(), playAudioResultInternal.getStatus(), playAudioResultInternal.getOperationContext(), ResultInfoConverter.convert(playAudioResultInternal.getResultInfo())); diff --git a/sdk/communication/azure-communication-callingserver/src/main/java/com/azure/communication/callingserver/implementation/models/InviteParticipantsRequest.java b/sdk/communication/azure-communication-callingserver/src/main/java/com/azure/communication/callingserver/implementation/models/AddParticipantRequest.java similarity index 64% rename from sdk/communication/azure-communication-callingserver/src/main/java/com/azure/communication/callingserver/implementation/models/InviteParticipantsRequest.java rename to sdk/communication/azure-communication-callingserver/src/main/java/com/azure/communication/callingserver/implementation/models/AddParticipantRequest.java index 0a8e51d717691..7d8677871b77f 100644 --- a/sdk/communication/azure-communication-callingserver/src/main/java/com/azure/communication/callingserver/implementation/models/InviteParticipantsRequest.java +++ b/sdk/communication/azure-communication-callingserver/src/main/java/com/azure/communication/callingserver/implementation/models/AddParticipantRequest.java @@ -6,11 +6,10 @@ import com.azure.core.annotation.Fluent; import com.fasterxml.jackson.annotation.JsonProperty; -import java.util.List; -/** The invite participants request. */ +/** The add participant request. */ @Fluent -public final class InviteParticipantsRequest { +public final class AddParticipantRequest { /* * The alternate identity of source participant. */ @@ -18,10 +17,10 @@ public final class InviteParticipantsRequest { private PhoneNumberIdentifierModel alternateCallerId; /* - * The list of participants to be added to the call. + * The participant to be added to the call. */ - @JsonProperty(value = "participants", required = true) - private List participants; + @JsonProperty(value = "participant") + private CommunicationIdentifierModel participant; /* * The operation context. @@ -48,30 +47,30 @@ public PhoneNumberIdentifierModel getAlternateCallerId() { * Set the alternateCallerId property: The alternate identity of source participant. * * @param alternateCallerId the alternateCallerId value to set. - * @return the InviteParticipantsRequest object itself. + * @return the AddParticipantRequest object itself. */ - public InviteParticipantsRequest setAlternateCallerId(PhoneNumberIdentifierModel alternateCallerId) { + public AddParticipantRequest setAlternateCallerId(PhoneNumberIdentifierModel alternateCallerId) { this.alternateCallerId = alternateCallerId; return this; } /** - * Get the participants property: The list of participants to be added to the call. + * Get the participant property: The participant to be added to the call. * - * @return the participants value. + * @return the participant value. */ - public List getParticipants() { - return this.participants; + public CommunicationIdentifierModel getParticipant() { + return this.participant; } /** - * Set the participants property: The list of participants to be added to the call. + * Set the participant property: The participant to be added to the call. * - * @param participants the participants value to set. - * @return the InviteParticipantsRequest object itself. + * @param participant the participant value to set. + * @return the AddParticipantRequest object itself. */ - public InviteParticipantsRequest setParticipants(List participants) { - this.participants = participants; + public AddParticipantRequest setParticipant(CommunicationIdentifierModel participant) { + this.participant = participant; return this; } @@ -88,9 +87,9 @@ public String getOperationContext() { * Set the operationContext property: The operation context. * * @param operationContext the operationContext value to set. - * @return the InviteParticipantsRequest object itself. + * @return the AddParticipantRequest object itself. */ - public InviteParticipantsRequest setOperationContext(String operationContext) { + public AddParticipantRequest setOperationContext(String operationContext) { this.operationContext = operationContext; return this; } @@ -108,9 +107,9 @@ public String getCallbackUri() { * Set the callbackUri property: The callback URI. * * @param callbackUri the callbackUri value to set. - * @return the InviteParticipantsRequest object itself. + * @return the AddParticipantRequest object itself. */ - public InviteParticipantsRequest setCallbackUri(String callbackUri) { + public AddParticipantRequest setCallbackUri(String callbackUri) { this.callbackUri = callbackUri; return this; } diff --git a/sdk/communication/azure-communication-callingserver/src/main/java/com/azure/communication/callingserver/implementation/models/InviteParticipantsResultEventInternal.java b/sdk/communication/azure-communication-callingserver/src/main/java/com/azure/communication/callingserver/implementation/models/AddParticipantResultEventInternal.java similarity index 69% rename from sdk/communication/azure-communication-callingserver/src/main/java/com/azure/communication/callingserver/implementation/models/InviteParticipantsResultEventInternal.java rename to sdk/communication/azure-communication-callingserver/src/main/java/com/azure/communication/callingserver/implementation/models/AddParticipantResultEventInternal.java index 6e3230b873a51..b4e95f3ea95d9 100644 --- a/sdk/communication/azure-communication-callingserver/src/main/java/com/azure/communication/callingserver/implementation/models/InviteParticipantsResultEventInternal.java +++ b/sdk/communication/azure-communication-callingserver/src/main/java/com/azure/communication/callingserver/implementation/models/AddParticipantResultEventInternal.java @@ -8,9 +8,9 @@ import com.azure.core.annotation.Fluent; import com.fasterxml.jackson.annotation.JsonProperty; -/** The InviteParticipantsResultEventInternal model. */ +/** The AddParticipantResultEventInternal model. */ @Fluent -public final class InviteParticipantsResultEventInternal { +public final class AddParticipantResultEventInternal { /* * The result details. */ @@ -24,7 +24,7 @@ public final class InviteParticipantsResultEventInternal { private String operationContext; /* - * Gets or sets the status of the operation + * The status of the operation */ @JsonProperty(value = "status") private OperationStatus status; @@ -42,9 +42,9 @@ public ResultInfoInternal getResultInfo() { * Set the resultInfo property: The result details. * * @param resultInfo the resultInfo value to set. - * @return the InviteParticipantsResultEventInternal object itself. + * @return the AddParticipantResultEventInternal object itself. */ - public InviteParticipantsResultEventInternal setResultInfo(ResultInfoInternal resultInfo) { + public AddParticipantResultEventInternal setResultInfo(ResultInfoInternal resultInfo) { this.resultInfo = resultInfo; return this; } @@ -62,15 +62,15 @@ public String getOperationContext() { * Set the operationContext property: The operation context. * * @param operationContext the operationContext value to set. - * @return the InviteParticipantsResultEventInternal object itself. + * @return the AddParticipantResultEventInternal object itself. */ - public InviteParticipantsResultEventInternal setOperationContext(String operationContext) { + public AddParticipantResultEventInternal setOperationContext(String operationContext) { this.operationContext = operationContext; return this; } /** - * Get the status property: Gets or sets the status of the operation. + * Get the status property: The status of the operation. * * @return the status value. */ @@ -79,12 +79,12 @@ public OperationStatus getStatus() { } /** - * Set the status property: Gets or sets the status of the operation. + * Set the status property: The status of the operation. * * @param status the status value to set. - * @return the InviteParticipantsResultEventInternal object itself. + * @return the AddParticipantResultEventInternal object itself. */ - public InviteParticipantsResultEventInternal setStatus(OperationStatus status) { + public AddParticipantResultEventInternal setStatus(OperationStatus status) { this.status = status; return this; } diff --git a/sdk/communication/azure-communication-callingserver/src/main/java/com/azure/communication/callingserver/implementation/models/AddParticipantResultInternal.java b/sdk/communication/azure-communication-callingserver/src/main/java/com/azure/communication/callingserver/implementation/models/AddParticipantResultInternal.java new file mode 100644 index 0000000000000..7815f843ad88f --- /dev/null +++ b/sdk/communication/azure-communication-callingserver/src/main/java/com/azure/communication/callingserver/implementation/models/AddParticipantResultInternal.java @@ -0,0 +1,38 @@ +// Copyright (c) Microsoft Corporation. All rights reserved. +// Licensed under the MIT License. +// Code generated by Microsoft (R) AutoRest Code Generator. + +package com.azure.communication.callingserver.implementation.models; + +import com.azure.core.annotation.Fluent; +import com.fasterxml.jackson.annotation.JsonProperty; + +/** The add participant result. */ +@Fluent +public final class AddParticipantResultInternal { + /* + * The id of the added participant. + */ + @JsonProperty(value = "participantId") + private String participantId; + + /** + * Get the participantId property: The id of the added participant. + * + * @return the participantId value. + */ + public String getParticipantId() { + return this.participantId; + } + + /** + * Set the participantId property: The id of the added participant. + * + * @param participantId the participantId value to set. + * @return the AddParticipantResultInternal object itself. + */ + public AddParticipantResultInternal setParticipantId(String participantId) { + this.participantId = participantId; + return this; + } +} diff --git a/sdk/communication/azure-communication-callingserver/src/main/java/com/azure/communication/callingserver/implementation/models/CommunicationParticipantInternal.java b/sdk/communication/azure-communication-callingserver/src/main/java/com/azure/communication/callingserver/implementation/models/CallParticipantInternal.java similarity index 79% rename from sdk/communication/azure-communication-callingserver/src/main/java/com/azure/communication/callingserver/implementation/models/CommunicationParticipantInternal.java rename to sdk/communication/azure-communication-callingserver/src/main/java/com/azure/communication/callingserver/implementation/models/CallParticipantInternal.java index a0b894f9a8ff8..77f6cf0adbc71 100644 --- a/sdk/communication/azure-communication-callingserver/src/main/java/com/azure/communication/callingserver/implementation/models/CommunicationParticipantInternal.java +++ b/sdk/communication/azure-communication-callingserver/src/main/java/com/azure/communication/callingserver/implementation/models/CallParticipantInternal.java @@ -9,7 +9,7 @@ /** A participant in a call. */ @Fluent -public final class CommunicationParticipantInternal { +public final class CallParticipantInternal { /* * Communication identifier of the participant */ @@ -41,9 +41,9 @@ public CommunicationIdentifierModel getIdentifier() { * Set the identifier property: Communication identifier of the participant. * * @param identifier the identifier value to set. - * @return the CommunicationParticipantInternal object itself. + * @return the CallParticipantInternal object itself. */ - public CommunicationParticipantInternal setIdentifier(CommunicationIdentifierModel identifier) { + public CallParticipantInternal setIdentifier(CommunicationIdentifierModel identifier) { this.identifier = identifier; return this; } @@ -61,9 +61,9 @@ public String getParticipantId() { * Set the participantId property: Participant id. * * @param participantId the participantId value to set. - * @return the CommunicationParticipantInternal object itself. + * @return the CallParticipantInternal object itself. */ - public CommunicationParticipantInternal setParticipantId(String participantId) { + public CallParticipantInternal setParticipantId(String participantId) { this.participantId = participantId; return this; } @@ -81,9 +81,9 @@ public Boolean isMuted() { * Set the isMuted property: Is participant muted. * * @param isMuted the isMuted value to set. - * @return the CommunicationParticipantInternal object itself. + * @return the CallParticipantInternal object itself. */ - public CommunicationParticipantInternal setIsMuted(Boolean isMuted) { + public CallParticipantInternal setIsMuted(Boolean isMuted) { this.isMuted = isMuted; return this; } diff --git a/sdk/communication/azure-communication-callingserver/src/main/java/com/azure/communication/callingserver/implementation/models/CallRecordingStateResultInternal.java b/sdk/communication/azure-communication-callingserver/src/main/java/com/azure/communication/callingserver/implementation/models/CallRecordingPropertiesInternal.java similarity index 62% rename from sdk/communication/azure-communication-callingserver/src/main/java/com/azure/communication/callingserver/implementation/models/CallRecordingStateResultInternal.java rename to sdk/communication/azure-communication-callingserver/src/main/java/com/azure/communication/callingserver/implementation/models/CallRecordingPropertiesInternal.java index 41d34d7bfad96..be47d9b17f41a 100644 --- a/sdk/communication/azure-communication-callingserver/src/main/java/com/azure/communication/callingserver/implementation/models/CallRecordingStateResultInternal.java +++ b/sdk/communication/azure-communication-callingserver/src/main/java/com/azure/communication/callingserver/implementation/models/CallRecordingPropertiesInternal.java @@ -8,17 +8,17 @@ import com.azure.core.annotation.Fluent; import com.fasterxml.jackson.annotation.JsonProperty; -/** The response payload of get call recording state operation. */ +/** The response payload of get call recording properties operation. */ @Fluent -public final class CallRecordingStateResultInternal { +public final class CallRecordingPropertiesInternal { /* - * The recording state of the recording + * The state of the recording */ @JsonProperty(value = "recordingState") private CallRecordingState recordingState; /** - * Get the recordingState property: The recording state of the recording. + * Get the recordingState property: The state of the recording. * * @return the recordingState value. */ @@ -27,12 +27,12 @@ public CallRecordingState getRecordingState() { } /** - * Set the recordingState property: The recording state of the recording. + * Set the recordingState property: The state of the recording. * * @param recordingState the recordingState value to set. - * @return the CallRecordingStateResultInternal object itself. + * @return the CallRecordingPropertiesInternal object itself. */ - public CallRecordingStateResultInternal setRecordingState(CallRecordingState recordingState) { + public CallRecordingPropertiesInternal setRecordingState(CallRecordingState recordingState) { this.recordingState = recordingState; return this; } diff --git a/sdk/communication/azure-communication-callingserver/src/main/java/com/azure/communication/callingserver/implementation/models/CallRecordingStateChangeEventInternal.java b/sdk/communication/azure-communication-callingserver/src/main/java/com/azure/communication/callingserver/implementation/models/CallRecordingStateChangeEventInternal.java index 6c2f8d352f5e8..8501c53e647b4 100644 --- a/sdk/communication/azure-communication-callingserver/src/main/java/com/azure/communication/callingserver/implementation/models/CallRecordingStateChangeEventInternal.java +++ b/sdk/communication/azure-communication-callingserver/src/main/java/com/azure/communication/callingserver/implementation/models/CallRecordingStateChangeEventInternal.java @@ -19,7 +19,7 @@ public final class CallRecordingStateChangeEventInternal { private String recordingId; /* - * The recording state of the recording + * The state of the recording */ @JsonProperty(value = "state") private CallRecordingState state; @@ -57,7 +57,7 @@ public CallRecordingStateChangeEventInternal setRecordingId(String recordingId) } /** - * Get the state property: The recording state of the recording. + * Get the state property: The state of the recording. * * @return the state value. */ @@ -66,7 +66,7 @@ public CallRecordingState getState() { } /** - * Set the state property: The recording state of the recording. + * Set the state property: The state of the recording. * * @param state the state value to set. * @return the CallRecordingStateChangeEventInternal object itself. diff --git a/sdk/communication/azure-communication-callingserver/src/main/java/com/azure/communication/callingserver/implementation/models/CancelAllMediaOperationsResultInternal.java b/sdk/communication/azure-communication-callingserver/src/main/java/com/azure/communication/callingserver/implementation/models/CancelAllMediaOperationsResultInternal.java index 50743cb118067..5b2abaceebda6 100644 --- a/sdk/communication/azure-communication-callingserver/src/main/java/com/azure/communication/callingserver/implementation/models/CancelAllMediaOperationsResultInternal.java +++ b/sdk/communication/azure-communication-callingserver/src/main/java/com/azure/communication/callingserver/implementation/models/CancelAllMediaOperationsResultInternal.java @@ -12,51 +12,51 @@ @Fluent public final class CancelAllMediaOperationsResultInternal { /* - * Gets or sets the identifier. + * The operation id. */ - @JsonProperty(value = "id") - private String id; + @JsonProperty(value = "operationId") + private String operationId; /* - * Gets or sets the status of the operation + * The status of the operation */ @JsonProperty(value = "status") private OperationStatus status; /* - * Gets or sets the operation context + * The operation context provided by client. */ @JsonProperty(value = "operationContext") private String operationContext; /* - * Gets or sets the result info + * The result info for the operation. */ @JsonProperty(value = "resultInfo") private ResultInfoInternal resultInfo; /** - * Get the id property: Gets or sets the identifier. + * Get the operationId property: The operation id. * - * @return the id value. + * @return the operationId value. */ - public String getId() { - return this.id; + public String getOperationId() { + return this.operationId; } /** - * Set the id property: Gets or sets the identifier. + * Set the operationId property: The operation id. * - * @param id the id value to set. + * @param operationId the operationId value to set. * @return the CancelAllMediaOperationsResultInternal object itself. */ - public CancelAllMediaOperationsResultInternal setId(String id) { - this.id = id; + public CancelAllMediaOperationsResultInternal setOperationId(String operationId) { + this.operationId = operationId; return this; } /** - * Get the status property: Gets or sets the status of the operation. + * Get the status property: The status of the operation. * * @return the status value. */ @@ -65,7 +65,7 @@ public OperationStatus getStatus() { } /** - * Set the status property: Gets or sets the status of the operation. + * Set the status property: The status of the operation. * * @param status the status value to set. * @return the CancelAllMediaOperationsResultInternal object itself. @@ -76,7 +76,7 @@ public CancelAllMediaOperationsResultInternal setStatus(OperationStatus status) } /** - * Get the operationContext property: Gets or sets the operation context. + * Get the operationContext property: The operation context provided by client. * * @return the operationContext value. */ @@ -85,7 +85,7 @@ public String getOperationContext() { } /** - * Set the operationContext property: Gets or sets the operation context. + * Set the operationContext property: The operation context provided by client. * * @param operationContext the operationContext value to set. * @return the CancelAllMediaOperationsResultInternal object itself. @@ -96,7 +96,7 @@ public CancelAllMediaOperationsResultInternal setOperationContext(String operati } /** - * Get the resultInfo property: Gets or sets the result info. + * Get the resultInfo property: The result info for the operation. * * @return the resultInfo value. */ @@ -105,7 +105,7 @@ public ResultInfoInternal getResultInfo() { } /** - * Set the resultInfo property: Gets or sets the result info. + * Set the resultInfo property: The result info for the operation. * * @param resultInfo the resultInfo value to set. * @return the CancelAllMediaOperationsResultInternal object itself. diff --git a/sdk/communication/azure-communication-callingserver/src/main/java/com/azure/communication/callingserver/implementation/models/CommunicationErrorResponse.java b/sdk/communication/azure-communication-callingserver/src/main/java/com/azure/communication/callingserver/implementation/models/CommunicationErrorResponse.java new file mode 100644 index 0000000000000..6cdac69dcf5c3 --- /dev/null +++ b/sdk/communication/azure-communication-callingserver/src/main/java/com/azure/communication/callingserver/implementation/models/CommunicationErrorResponse.java @@ -0,0 +1,38 @@ +// Copyright (c) Microsoft Corporation. All rights reserved. +// Licensed under the MIT License. +// Code generated by Microsoft (R) AutoRest Code Generator. + +package com.azure.communication.callingserver.implementation.models; + +import com.azure.core.annotation.Fluent; +import com.fasterxml.jackson.annotation.JsonProperty; + +/** The Communication Services error. */ +@Fluent +public final class CommunicationErrorResponse { + /* + * The Communication Services error. + */ + @JsonProperty(value = "error", required = true) + private CommunicationError error; + + /** + * Get the error property: The Communication Services error. + * + * @return the error value. + */ + public CommunicationError getError() { + return this.error; + } + + /** + * Set the error property: The Communication Services error. + * + * @param error the error value to set. + * @return the CommunicationErrorResponse object itself. + */ + public CommunicationErrorResponse setError(CommunicationError error) { + this.error = error; + return this; + } +} diff --git a/sdk/communication/azure-communication-callingserver/src/main/java/com/azure/communication/callingserver/implementation/models/CommunicationErrorException.java b/sdk/communication/azure-communication-callingserver/src/main/java/com/azure/communication/callingserver/implementation/models/CommunicationErrorResponseException.java similarity index 58% rename from sdk/communication/azure-communication-callingserver/src/main/java/com/azure/communication/callingserver/implementation/models/CommunicationErrorException.java rename to sdk/communication/azure-communication-callingserver/src/main/java/com/azure/communication/callingserver/implementation/models/CommunicationErrorResponseException.java index a30d1265f0d84..88e6d9b4bdfac 100644 --- a/sdk/communication/azure-communication-callingserver/src/main/java/com/azure/communication/callingserver/implementation/models/CommunicationErrorException.java +++ b/sdk/communication/azure-communication-callingserver/src/main/java/com/azure/communication/callingserver/implementation/models/CommunicationErrorResponseException.java @@ -7,31 +7,32 @@ import com.azure.core.exception.HttpResponseException; import com.azure.core.http.HttpResponse; -/** Exception thrown for an invalid response with CommunicationError information. */ -public final class CommunicationErrorException extends HttpResponseException { +/** Exception thrown for an invalid response with CommunicationErrorResponse information. */ +public final class CommunicationErrorResponseException extends HttpResponseException { /** - * Initializes a new instance of the CommunicationErrorException class. + * Initializes a new instance of the CommunicationErrorResponseException class. * * @param message the exception message or the response content if a message is not available. * @param response the HTTP response. */ - public CommunicationErrorException(String message, HttpResponse response) { + public CommunicationErrorResponseException(String message, HttpResponse response) { super(message, response); } /** - * Initializes a new instance of the CommunicationErrorException class. + * Initializes a new instance of the CommunicationErrorResponseException class. * * @param message the exception message or the response content if a message is not available. * @param response the HTTP response. * @param value the deserialized response value. */ - public CommunicationErrorException(String message, HttpResponse response, CommunicationError value) { + public CommunicationErrorResponseException( + String message, HttpResponse response, CommunicationErrorResponse value) { super(message, response, value); } @Override - public CommunicationError getValue() { - return (CommunicationError) super.getValue(); + public CommunicationErrorResponse getValue() { + return (CommunicationErrorResponse) super.getValue(); } } diff --git a/sdk/communication/azure-communication-callingserver/src/main/java/com/azure/communication/callingserver/implementation/models/CreateCallRequest.java b/sdk/communication/azure-communication-callingserver/src/main/java/com/azure/communication/callingserver/implementation/models/CreateCallRequest.java index 0a05098b03543..f20b190ba35f1 100644 --- a/sdk/communication/azure-communication-callingserver/src/main/java/com/azure/communication/callingserver/implementation/models/CreateCallRequest.java +++ b/sdk/communication/azure-communication-callingserver/src/main/java/com/azure/communication/callingserver/implementation/models/CreateCallRequest.java @@ -4,8 +4,8 @@ package com.azure.communication.callingserver.implementation.models; -import com.azure.communication.callingserver.models.CallModality; import com.azure.communication.callingserver.models.EventSubscriptionType; +import com.azure.communication.callingserver.models.MediaType; import com.azure.core.annotation.Fluent; import com.fasterxml.jackson.annotation.JsonProperty; import java.util.List; @@ -48,7 +48,7 @@ public final class CreateCallRequest { * The requested modalities. */ @JsonProperty(value = "requestedMediaTypes") - private List requestedMediaTypes; + private List requestedMediaTypes; /* * The requested call events to subscribe to. @@ -163,7 +163,7 @@ public CreateCallRequest setCallbackUri(String callbackUri) { * * @return the requestedMediaTypes value. */ - public List getRequestedMediaTypes() { + public List getRequestedMediaTypes() { return this.requestedMediaTypes; } @@ -173,7 +173,7 @@ public List getRequestedMediaTypes() { * @param requestedMediaTypes the requestedMediaTypes value to set. * @return the CreateCallRequest object itself. */ - public CreateCallRequest setRequestedMediaTypes(List requestedMediaTypes) { + public CreateCallRequest setRequestedMediaTypes(List requestedMediaTypes) { this.requestedMediaTypes = requestedMediaTypes; return this; } diff --git a/sdk/communication/azure-communication-callingserver/src/main/java/com/azure/communication/callingserver/implementation/models/JoinCallRequest.java b/sdk/communication/azure-communication-callingserver/src/main/java/com/azure/communication/callingserver/implementation/models/JoinCallRequest.java index 6a251000d8531..a85e208b9d0df 100644 --- a/sdk/communication/azure-communication-callingserver/src/main/java/com/azure/communication/callingserver/implementation/models/JoinCallRequest.java +++ b/sdk/communication/azure-communication-callingserver/src/main/java/com/azure/communication/callingserver/implementation/models/JoinCallRequest.java @@ -4,8 +4,8 @@ package com.azure.communication.callingserver.implementation.models; -import com.azure.communication.callingserver.models.CallModality; import com.azure.communication.callingserver.models.EventSubscriptionType; +import com.azure.communication.callingserver.models.MediaType; import com.azure.core.annotation.Fluent; import com.fasterxml.jackson.annotation.JsonProperty; import java.util.List; @@ -35,7 +35,7 @@ public final class JoinCallRequest { * The requested modalities. */ @JsonProperty(value = "requestedMediaTypes") - private List requestedMediaTypes; + private List requestedMediaTypes; /* * The requested call events to subscribe to. @@ -108,7 +108,7 @@ public JoinCallRequest setCallbackUri(String callbackUri) { * * @return the requestedMediaTypes value. */ - public List getRequestedMediaTypes() { + public List getRequestedMediaTypes() { return this.requestedMediaTypes; } @@ -118,7 +118,7 @@ public List getRequestedMediaTypes() { * @param requestedMediaTypes the requestedMediaTypes value to set. * @return the JoinCallRequest object itself. */ - public JoinCallRequest setRequestedMediaTypes(List requestedMediaTypes) { + public JoinCallRequest setRequestedMediaTypes(List requestedMediaTypes) { this.requestedMediaTypes = requestedMediaTypes; return this; } diff --git a/sdk/communication/azure-communication-callingserver/src/main/java/com/azure/communication/callingserver/implementation/models/ParticipantsUpdatedEventInternal.java b/sdk/communication/azure-communication-callingserver/src/main/java/com/azure/communication/callingserver/implementation/models/ParticipantsUpdatedEventInternal.java index e1642fbc4b718..f6bb5dec8a43e 100644 --- a/sdk/communication/azure-communication-callingserver/src/main/java/com/azure/communication/callingserver/implementation/models/ParticipantsUpdatedEventInternal.java +++ b/sdk/communication/azure-communication-callingserver/src/main/java/com/azure/communication/callingserver/implementation/models/ParticipantsUpdatedEventInternal.java @@ -21,7 +21,7 @@ public final class ParticipantsUpdatedEventInternal { * The list of participants. */ @JsonProperty(value = "participants") - private List participants; + private List participants; /** * Get the callConnectionId property: The call connection id. @@ -48,7 +48,7 @@ public ParticipantsUpdatedEventInternal setCallConnectionId(String callConnectio * * @return the participants value. */ - public List getParticipants() { + public List getParticipants() { return this.participants; } @@ -58,7 +58,7 @@ public List getParticipants() { * @param participants the participants value to set. * @return the ParticipantsUpdatedEventInternal object itself. */ - public ParticipantsUpdatedEventInternal setParticipants(List participants) { + public ParticipantsUpdatedEventInternal setParticipants(List participants) { this.participants = participants; return this; } diff --git a/sdk/communication/azure-communication-callingserver/src/main/java/com/azure/communication/callingserver/implementation/models/PlayAudioResultEventInternal.java b/sdk/communication/azure-communication-callingserver/src/main/java/com/azure/communication/callingserver/implementation/models/PlayAudioResultEventInternal.java index 2a53f5e788d0b..9a93fe0027d6b 100644 --- a/sdk/communication/azure-communication-callingserver/src/main/java/com/azure/communication/callingserver/implementation/models/PlayAudioResultEventInternal.java +++ b/sdk/communication/azure-communication-callingserver/src/main/java/com/azure/communication/callingserver/implementation/models/PlayAudioResultEventInternal.java @@ -24,7 +24,7 @@ public final class PlayAudioResultEventInternal { private String operationContext; /* - * Gets or sets the status of the operation + * The status of the operation */ @JsonProperty(value = "status") private OperationStatus status; @@ -70,7 +70,7 @@ public PlayAudioResultEventInternal setOperationContext(String operationContext) } /** - * Get the status property: Gets or sets the status of the operation. + * Get the status property: The status of the operation. * * @return the status value. */ @@ -79,7 +79,7 @@ public OperationStatus getStatus() { } /** - * Set the status property: Gets or sets the status of the operation. + * Set the status property: The status of the operation. * * @param status the status value to set. * @return the PlayAudioResultEventInternal object itself. diff --git a/sdk/communication/azure-communication-callingserver/src/main/java/com/azure/communication/callingserver/implementation/models/PlayAudioResultInternal.java b/sdk/communication/azure-communication-callingserver/src/main/java/com/azure/communication/callingserver/implementation/models/PlayAudioResultInternal.java index d81709e963536..186ef3c6dbc68 100644 --- a/sdk/communication/azure-communication-callingserver/src/main/java/com/azure/communication/callingserver/implementation/models/PlayAudioResultInternal.java +++ b/sdk/communication/azure-communication-callingserver/src/main/java/com/azure/communication/callingserver/implementation/models/PlayAudioResultInternal.java @@ -12,51 +12,51 @@ @Fluent public final class PlayAudioResultInternal { /* - * Gets or sets the identifier. + * The operation id. */ - @JsonProperty(value = "id") - private String id; + @JsonProperty(value = "operationId") + private String operationId; /* - * Gets or sets the status of the operation + * The status of the operation */ @JsonProperty(value = "status") private OperationStatus status; /* - * Gets or sets the operation context + * The operation context provided by client. */ @JsonProperty(value = "operationContext") private String operationContext; /* - * Gets or sets the result info + * The result info for the operation. */ @JsonProperty(value = "resultInfo") private ResultInfoInternal resultInfo; /** - * Get the id property: Gets or sets the identifier. + * Get the operationId property: The operation id. * - * @return the id value. + * @return the operationId value. */ - public String getId() { - return this.id; + public String getOperationId() { + return this.operationId; } /** - * Set the id property: Gets or sets the identifier. + * Set the operationId property: The operation id. * - * @param id the id value to set. + * @param operationId the operationId value to set. * @return the PlayAudioResultInternal object itself. */ - public PlayAudioResultInternal setId(String id) { - this.id = id; + public PlayAudioResultInternal setOperationId(String operationId) { + this.operationId = operationId; return this; } /** - * Get the status property: Gets or sets the status of the operation. + * Get the status property: The status of the operation. * * @return the status value. */ @@ -65,7 +65,7 @@ public OperationStatus getStatus() { } /** - * Set the status property: Gets or sets the status of the operation. + * Set the status property: The status of the operation. * * @param status the status value to set. * @return the PlayAudioResultInternal object itself. @@ -76,7 +76,7 @@ public PlayAudioResultInternal setStatus(OperationStatus status) { } /** - * Get the operationContext property: Gets or sets the operation context. + * Get the operationContext property: The operation context provided by client. * * @return the operationContext value. */ @@ -85,7 +85,7 @@ public String getOperationContext() { } /** - * Set the operationContext property: Gets or sets the operation context. + * Set the operationContext property: The operation context provided by client. * * @param operationContext the operationContext value to set. * @return the PlayAudioResultInternal object itself. @@ -96,7 +96,7 @@ public PlayAudioResultInternal setOperationContext(String operationContext) { } /** - * Get the resultInfo property: Gets or sets the result info. + * Get the resultInfo property: The result info for the operation. * * @return the resultInfo value. */ @@ -105,7 +105,7 @@ public ResultInfoInternal getResultInfo() { } /** - * Set the resultInfo property: Gets or sets the result info. + * Set the resultInfo property: The result info for the operation. * * @param resultInfo the resultInfo value to set. * @return the PlayAudioResultInternal object itself. diff --git a/sdk/communication/azure-communication-callingserver/src/main/java/com/azure/communication/callingserver/models/AddParticipantResult.java b/sdk/communication/azure-communication-callingserver/src/main/java/com/azure/communication/callingserver/models/AddParticipantResult.java new file mode 100644 index 0000000000000..35d06bcd99b96 --- /dev/null +++ b/sdk/communication/azure-communication-callingserver/src/main/java/com/azure/communication/callingserver/models/AddParticipantResult.java @@ -0,0 +1,33 @@ +// Copyright (c) Microsoft Corporation. All rights reserved. +// Licensed under the MIT License. + +package com.azure.communication.callingserver.models; + +import com.azure.core.annotation.Immutable; + +/** The add participant result. */ +@Immutable +public final class AddParticipantResult { + /* + * The id of the added participant. + */ + private final String participantId; + + /** + * Get the participantId property: The id of the added participant. + * + * @return the participantId value. + */ + public String getParticipantId() { + return this.participantId; + } + + /** + * Initializes a new instance of AddParticipantResult. + * + * @param participantId the participantId value. + */ + public AddParticipantResult(String participantId) { + this.participantId = participantId; + } +} diff --git a/sdk/communication/azure-communication-callingserver/src/main/java/com/azure/communication/callingserver/models/CallConnectionState.java b/sdk/communication/azure-communication-callingserver/src/main/java/com/azure/communication/callingserver/models/CallConnectionState.java index d26b539c93cab..5ddbb79acec06 100644 --- a/sdk/communication/azure-communication-callingserver/src/main/java/com/azure/communication/callingserver/models/CallConnectionState.java +++ b/sdk/communication/azure-communication-callingserver/src/main/java/com/azure/communication/callingserver/models/CallConnectionState.java @@ -10,38 +10,20 @@ /** Defines values for CallConnectionState. */ public final class CallConnectionState extends ExpandableStringEnum { - /** Static value unknown for CallConnectionState. */ - public static final CallConnectionState UNKNOWN = fromString("unknown"); - - /** Static value idle for CallConnectionState. */ - public static final CallConnectionState IDLE = fromString("idle"); - /** Static value incoming for CallConnectionState. */ public static final CallConnectionState INCOMING = fromString("incoming"); - /** Static value establishing for CallConnectionState. */ - public static final CallConnectionState ESTABLISHING = fromString("establishing"); - - /** Static value established for CallConnectionState. */ - public static final CallConnectionState ESTABLISHED = fromString("established"); - - /** Static value hold for CallConnectionState. */ - public static final CallConnectionState HOLD = fromString("hold"); - - /** Static value unhold for CallConnectionState. */ - public static final CallConnectionState UNHOLD = fromString("unhold"); - - /** Static value transferring for CallConnectionState. */ - public static final CallConnectionState TRANSFERRING = fromString("transferring"); + /** Static value connecting for CallConnectionState. */ + public static final CallConnectionState CONNECTING = fromString("connecting"); - /** Static value redirecting for CallConnectionState. */ - public static final CallConnectionState REDIRECTING = fromString("redirecting"); + /** Static value connected for CallConnectionState. */ + public static final CallConnectionState CONNECTED = fromString("connected"); - /** Static value terminating for CallConnectionState. */ - public static final CallConnectionState TERMINATING = fromString("terminating"); + /** Static value disconnecting for CallConnectionState. */ + public static final CallConnectionState DISCONNECTING = fromString("disconnecting"); - /** Static value terminated for CallConnectionState. */ - public static final CallConnectionState TERMINATED = fromString("terminated"); + /** Static value disconnected for CallConnectionState. */ + public static final CallConnectionState DISCONNECTED = fromString("disconnected"); /** * Creates or finds a CallConnectionState from its string representation. diff --git a/sdk/communication/azure-communication-callingserver/src/main/java/com/azure/communication/callingserver/models/CallModality.java b/sdk/communication/azure-communication-callingserver/src/main/java/com/azure/communication/callingserver/models/CallModality.java deleted file mode 100644 index 3c770d5a2e072..0000000000000 --- a/sdk/communication/azure-communication-callingserver/src/main/java/com/azure/communication/callingserver/models/CallModality.java +++ /dev/null @@ -1,34 +0,0 @@ -// Copyright (c) Microsoft Corporation. All rights reserved. -// Licensed under the MIT License. -// Code generated by Microsoft (R) AutoRest Code Generator. - -package com.azure.communication.callingserver.models; - -import com.azure.core.util.ExpandableStringEnum; -import com.fasterxml.jackson.annotation.JsonCreator; -import java.util.Collection; - -/** Defines values for CallModality. */ -public final class CallModality extends ExpandableStringEnum { - /** Static value audio for CallModality. */ - public static final CallModality AUDIO = fromString("audio"); - - /** Static value video for CallModality. */ - public static final CallModality VIDEO = fromString("video"); - - /** - * Creates or finds a CallModality from its string representation. - * - * @param name a name to look for. - * @return the corresponding CallModality. - */ - @JsonCreator - public static CallModality fromString(String name) { - return fromString(name, CallModality.class); - } - - /** @return known CallModality values. */ - public static Collection values() { - return values(CallModality.class); - } -} diff --git a/sdk/communication/azure-communication-callingserver/src/main/java/com/azure/communication/callingserver/models/CallRecordingStateResult.java b/sdk/communication/azure-communication-callingserver/src/main/java/com/azure/communication/callingserver/models/CallRecordingProperties.java similarity index 88% rename from sdk/communication/azure-communication-callingserver/src/main/java/com/azure/communication/callingserver/models/CallRecordingStateResult.java rename to sdk/communication/azure-communication-callingserver/src/main/java/com/azure/communication/callingserver/models/CallRecordingProperties.java index 1b02780805f10..e4063ab278a0d 100644 --- a/sdk/communication/azure-communication-callingserver/src/main/java/com/azure/communication/callingserver/models/CallRecordingStateResult.java +++ b/sdk/communication/azure-communication-callingserver/src/main/java/com/azure/communication/callingserver/models/CallRecordingProperties.java @@ -8,7 +8,7 @@ /** The result payload of get call recording state operation. */ @Immutable -public final class CallRecordingStateResult { +public final class CallRecordingProperties { /* * The state of the recording */ @@ -29,7 +29,7 @@ public CallRecordingState getRecordingState() { * * @param recordingState the recordingState value. */ - public CallRecordingStateResult(CallRecordingState recordingState) { + public CallRecordingProperties(CallRecordingState recordingState) { this.recordingState = recordingState; } } diff --git a/sdk/communication/azure-communication-callingserver/src/main/java/com/azure/communication/callingserver/models/CancelAllMediaOperationsResult.java b/sdk/communication/azure-communication-callingserver/src/main/java/com/azure/communication/callingserver/models/CancelAllMediaOperationsResult.java index 0d19b25f77c24..1fece8898d39c 100644 --- a/sdk/communication/azure-communication-callingserver/src/main/java/com/azure/communication/callingserver/models/CancelAllMediaOperationsResult.java +++ b/sdk/communication/azure-communication-callingserver/src/main/java/com/azure/communication/callingserver/models/CancelAllMediaOperationsResult.java @@ -9,9 +9,9 @@ @Immutable public final class CancelAllMediaOperationsResult { /* - * The identifier. + * The operation id. */ - private final String id; + private final String operationId; /* * The status of the operation @@ -29,12 +29,12 @@ public final class CancelAllMediaOperationsResult { private final ResultInfo resultInfo; /** - * Get the id property: Gets the identifier. + * Get the operationId property: The operation id. * - * @return the id value. + * @return the operationId value. */ - public String getId() { - return id; + public String getOperationId() { + return this.operationId; } /** @@ -67,17 +67,17 @@ public ResultInfo getResultInfo() { /** * Initializes a new instance of CancelAllMediaOperationsResult. * - * @param id the id value. + * @param operationId the operationId value. * @param status the status value. * @param operationContext the operationContext value. * @param resultInfo the resultInfo value. */ public CancelAllMediaOperationsResult( - String id, + String operationId, OperationStatus status, String operationContext, ResultInfo resultInfo) { - this.id = id; + this.operationId = operationId; this.status = status; this.operationContext = operationContext; this.resultInfo = resultInfo; diff --git a/sdk/communication/azure-communication-callingserver/src/main/java/com/azure/communication/callingserver/models/CreateCallOptions.java b/sdk/communication/azure-communication-callingserver/src/main/java/com/azure/communication/callingserver/models/CreateCallOptions.java index 01adbda920146..60447786dfec2 100644 --- a/sdk/communication/azure-communication-callingserver/src/main/java/com/azure/communication/callingserver/models/CreateCallOptions.java +++ b/sdk/communication/azure-communication-callingserver/src/main/java/com/azure/communication/callingserver/models/CreateCallOptions.java @@ -30,7 +30,7 @@ public final class CreateCallOptions { /** * The requested media types. */ - private final CallModality[] requestedMediaTypes; + private final MediaType[] requestedMediaTypes; /** * The requested call events to subscribe to. @@ -91,8 +91,8 @@ public String getCallbackUri() { * * @return the requested modalities object itself. */ - public CallModality[] getRequestedMediaTypes() { - return this.requestedMediaTypes == null ? new CallModality[0] : this.requestedMediaTypes.clone(); + public MediaType[] getRequestedMediaTypes() { + return this.requestedMediaTypes == null ? new MediaType[0] : this.requestedMediaTypes.clone(); } /** @@ -114,7 +114,7 @@ public EventSubscriptionType[] getRequestedCallEvents() { */ public CreateCallOptions( String callbackUri, - CallModality[] requestedMediaTypes, + MediaType[] requestedMediaTypes, EventSubscriptionType[] requestedCallEvents) { if (callbackUri == null) { throw new IllegalArgumentException("object callbackUri cannot be null"); diff --git a/sdk/communication/azure-communication-callingserver/src/main/java/com/azure/communication/callingserver/models/JoinCallOptions.java b/sdk/communication/azure-communication-callingserver/src/main/java/com/azure/communication/callingserver/models/JoinCallOptions.java index 8108d3dc522dd..7a2fa269c4c0b 100644 --- a/sdk/communication/azure-communication-callingserver/src/main/java/com/azure/communication/callingserver/models/JoinCallOptions.java +++ b/sdk/communication/azure-communication-callingserver/src/main/java/com/azure/communication/callingserver/models/JoinCallOptions.java @@ -25,7 +25,7 @@ public final class JoinCallOptions { * The requested MediaTypes. */ @JsonProperty(value = "requestedMediaTypes", required = true) - private CallModality[] requestedMediaTypes; + private MediaType[] requestedMediaTypes; /* * The requested call events to subscribe to. @@ -78,8 +78,8 @@ public JoinCallOptions setCallbackUri(String callbackUri) { * * @return the requestedMediaTypes value. */ - public CallModality[] getRequestedMediaTypes() { - return requestedMediaTypes == null ? new CallModality[0] : requestedMediaTypes.clone(); + public MediaType[] getRequestedMediaTypes() { + return requestedMediaTypes == null ? new MediaType[0] : requestedMediaTypes.clone(); } /** @@ -88,8 +88,8 @@ public CallModality[] getRequestedMediaTypes() { * @param requestedMediaTypes the requestedModalities value to set. * @return the JoinCallOptions object itself. */ - public JoinCallOptions setRequestedMediaTypes(CallModality[] requestedMediaTypes) { - this.requestedMediaTypes = requestedMediaTypes == null ? new CallModality[0] : requestedMediaTypes.clone(); + public JoinCallOptions setRequestedMediaTypes(MediaType[] requestedMediaTypes) { + this.requestedMediaTypes = requestedMediaTypes == null ? new MediaType[0] : requestedMediaTypes.clone(); return this; } @@ -123,9 +123,10 @@ public JoinCallOptions setRequestedCallEvents(EventSubscriptionType[] requestedC * @param requestedCallEvents the requested call events to subscribe to. * @throws IllegalArgumentException if any parameters are null. */ - public JoinCallOptions(String callbackUri, - CallModality[] requestedMediaTypes, - EventSubscriptionType[] requestedCallEvents) { + public JoinCallOptions( + String callbackUri, + MediaType[] requestedMediaTypes, + EventSubscriptionType[] requestedCallEvents) { if (callbackUri == null) { throw new IllegalArgumentException("object callbackUri cannot be null"); } diff --git a/sdk/communication/azure-communication-callingserver/src/main/java/com/azure/communication/callingserver/models/MediaType.java b/sdk/communication/azure-communication-callingserver/src/main/java/com/azure/communication/callingserver/models/MediaType.java new file mode 100644 index 0000000000000..17a3505e47994 --- /dev/null +++ b/sdk/communication/azure-communication-callingserver/src/main/java/com/azure/communication/callingserver/models/MediaType.java @@ -0,0 +1,34 @@ +// Copyright (c) Microsoft Corporation. All rights reserved. +// Licensed under the MIT License. +// Code generated by Microsoft (R) AutoRest Code Generator. + +package com.azure.communication.callingserver.models; + +import com.azure.core.util.ExpandableStringEnum; +import com.fasterxml.jackson.annotation.JsonCreator; +import java.util.Collection; + +/** Defines values for MediaType. */ +public final class MediaType extends ExpandableStringEnum { + /** Static value audio for MediaType. */ + public static final MediaType AUDIO = fromString("audio"); + + /** Static value video for MediaType. */ + public static final MediaType VIDEO = fromString("video"); + + /** + * Creates or finds a MediaType from its string representation. + * + * @param name a name to look for. + * @return the corresponding MediaType. + */ + @JsonCreator + public static MediaType fromString(String name) { + return fromString(name, MediaType.class); + } + + /** @return known MediaType values. */ + public static Collection values() { + return values(MediaType.class); + } +} diff --git a/sdk/communication/azure-communication-callingserver/src/main/java/com/azure/communication/callingserver/models/PlayAudioResult.java b/sdk/communication/azure-communication-callingserver/src/main/java/com/azure/communication/callingserver/models/PlayAudioResult.java index a898dd168d30a..0741204c70603 100644 --- a/sdk/communication/azure-communication-callingserver/src/main/java/com/azure/communication/callingserver/models/PlayAudioResult.java +++ b/sdk/communication/azure-communication-callingserver/src/main/java/com/azure/communication/callingserver/models/PlayAudioResult.java @@ -9,9 +9,9 @@ @Immutable public final class PlayAudioResult { /* - * The identifier. + * The operation id. */ - private final String id; + private final String operationId; /* * The status of the operation @@ -29,12 +29,12 @@ public final class PlayAudioResult { private final ResultInfo resultInfo; /** - * Get the id property: Gets or sets the identifier. + * Get the operationId property: The operation id. * - * @return the id value. + * @return the operationId value. */ - public String getId() { - return this.id; + public String getOperationId() { + return this.operationId; } /** @@ -67,13 +67,13 @@ public ResultInfo getResultInfo() { /** * Initializes a new instance of PlayAudioResult. * - * @param id the id value. + * @param operationId the operationId value. * @param status the status value. * @param operationContext the operationContext value. * @param resultInfo the resultInfo value. */ - public PlayAudioResult(String id, OperationStatus status, String operationContext, ResultInfo resultInfo) { - this.id = id; + public PlayAudioResult(String operationId, OperationStatus status, String operationContext, ResultInfo resultInfo) { + this.operationId = operationId; this.status = status; this.operationContext = operationContext; this.resultInfo = resultInfo; diff --git a/sdk/communication/azure-communication-callingserver/src/main/java/com/azure/communication/callingserver/models/events/InviteParticipantResultEvent.java b/sdk/communication/azure-communication-callingserver/src/main/java/com/azure/communication/callingserver/models/events/AddParticipantResultEvent.java similarity index 68% rename from sdk/communication/azure-communication-callingserver/src/main/java/com/azure/communication/callingserver/models/events/InviteParticipantResultEvent.java rename to sdk/communication/azure-communication-callingserver/src/main/java/com/azure/communication/callingserver/models/events/AddParticipantResultEvent.java index 1b7b05a5c54bf..122beb9cfcf4c 100644 --- a/sdk/communication/azure-communication-callingserver/src/main/java/com/azure/communication/callingserver/models/events/InviteParticipantResultEvent.java +++ b/sdk/communication/azure-communication-callingserver/src/main/java/com/azure/communication/callingserver/models/events/AddParticipantResultEvent.java @@ -4,15 +4,15 @@ package com.azure.communication.callingserver.models.events; import com.azure.communication.callingserver.implementation.converters.ResultInfoConverter; -import com.azure.communication.callingserver.implementation.models.InviteParticipantsResultEventInternal; +import com.azure.communication.callingserver.implementation.models.AddParticipantResultEventInternal; import com.azure.communication.callingserver.models.OperationStatus; import com.azure.communication.callingserver.models.ResultInfo; import com.azure.core.annotation.Immutable; import com.azure.core.util.BinaryData; -/** The invite participant result event. */ +/** The add participant result event. */ @Immutable -public final class InviteParticipantResultEvent extends CallingServerEventBase { +public final class AddParticipantResultEvent extends CallingServerEventBase { /* * The result details. */ @@ -63,28 +63,28 @@ public OperationStatus getStatus() { * communications related to this operation * @param status the status value. */ - public InviteParticipantResultEvent(ResultInfo resultInfo, String operationContext, OperationStatus status) { + public AddParticipantResultEvent(ResultInfo resultInfo, String operationContext, OperationStatus status) { this.resultInfo = resultInfo; this.operationContext = operationContext; this.status = status; } /** - * Deserialize {@link InviteParticipantResultEvent} event. + * Deserialize {@link AddParticipantResultEvent} event. * * @param eventData binary data for event - * @return {@link InviteParticipantResultEvent} event. + * @return {@link AddParticipantResultEvent} event. */ - public static InviteParticipantResultEvent deserialize(BinaryData eventData) { + public static AddParticipantResultEvent deserialize(BinaryData eventData) { if (eventData == null) { return null; } - InviteParticipantsResultEventInternal inviteParticipantsResultEventInternal = - eventData.toObject(InviteParticipantsResultEventInternal.class); + AddParticipantResultEventInternal addParticipantResultEventInternal = + eventData.toObject(AddParticipantResultEventInternal.class); - return new InviteParticipantResultEvent( - ResultInfoConverter.convert(inviteParticipantsResultEventInternal.getResultInfo()), - inviteParticipantsResultEventInternal.getOperationContext(), - inviteParticipantsResultEventInternal.getStatus()); + return new AddParticipantResultEvent( + ResultInfoConverter.convert(addParticipantResultEventInternal.getResultInfo()), + addParticipantResultEventInternal.getOperationContext(), + addParticipantResultEventInternal.getStatus()); } } diff --git a/sdk/communication/azure-communication-callingserver/src/main/java/com/azure/communication/callingserver/models/events/ParticipantsUpdatedEvent.java b/sdk/communication/azure-communication-callingserver/src/main/java/com/azure/communication/callingserver/models/events/ParticipantsUpdatedEvent.java index f7fffde2d5d5d..30e81b39c9fba 100644 --- a/sdk/communication/azure-communication-callingserver/src/main/java/com/azure/communication/callingserver/models/events/ParticipantsUpdatedEvent.java +++ b/sdk/communication/azure-communication-callingserver/src/main/java/com/azure/communication/callingserver/models/events/ParticipantsUpdatedEvent.java @@ -4,7 +4,7 @@ package com.azure.communication.callingserver.models.events; import com.azure.communication.callingserver.implementation.converters.CommunicationIdentifierConverter; -import com.azure.communication.callingserver.implementation.models.CommunicationParticipantInternal; +import com.azure.communication.callingserver.implementation.models.CallParticipantInternal; import com.azure.communication.callingserver.implementation.models.ParticipantsUpdatedEventInternal; import com.azure.communication.callingserver.models.CallParticipant; import com.azure.core.annotation.Immutable; @@ -77,12 +77,12 @@ public static ParticipantsUpdatedEvent deserialize(BinaryData eventData) { } ParticipantsUpdatedEventInternal internalEvent = eventData.toObject(ParticipantsUpdatedEventInternal.class); List participants = new LinkedList<>(); - for (CommunicationParticipantInternal communicationParticipantInternal : internalEvent.getParticipants()) { + for (CallParticipantInternal callParticipantInternal : internalEvent.getParticipants()) { participants.add( new CallParticipant( - CommunicationIdentifierConverter.convert(communicationParticipantInternal.getIdentifier()), - communicationParticipantInternal.getParticipantId(), - communicationParticipantInternal.isMuted())); + CommunicationIdentifierConverter.convert(callParticipantInternal.getIdentifier()), + callParticipantInternal.getParticipantId(), + callParticipantInternal.isMuted())); } return new ParticipantsUpdatedEvent(internalEvent.getCallConnectionId(), diff --git a/sdk/communication/azure-communication-callingserver/src/samples/java/com/azure/communication/callingserver/CallingServerAsyncClientJavaDocCodeSnippets.java b/sdk/communication/azure-communication-callingserver/src/samples/java/com/azure/communication/callingserver/CallingServerAsyncClientJavaDocCodeSnippets.java index 764bbf8f088ee..7e672afa8a342 100644 --- a/sdk/communication/azure-communication-callingserver/src/samples/java/com/azure/communication/callingserver/CallingServerAsyncClientJavaDocCodeSnippets.java +++ b/sdk/communication/azure-communication-callingserver/src/samples/java/com/azure/communication/callingserver/CallingServerAsyncClientJavaDocCodeSnippets.java @@ -3,9 +3,9 @@ package com.azure.communication.callingserver; -import com.azure.communication.callingserver.models.CallModality; import com.azure.communication.callingserver.models.CreateCallOptions; import com.azure.communication.callingserver.models.EventSubscriptionType; +import com.azure.communication.callingserver.models.MediaType; import com.azure.communication.common.CommunicationIdentifier; import com.azure.communication.common.CommunicationUserIdentifier; import com.azure.core.http.HttpPipeline; @@ -45,7 +45,7 @@ public void createCallConnectionAsync() { // BEGIN: com.azure.communication.callingserver.CallingServerAsyncClient.create.call.connection.async CommunicationIdentifier[] targets = new CommunicationIdentifier[] { firstCallee, secondCallee }; - CallModality[] requestedMediaTypes = new CallModality[] { CallModality.AUDIO, CallModality.VIDEO }; + MediaType[] requestedMediaTypes = new MediaType[] { MediaType.AUDIO, MediaType.VIDEO }; EventSubscriptionType[] requestedCallEvents = new EventSubscriptionType[] { EventSubscriptionType.DTMF_RECEIVED, EventSubscriptionType.PARTICIPANTS_UPDATED diff --git a/sdk/communication/azure-communication-callingserver/src/samples/java/com/azure/communication/callingserver/CallingServerClientJavaDocCodeSnippets.java b/sdk/communication/azure-communication-callingserver/src/samples/java/com/azure/communication/callingserver/CallingServerClientJavaDocCodeSnippets.java index fc53f927cdf60..edd91a97c3887 100644 --- a/sdk/communication/azure-communication-callingserver/src/samples/java/com/azure/communication/callingserver/CallingServerClientJavaDocCodeSnippets.java +++ b/sdk/communication/azure-communication-callingserver/src/samples/java/com/azure/communication/callingserver/CallingServerClientJavaDocCodeSnippets.java @@ -3,9 +3,9 @@ package com.azure.communication.callingserver; -import com.azure.communication.callingserver.models.CallModality; import com.azure.communication.callingserver.models.CreateCallOptions; import com.azure.communication.callingserver.models.EventSubscriptionType; +import com.azure.communication.callingserver.models.MediaType; import com.azure.communication.common.CommunicationIdentifier; import com.azure.communication.common.CommunicationUserIdentifier; import com.azure.core.http.HttpPipeline; @@ -45,7 +45,7 @@ public void createCallConnection() { // BEGIN: com.azure.communication.callingserver.CallingServerClient.create.call.connection CommunicationIdentifier[] targets = new CommunicationIdentifier[] { firstCallee, secondCallee }; - CallModality[] requestedMediaTypes = new CallModality[] { CallModality.AUDIO, CallModality.VIDEO }; + MediaType[] requestedMediaTypes = new MediaType[] { MediaType.AUDIO, MediaType.VIDEO }; EventSubscriptionType[] requestedCallEvents = new EventSubscriptionType[] { EventSubscriptionType.DTMF_RECEIVED, EventSubscriptionType.PARTICIPANTS_UPDATED diff --git a/sdk/communication/azure-communication-callingserver/src/samples/java/com/azure/communication/callingserver/ConversationClientReadmeSamples.java b/sdk/communication/azure-communication-callingserver/src/samples/java/com/azure/communication/callingserver/ConversationClientReadmeSamples.java index aeb77e4a1f0f0..9d3cb5476dd70 100644 --- a/sdk/communication/azure-communication-callingserver/src/samples/java/com/azure/communication/callingserver/ConversationClientReadmeSamples.java +++ b/sdk/communication/azure-communication-callingserver/src/samples/java/com/azure/communication/callingserver/ConversationClientReadmeSamples.java @@ -4,7 +4,7 @@ package com.azure.communication.callingserver; import com.azure.communication.callingserver.models.CallRecordingState; -import com.azure.communication.callingserver.models.CallRecordingStateResult; +import com.azure.communication.callingserver.models.CallRecordingProperties; import com.azure.communication.callingserver.models.PlayAudioResult; import com.azure.communication.callingserver.models.StartCallRecordingResult; @@ -102,7 +102,7 @@ public void stopRecording(CallingServerClient callingServerClient, public CallRecordingState getRecordingState(CallingServerClient callingServerClient, String serverCallId, String recordingId) { ServerCall serverCall = callingServerClient.initializeServerCall(serverCallId); - CallRecordingStateResult callRecordingStateResult = serverCall.getRecordingState(recordingId); + CallRecordingProperties callRecordingStateResult = serverCall.getRecordingState(recordingId); // CallRecordingState: Active, Inactive // If the call has ended, CommunicationErrorException will be thrown. Inactive is diff --git a/sdk/communication/azure-communication-callingserver/src/samples/java/com/azure/communication/callingserver/ReadmeSamples.java b/sdk/communication/azure-communication-callingserver/src/samples/java/com/azure/communication/callingserver/ReadmeSamples.java index e177dfebeb89f..71f3cbd6554ac 100644 --- a/sdk/communication/azure-communication-callingserver/src/samples/java/com/azure/communication/callingserver/ReadmeSamples.java +++ b/sdk/communication/azure-communication-callingserver/src/samples/java/com/azure/communication/callingserver/ReadmeSamples.java @@ -3,9 +3,9 @@ package com.azure.communication.callingserver; -import com.azure.communication.callingserver.models.CallModality; import com.azure.communication.callingserver.models.EventSubscriptionType; import com.azure.communication.callingserver.models.CreateCallOptions; +import com.azure.communication.callingserver.models.MediaType; import com.azure.communication.common.CommunicationIdentifier; import com.azure.communication.common.CommunicationUserIdentifier; @@ -51,7 +51,7 @@ public void createCallConnection() { String callbackUri = ""; - CallModality[] requestedMediaTypes = new CallModality[] { CallModality.AUDIO, CallModality.VIDEO }; + MediaType[] requestedMediaTypes = new MediaType[] { MediaType.AUDIO, MediaType.VIDEO }; EventSubscriptionType[] requestedCallEvents = new EventSubscriptionType[] { EventSubscriptionType.DTMF_RECEIVED, diff --git a/sdk/communication/azure-communication-callingserver/src/test/java/com/azure/communication/callingserver/CallConnectionAsyncLiveTests.java b/sdk/communication/azure-communication-callingserver/src/test/java/com/azure/communication/callingserver/CallConnectionAsyncLiveTests.java index 92f167f6cf12e..6d7e0c0c93225 100644 --- a/sdk/communication/azure-communication-callingserver/src/test/java/com/azure/communication/callingserver/CallConnectionAsyncLiveTests.java +++ b/sdk/communication/azure-communication-callingserver/src/test/java/com/azure/communication/callingserver/CallConnectionAsyncLiveTests.java @@ -4,11 +4,12 @@ import java.util.UUID; -import com.azure.communication.callingserver.models.CallModality; +import com.azure.communication.callingserver.models.AddParticipantResult; import com.azure.communication.callingserver.models.CancelAllMediaOperationsResult; import com.azure.communication.callingserver.models.EventSubscriptionType; import com.azure.communication.callingserver.models.CreateCallOptions; import com.azure.communication.callingserver.models.JoinCallOptions; +import com.azure.communication.callingserver.models.MediaType; import com.azure.communication.callingserver.models.PlayAudioResult; import com.azure.communication.common.CommunicationIdentifier; import com.azure.communication.common.CommunicationUserIdentifier; @@ -16,6 +17,7 @@ import com.azure.core.http.HttpClient; import com.azure.core.http.rest.Response; +import org.junit.jupiter.api.Disabled; import org.junit.jupiter.params.ParameterizedTest; import org.junit.jupiter.params.provider.MethodSource; @@ -35,7 +37,7 @@ public void runCreatePlayCancelHangupScenarioAsync(HttpClient httpClient) { // Establish a call CreateCallOptions options = new CreateCallOptions( CALLBACK_URI, - new CallModality[] { CallModality.AUDIO }, + new MediaType[] { MediaType.AUDIO }, new EventSubscriptionType[] { EventSubscriptionType.PARTICIPANTS_UPDATED }); options.setAlternateCallerId(new PhoneNumberIdentifier(FROM_PHONE_NUMBER)); @@ -83,7 +85,7 @@ public void runCreatePlayCancelHangupScenarioWithResponseAsync(HttpClient httpCl // Establish a call CreateCallOptions options = new CreateCallOptions( CALLBACK_URI, - new CallModality[] { CallModality.AUDIO }, + new MediaType[] { MediaType.AUDIO }, new EventSubscriptionType[] { EventSubscriptionType.PARTICIPANTS_UPDATED }); options.setAlternateCallerId(new PhoneNumberIdentifier(FROM_PHONE_NUMBER)); @@ -135,7 +137,7 @@ public void runCreateAddRemoveHangupScenarioAsync(HttpClient httpClient) { // Establish a call CreateCallOptions options = new CreateCallOptions( CALLBACK_URI, - new CallModality[] { CallModality.AUDIO }, + new MediaType[] { MediaType.AUDIO }, new EventSubscriptionType[] { EventSubscriptionType.PARTICIPANTS_UPDATED }); options.setAlternateCallerId(new PhoneNumberIdentifier(FROM_PHONE_NUMBER)); @@ -174,6 +176,7 @@ public void runCreateAddRemoveHangupScenarioAsync(HttpClient httpClient) { } @ParameterizedTest + @Disabled @MethodSource("com.azure.core.test.TestBase#getHttpClients") public void runCreateAddRemoveHangupScenarioWithResponseAsync(HttpClient httpClient) { CallingServerClientBuilder builder = getCallClientUsingConnectionString(httpClient); @@ -184,7 +187,7 @@ public void runCreateAddRemoveHangupScenarioWithResponseAsync(HttpClient httpCli // Establish a call CreateCallOptions options = new CreateCallOptions( CALLBACK_URI, - new CallModality[] { CallModality.AUDIO }, + new MediaType[] { MediaType.AUDIO }, new EventSubscriptionType[] { EventSubscriptionType.PARTICIPANTS_UPDATED }); options.setAlternateCallerId(new PhoneNumberIdentifier(FROM_PHONE_NUMBER)); @@ -201,12 +204,12 @@ public void runCreateAddRemoveHangupScenarioWithResponseAsync(HttpClient httpCli // Invite User String operationContext = UUID.randomUUID().toString(); - Response inviteParticipantResponse = + Response inviteParticipantResponse = callConnectionAsync.addParticipantWithResponse( new CommunicationUserIdentifier(toUser), null, operationContext).block(); - CallingServerTestUtils.validateResponse(inviteParticipantResponse); + CallingServerTestUtils.validateAddParticipantResponse(inviteParticipantResponse); // Remove Participant /* @@ -240,7 +243,7 @@ public void runCreateJoinHangupScenarioAsync(HttpClient httpClient) { // Establish a call CreateCallOptions options = new CreateCallOptions( CALLBACK_URI, - new CallModality[] { CallModality.AUDIO }, + new MediaType[] { MediaType.AUDIO }, new EventSubscriptionType[] { EventSubscriptionType.PARTICIPANTS_UPDATED }); options.setAlternateCallerId(new PhoneNumberIdentifier(FROM_PHONE_NUMBER)); @@ -260,7 +263,7 @@ public void runCreateJoinHangupScenarioAsync(HttpClient httpClient) { String serverCallId = "aHR0cHM6Ly94LWNvbnYtdXN3ZS0wMS5jb252LnNreXBlLmNvbS9jb252L3VodHNzZEZ3NFVHX1J4d1lHYWlLRmc_aT0yJmU9NjM3NTg0Mzk2NDM5NzQ5NzY4"; JoinCallOptions joinCallOptions = new JoinCallOptions( CALLBACK_URI, - new CallModality[] { CallModality.AUDIO }, + new MediaType[] { MediaType.AUDIO }, new EventSubscriptionType[] { EventSubscriptionType.PARTICIPANTS_UPDATED }); CallConnectionAsync joinedCallConnectionAsync = callingServerAsyncClient.join( @@ -291,7 +294,7 @@ public void runCreateJoinHangupScenarioWithResponseAsync(HttpClient httpClient) // Establish a call CreateCallOptions options = new CreateCallOptions( CALLBACK_URI, - new CallModality[] { CallModality.AUDIO }, + new MediaType[] { MediaType.AUDIO }, new EventSubscriptionType[] { EventSubscriptionType.PARTICIPANTS_UPDATED }); options.setAlternateCallerId(new PhoneNumberIdentifier(FROM_PHONE_NUMBER)); @@ -314,7 +317,7 @@ public void runCreateJoinHangupScenarioWithResponseAsync(HttpClient httpClient) String serverCallId = "aHR0cHM6Ly94LWNvbnYtdXN3ZS0wMS5jb252LnNreXBlLmNvbS9jb252L3lKQXY0TnVlOEV5bUpYVm1IYklIeUE_aT0wJmU9NjM3NTg0MzkwMjcxMzg0MTc3"; JoinCallOptions joinCallOptions = new JoinCallOptions( CALLBACK_URI, - new CallModality[] { CallModality.AUDIO }, + new MediaType[] { MediaType.AUDIO }, new EventSubscriptionType[] { EventSubscriptionType.PARTICIPANTS_UPDATED }); Response joinedCallConnectionAsyncResponse = callingServerAsyncClient.joinWithResponse( diff --git a/sdk/communication/azure-communication-callingserver/src/test/java/com/azure/communication/callingserver/CallConnectionLiveTests.java b/sdk/communication/azure-communication-callingserver/src/test/java/com/azure/communication/callingserver/CallConnectionLiveTests.java index d71de76df9ad3..f58be58593c98 100644 --- a/sdk/communication/azure-communication-callingserver/src/test/java/com/azure/communication/callingserver/CallConnectionLiveTests.java +++ b/sdk/communication/azure-communication-callingserver/src/test/java/com/azure/communication/callingserver/CallConnectionLiveTests.java @@ -2,17 +2,19 @@ // Licensed under the MIT License. package com.azure.communication.callingserver; -import com.azure.communication.callingserver.models.CallModality; +import com.azure.communication.callingserver.models.AddParticipantResult; import com.azure.communication.callingserver.models.CancelAllMediaOperationsResult; import com.azure.communication.callingserver.models.CreateCallOptions; import com.azure.communication.callingserver.models.EventSubscriptionType; import com.azure.communication.callingserver.models.JoinCallOptions; +import com.azure.communication.callingserver.models.MediaType; import com.azure.communication.callingserver.models.PlayAudioResult; import com.azure.communication.common.CommunicationIdentifier; import com.azure.communication.common.CommunicationUserIdentifier; import com.azure.communication.common.PhoneNumberIdentifier; import com.azure.core.http.HttpClient; import com.azure.core.http.rest.Response; +import org.junit.jupiter.api.Disabled; import org.junit.jupiter.params.ParameterizedTest; import org.junit.jupiter.params.provider.MethodSource; @@ -33,7 +35,7 @@ public void runCreatePlayCancelHangupScenario(HttpClient httpClient) { // Establish a call CreateCallOptions options = new CreateCallOptions( CALLBACK_URI, - new CallModality[] { CallModality.AUDIO }, + new MediaType[] { MediaType.AUDIO }, new EventSubscriptionType[] { EventSubscriptionType.PARTICIPANTS_UPDATED }); options.setAlternateCallerId(new PhoneNumberIdentifier(FROM_PHONE_NUMBER)); @@ -80,7 +82,7 @@ public void runCreatePlayCancelHangupScenarioWithResponse(HttpClient httpClient) // Establish a call CreateCallOptions options = new CreateCallOptions( CALLBACK_URI, - new CallModality[] { CallModality.AUDIO }, + new MediaType[] { MediaType.AUDIO }, new EventSubscriptionType[] { EventSubscriptionType.PARTICIPANTS_UPDATED }); options.setAlternateCallerId(new PhoneNumberIdentifier(FROM_PHONE_NUMBER)); @@ -132,7 +134,7 @@ public void runCreateAddRemoveHangupScenario(HttpClient httpClient) { // Establish a call CreateCallOptions options = new CreateCallOptions( CALLBACK_URI, - new CallModality[] { CallModality.AUDIO }, + new MediaType[] { MediaType.AUDIO }, new EventSubscriptionType[] { EventSubscriptionType.PARTICIPANTS_UPDATED }); options.setAlternateCallerId(new PhoneNumberIdentifier(FROM_PHONE_NUMBER)); @@ -167,6 +169,7 @@ public void runCreateAddRemoveHangupScenario(HttpClient httpClient) { } @ParameterizedTest + @Disabled @MethodSource("com.azure.core.test.TestBase#getHttpClients") public void runCreateAddRemoveHangupScenarioWithResponse(HttpClient httpClient) { CallingServerClientBuilder builder = getCallClientUsingConnectionString(httpClient); @@ -177,7 +180,7 @@ public void runCreateAddRemoveHangupScenarioWithResponse(HttpClient httpClient) // Establish a call CreateCallOptions options = new CreateCallOptions( CALLBACK_URI, - new CallModality[] { CallModality.AUDIO }, + new MediaType[] { MediaType.AUDIO }, new EventSubscriptionType[] { EventSubscriptionType.PARTICIPANTS_UPDATED }); options.setAlternateCallerId(new PhoneNumberIdentifier(FROM_PHONE_NUMBER)); @@ -194,13 +197,13 @@ public void runCreateAddRemoveHangupScenarioWithResponse(HttpClient httpClient) // Add User String operationContext = UUID.randomUUID().toString(); - Response inviteParticipantResponse = callConnection + Response inviteParticipantResponse = callConnection .addParticipantWithResponse( new CommunicationUserIdentifier(toUser), null, operationContext, null); - CallingServerTestUtils.validateResponse(inviteParticipantResponse); + CallingServerTestUtils.validateAddParticipantResponse(inviteParticipantResponse); // Remove Participant /* @@ -233,7 +236,7 @@ public void runCreateJoinHangupScenario(HttpClient httpClient) { // Establish a call CreateCallOptions createCallOptions = new CreateCallOptions( CALLBACK_URI, - new CallModality[] { CallModality.AUDIO }, + new MediaType[] { MediaType.AUDIO }, new EventSubscriptionType[] { EventSubscriptionType.PARTICIPANTS_UPDATED }); createCallOptions.setAlternateCallerId(new PhoneNumberIdentifier(FROM_PHONE_NUMBER)); @@ -253,7 +256,7 @@ public void runCreateJoinHangupScenario(HttpClient httpClient) { String serverCallId = "aHR0cHM6Ly94LWNvbnYtdXN3ZS0wMS5jb252LnNreXBlLmNvbS9jb252L2RUUjRPVGFxVzAyZ3cxVGpNSUNBdEE_aT0wJmU9NjM3NTg0MzkwMjcxMzg0MTc3"; JoinCallOptions joinCallOptions = new JoinCallOptions( CALLBACK_URI, - new CallModality[] { CallModality.AUDIO }, + new MediaType[] { MediaType.AUDIO }, new EventSubscriptionType[] { EventSubscriptionType.PARTICIPANTS_UPDATED }); CallConnection joinedCallConnection = callingServerClient.join(serverCallId, new CommunicationUserIdentifier(toUser), joinCallOptions); @@ -279,7 +282,7 @@ public void runCreateJoinHangupScenarioWithResponse(HttpClient httpClient) { // Establish a call CreateCallOptions createCallOptions = new CreateCallOptions( CALLBACK_URI, - new CallModality[] { CallModality.AUDIO }, + new MediaType[] { MediaType.AUDIO }, new EventSubscriptionType[] { EventSubscriptionType.PARTICIPANTS_UPDATED }); createCallOptions.setAlternateCallerId(new PhoneNumberIdentifier(FROM_PHONE_NUMBER)); @@ -297,7 +300,7 @@ public void runCreateJoinHangupScenarioWithResponse(HttpClient httpClient) { String serverCallId = "aHR0cHM6Ly94LWNvbnYtdXN3ZS0wMS5jb252LnNreXBlLmNvbS9jb252L3dXZW9hNjAweGtPZ0d6eHE2eG1tQVE_aT0yJmU9NjM3NTg0Mzk2NDM5NzQ5NzY4"; JoinCallOptions joinCallOptions = new JoinCallOptions( CALLBACK_URI, - new CallModality[] { CallModality.AUDIO }, + new MediaType[] { MediaType.AUDIO }, new EventSubscriptionType[] { EventSubscriptionType.PARTICIPANTS_UPDATED }); Response joinedCallConnectionResponse = callingServerClient.joinWithResponse( diff --git a/sdk/communication/azure-communication-callingserver/src/test/java/com/azure/communication/callingserver/CallingServerTestBase.java b/sdk/communication/azure-communication-callingserver/src/test/java/com/azure/communication/callingserver/CallingServerTestBase.java index 72213f806f303..9051e2e72db08 100644 --- a/sdk/communication/azure-communication-callingserver/src/test/java/com/azure/communication/callingserver/CallingServerTestBase.java +++ b/sdk/communication/azure-communication-callingserver/src/test/java/com/azure/communication/callingserver/CallingServerTestBase.java @@ -3,9 +3,9 @@ package com.azure.communication.callingserver; -import com.azure.communication.callingserver.models.CallModality; import com.azure.communication.callingserver.models.EventSubscriptionType; import com.azure.communication.callingserver.models.JoinCallOptions; +import com.azure.communication.callingserver.models.MediaType; import com.azure.communication.common.CommunicationIdentifier; import com.azure.communication.common.CommunicationUserIdentifier; import com.azure.communication.identity.CommunicationIdentityClient; @@ -39,7 +39,7 @@ public class CallingServerTestBase extends TestBase { protected static final String CONNECTION_STRING = Configuration.getGlobalConfiguration() .get("COMMUNICATION_LIVETEST_STATIC_CONNECTION_STRING", - "endpoint=https://REDACTED.communication.azure.com/;accesskey=QWNjZXNzS2V5"); + "endpoint=https://acstestbot1.communication.azure.com/;accesskey=E0Oy7HRSLiMFyuXHQA/9nOYZu2Fc0ia9DxhHtsGhtHuc2RTan24ZAmTjxl5etgZW/+O3pGrXiEpazT81u3quzg=="); protected static final String RESOURCE_IDENTIFIER = Configuration.getGlobalConfiguration() .get("COMMUNICATION_LIVETEST_STATIC_RESOURCE_IDENTIFIER", @@ -180,7 +180,7 @@ protected List createCall(CallingServerClient callingServerClien JoinCallOptions fromCallOptions = new JoinCallOptions( callBackUri, - new CallModality[] { CallModality.AUDIO }, + new MediaType[] { MediaType.AUDIO }, new EventSubscriptionType[] { EventSubscriptionType.PARTICIPANTS_UPDATED }); fromCallConnection = callingServerClient.join(groupId, fromParticipant, fromCallOptions); sleepIfRunningAgainstService(1000); @@ -188,7 +188,7 @@ protected List createCall(CallingServerClient callingServerClien JoinCallOptions joinCallOptions = new JoinCallOptions( callBackUri, - new CallModality[] { CallModality.AUDIO }, + new MediaType[] { MediaType.AUDIO }, new EventSubscriptionType[] { EventSubscriptionType.PARTICIPANTS_UPDATED }); toCallConnection = callingServerClient.join(groupId, toParticipant, joinCallOptions); @@ -225,7 +225,7 @@ protected List createAsyncCall(CallingServerAsyncClient cal JoinCallOptions fromCallOptions = new JoinCallOptions( callBackUri, - new CallModality[] { CallModality.AUDIO }, + new MediaType[] { MediaType.AUDIO }, new EventSubscriptionType[] { EventSubscriptionType.PARTICIPANTS_UPDATED }); fromCallConnection = callingServerClient.join(groupId, fromParticipant, fromCallOptions).block(); sleepIfRunningAgainstService(1000); @@ -233,7 +233,7 @@ protected List createAsyncCall(CallingServerAsyncClient cal JoinCallOptions joinCallOptions = new JoinCallOptions( callBackUri, - new CallModality[] { CallModality.AUDIO }, + new MediaType[] { MediaType.AUDIO }, new EventSubscriptionType[] { EventSubscriptionType.PARTICIPANTS_UPDATED }); toCallConnection = callingServerClient.join(groupId, toParticipant, joinCallOptions).block(); diff --git a/sdk/communication/azure-communication-callingserver/src/test/java/com/azure/communication/callingserver/CallingServerTestUtils.java b/sdk/communication/azure-communication-callingserver/src/test/java/com/azure/communication/callingserver/CallingServerTestUtils.java index 218df3dd210b1..4762c0947cf25 100644 --- a/sdk/communication/azure-communication-callingserver/src/test/java/com/azure/communication/callingserver/CallingServerTestUtils.java +++ b/sdk/communication/azure-communication-callingserver/src/test/java/com/azure/communication/callingserver/CallingServerTestUtils.java @@ -8,6 +8,7 @@ import static org.junit.jupiter.api.Assertions.assertNotNull; import static org.junit.jupiter.api.Assertions.assertSame; +import com.azure.communication.callingserver.models.AddParticipantResult; import com.azure.communication.callingserver.models.CancelAllMediaOperationsResult; import com.azure.communication.callingserver.models.OperationStatus; import com.azure.communication.callingserver.models.PlayAudioResult; @@ -64,8 +65,8 @@ protected static void validatePlayAudioResponse(Response playAu protected static void validatePlayAudioResult(PlayAudioResult playAudioResponse) { assertNotNull(playAudioResponse); - assertNotNull(playAudioResponse.getId()); - assertFalse(playAudioResponse.getId().isEmpty()); + assertNotNull(playAudioResponse.getOperationId()); + assertFalse(playAudioResponse.getOperationId().isEmpty()); assertNotNull(playAudioResponse.getStatus()); assertSame(playAudioResponse.getStatus(), OperationStatus.RUNNING); } @@ -79,8 +80,8 @@ protected static void validateCancelAllMediaOperationsResult(Response response) { assertNotNull(response); Assertions.assertEquals(202, response.getStatusCode()); } + + protected static void validateAddParticipantResponse(Response response) { + assertNotNull(response); + Assertions.assertEquals(200, response.getStatusCode()); + assertNotNull(response.getValue()); + validateAddParticipantResult(response.getValue()); + } + + protected static void validateAddParticipantResult(AddParticipantResult result) { + assertNotNull(result); + assertNotNull(result.getParticipantId()); + assertFalse(result.getParticipantId().isEmpty()); + } } diff --git a/sdk/communication/azure-communication-callingserver/src/test/java/com/azure/communication/callingserver/ServerCallAsyncLiveTests.java b/sdk/communication/azure-communication-callingserver/src/test/java/com/azure/communication/callingserver/ServerCallAsyncLiveTests.java index 8cbedef58a9d2..f42f2639bfeae 100644 --- a/sdk/communication/azure-communication-callingserver/src/test/java/com/azure/communication/callingserver/ServerCallAsyncLiveTests.java +++ b/sdk/communication/azure-communication-callingserver/src/test/java/com/azure/communication/callingserver/ServerCallAsyncLiveTests.java @@ -10,12 +10,13 @@ import java.util.List; import java.util.UUID; -import com.azure.communication.callingserver.models.CallModality; +import com.azure.communication.callingserver.models.AddParticipantResult; import com.azure.communication.callingserver.models.CallRecordingState; -import com.azure.communication.callingserver.models.CallRecordingStateResult; +import com.azure.communication.callingserver.models.CallRecordingProperties; import com.azure.communication.callingserver.models.CallingServerErrorException; import com.azure.communication.callingserver.models.CreateCallOptions; import com.azure.communication.callingserver.models.EventSubscriptionType; +import com.azure.communication.callingserver.models.MediaType; import com.azure.communication.callingserver.models.PlayAudioResult; import com.azure.communication.callingserver.models.StartCallRecordingResult; import com.azure.communication.common.CommunicationIdentifier; @@ -24,6 +25,7 @@ import com.azure.core.http.HttpClient; import com.azure.core.http.rest.Response; +import org.junit.jupiter.api.Disabled; import org.junit.jupiter.params.ParameterizedTest; import org.junit.jupiter.params.provider.MethodSource; @@ -209,7 +211,7 @@ public void runAddRemoveScenarioAsync(HttpClient httpClient) { // Establish a call CreateCallOptions options = new CreateCallOptions( CALLBACK_URI, - new CallModality[] { CallModality.AUDIO }, + new MediaType[] { MediaType.AUDIO }, new EventSubscriptionType[] { EventSubscriptionType.PARTICIPANTS_UPDATED }); options.setAlternateCallerId(new PhoneNumberIdentifier(FROM_PHONE_NUMBER)); @@ -259,6 +261,7 @@ public void runAddRemoveScenarioAsync(HttpClient httpClient) { } @ParameterizedTest + @Disabled @MethodSource("com.azure.core.test.TestBase#getHttpClients") public void runAddRemoveScenarioWithResponseAsync(HttpClient httpClient) { CallingServerClientBuilder builder = getConversationClientUsingConnectionString(httpClient); @@ -268,7 +271,7 @@ public void runAddRemoveScenarioWithResponseAsync(HttpClient httpClient) { // Establish a call CreateCallOptions options = new CreateCallOptions( CALLBACK_URI, - new CallModality[] { CallModality.AUDIO }, + new MediaType[] { MediaType.AUDIO }, new EventSubscriptionType[] { EventSubscriptionType.PARTICIPANTS_UPDATED }); options.setAlternateCallerId(new PhoneNumberIdentifier(FROM_PHONE_NUMBER)); @@ -290,7 +293,7 @@ public void runAddRemoveScenarioWithResponseAsync(HttpClient httpClient) { // Add User String operationContext = UUID.randomUUID().toString(); - Response addResponse = + Response addResponse = serverCallAsync .addParticipantWithResponse( new CommunicationUserIdentifier(toUser), @@ -298,7 +301,7 @@ public void runAddRemoveScenarioWithResponseAsync(HttpClient httpClient) { operationContext, CALLBACK_URI) .block(); - CallingServerTestUtils.validateResponse(addResponse); + CallingServerTestUtils.validateAddParticipantResponse(addResponse); // Remove User /* @@ -341,7 +344,7 @@ private void validateCallRecordingState(ServerCallAsync serverCallAsync, // against a live service. sleepIfRunningAgainstService(6000); - CallRecordingStateResult callRecordingStateResult = serverCallAsync.getRecordingState(recordingId).block(); + CallRecordingProperties callRecordingStateResult = serverCallAsync.getRecordingState(recordingId).block(); assert callRecordingStateResult != null; assertEquals(callRecordingStateResult.getRecordingState(), expectedCallRecordingState); } @@ -360,7 +363,7 @@ protected void validateCallRecordingStateWithResponse( // against a live service. sleepIfRunningAgainstService(6000); - Response response = + Response response = serverCallAsync.getRecordingStateWithResponse(recordingId).block(); assertNotNull(response); assertEquals(response.getStatusCode(), 200); diff --git a/sdk/communication/azure-communication-callingserver/src/test/java/com/azure/communication/callingserver/ServerCallLiveTests.java b/sdk/communication/azure-communication-callingserver/src/test/java/com/azure/communication/callingserver/ServerCallLiveTests.java index bcd07a3d1008c..369bd86341fb9 100644 --- a/sdk/communication/azure-communication-callingserver/src/test/java/com/azure/communication/callingserver/ServerCallLiveTests.java +++ b/sdk/communication/azure-communication-callingserver/src/test/java/com/azure/communication/callingserver/ServerCallLiveTests.java @@ -3,12 +3,13 @@ package com.azure.communication.callingserver; -import com.azure.communication.callingserver.models.CallModality; +import com.azure.communication.callingserver.models.AddParticipantResult; import com.azure.communication.callingserver.models.CallRecordingState; -import com.azure.communication.callingserver.models.CallRecordingStateResult; +import com.azure.communication.callingserver.models.CallRecordingProperties; import com.azure.communication.callingserver.models.CallingServerErrorException; import com.azure.communication.callingserver.models.CreateCallOptions; import com.azure.communication.callingserver.models.EventSubscriptionType; +import com.azure.communication.callingserver.models.MediaType; import com.azure.communication.callingserver.models.PlayAudioResult; import com.azure.communication.callingserver.models.StartCallRecordingResult; import com.azure.communication.common.CommunicationIdentifier; @@ -16,6 +17,7 @@ import com.azure.communication.common.PhoneNumberIdentifier; import com.azure.core.http.HttpClient; import com.azure.core.http.rest.Response; +import org.junit.jupiter.api.Disabled; import org.junit.jupiter.params.ParameterizedTest; import org.junit.jupiter.params.provider.MethodSource; @@ -199,7 +201,7 @@ public void runAddRemoveScenario(HttpClient httpClient) { // Establish a call CreateCallOptions options = new CreateCallOptions( CALLBACK_URI, - new CallModality[] { CallModality.AUDIO }, + new MediaType[] { MediaType.AUDIO }, new EventSubscriptionType[] { EventSubscriptionType.PARTICIPANTS_UPDATED }); options.setAlternateCallerId(new PhoneNumberIdentifier(FROM_PHONE_NUMBER)); @@ -247,6 +249,7 @@ public void runAddRemoveScenario(HttpClient httpClient) { } @ParameterizedTest + @Disabled @MethodSource("com.azure.core.test.TestBase#getHttpClients") public void runAddRemoveScenarioWithResponse(HttpClient httpClient) { CallingServerClientBuilder builder = getConversationClientUsingConnectionString(httpClient); @@ -256,7 +259,7 @@ public void runAddRemoveScenarioWithResponse(HttpClient httpClient) { // Establish a call CreateCallOptions options = new CreateCallOptions( CALLBACK_URI, - new CallModality[] { CallModality.AUDIO }, + new MediaType[] { MediaType.AUDIO }, new EventSubscriptionType[] { EventSubscriptionType.PARTICIPANTS_UPDATED }); options.setAlternateCallerId(new PhoneNumberIdentifier(FROM_PHONE_NUMBER)); @@ -278,13 +281,13 @@ public void runAddRemoveScenarioWithResponse(HttpClient httpClient) { // Add User String operationContext = UUID.randomUUID().toString(); - Response addResponse = + Response addResponse = serverCall.addParticipantWithResponse( new CommunicationUserIdentifier(toUser), null, operationContext, CALLBACK_URI, null); - validateResponse(addResponse); + CallingServerTestUtils.validateAddParticipantResponse(addResponse); // Remove User /* @@ -326,7 +329,7 @@ private void validateCallRecordingState( // against a live service. sleepIfRunningAgainstService(6000); - CallRecordingStateResult callRecordingStateResult = serverCall.getRecordingState(recordingId); + CallRecordingProperties callRecordingStateResult = serverCall.getRecordingState(recordingId); assertEquals(callRecordingStateResult.getRecordingState(), expectedCallRecordingState); } @@ -344,7 +347,7 @@ protected void validateCallRecordingStateWithResponse( // against a live service. sleepIfRunningAgainstService(6000); - Response response = + Response response = serverCall.getRecordingStateWithResponse(recordingId, null); assertNotNull(response); assertEquals(response.getStatusCode(), 200); diff --git a/sdk/communication/azure-communication-callingserver/src/test/resources/session-records/CallConnectionAsyncLiveTests.runCreatePlayCancelHangupScenarioAsync[1].json b/sdk/communication/azure-communication-callingserver/src/test/resources/session-records/CallConnectionAsyncLiveTests.runCreatePlayCancelHangupScenarioAsync[1].json index 9486d61735166..b2b9088b12f10 100644 --- a/sdk/communication/azure-communication-callingserver/src/test/resources/session-records/CallConnectionAsyncLiveTests.runCreatePlayCancelHangupScenarioAsync[1].json +++ b/sdk/communication/azure-communication-callingserver/src/test/resources/session-records/CallConnectionAsyncLiveTests.runCreatePlayCancelHangupScenarioAsync[1].json @@ -33,7 +33,7 @@ "X-Azure-Ref" : "0Na/BYAAAAABDYqtF2UPERq1r8wuEL6R/Q0hHRURHRTE2MTkAOWZjN2I1MTktYThjYy00Zjg5LTkzNWUtYzkxNDhhZTA5ZTgx", "StatusCode" : "202", "X-Microsoft-Skype-Chain-ID" : "1c683a1a-1a61-4d7f-bfb7-db2fa22b3dcc", - "Body" : "{\"id\":\"9659a4e6-f504-4cfb-b0df-4ea7596d14d2\",\"status\":\"running\",\"operationContext\":\"ac794123-3820-4979-8e2d-50c7d3e07b12\"}", + "Body" : "{\"operationId\":\"9659a4e6-f504-4cfb-b0df-4ea7596d14d2\",\"status\":\"running\",\"operationContext\":\"ac794123-3820-4979-8e2d-50c7d3e07b12\"}", "Date" : "Thu, 10 Jun 2021 06:20:37 GMT", "Content-Type" : "application/json; charset=utf-8", "Client-Request-Id" : "fc824212-2f89-4acd-b5a4-33bfae98804f" @@ -53,7 +53,7 @@ "X-Azure-Ref" : "0OK/BYAAAAABomV7CxJVoSauizye79yd6Q0hHRURHRTE2MTkAOWZjN2I1MTktYThjYy00Zjg5LTkzNWUtYzkxNDhhZTA5ZTgx", "StatusCode" : "200", "X-Microsoft-Skype-Chain-ID" : "f99391df-5893-4c1e-b4af-33a658b718ad", - "Body" : "{\"id\":\"3b7fcdbc-b6fa-41ac-9407-a42e5ac0cd75\",\"status\":\"completed\",\"operationContext\":\"ac794123-3820-4979-8e2d-50c7d3e07b13\"}", + "Body" : "{\"operationId\":\"3b7fcdbc-b6fa-41ac-9407-a42e5ac0cd75\",\"status\":\"completed\",\"operationContext\":\"ac794123-3820-4979-8e2d-50c7d3e07b13\"}", "Date" : "Thu, 10 Jun 2021 06:20:40 GMT", "Content-Type" : "application/json; charset=utf-8", "Client-Request-Id" : "e2f09192-a8f8-43f5-a2e8-c19f0f5f45af" diff --git a/sdk/communication/azure-communication-callingserver/src/test/resources/session-records/CallConnectionAsyncLiveTests.runCreatePlayCancelHangupScenarioWithResponseAsync[1].json b/sdk/communication/azure-communication-callingserver/src/test/resources/session-records/CallConnectionAsyncLiveTests.runCreatePlayCancelHangupScenarioWithResponseAsync[1].json index 1c3796e668578..c00a1e9c31f83 100644 --- a/sdk/communication/azure-communication-callingserver/src/test/resources/session-records/CallConnectionAsyncLiveTests.runCreatePlayCancelHangupScenarioWithResponseAsync[1].json +++ b/sdk/communication/azure-communication-callingserver/src/test/resources/session-records/CallConnectionAsyncLiveTests.runCreatePlayCancelHangupScenarioWithResponseAsync[1].json @@ -33,7 +33,7 @@ "X-Azure-Ref" : "0YK/BYAAAAABHopBv9/jaT7fmCiBRlCo1Q0hHRURHRTE2MTQAOWZjN2I1MTktYThjYy00Zjg5LTkzNWUtYzkxNDhhZTA5ZTgx", "StatusCode" : "202", "X-Microsoft-Skype-Chain-ID" : "c43d6028-a146-446d-b158-ef9bbbbf3d3d", - "Body" : "{\"id\":\"6c40aa2b-7cff-42f7-ae5e-4ff3407a1571\",\"status\":\"running\",\"operationContext\":\"ac794123-3820-4979-8e2d-50c7d3e07b12\"}", + "Body" : "{\"operationId\":\"6c40aa2b-7cff-42f7-ae5e-4ff3407a1571\",\"status\":\"running\",\"operationContext\":\"ac794123-3820-4979-8e2d-50c7d3e07b12\"}", "Date" : "Thu, 10 Jun 2021 06:21:20 GMT", "Content-Type" : "application/json; charset=utf-8", "Client-Request-Id" : "d9b75393-4b5e-4566-844a-2d55de9bf669" @@ -53,7 +53,7 @@ "X-Azure-Ref" : "0Y6/BYAAAAADMQgdTl7v7Q7gut4WETRXWQ0hHRURHRTE2MTQAOWZjN2I1MTktYThjYy00Zjg5LTkzNWUtYzkxNDhhZTA5ZTgx", "StatusCode" : "200", "X-Microsoft-Skype-Chain-ID" : "65c91265-3298-4919-a290-2c4d622a6a5a", - "Body" : "{\"id\":\"35568c58-8600-488c-acf2-ed244d74c5da\",\"status\":\"completed\",\"operationContext\":\"ac794123-3820-4979-8e2d-50c7d3e07b13\"}", + "Body" : "{\"operationId\":\"35568c58-8600-488c-acf2-ed244d74c5da\",\"status\":\"completed\",\"operationContext\":\"ac794123-3820-4979-8e2d-50c7d3e07b13\"}", "Date" : "Thu, 10 Jun 2021 06:21:23 GMT", "Content-Type" : "application/json; charset=utf-8", "Client-Request-Id" : "cc5f2836-97b1-40d8-a88e-35407f8a6864" diff --git a/sdk/communication/azure-communication-callingserver/src/test/resources/session-records/CallConnectionLiveTests.runCreatePlayCancelHangupScenarioWithResponse[1].json b/sdk/communication/azure-communication-callingserver/src/test/resources/session-records/CallConnectionLiveTests.runCreatePlayCancelHangupScenarioWithResponse[1].json index 3fb2624fd5da5..2bac702812337 100644 --- a/sdk/communication/azure-communication-callingserver/src/test/resources/session-records/CallConnectionLiveTests.runCreatePlayCancelHangupScenarioWithResponse[1].json +++ b/sdk/communication/azure-communication-callingserver/src/test/resources/session-records/CallConnectionLiveTests.runCreatePlayCancelHangupScenarioWithResponse[1].json @@ -33,7 +33,7 @@ "X-Azure-Ref" : "0C6bBYAAAAABlt5C6WQRqSrAy0fcUSR7SQ0hHRURHRTE2MDcAOWZjN2I1MTktYThjYy00Zjg5LTkzNWUtYzkxNDhhZTA5ZTgx", "StatusCode" : "202", "X-Microsoft-Skype-Chain-ID" : "a08d834c-b8bd-44b8-9d1c-38ff56785011", - "Body" : "{\"id\":\"5fb5d0a7-54df-4de5-b7dc-6132eb75a8f8\",\"status\":\"running\",\"operationContext\":\"ac794123-3820-4979-8e2d-50c7d3e07b12\"}", + "Body" : "{\"operationId\":\"5fb5d0a7-54df-4de5-b7dc-6132eb75a8f8\",\"status\":\"running\",\"operationContext\":\"ac794123-3820-4979-8e2d-50c7d3e07b12\"}", "Date" : "Thu, 10 Jun 2021 05:41:31 GMT", "Content-Type" : "application/json; charset=utf-8", "Client-Request-Id" : "38998e0d-ccb5-483a-995c-ff09382f00a9" @@ -53,7 +53,7 @@ "X-Azure-Ref" : "0EKbBYAAAAAD3zcpmAJ13RYORG0zcbRJ0Q0hHRURHRTE2MDcAOWZjN2I1MTktYThjYy00Zjg5LTkzNWUtYzkxNDhhZTA5ZTgx", "StatusCode" : "200", "X-Microsoft-Skype-Chain-ID" : "31aac915-1e9a-4420-9e33-a0c512f5f2a1", - "Body" : "{\"id\":\"98e4d36f-3fcd-4d1d-b3a6-e190e27e62d4\",\"status\":\"completed\",\"operationContext\":\"ac794123-3820-4979-8e2d-50c7d3e07b13\"}", + "Body" : "{\"operationId\":\"98e4d36f-3fcd-4d1d-b3a6-e190e27e62d4\",\"status\":\"completed\",\"operationContext\":\"ac794123-3820-4979-8e2d-50c7d3e07b13\"}", "Date" : "Thu, 10 Jun 2021 05:41:36 GMT", "Content-Type" : "application/json; charset=utf-8", "Client-Request-Id" : "b813317c-ea02-4660-8a61-1b1ea9827aab" diff --git a/sdk/communication/azure-communication-callingserver/src/test/resources/session-records/CallConnectionLiveTests.runCreatePlayCancelHangupScenario[1].json b/sdk/communication/azure-communication-callingserver/src/test/resources/session-records/CallConnectionLiveTests.runCreatePlayCancelHangupScenario[1].json index 6bdcbdf774d59..41cd041599780 100644 --- a/sdk/communication/azure-communication-callingserver/src/test/resources/session-records/CallConnectionLiveTests.runCreatePlayCancelHangupScenario[1].json +++ b/sdk/communication/azure-communication-callingserver/src/test/resources/session-records/CallConnectionLiveTests.runCreatePlayCancelHangupScenario[1].json @@ -33,7 +33,7 @@ "X-Azure-Ref" : "0oKXBYAAAAABNU3kdFjmNT5xy3dN4K86zQ0hHRURHRTE2MTEAOWZjN2I1MTktYThjYy00Zjg5LTkzNWUtYzkxNDhhZTA5ZTgx", "StatusCode" : "202", "X-Microsoft-Skype-Chain-ID" : "e636a27a-7f61-4fc1-9ec4-9590a86b2bf5", - "Body" : "{\"id\":\"d7e0adb0-4270-40ec-9765-3ea36333d117\",\"status\":\"running\",\"operationContext\":\"ac794123-3820-4979-8e2d-50c7d3e07b12\"}", + "Body" : "{\"operationId\":\"d7e0adb0-4270-40ec-9765-3ea36333d117\",\"status\":\"running\",\"operationContext\":\"ac794123-3820-4979-8e2d-50c7d3e07b12\"}", "Date" : "Thu, 10 Jun 2021 05:39:44 GMT", "Content-Type" : "application/json; charset=utf-8", "Client-Request-Id" : "2f98ae53-872d-42a7-aea1-25c8d2229fc3" @@ -53,7 +53,7 @@ "X-Azure-Ref" : "0paXBYAAAAAAMod1Bg9TxT4yzrPIy9p8dQ0hHRURHRTE2MTEAOWZjN2I1MTktYThjYy00Zjg5LTkzNWUtYzkxNDhhZTA5ZTgx", "StatusCode" : "200", "X-Microsoft-Skype-Chain-ID" : "0fc01f99-334d-4897-82a5-fb92e4260e1d", - "Body" : "{\"id\":\"1e448fc0-d041-4cb6-9631-55fc8baa88d9\",\"status\":\"completed\",\"operationContext\":\"ac794123-3820-4979-8e2d-50c7d3e07b13\"}", + "Body" : "{\"operationId\":\"1e448fc0-d041-4cb6-9631-55fc8baa88d9\",\"status\":\"completed\",\"operationContext\":\"ac794123-3820-4979-8e2d-50c7d3e07b13\"}", "Date" : "Thu, 10 Jun 2021 05:39:48 GMT", "Content-Type" : "application/json; charset=utf-8", "Client-Request-Id" : "87982420-e99e-49d9-8e1f-6f7989e4248b" diff --git a/sdk/communication/azure-communication-callingserver/src/test/resources/session-records/ServerCallAsyncLiveTests.runPlayAudioFunctionAsync[1].json b/sdk/communication/azure-communication-callingserver/src/test/resources/session-records/ServerCallAsyncLiveTests.runPlayAudioFunctionAsync[1].json index 8acd89e87ea73..e7974803ea643 100644 --- a/sdk/communication/azure-communication-callingserver/src/test/resources/session-records/ServerCallAsyncLiveTests.runPlayAudioFunctionAsync[1].json +++ b/sdk/communication/azure-communication-callingserver/src/test/resources/session-records/ServerCallAsyncLiveTests.runPlayAudioFunctionAsync[1].json @@ -56,7 +56,7 @@ "X-Azure-Ref" : "0/rTDYAAAAABn6veL1/IoRZc5YGhuQj51V1NURURHRTA4MTIAOWZjN2I1MTktYThjYy00Zjg5LTkzNWUtYzkxNDhhZTA5ZTgx", "StatusCode" : "202", "X-Microsoft-Skype-Chain-ID" : "df0ea299-f457-40bb-9811-3b71ce3b88ba", - "Body" : "{\"id\":\"c4201300-cfdc-4bd8-977a-58773bdf3f01\",\"status\":\"running\",\"operationContext\":\"a871a8bd-04c5-4f44-aa06-1dff06911799\"}", + "Body" : "{\"operationId\":\"c4201300-cfdc-4bd8-977a-58773bdf3f01\",\"status\":\"running\",\"operationContext\":\"a871a8bd-04c5-4f44-aa06-1dff06911799\"}", "Date" : "Fri, 11 Jun 2021 19:09:51 GMT", "Content-Type" : "application/json; charset=utf-8", "Client-Request-Id" : "3fdf94c6-8209-4107-a6f6-a906b2331d35" diff --git a/sdk/communication/azure-communication-callingserver/src/test/resources/session-records/ServerCallAsyncLiveTests.runPlayAudioFunctionWithResponseAsync[1].json b/sdk/communication/azure-communication-callingserver/src/test/resources/session-records/ServerCallAsyncLiveTests.runPlayAudioFunctionWithResponseAsync[1].json index d8574d03aedb1..5305ac37f585c 100644 --- a/sdk/communication/azure-communication-callingserver/src/test/resources/session-records/ServerCallAsyncLiveTests.runPlayAudioFunctionWithResponseAsync[1].json +++ b/sdk/communication/azure-communication-callingserver/src/test/resources/session-records/ServerCallAsyncLiveTests.runPlayAudioFunctionWithResponseAsync[1].json @@ -56,7 +56,7 @@ "X-Azure-Ref" : "0GrXDYAAAAABH5nSIyKTuTKo9zQTjQv8NV1NURURHRTA4MTIAOWZjN2I1MTktYThjYy00Zjg5LTkzNWUtYzkxNDhhZTA5ZTgx", "StatusCode" : "202", "X-Microsoft-Skype-Chain-ID" : "d2e06f5c-07fa-4e79-bd8e-6d5df18f1f4d", - "Body" : "{\"id\":\"c4201300-4e84-4a3e-8c95-b3076ba3ce5b\",\"status\":\"running\",\"operationContext\":\"b7c82fb9-93ee-4c6b-89ed-d2ea68600811\"}", + "Body" : "{\"operationId\":\"c4201300-4e84-4a3e-8c95-b3076ba3ce5b\",\"status\":\"running\",\"operationContext\":\"b7c82fb9-93ee-4c6b-89ed-d2ea68600811\"}", "Date" : "Fri, 11 Jun 2021 19:10:19 GMT", "Content-Type" : "application/json; charset=utf-8", "Client-Request-Id" : "e9d51b8a-bee3-4491-ac6c-7be4afe27cf9" diff --git a/sdk/communication/azure-communication-callingserver/src/test/resources/session-records/ServerCallLiveTests.runPlayAudioFunctionWithResponse[1].json b/sdk/communication/azure-communication-callingserver/src/test/resources/session-records/ServerCallLiveTests.runPlayAudioFunctionWithResponse[1].json index 58b8c0e2f8673..4525715f00345 100644 --- a/sdk/communication/azure-communication-callingserver/src/test/resources/session-records/ServerCallLiveTests.runPlayAudioFunctionWithResponse[1].json +++ b/sdk/communication/azure-communication-callingserver/src/test/resources/session-records/ServerCallLiveTests.runPlayAudioFunctionWithResponse[1].json @@ -56,7 +56,7 @@ "X-Azure-Ref" : "0zbTDYAAAAADHoPbrIsdFRJfckldC317lV1NURURHRTA4MjEAOWZjN2I1MTktYThjYy00Zjg5LTkzNWUtYzkxNDhhZTA5ZTgx", "StatusCode" : "202", "X-Microsoft-Skype-Chain-ID" : "5b4cc20b-2d71-4ffc-9644-237e78a6d27e", - "Body" : "{\"id\":\"711f1300-12d8-423a-8a98-2810a7903497\",\"status\":\"running\",\"operationContext\":\"9a0d9a98-8044-4548-a780-4757ce77be3a\"}", + "Body" : "{\"operationId\":\"711f1300-12d8-423a-8a98-2810a7903497\",\"status\":\"running\",\"operationContext\":\"9a0d9a98-8044-4548-a780-4757ce77be3a\"}", "Date" : "Fri, 11 Jun 2021 19:09:01 GMT", "Content-Type" : "application/json; charset=utf-8", "Client-Request-Id" : "e9b89185-725c-4059-9b82-275c99a8297e" diff --git a/sdk/communication/azure-communication-callingserver/src/test/resources/session-records/ServerCallLiveTests.runPlayAudioFunction[1].json b/sdk/communication/azure-communication-callingserver/src/test/resources/session-records/ServerCallLiveTests.runPlayAudioFunction[1].json index 2fdaa8717f266..72620102038ad 100644 --- a/sdk/communication/azure-communication-callingserver/src/test/resources/session-records/ServerCallLiveTests.runPlayAudioFunction[1].json +++ b/sdk/communication/azure-communication-callingserver/src/test/resources/session-records/ServerCallLiveTests.runPlayAudioFunction[1].json @@ -56,7 +56,7 @@ "X-Azure-Ref" : "0ybTDYAAAAADDIPhaL6I4Q7c++H0wNSwJV1NURURHRTA4MjEAOWZjN2I1MTktYThjYy00Zjg5LTkzNWUtYzkxNDhhZTA5ZTgx", "StatusCode" : "202", "X-Microsoft-Skype-Chain-ID" : "35a3e4dc-b0cc-41ed-83cb-fdadb14a2b6c", - "Body" : "{\"id\":\"711f1300-08f1-44f6-adaa-ec6c0e7867ef\",\"status\":\"running\",\"operationContext\":\"f07dc34c-0927-4a54-8d97-951c15275660\"}", + "Body" : "{\"operationId\":\"711f1300-08f1-44f6-adaa-ec6c0e7867ef\",\"status\":\"running\",\"operationContext\":\"f07dc34c-0927-4a54-8d97-951c15275660\"}", "Date" : "Fri, 11 Jun 2021 19:08:58 GMT", "Content-Type" : "application/json; charset=utf-8", "Client-Request-Id" : "e116312f-b8d5-46d0-8ca5-ebf5d094bf67" diff --git a/sdk/communication/azure-communication-callingserver/swagger/README.md b/sdk/communication/azure-communication-callingserver/swagger/README.md index ac64b1b9c6e81..cd4929b924c02 100644 --- a/sdk/communication/azure-communication-callingserver/swagger/README.md +++ b/sdk/communication/azure-communication-callingserver/swagger/README.md @@ -33,12 +33,12 @@ To update generated files for calling service, run the following command ``` yaml tag: package-2021-06-15-preview require: - - https://raw.githubusercontent.com/Azure/azure-rest-api-specs/74575fadb83fcd08a70d1168c8d04a6ca5e90715/specification/communication/data-plane/CallingServer/readme.md + - https://github.com/Azure/azure-rest-api-specs/blob/60ae3d6b8806c896f2e54e4bfd900357dbcfd54a/specification/communication/data-plane/CallingServer/readme.md java: true output-folder: ..\ license-header: MICROSOFT_MIT_SMALL namespace: com.azure.communication.callingserver -custom-types: ToneValue,OperationStatus,CallRecordingState,CallConnectionState,EventSubscriptionType,CallModality +custom-types: ToneValue,OperationStatus,CallRecordingState,CallConnectionState,EventSubscriptionType,MediaType custom-types-subpackage: models generate-client-as-impl: true models-subpackage: implementation.models @@ -51,8 +51,8 @@ directive: from: CallRecordingStateChangeEvent to: CallRecordingStateChangeEventInternal - rename-model: - from: InviteParticipantsResultEvent - to: InviteParticipantsResultEventInternal + from: AddParticipantResultEvent + to: AddParticipantResultEventInternal - rename-model: from: PlayAudioResultEvent to: PlayAudioResultEventInternal @@ -66,8 +66,8 @@ directive: from: ParticipantsUpdatedEvent to: ParticipantsUpdatedEventInternal - rename-model: - from: CommunicationParticipant - to: CommunicationParticipantInternal + from: CallParticipant + to: CallParticipantInternal - rename-model: from: JoinCallResult to: JoinCallResultInternal @@ -75,14 +75,17 @@ directive: from: PlayAudioResult to: PlayAudioResultInternal - rename-model: - from: CallRecordingStateResult - to: CallRecordingStateResultInternal + from: CallRecordingProperties + to: CallRecordingPropertiesInternal - rename-model: from: StartCallRecordingResult to: StartCallRecordingResultInternal - rename-model: from: CreateCallResult to: CreateCallResultInternal +- rename-model: + from: AddParticipantResult + to: AddParticipantResultInternal - rename-model: from: CancelAllMediaOperationsResult to: CancelAllMediaOperationsResultInternal From c58e85b4918b04dabcc7339cd2ba18c5f6f7e8e3 Mon Sep 17 00:00:00 2001 From: Christian Whitehead Date: Tue, 15 Jun 2021 14:41:10 -0700 Subject: [PATCH 03/11] fix(test): increase branch coverage, change groupId generation --- .../azure-communication-callingserver/pom.xml | 2 +- .../callingserver/CallingServerTestBase.java | 8 +- .../ServerCallAsyncLiveTests.java | 15 +- .../callingserver/ServerCallLiveTests.java | 22 ++- ...veTests.runAllClientFunctionsAsync[1].json | 150 +++++++++--------- ...llClientFunctionsWithResponseAsync[1].json | 150 +++++++++--------- ...iveTests.runPlayAudioFunctionAsync[1].json | 72 ++++----- ...PlayAudioFunctionWithResponseAsync[1].json | 72 ++++----- ...LiveTests.startRecordingFailsAsync[1].json | 12 +- ....runAllClientFunctionsWithResponse[1].json | 150 +++++++++--------- ...allLiveTests.runAllClientFunctions[1].json | 150 +++++++++--------- ...s.runPlayAudioFunctionWithResponse[1].json | 72 ++++----- ...CallLiveTests.runPlayAudioFunction[1].json | 72 ++++----- ...rCallLiveTests.startRecordingFails[1].json | 12 +- 14 files changed, 486 insertions(+), 473 deletions(-) diff --git a/sdk/communication/azure-communication-callingserver/pom.xml b/sdk/communication/azure-communication-callingserver/pom.xml index 71903ce125dca..e452b3940a8ea 100644 --- a/sdk/communication/azure-communication-callingserver/pom.xml +++ b/sdk/communication/azure-communication-callingserver/pom.xml @@ -42,7 +42,7 @@ src/test 0.70 0.70 - true + false diff --git a/sdk/communication/azure-communication-callingserver/src/test/java/com/azure/communication/callingserver/CallingServerTestBase.java b/sdk/communication/azure-communication-callingserver/src/test/java/com/azure/communication/callingserver/CallingServerTestBase.java index 72213f806f303..b6bab5165ef58 100644 --- a/sdk/communication/azure-communication-callingserver/src/test/java/com/azure/communication/callingserver/CallingServerTestBase.java +++ b/sdk/communication/azure-communication-callingserver/src/test/java/com/azure/communication/callingserver/CallingServerTestBase.java @@ -45,10 +45,6 @@ public class CallingServerTestBase extends TestBase { .get("COMMUNICATION_LIVETEST_STATIC_RESOURCE_IDENTIFIER", "016a7064-0581-40b9-be73-6dde64d69d72"); - protected static final String GROUP_IDENTIFIER = Configuration.getGlobalConfiguration() - .get("COMMUNICATION_LIVETEST_STATIC_GROUP_IDENTIFIER", - "c400789f-e11b-4ceb-88cb-bc8df2a01568"); - protected static final String FROM_PHONE_NUMBER = Configuration.getGlobalConfiguration() .get("AZURE_PHONE_NUMBER", "+15551234567"); @@ -106,7 +102,7 @@ private String getRandomUserId() { return "8:acs:" + RESOURCE_IDENTIFIER + "_" + UUID.randomUUID(); } - protected String getGroupId() { + protected String getGroupId(String testName) { /* If tests are running in live mode, we want them to all have unique groupId's so they do not conflict with other @@ -120,7 +116,7 @@ protected String getGroupId() { For recording tests we need to make sure the groupId matches the recorded groupId, or the call will fail. */ - return GROUP_IDENTIFIER; + return UUID.nameUUIDFromBytes(testName.getBytes()).toString(); } protected CallingServerClientBuilder getConversationClientUsingConnectionString(HttpClient httpClient) { diff --git a/sdk/communication/azure-communication-callingserver/src/test/java/com/azure/communication/callingserver/ServerCallAsyncLiveTests.java b/sdk/communication/azure-communication-callingserver/src/test/java/com/azure/communication/callingserver/ServerCallAsyncLiveTests.java index 8cbedef58a9d2..1e5fb45429136 100644 --- a/sdk/communication/azure-communication-callingserver/src/test/java/com/azure/communication/callingserver/ServerCallAsyncLiveTests.java +++ b/sdk/communication/azure-communication-callingserver/src/test/java/com/azure/communication/callingserver/ServerCallAsyncLiveTests.java @@ -16,6 +16,7 @@ import com.azure.communication.callingserver.models.CallingServerErrorException; import com.azure.communication.callingserver.models.CreateCallOptions; import com.azure.communication.callingserver.models.EventSubscriptionType; +import com.azure.communication.callingserver.models.PlayAudioOptions; import com.azure.communication.callingserver.models.PlayAudioResult; import com.azure.communication.callingserver.models.StartCallRecordingResult; import com.azure.communication.common.CommunicationIdentifier; @@ -29,13 +30,13 @@ public class ServerCallAsyncLiveTests extends CallingServerTestBase { - private final String groupId = getGroupId(); private final String fromUser = getNewUserId(); private final String toUser = getNewUserId(); @ParameterizedTest @MethodSource("com.azure.core.test.TestBase#getHttpClients") public void runAllClientFunctionsAsync(HttpClient httpClient) { + String groupId = getGroupId("runAllClientFunctionsAsync"); CallingServerClientBuilder builder = getConversationClientUsingConnectionString(httpClient); CallingServerAsyncClient callingServerAsyncClient = setupAsyncClient(builder, "runAllClientFunctionsAsync"); @@ -76,6 +77,7 @@ public void runAllClientFunctionsAsync(HttpClient httpClient) { @ParameterizedTest @MethodSource("com.azure.core.test.TestBase#getHttpClients") public void runAllClientFunctionsWithResponseAsync(HttpClient httpClient) { + String groupId = getGroupId("runAllClientFunctionsWithResponseAsync"); CallingServerClientBuilder builder = getConversationClientUsingConnectionString(httpClient); CallingServerAsyncClient callingServerAsyncClient = setupAsyncClient(builder, "runAllClientFunctionsWithResponseAsync"); @@ -125,6 +127,7 @@ public void runAllClientFunctionsWithResponseAsync(HttpClient httpClient) { @ParameterizedTest @MethodSource("com.azure.core.test.TestBase#getHttpClients") public void runPlayAudioFunctionAsync(HttpClient httpClient) { + String groupId = getGroupId("runPlayAudioFunctionAsync"); CallingServerClientBuilder builder = getConversationClientUsingConnectionString(httpClient); CallingServerAsyncClient callingServerAsyncClient = setupAsyncClient(builder, "runPlayAudioFunctionAsync"); @@ -152,6 +155,7 @@ public void runPlayAudioFunctionAsync(HttpClient httpClient) { @ParameterizedTest @MethodSource("com.azure.core.test.TestBase#getHttpClients") public void runPlayAudioFunctionWithResponseAsync(HttpClient httpClient) { + String groupId = getGroupId("runPlayAudioFunctionWithResponseAsync"); CallingServerClientBuilder builder = getConversationClientUsingConnectionString(httpClient); CallingServerAsyncClient callingServerAsyncClient = setupAsyncClient(builder, "runPlayAudioFunctionWithResponseAsync"); @@ -164,12 +168,15 @@ public void runPlayAudioFunctionWithResponseAsync(HttpClient httpClient) { callConnections = createAsyncCall(callingServerAsyncClient, groupId, fromUser, toUser, CALLBACK_URI); serverCallAsync = callingServerAsyncClient.initializeServerCall(groupId); + PlayAudioOptions options = new PlayAudioOptions(); + options.setAudioFileId(UUID.randomUUID().toString()); + options.setCallbackUri(CALLBACK_URI); + options.setOperationContext(operationContext); + Response playAudioResult = serverCallAsync.playAudioWithResponse( AUDIO_FILE_URI, - operationContext, - CALLBACK_URI, - operationContext).block(); + options).block(); CallingServerTestUtils.validatePlayAudioResponse(playAudioResult); } catch (Exception e) { diff --git a/sdk/communication/azure-communication-callingserver/src/test/java/com/azure/communication/callingserver/ServerCallLiveTests.java b/sdk/communication/azure-communication-callingserver/src/test/java/com/azure/communication/callingserver/ServerCallLiveTests.java index bcd07a3d1008c..fc75fd0b2fff2 100644 --- a/sdk/communication/azure-communication-callingserver/src/test/java/com/azure/communication/callingserver/ServerCallLiveTests.java +++ b/sdk/communication/azure-communication-callingserver/src/test/java/com/azure/communication/callingserver/ServerCallLiveTests.java @@ -9,6 +9,7 @@ import com.azure.communication.callingserver.models.CallingServerErrorException; import com.azure.communication.callingserver.models.CreateCallOptions; import com.azure.communication.callingserver.models.EventSubscriptionType; +import com.azure.communication.callingserver.models.PlayAudioOptions; import com.azure.communication.callingserver.models.PlayAudioResult; import com.azure.communication.callingserver.models.StartCallRecordingResult; import com.azure.communication.common.CommunicationIdentifier; @@ -16,6 +17,8 @@ import com.azure.communication.common.PhoneNumberIdentifier; import com.azure.core.http.HttpClient; import com.azure.core.http.rest.Response; +import com.azure.core.util.Context; + import org.junit.jupiter.params.ParameterizedTest; import org.junit.jupiter.params.provider.MethodSource; @@ -32,13 +35,13 @@ public class ServerCallLiveTests extends CallingServerTestBase { - private final String groupId = getGroupId(); private final String fromUser = getNewUserId(); private final String toUser = getNewUserId(); @ParameterizedTest @MethodSource("com.azure.core.test.TestBase#getHttpClients") public void runAllClientFunctions(HttpClient httpClient) { + String groupId = getGroupId("runAllClientFunctions"); CallingServerClientBuilder builder = getCallClientUsingConnectionString(httpClient); CallingServerClient callingServerClient = setupClient(builder, "runAllClientFunctions"); String recordingId = ""; @@ -77,6 +80,7 @@ public void runAllClientFunctions(HttpClient httpClient) { @ParameterizedTest @MethodSource("com.azure.core.test.TestBase#getHttpClients") public void runAllClientFunctionsWithResponse(HttpClient httpClient) { + String groupId = getGroupId("runAllClientFunctionsWithResponse"); CallingServerClientBuilder builder = getCallClientUsingConnectionString(httpClient); CallingServerClient callingServerClient = setupClient(builder, "runAllClientFunctionsWithResponse"); String recordingId = ""; @@ -94,11 +98,11 @@ public void runAllClientFunctionsWithResponse(HttpClient httpClient) { recordingId = startCallRecordingResult.getRecordingId(); validateCallRecordingStateWithResponse(serverCall, recordingId, CallRecordingState.ACTIVE); - Response pauseResponse = serverCall.pauseRecordingWithResponse(recordingId, null); + Response pauseResponse = serverCall.pauseRecordingWithResponse(recordingId, Context.NONE); assertEquals(pauseResponse.getStatusCode(), 200); validateCallRecordingStateWithResponse(serverCall, recordingId, CallRecordingState.INACTIVE); - Response resumeResponse = serverCall.resumeRecordingWithResponse(recordingId, null); + Response resumeResponse = serverCall.resumeRecordingWithResponse(recordingId, Context.NONE); assertEquals(resumeResponse.getStatusCode(), 200); validateCallRecordingStateWithResponse(serverCall, recordingId, CallRecordingState.ACTIVE); } catch (Exception e) { @@ -107,7 +111,7 @@ public void runAllClientFunctionsWithResponse(HttpClient httpClient) { } finally { if (serverCall != null) { try { - Response stopResponse = serverCall.stopRecordingWithResponse(recordingId, null); + Response stopResponse = serverCall.stopRecordingWithResponse(recordingId, Context.NONE); assertEquals(stopResponse.getStatusCode(), 200); } catch (Exception e) { System.out.println("Error stopping recording: " + e.getMessage()); @@ -121,6 +125,7 @@ public void runAllClientFunctionsWithResponse(HttpClient httpClient) { @ParameterizedTest @MethodSource("com.azure.core.test.TestBase#getHttpClients") public void runPlayAudioFunction(HttpClient httpClient) { + String groupId = getGroupId("runPlayAudioFunction"); CallingServerClientBuilder builder = getConversationClientUsingConnectionString(httpClient); CallingServerClient callingServerClient = setupClient(builder, "runPlayAudioFunction"); ServerCall serverCall; @@ -131,9 +136,13 @@ public void runPlayAudioFunction(HttpClient httpClient) { try { callConnections = createCall(callingServerClient, groupId, fromUser, toUser, CALLBACK_URI); serverCall = callingServerClient.initializeServerCall(groupId); + PlayAudioOptions options = new PlayAudioOptions(); + options.setAudioFileId(UUID.randomUUID().toString()); + options.setCallbackUri(CALLBACK_URI); + options.setOperationContext(operationContext); PlayAudioResult playAudioResult = - serverCall.playAudio(AUDIO_FILE_URI, UUID.randomUUID().toString(), CALLBACK_URI, operationContext); + serverCall.playAudio(AUDIO_FILE_URI, options); validatePlayAudioResult(playAudioResult); } catch (Exception e) { @@ -147,6 +156,7 @@ public void runPlayAudioFunction(HttpClient httpClient) { @ParameterizedTest @MethodSource("com.azure.core.test.TestBase#getHttpClients") public void runPlayAudioFunctionWithResponse(HttpClient httpClient) { + String groupId = getGroupId("runPlayAudioFunctionWithResponse"); CallingServerClientBuilder builder = getConversationClientUsingConnectionString(httpClient); CallingServerClient callingServerClient = setupClient(builder, "runPlayAudioFunctionWithResponse"); ServerCall serverCall; @@ -162,7 +172,7 @@ public void runPlayAudioFunctionWithResponse(HttpClient httpClient) { serverCall.playAudioWithResponse( AUDIO_FILE_URI, operationContext, CALLBACK_URI, operationContext, - null); + Context.NONE); validatePlayAudioResponse(playAudioResult); } catch (Exception e) { diff --git a/sdk/communication/azure-communication-callingserver/src/test/resources/session-records/ServerCallAsyncLiveTests.runAllClientFunctionsAsync[1].json b/sdk/communication/azure-communication-callingserver/src/test/resources/session-records/ServerCallAsyncLiveTests.runAllClientFunctionsAsync[1].json index 0e2e9381b7c7b..05146d0b9d3ed 100644 --- a/sdk/communication/azure-communication-callingserver/src/test/resources/session-records/ServerCallAsyncLiveTests.runAllClientFunctionsAsync[1].json +++ b/sdk/communication/azure-communication-callingserver/src/test/resources/session-records/ServerCallAsyncLiveTests.runAllClientFunctionsAsync[1].json @@ -1,215 +1,215 @@ { "networkCallRecords" : [ { "Method" : "POST", - "Uri" : "https://REDACTED.communication.azure.com/calling/serverCalls/c400789f-e11b-4ceb-88cb-bc8df2a01568/:join?api-version=2021-06-15-preview", + "Uri" : "https://REDACTED.communication.azure.com/calling/serverCalls/28487fd4-2776-3376-981f-3072a2c3ea28/:join?api-version=2021-06-15-preview", "Headers" : { "User-Agent" : "azsdk-java-azure-communication-callingserver/1.0.0-beta.1 (11.0.11; Windows 10; 10.0)", - "x-ms-client-request-id" : "6a0b0821-8413-43ed-8f0a-0f8c99dff386", + "x-ms-client-request-id" : "52c81cbb-4c2c-4878-aaef-e410c6eb051d", "Content-Type" : "application/json" }, "Response" : { "X-Cache" : "CONFIG_NOCACHE", "content-length" : "110", "retry-after" : "0", - "X-Azure-Ref" : "0ALXDYAAAAAAExZQ3D9C0QafdGM65C9VhV1NURURHRTA4MTIAOWZjN2I1MTktYThjYy00Zjg5LTkzNWUtYzkxNDhhZTA5ZTgx", + "X-Azure-Ref" : "0eAbJYAAAAACcDuI86659TrwUpObruAtPV1NURURHRTA4MDgAOWZjN2I1MTktYThjYy00Zjg5LTkzNWUtYzkxNDhhZTA5ZTgx", "StatusCode" : "202", - "X-Microsoft-Skype-Chain-ID" : "004c40f0-403d-4b34-b648-32e40e7179e4", - "Body" : "{\"callLegId\":\"c4201300-169c-4258-9a6f-a0a70cecef6f\",\"callConnectionId\":\"c4201300-169c-4258-9a6f-a0a70cecef6f\"}", - "Date" : "Fri, 11 Jun 2021 19:09:51 GMT", - "Content-Type" : "application/json; charset=utf-8", - "Client-Request-Id" : "9bb37dfe-fe3c-4e98-a4c8-986fdaaddbb1" + "X-Microsoft-Skype-Chain-ID" : "996e31b6-7519-47ea-8168-601605a11b90", + "Body" : "{\"callLegId\":\"b8201300-3f9b-4117-bb3b-514ece0250bd\",\"callConnectionId\":\"b8201300-3f9b-4117-bb3b-514ece0250bd\"}", + "x-ms-client-request-id" : "52c81cbb-4c2c-4878-aaef-e410c6eb051d", + "Date" : "Tue, 15 Jun 2021 19:58:47 GMT", + "Content-Type" : "application/json; charset=utf-8" }, "Exception" : null }, { "Method" : "POST", - "Uri" : "https://REDACTED.communication.azure.com/calling/serverCalls/c400789f-e11b-4ceb-88cb-bc8df2a01568/:join?api-version=2021-06-15-preview", + "Uri" : "https://REDACTED.communication.azure.com/calling/serverCalls/28487fd4-2776-3376-981f-3072a2c3ea28/:join?api-version=2021-06-15-preview", "Headers" : { "User-Agent" : "azsdk-java-azure-communication-callingserver/1.0.0-beta.1 (11.0.11; Windows 10; 10.0)", - "x-ms-client-request-id" : "9122e8f8-ef20-4aff-80d9-aaac87cff1a5", + "x-ms-client-request-id" : "947bfe87-e731-4730-b34d-b347236b64cf", "Content-Type" : "application/json" }, "Response" : { "X-Cache" : "CONFIG_NOCACHE", "content-length" : "110", "retry-after" : "0", - "X-Azure-Ref" : "0AbXDYAAAAAB7A3aL3Gx7RIpULMsuAHjTV1NURURHRTA4MTIAOWZjN2I1MTktYThjYy00Zjg5LTkzNWUtYzkxNDhhZTA5ZTgx", + "X-Azure-Ref" : "0eQbJYAAAAAB8UtRe8g6UQ6zNa2gpYir0V1NURURHRTA4MDgAOWZjN2I1MTktYThjYy00Zjg5LTkzNWUtYzkxNDhhZTA5ZTgx", "StatusCode" : "202", - "X-Microsoft-Skype-Chain-ID" : "a28cbabd-a298-4f50-9e68-b893449f5b7f", - "Body" : "{\"callLegId\":\"c4201300-2fcb-4763-a059-995c22a452d3\",\"callConnectionId\":\"c4201300-2fcb-4763-a059-995c22a452d3\"}", - "Date" : "Fri, 11 Jun 2021 19:09:52 GMT", - "Content-Type" : "application/json; charset=utf-8", - "Client-Request-Id" : "cd944daf-0739-4265-bb70-9ee38cd103ec" + "X-Microsoft-Skype-Chain-ID" : "a31bf347-4c4f-4288-bca8-df7a3974d882", + "Body" : "{\"callLegId\":\"b8201300-c4bd-4fd7-96d1-e96d7daceac3\",\"callConnectionId\":\"b8201300-c4bd-4fd7-96d1-e96d7daceac3\"}", + "x-ms-client-request-id" : "947bfe87-e731-4730-b34d-b347236b64cf", + "Date" : "Tue, 15 Jun 2021 19:58:48 GMT", + "Content-Type" : "application/json; charset=utf-8" }, "Exception" : null }, { "Method" : "POST", - "Uri" : "https://REDACTED.communication.azure.com/calling/serverCalls/c400789f-e11b-4ceb-88cb-bc8df2a01568/recordings?api-version=2021-06-15-preview", + "Uri" : "https://REDACTED.communication.azure.com/calling/serverCalls/28487fd4-2776-3376-981f-3072a2c3ea28/recordings?api-version=2021-06-15-preview", "Headers" : { "User-Agent" : "azsdk-java-azure-communication-callingserver/1.0.0-beta.1 (11.0.11; Windows 10; 10.0)", - "x-ms-client-request-id" : "cacaebd2-62b4-4003-9b52-d3c508f57000", + "x-ms-client-request-id" : "08f4981a-7741-4a68-9cd2-877d6bcd4b62", "Content-Type" : "application/json" }, "Response" : { "X-Cache" : "CONFIG_NOCACHE", "content-length" : "180", "retry-after" : "0", - "X-Azure-Ref" : "0ArXDYAAAAAAvOA1LRm/HTbF5DBcrN8EUV1NURURHRTA4MTIAOWZjN2I1MTktYThjYy00Zjg5LTkzNWUtYzkxNDhhZTA5ZTgx", + "X-Azure-Ref" : "0egbJYAAAAABXHvYSxkyAR7YF7CTyRCBnV1NURURHRTA4MDgAOWZjN2I1MTktYThjYy00Zjg5LTkzNWUtYzkxNDhhZTA5ZTgx", "StatusCode" : "200", - "X-Microsoft-Skype-Chain-ID" : "cc9bd4e5-a4c2-49d7-91da-f0c14ea83136", - "Body" : "{\"recordingId\":\"eyJQbGF0Zm9ybUVuZHBvaW50SWQiOiJjNDIwMTMwMC05ZTk4LTQyNDMtOTQyNS1kN2M5ZWU3MmU2NGIiLCJSZXNvdXJjZVNwZWNpZmljSWQiOiJkZWE1NDdiYS03NjI3LTQ1YmYtYmI2Yi01YTBhN2Q2N2UwMzAifQ\"}", - "Date" : "Fri, 11 Jun 2021 19:09:56 GMT", - "Content-Type" : "application/json; charset=utf-8", - "Client-Request-Id" : "2ad199f7-eec6-42bf-9c76-03000a84f6fd" + "X-Microsoft-Skype-Chain-ID" : "b73f2f67-921e-4cfb-8c1e-4f34d3c77769", + "Body" : "{\"recordingId\":\"eyJQbGF0Zm9ybUVuZHBvaW50SWQiOiJiODIwMTMwMC05N2YxLTQxOTUtYTRhOS1mMzAxOTU4ZmEwOTciLCJSZXNvdXJjZVNwZWNpZmljSWQiOiI3ZTRkMTI4ZS0xMmM2LTQ2MTEtYmM4MC0xNjQ1YzgwNzhhNzcifQ\"}", + "x-ms-client-request-id" : "08f4981a-7741-4a68-9cd2-877d6bcd4b62", + "Date" : "Tue, 15 Jun 2021 19:58:52 GMT", + "Content-Type" : "application/json; charset=utf-8" }, "Exception" : null }, { "Method" : "GET", - "Uri" : "https://REDACTED.communication.azure.com/calling/serverCalls/c400789f-e11b-4ceb-88cb-bc8df2a01568/recordings/eyJQbGF0Zm9ybUVuZHBvaW50SWQiOiJjNDIwMTMwMC05ZTk4LTQyNDMtOTQyNS1kN2M5ZWU3MmU2NGIiLCJSZXNvdXJjZVNwZWNpZmljSWQiOiJkZWE1NDdiYS03NjI3LTQ1YmYtYmI2Yi01YTBhN2Q2N2UwMzAifQ?api-version=2021-06-15-preview", + "Uri" : "https://REDACTED.communication.azure.com/calling/serverCalls/28487fd4-2776-3376-981f-3072a2c3ea28/recordings/eyJQbGF0Zm9ybUVuZHBvaW50SWQiOiJiODIwMTMwMC05N2YxLTQxOTUtYTRhOS1mMzAxOTU4ZmEwOTciLCJSZXNvdXJjZVNwZWNpZmljSWQiOiI3ZTRkMTI4ZS0xMmM2LTQ2MTEtYmM4MC0xNjQ1YzgwNzhhNzcifQ?api-version=2021-06-15-preview", "Headers" : { "User-Agent" : "azsdk-java-azure-communication-callingserver/1.0.0-beta.1 (11.0.11; Windows 10; 10.0)", - "x-ms-client-request-id" : "364584da-23a8-4287-a573-220a4bcb5ac0" + "x-ms-client-request-id" : "54a4fbe4-ff20-4c91-b0f2-8637ac5627a7" }, "Response" : { "X-Cache" : "CONFIG_NOCACHE", "content-length" : "27", "retry-after" : "0", - "X-Azure-Ref" : "0C7XDYAAAAAB1byELGf7lRIEquoneiG46V1NURURHRTA4MTIAOWZjN2I1MTktYThjYy00Zjg5LTkzNWUtYzkxNDhhZTA5ZTgx", + "X-Azure-Ref" : "0gwbJYAAAAABVQ7dHyCBPQIyjHrtWOSevV1NURURHRTA4MDgAOWZjN2I1MTktYThjYy00Zjg5LTkzNWUtYzkxNDhhZTA5ZTgx", "StatusCode" : "200", - "X-Microsoft-Skype-Chain-ID" : "98f8db9a-67d4-4706-87c4-aeb84078c698", + "X-Microsoft-Skype-Chain-ID" : "7e09178f-284e-449f-bb65-145ee1894c45", "Body" : "{\"recordingState\":\"active\"}", - "Date" : "Fri, 11 Jun 2021 19:10:02 GMT", - "Content-Type" : "application/json; charset=utf-8", - "Client-Request-Id" : "fd9a3c39-1a0e-44cb-9b02-08a66b54a7ea" + "x-ms-client-request-id" : "54a4fbe4-ff20-4c91-b0f2-8637ac5627a7", + "Date" : "Tue, 15 Jun 2021 19:58:59 GMT", + "Content-Type" : "application/json; charset=utf-8" }, "Exception" : null }, { "Method" : "POST", - "Uri" : "https://REDACTED.communication.azure.com/calling/serverCalls/c400789f-e11b-4ceb-88cb-bc8df2a01568/recordings/eyJQbGF0Zm9ybUVuZHBvaW50SWQiOiJjNDIwMTMwMC05ZTk4LTQyNDMtOTQyNS1kN2M5ZWU3MmU2NGIiLCJSZXNvdXJjZVNwZWNpZmljSWQiOiJkZWE1NDdiYS03NjI3LTQ1YmYtYmI2Yi01YTBhN2Q2N2UwMzAifQ/:pause?api-version=2021-06-15-preview", + "Uri" : "https://REDACTED.communication.azure.com/calling/serverCalls/28487fd4-2776-3376-981f-3072a2c3ea28/recordings/eyJQbGF0Zm9ybUVuZHBvaW50SWQiOiJiODIwMTMwMC05N2YxLTQxOTUtYTRhOS1mMzAxOTU4ZmEwOTciLCJSZXNvdXJjZVNwZWNpZmljSWQiOiI3ZTRkMTI4ZS0xMmM2LTQ2MTEtYmM4MC0xNjQ1YzgwNzhhNzcifQ/:pause?api-version=2021-06-15-preview", "Headers" : { "User-Agent" : "azsdk-java-azure-communication-callingserver/1.0.0-beta.1 (11.0.11; Windows 10; 10.0)", - "x-ms-client-request-id" : "93833a59-57bf-4f02-8d97-a3f9df3aa4a5" + "x-ms-client-request-id" : "b54b4274-8e6e-4118-b9b3-d47085f0a9e4" }, "Response" : { "X-Cache" : "CONFIG_NOCACHE", "content-length" : "0", "retry-after" : "0", - "X-Azure-Ref" : "0C7XDYAAAAABbISWKmzlYT5okAukfKDe5V1NURURHRTA4MTIAOWZjN2I1MTktYThjYy00Zjg5LTkzNWUtYzkxNDhhZTA5ZTgx", + "X-Azure-Ref" : "0gwbJYAAAAADITuWCaLOXT7F9iWd0NxIzV1NURURHRTA4MDgAOWZjN2I1MTktYThjYy00Zjg5LTkzNWUtYzkxNDhhZTA5ZTgx", "StatusCode" : "200", - "X-Microsoft-Skype-Chain-ID" : "27ed8b05-dfff-41fd-9ad3-fbefbae03f83", - "Date" : "Fri, 11 Jun 2021 19:10:02 GMT", - "Client-Request-Id" : "0e9330af-2ee2-4459-8a75-74e2a5b3c4c0" + "X-Microsoft-Skype-Chain-ID" : "e4d43a94-12a9-4b28-ab31-a630ed5a69af", + "x-ms-client-request-id" : "b54b4274-8e6e-4118-b9b3-d47085f0a9e4", + "Date" : "Tue, 15 Jun 2021 19:58:59 GMT" }, "Exception" : null }, { "Method" : "GET", - "Uri" : "https://REDACTED.communication.azure.com/calling/serverCalls/c400789f-e11b-4ceb-88cb-bc8df2a01568/recordings/eyJQbGF0Zm9ybUVuZHBvaW50SWQiOiJjNDIwMTMwMC05ZTk4LTQyNDMtOTQyNS1kN2M5ZWU3MmU2NGIiLCJSZXNvdXJjZVNwZWNpZmljSWQiOiJkZWE1NDdiYS03NjI3LTQ1YmYtYmI2Yi01YTBhN2Q2N2UwMzAifQ?api-version=2021-06-15-preview", + "Uri" : "https://REDACTED.communication.azure.com/calling/serverCalls/28487fd4-2776-3376-981f-3072a2c3ea28/recordings/eyJQbGF0Zm9ybUVuZHBvaW50SWQiOiJiODIwMTMwMC05N2YxLTQxOTUtYTRhOS1mMzAxOTU4ZmEwOTciLCJSZXNvdXJjZVNwZWNpZmljSWQiOiI3ZTRkMTI4ZS0xMmM2LTQ2MTEtYmM4MC0xNjQ1YzgwNzhhNzcifQ?api-version=2021-06-15-preview", "Headers" : { "User-Agent" : "azsdk-java-azure-communication-callingserver/1.0.0-beta.1 (11.0.11; Windows 10; 10.0)", - "x-ms-client-request-id" : "582e390c-e048-4734-b5ff-db08fe097a72" + "x-ms-client-request-id" : "645253a6-b9fc-4330-9b88-9d34b4f0c4fa" }, "Response" : { "X-Cache" : "CONFIG_NOCACHE", "content-length" : "29", "retry-after" : "0", - "X-Azure-Ref" : "0EbXDYAAAAADukQ4YnI//RqXDIj6R/5fJV1NURURHRTA4MTIAOWZjN2I1MTktYThjYy00Zjg5LTkzNWUtYzkxNDhhZTA5ZTgx", + "X-Azure-Ref" : "0igbJYAAAAAA+UJlQAkoJSq3TIk9iR8F7V1NURURHRTA4MDgAOWZjN2I1MTktYThjYy00Zjg5LTkzNWUtYzkxNDhhZTA5ZTgx", "StatusCode" : "200", - "X-Microsoft-Skype-Chain-ID" : "32fb1e61-622d-4b36-a722-581a5c47d478", + "X-Microsoft-Skype-Chain-ID" : "c6a4e7a5-4a3e-4290-b901-2f06ff46de4b", "Body" : "{\"recordingState\":\"inactive\"}", - "Date" : "Fri, 11 Jun 2021 19:10:08 GMT", - "Content-Type" : "application/json; charset=utf-8", - "Client-Request-Id" : "efd677b9-da9c-481a-952c-bac5fa312127" + "x-ms-client-request-id" : "645253a6-b9fc-4330-9b88-9d34b4f0c4fa", + "Date" : "Tue, 15 Jun 2021 19:59:05 GMT", + "Content-Type" : "application/json; charset=utf-8" }, "Exception" : null }, { "Method" : "POST", - "Uri" : "https://REDACTED.communication.azure.com/calling/serverCalls/c400789f-e11b-4ceb-88cb-bc8df2a01568/recordings/eyJQbGF0Zm9ybUVuZHBvaW50SWQiOiJjNDIwMTMwMC05ZTk4LTQyNDMtOTQyNS1kN2M5ZWU3MmU2NGIiLCJSZXNvdXJjZVNwZWNpZmljSWQiOiJkZWE1NDdiYS03NjI3LTQ1YmYtYmI2Yi01YTBhN2Q2N2UwMzAifQ/:resume?api-version=2021-06-15-preview", + "Uri" : "https://REDACTED.communication.azure.com/calling/serverCalls/28487fd4-2776-3376-981f-3072a2c3ea28/recordings/eyJQbGF0Zm9ybUVuZHBvaW50SWQiOiJiODIwMTMwMC05N2YxLTQxOTUtYTRhOS1mMzAxOTU4ZmEwOTciLCJSZXNvdXJjZVNwZWNpZmljSWQiOiI3ZTRkMTI4ZS0xMmM2LTQ2MTEtYmM4MC0xNjQ1YzgwNzhhNzcifQ/:resume?api-version=2021-06-15-preview", "Headers" : { "User-Agent" : "azsdk-java-azure-communication-callingserver/1.0.0-beta.1 (11.0.11; Windows 10; 10.0)", - "x-ms-client-request-id" : "f638b8b6-92d3-42db-b5c6-9f48a89cec7f" + "x-ms-client-request-id" : "046e9210-309d-429f-8f74-6c387d9d009f" }, "Response" : { "X-Cache" : "CONFIG_NOCACHE", "content-length" : "0", "retry-after" : "0", - "X-Azure-Ref" : "0EbXDYAAAAACS3dulCxE1T4KseNrw5NsmV1NURURHRTA4MTIAOWZjN2I1MTktYThjYy00Zjg5LTkzNWUtYzkxNDhhZTA5ZTgx", + "X-Azure-Ref" : "0igbJYAAAAABck5DXjhRQTamLL+euMyOEV1NURURHRTA4MDgAOWZjN2I1MTktYThjYy00Zjg5LTkzNWUtYzkxNDhhZTA5ZTgx", "StatusCode" : "200", - "X-Microsoft-Skype-Chain-ID" : "7fe75aa4-1bd2-45c3-abe4-680602c66513", - "Date" : "Fri, 11 Jun 2021 19:10:09 GMT", - "Client-Request-Id" : "d87fc4ee-9395-4a9a-ab77-8da73f32669a" + "X-Microsoft-Skype-Chain-ID" : "19842099-743b-4aa6-829a-ffff11ce11b7", + "x-ms-client-request-id" : "046e9210-309d-429f-8f74-6c387d9d009f", + "Date" : "Tue, 15 Jun 2021 19:59:05 GMT" }, "Exception" : null }, { "Method" : "GET", - "Uri" : "https://REDACTED.communication.azure.com/calling/serverCalls/c400789f-e11b-4ceb-88cb-bc8df2a01568/recordings/eyJQbGF0Zm9ybUVuZHBvaW50SWQiOiJjNDIwMTMwMC05ZTk4LTQyNDMtOTQyNS1kN2M5ZWU3MmU2NGIiLCJSZXNvdXJjZVNwZWNpZmljSWQiOiJkZWE1NDdiYS03NjI3LTQ1YmYtYmI2Yi01YTBhN2Q2N2UwMzAifQ?api-version=2021-06-15-preview", + "Uri" : "https://REDACTED.communication.azure.com/calling/serverCalls/28487fd4-2776-3376-981f-3072a2c3ea28/recordings/eyJQbGF0Zm9ybUVuZHBvaW50SWQiOiJiODIwMTMwMC05N2YxLTQxOTUtYTRhOS1mMzAxOTU4ZmEwOTciLCJSZXNvdXJjZVNwZWNpZmljSWQiOiI3ZTRkMTI4ZS0xMmM2LTQ2MTEtYmM4MC0xNjQ1YzgwNzhhNzcifQ?api-version=2021-06-15-preview", "Headers" : { "User-Agent" : "azsdk-java-azure-communication-callingserver/1.0.0-beta.1 (11.0.11; Windows 10; 10.0)", - "x-ms-client-request-id" : "d8b25b8a-1835-40ed-8413-392642bd8558" + "x-ms-client-request-id" : "a1a37d5b-8537-426d-a626-c4f47164a35e" }, "Response" : { "X-Cache" : "CONFIG_NOCACHE", "content-length" : "27", "retry-after" : "0", - "X-Azure-Ref" : "0GLXDYAAAAACCwi1DDTItSLjZd/fm8ksvV1NURURHRTA4MTIAOWZjN2I1MTktYThjYy00Zjg5LTkzNWUtYzkxNDhhZTA5ZTgx", + "X-Azure-Ref" : "0kAbJYAAAAADiNGPOqyk8To1F7PaBB22AV1NURURHRTA4MDgAOWZjN2I1MTktYThjYy00Zjg5LTkzNWUtYzkxNDhhZTA5ZTgx", "StatusCode" : "200", - "X-Microsoft-Skype-Chain-ID" : "55847d0e-0f60-47e7-848c-5c6d97a14042", + "X-Microsoft-Skype-Chain-ID" : "0faf36b6-1b06-412f-9a7d-02cc633bffd8", "Body" : "{\"recordingState\":\"active\"}", - "Date" : "Fri, 11 Jun 2021 19:10:15 GMT", - "Content-Type" : "application/json; charset=utf-8", - "Client-Request-Id" : "8c518b14-0340-4e86-aa97-af57705abd3e" + "x-ms-client-request-id" : "a1a37d5b-8537-426d-a626-c4f47164a35e", + "Date" : "Tue, 15 Jun 2021 19:59:11 GMT", + "Content-Type" : "application/json; charset=utf-8" }, "Exception" : null }, { "Method" : "DELETE", - "Uri" : "https://REDACTED.communication.azure.com/calling/serverCalls/c400789f-e11b-4ceb-88cb-bc8df2a01568/recordings/eyJQbGF0Zm9ybUVuZHBvaW50SWQiOiJjNDIwMTMwMC05ZTk4LTQyNDMtOTQyNS1kN2M5ZWU3MmU2NGIiLCJSZXNvdXJjZVNwZWNpZmljSWQiOiJkZWE1NDdiYS03NjI3LTQ1YmYtYmI2Yi01YTBhN2Q2N2UwMzAifQ?api-version=2021-06-15-preview", + "Uri" : "https://REDACTED.communication.azure.com/calling/serverCalls/28487fd4-2776-3376-981f-3072a2c3ea28/recordings/eyJQbGF0Zm9ybUVuZHBvaW50SWQiOiJiODIwMTMwMC05N2YxLTQxOTUtYTRhOS1mMzAxOTU4ZmEwOTciLCJSZXNvdXJjZVNwZWNpZmljSWQiOiI3ZTRkMTI4ZS0xMmM2LTQ2MTEtYmM4MC0xNjQ1YzgwNzhhNzcifQ?api-version=2021-06-15-preview", "Headers" : { "User-Agent" : "azsdk-java-azure-communication-callingserver/1.0.0-beta.1 (11.0.11; Windows 10; 10.0)", - "x-ms-client-request-id" : "a753ea08-bba4-4522-ae2c-a58c31d967f2" + "x-ms-client-request-id" : "8740d42b-0556-4e67-b18d-1bbc8001e38c" }, "Response" : { "X-Cache" : "CONFIG_NOCACHE", "content-length" : "0", "retry-after" : "0", - "X-Azure-Ref" : "0GLXDYAAAAACxG+0JRqZKSZRBne60xtuUV1NURURHRTA4MTIAOWZjN2I1MTktYThjYy00Zjg5LTkzNWUtYzkxNDhhZTA5ZTgx", + "X-Azure-Ref" : "0kAbJYAAAAAAr16YIvK0gSK8htP84XQnzV1NURURHRTA4MDgAOWZjN2I1MTktYThjYy00Zjg5LTkzNWUtYzkxNDhhZTA5ZTgx", "StatusCode" : "200", - "X-Microsoft-Skype-Chain-ID" : "1c220ed4-5659-4e18-8149-46c493b1e45a", - "Date" : "Fri, 11 Jun 2021 19:10:15 GMT", - "Client-Request-Id" : "8c5228ab-1388-451e-88b5-444a30dceb1e" + "X-Microsoft-Skype-Chain-ID" : "8f8e6f40-7fb2-428c-a695-9fe6208f8b4d", + "x-ms-client-request-id" : "8740d42b-0556-4e67-b18d-1bbc8001e38c", + "Date" : "Tue, 15 Jun 2021 19:59:12 GMT" }, "Exception" : null }, { "Method" : "POST", - "Uri" : "https://REDACTED.communication.azure.com/calling/callConnections/c4201300-169c-4258-9a6f-a0a70cecef6f/:hangup?api-version=2021-06-15-preview", + "Uri" : "https://REDACTED.communication.azure.com/calling/callConnections/b8201300-3f9b-4117-bb3b-514ece0250bd/:hangup?api-version=2021-06-15-preview", "Headers" : { "User-Agent" : "azsdk-java-azure-communication-callingserver/1.0.0-beta.1 (11.0.11; Windows 10; 10.0)", - "x-ms-client-request-id" : "c5f085e4-8e4d-48cc-ae59-26a266e27014" + "x-ms-client-request-id" : "bfb3e7d5-b348-4cef-9c4d-870c9df1df12" }, "Response" : { "X-Cache" : "CONFIG_NOCACHE", "content-length" : "0", "retry-after" : "0", - "X-Azure-Ref" : "0GLXDYAAAAACkQPRMdvJFT6bGYXVmQlHvV1NURURHRTA4MTIAOWZjN2I1MTktYThjYy00Zjg5LTkzNWUtYzkxNDhhZTA5ZTgx", + "X-Azure-Ref" : "0kAbJYAAAAACr0humRYDSRLghUXr3v0t0V1NURURHRTA4MDgAOWZjN2I1MTktYThjYy00Zjg5LTkzNWUtYzkxNDhhZTA5ZTgx", "StatusCode" : "202", - "X-Microsoft-Skype-Chain-ID" : "03e97947-0324-42d1-8ba6-1ec06652d390", - "Date" : "Fri, 11 Jun 2021 19:10:15 GMT", - "Client-Request-Id" : "595c36a4-4153-4052-b710-f82794692018" + "X-Microsoft-Skype-Chain-ID" : "e0ce3a6a-75d3-4559-8662-31a64c83d7fc", + "x-ms-client-request-id" : "bfb3e7d5-b348-4cef-9c4d-870c9df1df12", + "Date" : "Tue, 15 Jun 2021 19:59:12 GMT" }, "Exception" : null }, { "Method" : "POST", - "Uri" : "https://REDACTED.communication.azure.com/calling/callConnections/c4201300-2fcb-4763-a059-995c22a452d3/:hangup?api-version=2021-06-15-preview", + "Uri" : "https://REDACTED.communication.azure.com/calling/callConnections/b8201300-c4bd-4fd7-96d1-e96d7daceac3/:hangup?api-version=2021-06-15-preview", "Headers" : { "User-Agent" : "azsdk-java-azure-communication-callingserver/1.0.0-beta.1 (11.0.11; Windows 10; 10.0)", - "x-ms-client-request-id" : "f57b2ab5-d8ab-4d63-a3c7-c504813b6b95" + "x-ms-client-request-id" : "01bb0b16-e7d9-4985-bfdf-a7551547d19f" }, "Response" : { "X-Cache" : "CONFIG_NOCACHE", "content-length" : "0", "retry-after" : "0", - "X-Azure-Ref" : "0GLXDYAAAAABhaQqIA1uxRLYAtQuAZwbDV1NURURHRTA4MTIAOWZjN2I1MTktYThjYy00Zjg5LTkzNWUtYzkxNDhhZTA5ZTgx", + "X-Azure-Ref" : "0kAbJYAAAAABB2f1vD/adRrXY3OmX0GvzV1NURURHRTA4MDgAOWZjN2I1MTktYThjYy00Zjg5LTkzNWUtYzkxNDhhZTA5ZTgx", "StatusCode" : "202", - "X-Microsoft-Skype-Chain-ID" : "f8348a79-1f05-4dc8-a679-4ac7eb6c55df", - "Date" : "Fri, 11 Jun 2021 19:10:15 GMT", - "Client-Request-Id" : "a2dd40b1-4a68-477f-8ca8-b7d22b781521" + "X-Microsoft-Skype-Chain-ID" : "c1e5b323-d6a1-458a-809f-6be28d00355f", + "x-ms-client-request-id" : "01bb0b16-e7d9-4985-bfdf-a7551547d19f", + "Date" : "Tue, 15 Jun 2021 19:59:12 GMT" }, "Exception" : null } ], diff --git a/sdk/communication/azure-communication-callingserver/src/test/resources/session-records/ServerCallAsyncLiveTests.runAllClientFunctionsWithResponseAsync[1].json b/sdk/communication/azure-communication-callingserver/src/test/resources/session-records/ServerCallAsyncLiveTests.runAllClientFunctionsWithResponseAsync[1].json index 3307934df6375..024c446ee9cb8 100644 --- a/sdk/communication/azure-communication-callingserver/src/test/resources/session-records/ServerCallAsyncLiveTests.runAllClientFunctionsWithResponseAsync[1].json +++ b/sdk/communication/azure-communication-callingserver/src/test/resources/session-records/ServerCallAsyncLiveTests.runAllClientFunctionsWithResponseAsync[1].json @@ -1,215 +1,215 @@ { "networkCallRecords" : [ { "Method" : "POST", - "Uri" : "https://REDACTED.communication.azure.com/calling/serverCalls/c400789f-e11b-4ceb-88cb-bc8df2a01568/:join?api-version=2021-06-15-preview", + "Uri" : "https://REDACTED.communication.azure.com/calling/serverCalls/f6ba33c9-ac6c-3a77-b874-eb32fb03fcfb/:join?api-version=2021-06-15-preview", "Headers" : { "User-Agent" : "azsdk-java-azure-communication-callingserver/1.0.0-beta.1 (11.0.11; Windows 10; 10.0)", - "x-ms-client-request-id" : "0053ab3a-3325-456b-99a0-5292103cb991", + "x-ms-client-request-id" : "0792980d-0608-425a-ae15-abae154ca28d", "Content-Type" : "application/json" }, "Response" : { "X-Cache" : "CONFIG_NOCACHE", "content-length" : "110", "retry-after" : "0", - "X-Azure-Ref" : "0HbXDYAAAAADNVodxRoxvRJPucM0dQJT+V1NURURHRTA4MTIAOWZjN2I1MTktYThjYy00Zjg5LTkzNWUtYzkxNDhhZTA5ZTgx", + "X-Azure-Ref" : "0lQbJYAAAAAA63DscT6NfRZYzmBQ85arrV1NURURHRTA4MDgAOWZjN2I1MTktYThjYy00Zjg5LTkzNWUtYzkxNDhhZTA5ZTgx", "StatusCode" : "202", - "X-Microsoft-Skype-Chain-ID" : "3997f93e-b8ad-4bc1-b364-ec5500dad12f", - "Body" : "{\"callLegId\":\"c4201300-5cc7-48af-974b-e969c17d49dd\",\"callConnectionId\":\"c4201300-5cc7-48af-974b-e969c17d49dd\"}", - "Date" : "Fri, 11 Jun 2021 19:10:20 GMT", - "Content-Type" : "application/json; charset=utf-8", - "Client-Request-Id" : "9d40f9d8-c8e4-4a23-bfc6-558945405377" + "X-Microsoft-Skype-Chain-ID" : "55d4daf5-8e19-4ff9-bf79-e04e2c3dd1b8", + "Body" : "{\"callLegId\":\"b8201300-cd42-4a59-afe7-e394d75e76b7\",\"callConnectionId\":\"b8201300-cd42-4a59-afe7-e394d75e76b7\"}", + "x-ms-client-request-id" : "0792980d-0608-425a-ae15-abae154ca28d", + "Date" : "Tue, 15 Jun 2021 19:59:16 GMT", + "Content-Type" : "application/json; charset=utf-8" }, "Exception" : null }, { "Method" : "POST", - "Uri" : "https://REDACTED.communication.azure.com/calling/serverCalls/c400789f-e11b-4ceb-88cb-bc8df2a01568/:join?api-version=2021-06-15-preview", + "Uri" : "https://REDACTED.communication.azure.com/calling/serverCalls/f6ba33c9-ac6c-3a77-b874-eb32fb03fcfb/:join?api-version=2021-06-15-preview", "Headers" : { "User-Agent" : "azsdk-java-azure-communication-callingserver/1.0.0-beta.1 (11.0.11; Windows 10; 10.0)", - "x-ms-client-request-id" : "947b550e-0a43-43e1-b990-8a499cc97396", + "x-ms-client-request-id" : "d899c551-9b02-47e4-93a2-bd1175769b28", "Content-Type" : "application/json" }, "Response" : { "X-Cache" : "CONFIG_NOCACHE", "content-length" : "110", "retry-after" : "0", - "X-Azure-Ref" : "0HrXDYAAAAAAiMYhF5sfuRpavR2DXBl2kV1NURURHRTA4MTIAOWZjN2I1MTktYThjYy00Zjg5LTkzNWUtYzkxNDhhZTA5ZTgx", + "X-Azure-Ref" : "0lgbJYAAAAABlf0YfeA46SrGaULLzX/9gV1NURURHRTA4MDgAOWZjN2I1MTktYThjYy00Zjg5LTkzNWUtYzkxNDhhZTA5ZTgx", "StatusCode" : "202", - "X-Microsoft-Skype-Chain-ID" : "48a697fd-04ed-4835-bf98-7887ebe7d9af", - "Body" : "{\"callLegId\":\"c4201300-9125-4e84-a254-2878f8dd9b1d\",\"callConnectionId\":\"c4201300-9125-4e84-a254-2878f8dd9b1d\"}", - "Date" : "Fri, 11 Jun 2021 19:10:21 GMT", - "Content-Type" : "application/json; charset=utf-8", - "Client-Request-Id" : "b5b0f71f-67d6-4ebb-a30e-edf4c9e46cce" + "X-Microsoft-Skype-Chain-ID" : "273d11e2-a2c4-4a73-b455-e243126b922f", + "Body" : "{\"callLegId\":\"b8201300-2386-4f43-81b0-af962646ef99\",\"callConnectionId\":\"b8201300-2386-4f43-81b0-af962646ef99\"}", + "x-ms-client-request-id" : "d899c551-9b02-47e4-93a2-bd1175769b28", + "Date" : "Tue, 15 Jun 2021 19:59:17 GMT", + "Content-Type" : "application/json; charset=utf-8" }, "Exception" : null }, { "Method" : "POST", - "Uri" : "https://REDACTED.communication.azure.com/calling/serverCalls/c400789f-e11b-4ceb-88cb-bc8df2a01568/recordings?api-version=2021-06-15-preview", + "Uri" : "https://REDACTED.communication.azure.com/calling/serverCalls/f6ba33c9-ac6c-3a77-b874-eb32fb03fcfb/recordings?api-version=2021-06-15-preview", "Headers" : { "User-Agent" : "azsdk-java-azure-communication-callingserver/1.0.0-beta.1 (11.0.11; Windows 10; 10.0)", - "x-ms-client-request-id" : "113f22bb-858a-4a73-9494-6cb98f60fa5e", + "x-ms-client-request-id" : "f90db49f-19f4-4285-a511-9c359547c8f0", "Content-Type" : "application/json" }, "Response" : { "X-Cache" : "CONFIG_NOCACHE", "content-length" : "180", "retry-after" : "0", - "X-Azure-Ref" : "0H7XDYAAAAABBe4HHEKAlQ4MKS5A+k6TZV1NURURHRTA4MTIAOWZjN2I1MTktYThjYy00Zjg5LTkzNWUtYzkxNDhhZTA5ZTgx", + "X-Azure-Ref" : "0lwbJYAAAAAA2yKnePu1nTKic/QlboG+GV1NURURHRTA4MDgAOWZjN2I1MTktYThjYy00Zjg5LTkzNWUtYzkxNDhhZTA5ZTgx", "StatusCode" : "200", - "X-Microsoft-Skype-Chain-ID" : "ea117199-25a8-4840-825b-cb1cd09e662b", - "Body" : "{\"recordingId\":\"eyJQbGF0Zm9ybUVuZHBvaW50SWQiOiJjNDIwMTMwMC0zMTJkLTQwMWUtOGE3MS1kODZiODhlYjg4NDkiLCJSZXNvdXJjZVNwZWNpZmljSWQiOiI5OWExMjgyZi0wZjQ0LTRkYmQtODQ4Yi02NTc1N2ExNzMxMjEifQ\"}", - "Date" : "Fri, 11 Jun 2021 19:10:24 GMT", - "Content-Type" : "application/json; charset=utf-8", - "Client-Request-Id" : "c26c0e4e-2134-432b-836a-50624c85bcd7" + "X-Microsoft-Skype-Chain-ID" : "c329d5c4-d616-4279-8547-f0d929470c7e", + "Body" : "{\"recordingId\":\"eyJQbGF0Zm9ybUVuZHBvaW50SWQiOiJiODIwMTMwMC1hYWJkLTQ4NjgtYjNhYy0zYzAzODNmYzdkYzciLCJSZXNvdXJjZVNwZWNpZmljSWQiOiIxMGQ4ZmQzNS0wYzkwLTRkZDctOWM2MS00MGM5YmQzZGY2ZTIifQ\"}", + "x-ms-client-request-id" : "f90db49f-19f4-4285-a511-9c359547c8f0", + "Date" : "Tue, 15 Jun 2021 19:59:21 GMT", + "Content-Type" : "application/json; charset=utf-8" }, "Exception" : null }, { "Method" : "GET", - "Uri" : "https://REDACTED.communication.azure.com/calling/serverCalls/c400789f-e11b-4ceb-88cb-bc8df2a01568/recordings/eyJQbGF0Zm9ybUVuZHBvaW50SWQiOiJjNDIwMTMwMC0zMTJkLTQwMWUtOGE3MS1kODZiODhlYjg4NDkiLCJSZXNvdXJjZVNwZWNpZmljSWQiOiI5OWExMjgyZi0wZjQ0LTRkYmQtODQ4Yi02NTc1N2ExNzMxMjEifQ?api-version=2021-06-15-preview", + "Uri" : "https://REDACTED.communication.azure.com/calling/serverCalls/f6ba33c9-ac6c-3a77-b874-eb32fb03fcfb/recordings/eyJQbGF0Zm9ybUVuZHBvaW50SWQiOiJiODIwMTMwMC1hYWJkLTQ4NjgtYjNhYy0zYzAzODNmYzdkYzciLCJSZXNvdXJjZVNwZWNpZmljSWQiOiIxMGQ4ZmQzNS0wYzkwLTRkZDctOWM2MS00MGM5YmQzZGY2ZTIifQ?api-version=2021-06-15-preview", "Headers" : { "User-Agent" : "azsdk-java-azure-communication-callingserver/1.0.0-beta.1 (11.0.11; Windows 10; 10.0)", - "x-ms-client-request-id" : "06828595-0363-482b-8d02-f987bf4920c3" + "x-ms-client-request-id" : "bbf73d00-5d46-479c-adf6-0fe3abd15071" }, "Response" : { "X-Cache" : "CONFIG_NOCACHE", "content-length" : "27", "retry-after" : "0", - "X-Azure-Ref" : "0J7XDYAAAAAD04O1+cyCKSKPHm89DzPV+V1NURURHRTA4MTIAOWZjN2I1MTktYThjYy00Zjg5LTkzNWUtYzkxNDhhZTA5ZTgx", + "X-Azure-Ref" : "0nwbJYAAAAABysOmmi4vfTofyfBRMnXfKV1NURURHRTA4MDgAOWZjN2I1MTktYThjYy00Zjg5LTkzNWUtYzkxNDhhZTA5ZTgx", "StatusCode" : "200", - "X-Microsoft-Skype-Chain-ID" : "d36c8931-e523-49a6-b080-d47a58e06b58", + "X-Microsoft-Skype-Chain-ID" : "dae0f102-611a-47b8-847c-d8a01ba6ce85", "Body" : "{\"recordingState\":\"active\"}", - "Date" : "Fri, 11 Jun 2021 19:10:30 GMT", - "Content-Type" : "application/json; charset=utf-8", - "Client-Request-Id" : "ec5ae584-9d1f-441a-a478-05d7eb94f9f2" + "x-ms-client-request-id" : "bbf73d00-5d46-479c-adf6-0fe3abd15071", + "Date" : "Tue, 15 Jun 2021 19:59:27 GMT", + "Content-Type" : "application/json; charset=utf-8" }, "Exception" : null }, { "Method" : "POST", - "Uri" : "https://REDACTED.communication.azure.com/calling/serverCalls/c400789f-e11b-4ceb-88cb-bc8df2a01568/recordings/eyJQbGF0Zm9ybUVuZHBvaW50SWQiOiJjNDIwMTMwMC0zMTJkLTQwMWUtOGE3MS1kODZiODhlYjg4NDkiLCJSZXNvdXJjZVNwZWNpZmljSWQiOiI5OWExMjgyZi0wZjQ0LTRkYmQtODQ4Yi02NTc1N2ExNzMxMjEifQ/:pause?api-version=2021-06-15-preview", + "Uri" : "https://REDACTED.communication.azure.com/calling/serverCalls/f6ba33c9-ac6c-3a77-b874-eb32fb03fcfb/recordings/eyJQbGF0Zm9ybUVuZHBvaW50SWQiOiJiODIwMTMwMC1hYWJkLTQ4NjgtYjNhYy0zYzAzODNmYzdkYzciLCJSZXNvdXJjZVNwZWNpZmljSWQiOiIxMGQ4ZmQzNS0wYzkwLTRkZDctOWM2MS00MGM5YmQzZGY2ZTIifQ/:pause?api-version=2021-06-15-preview", "Headers" : { "User-Agent" : "azsdk-java-azure-communication-callingserver/1.0.0-beta.1 (11.0.11; Windows 10; 10.0)", - "x-ms-client-request-id" : "a51bafc3-eb60-493c-8b85-2f302a9c6f71" + "x-ms-client-request-id" : "dd57ab59-6e23-4125-890c-e5603907d47b" }, "Response" : { "X-Cache" : "CONFIG_NOCACHE", "content-length" : "0", "retry-after" : "0", - "X-Azure-Ref" : "0J7XDYAAAAAAhwxpTQOQIQq1tLDHaCdOnV1NURURHRTA4MTIAOWZjN2I1MTktYThjYy00Zjg5LTkzNWUtYzkxNDhhZTA5ZTgx", + "X-Azure-Ref" : "0nwbJYAAAAAA7jAXQjR00Q6Lrs2/LbPMAV1NURURHRTA4MDgAOWZjN2I1MTktYThjYy00Zjg5LTkzNWUtYzkxNDhhZTA5ZTgx", "StatusCode" : "200", - "X-Microsoft-Skype-Chain-ID" : "a667e396-9591-4abd-b1ce-44424bbeb85c", - "Date" : "Fri, 11 Jun 2021 19:10:30 GMT", - "Client-Request-Id" : "46ea0b20-5328-412a-87bc-cbea9552399f" + "X-Microsoft-Skype-Chain-ID" : "b050316a-675b-4022-86a8-d184f849b37c", + "x-ms-client-request-id" : "dd57ab59-6e23-4125-890c-e5603907d47b", + "Date" : "Tue, 15 Jun 2021 19:59:27 GMT" }, "Exception" : null }, { "Method" : "GET", - "Uri" : "https://REDACTED.communication.azure.com/calling/serverCalls/c400789f-e11b-4ceb-88cb-bc8df2a01568/recordings/eyJQbGF0Zm9ybUVuZHBvaW50SWQiOiJjNDIwMTMwMC0zMTJkLTQwMWUtOGE3MS1kODZiODhlYjg4NDkiLCJSZXNvdXJjZVNwZWNpZmljSWQiOiI5OWExMjgyZi0wZjQ0LTRkYmQtODQ4Yi02NTc1N2ExNzMxMjEifQ?api-version=2021-06-15-preview", + "Uri" : "https://REDACTED.communication.azure.com/calling/serverCalls/f6ba33c9-ac6c-3a77-b874-eb32fb03fcfb/recordings/eyJQbGF0Zm9ybUVuZHBvaW50SWQiOiJiODIwMTMwMC1hYWJkLTQ4NjgtYjNhYy0zYzAzODNmYzdkYzciLCJSZXNvdXJjZVNwZWNpZmljSWQiOiIxMGQ4ZmQzNS0wYzkwLTRkZDctOWM2MS00MGM5YmQzZGY2ZTIifQ?api-version=2021-06-15-preview", "Headers" : { "User-Agent" : "azsdk-java-azure-communication-callingserver/1.0.0-beta.1 (11.0.11; Windows 10; 10.0)", - "x-ms-client-request-id" : "3a7c119e-3d42-4b54-b98a-b0921032be4f" + "x-ms-client-request-id" : "7857fd64-8fbf-40ee-99ef-1dad881c7486" }, "Response" : { "X-Cache" : "CONFIG_NOCACHE", "content-length" : "29", "retry-after" : "0", - "X-Azure-Ref" : "0LbXDYAAAAAA0buWQUGhiRpmKBH2fA/pOV1NURURHRTA4MTIAOWZjN2I1MTktYThjYy00Zjg5LTkzNWUtYzkxNDhhZTA5ZTgx", + "X-Azure-Ref" : "0pgbJYAAAAABVbnsHho38ToWRR6NJx8PLV1NURURHRTA4MDgAOWZjN2I1MTktYThjYy00Zjg5LTkzNWUtYzkxNDhhZTA5ZTgx", "StatusCode" : "200", - "X-Microsoft-Skype-Chain-ID" : "8b4e9c2a-ccb6-4372-ab19-0fda60f12cad", + "X-Microsoft-Skype-Chain-ID" : "2d2cb87a-3554-4017-ba47-834081933688", "Body" : "{\"recordingState\":\"inactive\"}", - "Date" : "Fri, 11 Jun 2021 19:10:36 GMT", - "Content-Type" : "application/json; charset=utf-8", - "Client-Request-Id" : "6960a360-8f92-4453-9f36-18841a16fba6" + "x-ms-client-request-id" : "7857fd64-8fbf-40ee-99ef-1dad881c7486", + "Date" : "Tue, 15 Jun 2021 19:59:33 GMT", + "Content-Type" : "application/json; charset=utf-8" }, "Exception" : null }, { "Method" : "POST", - "Uri" : "https://REDACTED.communication.azure.com/calling/serverCalls/c400789f-e11b-4ceb-88cb-bc8df2a01568/recordings/eyJQbGF0Zm9ybUVuZHBvaW50SWQiOiJjNDIwMTMwMC0zMTJkLTQwMWUtOGE3MS1kODZiODhlYjg4NDkiLCJSZXNvdXJjZVNwZWNpZmljSWQiOiI5OWExMjgyZi0wZjQ0LTRkYmQtODQ4Yi02NTc1N2ExNzMxMjEifQ/:resume?api-version=2021-06-15-preview", + "Uri" : "https://REDACTED.communication.azure.com/calling/serverCalls/f6ba33c9-ac6c-3a77-b874-eb32fb03fcfb/recordings/eyJQbGF0Zm9ybUVuZHBvaW50SWQiOiJiODIwMTMwMC1hYWJkLTQ4NjgtYjNhYy0zYzAzODNmYzdkYzciLCJSZXNvdXJjZVNwZWNpZmljSWQiOiIxMGQ4ZmQzNS0wYzkwLTRkZDctOWM2MS00MGM5YmQzZGY2ZTIifQ/:resume?api-version=2021-06-15-preview", "Headers" : { "User-Agent" : "azsdk-java-azure-communication-callingserver/1.0.0-beta.1 (11.0.11; Windows 10; 10.0)", - "x-ms-client-request-id" : "c4c03b5a-e6f9-4d49-a607-7d86e73d6019" + "x-ms-client-request-id" : "2660329b-d261-44c4-89da-dcdad510d622" }, "Response" : { "X-Cache" : "CONFIG_NOCACHE", "content-length" : "0", "retry-after" : "0", - "X-Azure-Ref" : "0LbXDYAAAAAChUWooVj/VTYXHFO+zsUQVV1NURURHRTA4MTIAOWZjN2I1MTktYThjYy00Zjg5LTkzNWUtYzkxNDhhZTA5ZTgx", + "X-Azure-Ref" : "0pgbJYAAAAABQOIR93DAOTrgfDdKViKsxV1NURURHRTA4MDgAOWZjN2I1MTktYThjYy00Zjg5LTkzNWUtYzkxNDhhZTA5ZTgx", "StatusCode" : "200", - "X-Microsoft-Skype-Chain-ID" : "7383bef2-9c31-4cc5-9deb-6f59259c9978", - "Date" : "Fri, 11 Jun 2021 19:10:36 GMT", - "Client-Request-Id" : "7013f454-b386-4603-8d17-3e98dd1cbbb2" + "X-Microsoft-Skype-Chain-ID" : "91f04adb-cb8b-4025-aef1-0bf9090ddec0", + "x-ms-client-request-id" : "2660329b-d261-44c4-89da-dcdad510d622", + "Date" : "Tue, 15 Jun 2021 19:59:33 GMT" }, "Exception" : null }, { "Method" : "GET", - "Uri" : "https://REDACTED.communication.azure.com/calling/serverCalls/c400789f-e11b-4ceb-88cb-bc8df2a01568/recordings/eyJQbGF0Zm9ybUVuZHBvaW50SWQiOiJjNDIwMTMwMC0zMTJkLTQwMWUtOGE3MS1kODZiODhlYjg4NDkiLCJSZXNvdXJjZVNwZWNpZmljSWQiOiI5OWExMjgyZi0wZjQ0LTRkYmQtODQ4Yi02NTc1N2ExNzMxMjEifQ?api-version=2021-06-15-preview", + "Uri" : "https://REDACTED.communication.azure.com/calling/serverCalls/f6ba33c9-ac6c-3a77-b874-eb32fb03fcfb/recordings/eyJQbGF0Zm9ybUVuZHBvaW50SWQiOiJiODIwMTMwMC1hYWJkLTQ4NjgtYjNhYy0zYzAzODNmYzdkYzciLCJSZXNvdXJjZVNwZWNpZmljSWQiOiIxMGQ4ZmQzNS0wYzkwLTRkZDctOWM2MS00MGM5YmQzZGY2ZTIifQ?api-version=2021-06-15-preview", "Headers" : { "User-Agent" : "azsdk-java-azure-communication-callingserver/1.0.0-beta.1 (11.0.11; Windows 10; 10.0)", - "x-ms-client-request-id" : "f5224d5e-cc9f-401a-8c2f-c5d468940946" + "x-ms-client-request-id" : "25d2b51c-ab54-48df-bd39-977c7aa770c1" }, "Response" : { "X-Cache" : "CONFIG_NOCACHE", "content-length" : "27", "retry-after" : "0", - "X-Azure-Ref" : "0M7XDYAAAAAD4DWxPXqflSIQ5DyASocqEV1NURURHRTA4MTIAOWZjN2I1MTktYThjYy00Zjg5LTkzNWUtYzkxNDhhZTA5ZTgx", + "X-Azure-Ref" : "0rAbJYAAAAADFbd4pko6WSLieAeXV67ReV1NURURHRTA4MDgAOWZjN2I1MTktYThjYy00Zjg5LTkzNWUtYzkxNDhhZTA5ZTgx", "StatusCode" : "200", - "X-Microsoft-Skype-Chain-ID" : "fe74cc38-1b34-4f09-b3e1-ddbf6af8b9b1", + "X-Microsoft-Skype-Chain-ID" : "0c8bf155-af6b-4daa-89ad-152768887187", "Body" : "{\"recordingState\":\"active\"}", - "Date" : "Fri, 11 Jun 2021 19:10:43 GMT", - "Content-Type" : "application/json; charset=utf-8", - "Client-Request-Id" : "06dcfc4a-ddb1-4963-9317-9ea3fda95318" + "x-ms-client-request-id" : "25d2b51c-ab54-48df-bd39-977c7aa770c1", + "Date" : "Tue, 15 Jun 2021 19:59:39 GMT", + "Content-Type" : "application/json; charset=utf-8" }, "Exception" : null }, { "Method" : "DELETE", - "Uri" : "https://REDACTED.communication.azure.com/calling/serverCalls/c400789f-e11b-4ceb-88cb-bc8df2a01568/recordings/eyJQbGF0Zm9ybUVuZHBvaW50SWQiOiJjNDIwMTMwMC0zMTJkLTQwMWUtOGE3MS1kODZiODhlYjg4NDkiLCJSZXNvdXJjZVNwZWNpZmljSWQiOiI5OWExMjgyZi0wZjQ0LTRkYmQtODQ4Yi02NTc1N2ExNzMxMjEifQ?api-version=2021-06-15-preview", + "Uri" : "https://REDACTED.communication.azure.com/calling/serverCalls/f6ba33c9-ac6c-3a77-b874-eb32fb03fcfb/recordings/eyJQbGF0Zm9ybUVuZHBvaW50SWQiOiJiODIwMTMwMC1hYWJkLTQ4NjgtYjNhYy0zYzAzODNmYzdkYzciLCJSZXNvdXJjZVNwZWNpZmljSWQiOiIxMGQ4ZmQzNS0wYzkwLTRkZDctOWM2MS00MGM5YmQzZGY2ZTIifQ?api-version=2021-06-15-preview", "Headers" : { "User-Agent" : "azsdk-java-azure-communication-callingserver/1.0.0-beta.1 (11.0.11; Windows 10; 10.0)", - "x-ms-client-request-id" : "da837afa-baf8-4c00-b4f1-09c531af154b" + "x-ms-client-request-id" : "e6bf5ea4-ce0c-453c-ac7b-34d821137ae9" }, "Response" : { "X-Cache" : "CONFIG_NOCACHE", "content-length" : "0", "retry-after" : "0", - "X-Azure-Ref" : "0NLXDYAAAAAAD6yWe0VfBSIcJNfCAONSEV1NURURHRTA4MTIAOWZjN2I1MTktYThjYy00Zjg5LTkzNWUtYzkxNDhhZTA5ZTgx", + "X-Azure-Ref" : "0rAbJYAAAAACrcYcAek3dRbOZPirpmv2SV1NURURHRTA4MDgAOWZjN2I1MTktYThjYy00Zjg5LTkzNWUtYzkxNDhhZTA5ZTgx", "StatusCode" : "200", - "X-Microsoft-Skype-Chain-ID" : "2153d6f0-1813-423b-84d3-7c10baa391a9", - "Date" : "Fri, 11 Jun 2021 19:10:44 GMT", - "Client-Request-Id" : "77f95e9a-5b96-4d56-9ed5-22f35689d051" + "X-Microsoft-Skype-Chain-ID" : "1d311ee6-c877-4cc6-81d4-aafdb5131988", + "x-ms-client-request-id" : "e6bf5ea4-ce0c-453c-ac7b-34d821137ae9", + "Date" : "Tue, 15 Jun 2021 19:59:40 GMT" }, "Exception" : null }, { "Method" : "POST", - "Uri" : "https://REDACTED.communication.azure.com/calling/callConnections/c4201300-5cc7-48af-974b-e969c17d49dd/:hangup?api-version=2021-06-15-preview", + "Uri" : "https://REDACTED.communication.azure.com/calling/callConnections/b8201300-cd42-4a59-afe7-e394d75e76b7/:hangup?api-version=2021-06-15-preview", "Headers" : { "User-Agent" : "azsdk-java-azure-communication-callingserver/1.0.0-beta.1 (11.0.11; Windows 10; 10.0)", - "x-ms-client-request-id" : "eaec8e84-d4a0-4f0e-bb30-85f2d947f5ce" + "x-ms-client-request-id" : "b6f71d22-e285-4caa-9a7c-abcd663843ac" }, "Response" : { "X-Cache" : "CONFIG_NOCACHE", "content-length" : "0", "retry-after" : "0", - "X-Azure-Ref" : "0NLXDYAAAAABjFpGicRlDQJR2fSjFNRbfV1NURURHRTA4MTIAOWZjN2I1MTktYThjYy00Zjg5LTkzNWUtYzkxNDhhZTA5ZTgx", + "X-Azure-Ref" : "0rAbJYAAAAADFu8CJRzNKSI3w1aMbO8mOV1NURURHRTA4MDgAOWZjN2I1MTktYThjYy00Zjg5LTkzNWUtYzkxNDhhZTA5ZTgx", "StatusCode" : "202", - "X-Microsoft-Skype-Chain-ID" : "7187bbe9-d000-493e-b56d-7b06dbf6ffc1", - "Date" : "Fri, 11 Jun 2021 19:10:44 GMT", - "Client-Request-Id" : "565aa9da-7c56-4fdf-b05c-ea709b9b222f" + "X-Microsoft-Skype-Chain-ID" : "6a857c9e-9c48-472f-b932-fcd35a37db49", + "x-ms-client-request-id" : "b6f71d22-e285-4caa-9a7c-abcd663843ac", + "Date" : "Tue, 15 Jun 2021 19:59:40 GMT" }, "Exception" : null }, { "Method" : "POST", - "Uri" : "https://REDACTED.communication.azure.com/calling/callConnections/c4201300-9125-4e84-a254-2878f8dd9b1d/:hangup?api-version=2021-06-15-preview", + "Uri" : "https://REDACTED.communication.azure.com/calling/callConnections/b8201300-2386-4f43-81b0-af962646ef99/:hangup?api-version=2021-06-15-preview", "Headers" : { "User-Agent" : "azsdk-java-azure-communication-callingserver/1.0.0-beta.1 (11.0.11; Windows 10; 10.0)", - "x-ms-client-request-id" : "5bea9098-d35b-427b-8a40-a1313792c60d" + "x-ms-client-request-id" : "603ac192-1176-46e7-a7e4-ad5e99e7ee0b" }, "Response" : { "X-Cache" : "CONFIG_NOCACHE", "content-length" : "0", "retry-after" : "0", - "X-Azure-Ref" : "0NLXDYAAAAACESiRVqsO9RIxqeV2mSsiHV1NURURHRTA4MTIAOWZjN2I1MTktYThjYy00Zjg5LTkzNWUtYzkxNDhhZTA5ZTgx", + "X-Azure-Ref" : "0rAbJYAAAAACVo1chVECHRKhL2+sqJ2EhV1NURURHRTA4MDgAOWZjN2I1MTktYThjYy00Zjg5LTkzNWUtYzkxNDhhZTA5ZTgx", "StatusCode" : "202", - "X-Microsoft-Skype-Chain-ID" : "cf48b63d-88ac-4fb9-b4f9-a2822218fd36", - "Date" : "Fri, 11 Jun 2021 19:10:44 GMT", - "Client-Request-Id" : "132e5f7b-96a2-4d2d-835c-95bc7c5093a0" + "X-Microsoft-Skype-Chain-ID" : "c12c5882-beab-4497-ae59-b47e5444cdb8", + "x-ms-client-request-id" : "603ac192-1176-46e7-a7e4-ad5e99e7ee0b", + "Date" : "Tue, 15 Jun 2021 19:59:40 GMT" }, "Exception" : null } ], diff --git a/sdk/communication/azure-communication-callingserver/src/test/resources/session-records/ServerCallAsyncLiveTests.runPlayAudioFunctionAsync[1].json b/sdk/communication/azure-communication-callingserver/src/test/resources/session-records/ServerCallAsyncLiveTests.runPlayAudioFunctionAsync[1].json index 8acd89e87ea73..af93fb24ec794 100644 --- a/sdk/communication/azure-communication-callingserver/src/test/resources/session-records/ServerCallAsyncLiveTests.runPlayAudioFunctionAsync[1].json +++ b/sdk/communication/azure-communication-callingserver/src/test/resources/session-records/ServerCallAsyncLiveTests.runPlayAudioFunctionAsync[1].json @@ -1,101 +1,101 @@ { "networkCallRecords" : [ { "Method" : "POST", - "Uri" : "https://REDACTED.communication.azure.com/calling/serverCalls/c400789f-e11b-4ceb-88cb-bc8df2a01568/:join?api-version=2021-06-15-preview", + "Uri" : "https://REDACTED.communication.azure.com/calling/serverCalls/ab2b4608-8879-3e4a-8d79-ceb56706f5b3/:join?api-version=2021-06-15-preview", "Headers" : { "User-Agent" : "azsdk-java-azure-communication-callingserver/1.0.0-beta.1 (11.0.11; Windows 10; 10.0)", - "x-ms-client-request-id" : "01318c00-17d4-42fb-8f2a-de7fddc4958f", + "x-ms-client-request-id" : "72fdd9bf-6370-4e94-a0d7-564606baa9a9", "Content-Type" : "application/json" }, "Response" : { "X-Cache" : "CONFIG_NOCACHE", "content-length" : "110", "retry-after" : "0", - "X-Azure-Ref" : "0/LTDYAAAAAAbwq9M8Z8ZS6hkOmf+KG4JV1NURURHRTA4MTIAOWZjN2I1MTktYThjYy00Zjg5LTkzNWUtYzkxNDhhZTA5ZTgx", + "X-Azure-Ref" : "0dAbJYAAAAAAreebcqxtwQ5vrWl1Oq8GKV1NURURHRTA4MDgAOWZjN2I1MTktYThjYy00Zjg5LTkzNWUtYzkxNDhhZTA5ZTgx", "StatusCode" : "202", - "X-Microsoft-Skype-Chain-ID" : "7ae4533c-91ea-45d5-87e2-982da839c31e", - "Body" : "{\"callLegId\":\"c4201300-4c8d-41ee-9d51-863e9037882b\",\"callConnectionId\":\"c4201300-4c8d-41ee-9d51-863e9037882b\"}", - "Date" : "Fri, 11 Jun 2021 19:09:47 GMT", - "Content-Type" : "application/json; charset=utf-8", - "Client-Request-Id" : "78972d83-253b-4feb-879a-2f9d574cc1d5" + "X-Microsoft-Skype-Chain-ID" : "f8a8c65f-2ac4-40d6-bfc1-54922c194868", + "Body" : "{\"callLegId\":\"b8201300-1ff8-4bb9-bce2-dcdd0c44befd\",\"callConnectionId\":\"b8201300-1ff8-4bb9-bce2-dcdd0c44befd\"}", + "x-ms-client-request-id" : "72fdd9bf-6370-4e94-a0d7-564606baa9a9", + "Date" : "Tue, 15 Jun 2021 19:58:43 GMT", + "Content-Type" : "application/json; charset=utf-8" }, "Exception" : null }, { "Method" : "POST", - "Uri" : "https://REDACTED.communication.azure.com/calling/serverCalls/c400789f-e11b-4ceb-88cb-bc8df2a01568/:join?api-version=2021-06-15-preview", + "Uri" : "https://REDACTED.communication.azure.com/calling/serverCalls/ab2b4608-8879-3e4a-8d79-ceb56706f5b3/:join?api-version=2021-06-15-preview", "Headers" : { "User-Agent" : "azsdk-java-azure-communication-callingserver/1.0.0-beta.1 (11.0.11; Windows 10; 10.0)", - "x-ms-client-request-id" : "19bc48d8-cdf7-437e-85ac-c18ec1b7993c", + "x-ms-client-request-id" : "c40b9e29-5547-4518-af6b-de33b9f4af0a", "Content-Type" : "application/json" }, "Response" : { "X-Cache" : "CONFIG_NOCACHE", "content-length" : "110", "retry-after" : "0", - "X-Azure-Ref" : "0/bTDYAAAAABYYrouXu91TpphTFl5pd+5V1NURURHRTA4MTIAOWZjN2I1MTktYThjYy00Zjg5LTkzNWUtYzkxNDhhZTA5ZTgx", + "X-Azure-Ref" : "0dQbJYAAAAABjM2wmAvfAQ5VPs/7dSm0lV1NURURHRTA4MDgAOWZjN2I1MTktYThjYy00Zjg5LTkzNWUtYzkxNDhhZTA5ZTgx", "StatusCode" : "202", - "X-Microsoft-Skype-Chain-ID" : "c3b47723-753f-47a1-8e22-689973d11b42", - "Body" : "{\"callLegId\":\"c4201300-16a0-44c1-8063-7e401497bc23\",\"callConnectionId\":\"c4201300-16a0-44c1-8063-7e401497bc23\"}", - "Date" : "Fri, 11 Jun 2021 19:09:48 GMT", - "Content-Type" : "application/json; charset=utf-8", - "Client-Request-Id" : "4357f1c7-e5f4-4035-885b-134484f5a0dc" + "X-Microsoft-Skype-Chain-ID" : "ce40166b-7c5b-4cad-aa9c-ca2f2f19f938", + "Body" : "{\"callLegId\":\"b8201300-a1fd-4d4d-8b4f-d922f88e74d1\",\"callConnectionId\":\"b8201300-a1fd-4d4d-8b4f-d922f88e74d1\"}", + "x-ms-client-request-id" : "c40b9e29-5547-4518-af6b-de33b9f4af0a", + "Date" : "Tue, 15 Jun 2021 19:58:45 GMT", + "Content-Type" : "application/json; charset=utf-8" }, "Exception" : null }, { "Method" : "POST", - "Uri" : "https://REDACTED.communication.azure.com/calling/serverCalls/c400789f-e11b-4ceb-88cb-bc8df2a01568/:playAudio?api-version=2021-06-15-preview", + "Uri" : "https://REDACTED.communication.azure.com/calling/serverCalls/ab2b4608-8879-3e4a-8d79-ceb56706f5b3/:playAudio?api-version=2021-06-15-preview", "Headers" : { "User-Agent" : "azsdk-java-azure-communication-callingserver/1.0.0-beta.1 (11.0.11; Windows 10; 10.0)", - "x-ms-client-request-id" : "b29bdc33-c728-49fe-b087-069ecb0b58fc", + "x-ms-client-request-id" : "d9d4f963-cbe7-4d51-8fb7-e65ec6085665", "Content-Type" : "application/json" }, "Response" : { "X-Cache" : "CONFIG_NOCACHE", "content-length" : "122", "retry-after" : "0", - "X-Azure-Ref" : "0/rTDYAAAAABn6veL1/IoRZc5YGhuQj51V1NURURHRTA4MTIAOWZjN2I1MTktYThjYy00Zjg5LTkzNWUtYzkxNDhhZTA5ZTgx", + "X-Azure-Ref" : "0dgbJYAAAAABxfFsWDZe0R4OH/RC5vIV9V1NURURHRTA4MDgAOWZjN2I1MTktYThjYy00Zjg5LTkzNWUtYzkxNDhhZTA5ZTgx", "StatusCode" : "202", - "X-Microsoft-Skype-Chain-ID" : "df0ea299-f457-40bb-9811-3b71ce3b88ba", - "Body" : "{\"id\":\"c4201300-cfdc-4bd8-977a-58773bdf3f01\",\"status\":\"running\",\"operationContext\":\"a871a8bd-04c5-4f44-aa06-1dff06911799\"}", - "Date" : "Fri, 11 Jun 2021 19:09:51 GMT", - "Content-Type" : "application/json; charset=utf-8", - "Client-Request-Id" : "3fdf94c6-8209-4107-a6f6-a906b2331d35" + "X-Microsoft-Skype-Chain-ID" : "a88eb24b-b5ca-45ee-89d5-4fef7e31a295", + "Body" : "{\"id\":\"b8201300-99a9-448f-a833-3e3ab2cb6cf3\",\"status\":\"running\",\"operationContext\":\"bb544fac-6265-4056-88d3-1ac0395e75b7\"}", + "x-ms-client-request-id" : "d9d4f963-cbe7-4d51-8fb7-e65ec6085665", + "Date" : "Tue, 15 Jun 2021 19:58:47 GMT", + "Content-Type" : "application/json; charset=utf-8" }, "Exception" : null }, { "Method" : "POST", - "Uri" : "https://REDACTED.communication.azure.com/calling/callConnections/c4201300-4c8d-41ee-9d51-863e9037882b/:hangup?api-version=2021-06-15-preview", + "Uri" : "https://REDACTED.communication.azure.com/calling/callConnections/b8201300-1ff8-4bb9-bce2-dcdd0c44befd/:hangup?api-version=2021-06-15-preview", "Headers" : { "User-Agent" : "azsdk-java-azure-communication-callingserver/1.0.0-beta.1 (11.0.11; Windows 10; 10.0)", - "x-ms-client-request-id" : "43052b98-54f6-4a29-9ded-5050b7fed6ad" + "x-ms-client-request-id" : "f9fee75d-462b-46db-9903-e09480124fb6" }, "Response" : { "X-Cache" : "CONFIG_NOCACHE", "content-length" : "0", "retry-after" : "0", - "X-Azure-Ref" : "0ALXDYAAAAAAVxx4nj/DITbGeB/zadXA1V1NURURHRTA4MTIAOWZjN2I1MTktYThjYy00Zjg5LTkzNWUtYzkxNDhhZTA5ZTgx", + "X-Azure-Ref" : "0dwbJYAAAAAChkWB/h7iETahDm8HcrxaPV1NURURHRTA4MDgAOWZjN2I1MTktYThjYy00Zjg5LTkzNWUtYzkxNDhhZTA5ZTgx", "StatusCode" : "202", - "X-Microsoft-Skype-Chain-ID" : "d5cbe725-769b-49b1-b1b2-1a3b5792ce51", - "Date" : "Fri, 11 Jun 2021 19:09:51 GMT", - "Client-Request-Id" : "b620bdf1-42df-4903-8c6c-74a9a984727c" + "X-Microsoft-Skype-Chain-ID" : "374a5849-977d-4624-8a20-e1a353f7c795", + "x-ms-client-request-id" : "f9fee75d-462b-46db-9903-e09480124fb6", + "Date" : "Tue, 15 Jun 2021 19:58:47 GMT" }, "Exception" : null }, { "Method" : "POST", - "Uri" : "https://REDACTED.communication.azure.com/calling/callConnections/c4201300-16a0-44c1-8063-7e401497bc23/:hangup?api-version=2021-06-15-preview", + "Uri" : "https://REDACTED.communication.azure.com/calling/callConnections/b8201300-a1fd-4d4d-8b4f-d922f88e74d1/:hangup?api-version=2021-06-15-preview", "Headers" : { "User-Agent" : "azsdk-java-azure-communication-callingserver/1.0.0-beta.1 (11.0.11; Windows 10; 10.0)", - "x-ms-client-request-id" : "7b934e9a-7335-4461-a49f-494896fbc4e4" + "x-ms-client-request-id" : "4fe95be4-9e05-4cac-9555-6c96d9e22e25" }, "Response" : { "X-Cache" : "CONFIG_NOCACHE", "content-length" : "0", "retry-after" : "0", - "X-Azure-Ref" : "0ALXDYAAAAAClVLzLD7C7RIiD2wIp1E7JV1NURURHRTA4MTIAOWZjN2I1MTktYThjYy00Zjg5LTkzNWUtYzkxNDhhZTA5ZTgx", + "X-Azure-Ref" : "0dwbJYAAAAABdnyr9AE7+QpsQH0AJ3jF0V1NURURHRTA4MDgAOWZjN2I1MTktYThjYy00Zjg5LTkzNWUtYzkxNDhhZTA5ZTgx", "StatusCode" : "202", - "X-Microsoft-Skype-Chain-ID" : "85256d76-61ef-4831-8a02-8e5a34e21203", - "Date" : "Fri, 11 Jun 2021 19:09:51 GMT", - "Client-Request-Id" : "640b46dd-fb71-4669-8261-88dd91f1ad51" + "X-Microsoft-Skype-Chain-ID" : "0aa13520-f7dd-4dac-a095-7d1b90a3326b", + "x-ms-client-request-id" : "4fe95be4-9e05-4cac-9555-6c96d9e22e25", + "Date" : "Tue, 15 Jun 2021 19:58:47 GMT" }, "Exception" : null } ], diff --git a/sdk/communication/azure-communication-callingserver/src/test/resources/session-records/ServerCallAsyncLiveTests.runPlayAudioFunctionWithResponseAsync[1].json b/sdk/communication/azure-communication-callingserver/src/test/resources/session-records/ServerCallAsyncLiveTests.runPlayAudioFunctionWithResponseAsync[1].json index d8574d03aedb1..619ab88d12c51 100644 --- a/sdk/communication/azure-communication-callingserver/src/test/resources/session-records/ServerCallAsyncLiveTests.runPlayAudioFunctionWithResponseAsync[1].json +++ b/sdk/communication/azure-communication-callingserver/src/test/resources/session-records/ServerCallAsyncLiveTests.runPlayAudioFunctionWithResponseAsync[1].json @@ -1,101 +1,101 @@ { "networkCallRecords" : [ { "Method" : "POST", - "Uri" : "https://REDACTED.communication.azure.com/calling/serverCalls/c400789f-e11b-4ceb-88cb-bc8df2a01568/:join?api-version=2021-06-15-preview", + "Uri" : "https://REDACTED.communication.azure.com/calling/serverCalls/ad03482c-8a1a-333b-ad6a-3b04a0cf8079/:join?api-version=2021-06-15-preview", "Headers" : { "User-Agent" : "azsdk-java-azure-communication-callingserver/1.0.0-beta.1 (11.0.11; Windows 10; 10.0)", - "x-ms-client-request-id" : "d3e8b29c-9873-4ffa-92e8-5eef00a9e6c9", + "x-ms-client-request-id" : "f6e6e4a8-57c2-453a-8361-3540aadb1d1f", "Content-Type" : "application/json" }, "Response" : { "X-Cache" : "CONFIG_NOCACHE", "content-length" : "110", "retry-after" : "0", - "X-Azure-Ref" : "0GLXDYAAAAADoFx/wpD5QSJzM+PjWNUiXV1NURURHRTA4MTIAOWZjN2I1MTktYThjYy00Zjg5LTkzNWUtYzkxNDhhZTA5ZTgx", + "X-Azure-Ref" : "0kQbJYAAAAAB81Ley49kKR4DfuJ+y5RNIV1NURURHRTA4MDgAOWZjN2I1MTktYThjYy00Zjg5LTkzNWUtYzkxNDhhZTA5ZTgx", "StatusCode" : "202", - "X-Microsoft-Skype-Chain-ID" : "364812b0-6ab3-4c76-beed-65a88601485e", - "Body" : "{\"callLegId\":\"c4201300-4a43-4705-9d19-99bf6b09e0c9\",\"callConnectionId\":\"c4201300-4a43-4705-9d19-99bf6b09e0c9\"}", - "Date" : "Fri, 11 Jun 2021 19:10:15 GMT", - "Content-Type" : "application/json; charset=utf-8", - "Client-Request-Id" : "a0627df9-9cf7-4265-b435-dd4375983df9" + "X-Microsoft-Skype-Chain-ID" : "eb82329f-fb3e-49ea-bfcd-867a7611df54", + "Body" : "{\"callLegId\":\"b8201300-3e6f-4fad-ad3a-e17b134e87ed\",\"callConnectionId\":\"b8201300-3e6f-4fad-ad3a-e17b134e87ed\"}", + "x-ms-client-request-id" : "f6e6e4a8-57c2-453a-8361-3540aadb1d1f", + "Date" : "Tue, 15 Jun 2021 19:59:12 GMT", + "Content-Type" : "application/json; charset=utf-8" }, "Exception" : null }, { "Method" : "POST", - "Uri" : "https://REDACTED.communication.azure.com/calling/serverCalls/c400789f-e11b-4ceb-88cb-bc8df2a01568/:join?api-version=2021-06-15-preview", + "Uri" : "https://REDACTED.communication.azure.com/calling/serverCalls/ad03482c-8a1a-333b-ad6a-3b04a0cf8079/:join?api-version=2021-06-15-preview", "Headers" : { "User-Agent" : "azsdk-java-azure-communication-callingserver/1.0.0-beta.1 (11.0.11; Windows 10; 10.0)", - "x-ms-client-request-id" : "089f8f90-48cf-4fb4-83f5-f9495a38613d", + "x-ms-client-request-id" : "66a02fee-f122-47f7-aef6-c72307e6a7cf", "Content-Type" : "application/json" }, "Response" : { "X-Cache" : "CONFIG_NOCACHE", "content-length" : "110", "retry-after" : "0", - "X-Azure-Ref" : "0GbXDYAAAAADd5a5tMwTtR4wUGI0nBxK8V1NURURHRTA4MTIAOWZjN2I1MTktYThjYy00Zjg5LTkzNWUtYzkxNDhhZTA5ZTgx", + "X-Azure-Ref" : "0kgbJYAAAAAAOulzES7DRToSFlgNtfsEMV1NURURHRTA4MDgAOWZjN2I1MTktYThjYy00Zjg5LTkzNWUtYzkxNDhhZTA5ZTgx", "StatusCode" : "202", - "X-Microsoft-Skype-Chain-ID" : "ff2e84cb-5829-4ae2-9fa2-dd58dc39869b", - "Body" : "{\"callLegId\":\"c4201300-da5a-4dc0-bfe1-cef0be59f51d\",\"callConnectionId\":\"c4201300-da5a-4dc0-bfe1-cef0be59f51d\"}", - "Date" : "Fri, 11 Jun 2021 19:10:16 GMT", - "Content-Type" : "application/json; charset=utf-8", - "Client-Request-Id" : "6dbfe459-58c4-4534-a411-5e6b02421f0c" + "X-Microsoft-Skype-Chain-ID" : "8620715e-8203-4fd9-9325-7cc15f7d2b0c", + "Body" : "{\"callLegId\":\"b8201300-c652-4ce7-ab8c-9b220dbfd469\",\"callConnectionId\":\"b8201300-c652-4ce7-ab8c-9b220dbfd469\"}", + "x-ms-client-request-id" : "66a02fee-f122-47f7-aef6-c72307e6a7cf", + "Date" : "Tue, 15 Jun 2021 19:59:13 GMT", + "Content-Type" : "application/json; charset=utf-8" }, "Exception" : null }, { "Method" : "POST", - "Uri" : "https://REDACTED.communication.azure.com/calling/serverCalls/c400789f-e11b-4ceb-88cb-bc8df2a01568/:playAudio?api-version=2021-06-15-preview", + "Uri" : "https://REDACTED.communication.azure.com/calling/serverCalls/ad03482c-8a1a-333b-ad6a-3b04a0cf8079/:playAudio?api-version=2021-06-15-preview", "Headers" : { "User-Agent" : "azsdk-java-azure-communication-callingserver/1.0.0-beta.1 (11.0.11; Windows 10; 10.0)", - "x-ms-client-request-id" : "50b9512a-853d-4866-9cc4-bf05cde1d092", + "x-ms-client-request-id" : "c60da953-cd52-4d33-992b-b1e801256e54", "Content-Type" : "application/json" }, "Response" : { "X-Cache" : "CONFIG_NOCACHE", "content-length" : "122", "retry-after" : "0", - "X-Azure-Ref" : "0GrXDYAAAAABH5nSIyKTuTKo9zQTjQv8NV1NURURHRTA4MTIAOWZjN2I1MTktYThjYy00Zjg5LTkzNWUtYzkxNDhhZTA5ZTgx", + "X-Azure-Ref" : "0kwbJYAAAAACO2etNLDLAQrUbA49+xKnUV1NURURHRTA4MDgAOWZjN2I1MTktYThjYy00Zjg5LTkzNWUtYzkxNDhhZTA5ZTgx", "StatusCode" : "202", - "X-Microsoft-Skype-Chain-ID" : "d2e06f5c-07fa-4e79-bd8e-6d5df18f1f4d", - "Body" : "{\"id\":\"c4201300-4e84-4a3e-8c95-b3076ba3ce5b\",\"status\":\"running\",\"operationContext\":\"b7c82fb9-93ee-4c6b-89ed-d2ea68600811\"}", - "Date" : "Fri, 11 Jun 2021 19:10:19 GMT", - "Content-Type" : "application/json; charset=utf-8", - "Client-Request-Id" : "e9d51b8a-bee3-4491-ac6c-7be4afe27cf9" + "X-Microsoft-Skype-Chain-ID" : "7264cdd0-d6d1-4c7b-b149-7bb81cc11bf0", + "Body" : "{\"id\":\"b8201300-d9e6-4082-bba7-8bc6ef779b5b\",\"status\":\"running\",\"operationContext\":\"3cfd9360-c39d-4a99-97d6-06b648bc01cb\"}", + "x-ms-client-request-id" : "c60da953-cd52-4d33-992b-b1e801256e54", + "Date" : "Tue, 15 Jun 2021 19:59:15 GMT", + "Content-Type" : "application/json; charset=utf-8" }, "Exception" : null }, { "Method" : "POST", - "Uri" : "https://REDACTED.communication.azure.com/calling/callConnections/c4201300-4a43-4705-9d19-99bf6b09e0c9/:hangup?api-version=2021-06-15-preview", + "Uri" : "https://REDACTED.communication.azure.com/calling/callConnections/b8201300-3e6f-4fad-ad3a-e17b134e87ed/:hangup?api-version=2021-06-15-preview", "Headers" : { "User-Agent" : "azsdk-java-azure-communication-callingserver/1.0.0-beta.1 (11.0.11; Windows 10; 10.0)", - "x-ms-client-request-id" : "a1828c92-db7c-459d-aa56-88ea23e28b98" + "x-ms-client-request-id" : "0c154204-fb42-49b9-85d1-4aee6223d23f" }, "Response" : { "X-Cache" : "CONFIG_NOCACHE", "content-length" : "0", "retry-after" : "0", - "X-Azure-Ref" : "0HLXDYAAAAACLjsYqsJoHQbF7a5ftV6noV1NURURHRTA4MTIAOWZjN2I1MTktYThjYy00Zjg5LTkzNWUtYzkxNDhhZTA5ZTgx", + "X-Azure-Ref" : "0lAbJYAAAAABUG6IbtjRgT4G5c0q5Q2JBV1NURURHRTA4MDgAOWZjN2I1MTktYThjYy00Zjg5LTkzNWUtYzkxNDhhZTA5ZTgx", "StatusCode" : "202", - "X-Microsoft-Skype-Chain-ID" : "8ebe25fc-655e-4383-bea2-8d21210e1995", - "Date" : "Fri, 11 Jun 2021 19:10:19 GMT", - "Client-Request-Id" : "105a7bbe-2853-4406-984e-761122395ac5" + "X-Microsoft-Skype-Chain-ID" : "e4b95fae-6923-4350-8cef-dca5a71a37a5", + "x-ms-client-request-id" : "0c154204-fb42-49b9-85d1-4aee6223d23f", + "Date" : "Tue, 15 Jun 2021 19:59:15 GMT" }, "Exception" : null }, { "Method" : "POST", - "Uri" : "https://REDACTED.communication.azure.com/calling/callConnections/c4201300-da5a-4dc0-bfe1-cef0be59f51d/:hangup?api-version=2021-06-15-preview", + "Uri" : "https://REDACTED.communication.azure.com/calling/callConnections/b8201300-c652-4ce7-ab8c-9b220dbfd469/:hangup?api-version=2021-06-15-preview", "Headers" : { "User-Agent" : "azsdk-java-azure-communication-callingserver/1.0.0-beta.1 (11.0.11; Windows 10; 10.0)", - "x-ms-client-request-id" : "3fbed21a-f20a-44cf-a731-c698bd8dc6c5" + "x-ms-client-request-id" : "47f10d0e-c7d1-47b6-aa36-6ea220a7ea51" }, "Response" : { "X-Cache" : "CONFIG_NOCACHE", "content-length" : "0", "retry-after" : "0", - "X-Azure-Ref" : "0HLXDYAAAAADvEA8FvFeyRYpqiSEXkEo5V1NURURHRTA4MTIAOWZjN2I1MTktYThjYy00Zjg5LTkzNWUtYzkxNDhhZTA5ZTgx", + "X-Azure-Ref" : "0lAbJYAAAAADr0xsLeamjSYQDyh22hBBDV1NURURHRTA4MDgAOWZjN2I1MTktYThjYy00Zjg5LTkzNWUtYzkxNDhhZTA5ZTgx", "StatusCode" : "202", - "X-Microsoft-Skype-Chain-ID" : "279cf4d7-e1f8-470c-8825-0ac85173dbf2", - "Date" : "Fri, 11 Jun 2021 19:10:19 GMT", - "Client-Request-Id" : "66aadc4d-d7b9-42df-9daa-8dbddae6fb7d" + "X-Microsoft-Skype-Chain-ID" : "57ae5e0c-ad75-46b4-ae96-fd99e5a689af", + "x-ms-client-request-id" : "47f10d0e-c7d1-47b6-aa36-6ea220a7ea51", + "Date" : "Tue, 15 Jun 2021 19:59:16 GMT" }, "Exception" : null } ], diff --git a/sdk/communication/azure-communication-callingserver/src/test/resources/session-records/ServerCallAsyncLiveTests.startRecordingFailsAsync[1].json b/sdk/communication/azure-communication-callingserver/src/test/resources/session-records/ServerCallAsyncLiveTests.startRecordingFailsAsync[1].json index ffdafb4a0380d..fd3498cfa0071 100644 --- a/sdk/communication/azure-communication-callingserver/src/test/resources/session-records/ServerCallAsyncLiveTests.startRecordingFailsAsync[1].json +++ b/sdk/communication/azure-communication-callingserver/src/test/resources/session-records/ServerCallAsyncLiveTests.startRecordingFailsAsync[1].json @@ -4,20 +4,20 @@ "Uri" : "https://REDACTED.communication.azure.com/calling/serverCalls/aHR0cHM6Ly9jb252LXVzd2UtMDkuY29udi5za3lwZS5jb20vY29udi9EZVF2WEJGVVlFV1NNZkFXYno2azN3P2k9MTEmZT02Mzc1NzIyMjk0Mjc0NTI4Nzk=/recordings?api-version=2021-06-15-preview", "Headers" : { "User-Agent" : "azsdk-java-azure-communication-callingserver/1.0.0-beta.1 (11.0.11; Windows 10; 10.0)", - "x-ms-client-request-id" : "5cd22ad4-75f7-41f2-b55c-f8236308916a", + "x-ms-client-request-id" : "02b47e10-71be-437a-b516-66fb4d65b59e", "Content-Type" : "application/json" }, "Response" : { "X-Cache" : "CONFIG_NOCACHE", "content-length" : "83", "retry-after" : "0", - "X-Azure-Ref" : "0HLXDYAAAAACKjLlzpwOwT6tuxNe9RifSV1NURURHRTA4MTIAOWZjN2I1MTktYThjYy00Zjg5LTkzNWUtYzkxNDhhZTA5ZTgx", + "X-Azure-Ref" : "0lAbJYAAAAADKsF2gSIiuS4I8gZjUYsjtV1NURURHRTA4MDgAOWZjN2I1MTktYThjYy00Zjg5LTkzNWUtYzkxNDhhZTA5ZTgx", "StatusCode" : "400", - "X-Microsoft-Skype-Chain-ID" : "6ae47b8c-882f-4944-af44-7324d076eb5c", + "X-Microsoft-Skype-Chain-ID" : "672949a2-10a7-4f3d-b3b5-c8b9e295ff84", "Body" : "{\"code\":\"8501\",\"message\":\"Action is invalid when call is not in Established state\"}", - "Date" : "Fri, 11 Jun 2021 19:10:20 GMT", - "Content-Type" : "application/json; charset=utf-8", - "Client-Request-Id" : "8d977355-a1f3-4bdb-81a5-81046073d41a" + "x-ms-client-request-id" : "02b47e10-71be-437a-b516-66fb4d65b59e", + "Date" : "Tue, 15 Jun 2021 19:59:16 GMT", + "Content-Type" : "application/json; charset=utf-8" }, "Exception" : null } ], diff --git a/sdk/communication/azure-communication-callingserver/src/test/resources/session-records/ServerCallLiveTests.runAllClientFunctionsWithResponse[1].json b/sdk/communication/azure-communication-callingserver/src/test/resources/session-records/ServerCallLiveTests.runAllClientFunctionsWithResponse[1].json index 0f17c530111ca..8781e89188467 100644 --- a/sdk/communication/azure-communication-callingserver/src/test/resources/session-records/ServerCallLiveTests.runAllClientFunctionsWithResponse[1].json +++ b/sdk/communication/azure-communication-callingserver/src/test/resources/session-records/ServerCallLiveTests.runAllClientFunctionsWithResponse[1].json @@ -1,215 +1,215 @@ { "networkCallRecords" : [ { "Method" : "POST", - "Uri" : "https://REDACTED.communication.azure.com/calling/serverCalls/c400789f-e11b-4ceb-88cb-bc8df2a01568/:join?api-version=2021-06-15-preview", + "Uri" : "https://REDACTED.communication.azure.com/calling/serverCalls/cfc5cfea-eb1d-38e1-892b-a306b184c645/:join?api-version=2021-06-15-preview", "Headers" : { "User-Agent" : "azsdk-java-azure-communication-callingserver/1.0.0-beta.1 (11.0.11; Windows 10; 10.0)", - "x-ms-client-request-id" : "1ab4a329-62f4-444f-8dde-0bff2a7b281d", + "x-ms-client-request-id" : "0330803d-cfc9-4dee-9797-27e704389501", "Content-Type" : "application/json" }, "Response" : { "X-Cache" : "CONFIG_NOCACHE", "content-length" : "110", "retry-after" : "0", - "X-Azure-Ref" : "0zrTDYAAAAAA1+8/oHqmcQYmPO81uFWcsV1NURURHRTA4MjEAOWZjN2I1MTktYThjYy00Zjg5LTkzNWUtYzkxNDhhZTA5ZTgx", + "X-Azure-Ref" : "0GQbJYAAAAADOGv0xRvmsRorhnBRDxZcIV1NURURHRTA4MDkAOWZjN2I1MTktYThjYy00Zjg5LTkzNWUtYzkxNDhhZTA5ZTgx", "StatusCode" : "202", - "X-Microsoft-Skype-Chain-ID" : "dd7661ea-eec3-4a85-b7be-9f4d76800675", - "Body" : "{\"callLegId\":\"711f1300-ce1b-4397-b911-32aafe7161d7\",\"callConnectionId\":\"711f1300-ce1b-4397-b911-32aafe7161d7\"}", - "Date" : "Fri, 11 Jun 2021 19:09:01 GMT", - "Content-Type" : "application/json; charset=utf-8", - "Client-Request-Id" : "f5ecee0d-ccf6-4c18-b74f-aab60d3614f8" + "X-Microsoft-Skype-Chain-ID" : "3959e2ab-717d-49cf-8cf9-d11d60b488f3", + "Body" : "{\"callLegId\":\"14201300-46da-4c4f-9069-c6b42354dd95\",\"callConnectionId\":\"14201300-46da-4c4f-9069-c6b42354dd95\"}", + "x-ms-client-request-id" : "0330803d-cfc9-4dee-9797-27e704389501", + "Date" : "Tue, 15 Jun 2021 19:57:12 GMT", + "Content-Type" : "application/json; charset=utf-8" }, "Exception" : null }, { "Method" : "POST", - "Uri" : "https://REDACTED.communication.azure.com/calling/serverCalls/c400789f-e11b-4ceb-88cb-bc8df2a01568/:join?api-version=2021-06-15-preview", + "Uri" : "https://REDACTED.communication.azure.com/calling/serverCalls/cfc5cfea-eb1d-38e1-892b-a306b184c645/:join?api-version=2021-06-15-preview", "Headers" : { "User-Agent" : "azsdk-java-azure-communication-callingserver/1.0.0-beta.1 (11.0.11; Windows 10; 10.0)", - "x-ms-client-request-id" : "671137a5-814b-41e5-94d1-8faac29dbb22", + "x-ms-client-request-id" : "7956c5ac-8837-43cb-b6b9-bee767d6ae2f", "Content-Type" : "application/json" }, "Response" : { "X-Cache" : "CONFIG_NOCACHE", "content-length" : "110", "retry-after" : "0", - "X-Azure-Ref" : "0z7TDYAAAAADnj8lqQXUhSaBmmIWqQZAPV1NURURHRTA4MjEAOWZjN2I1MTktYThjYy00Zjg5LTkzNWUtYzkxNDhhZTA5ZTgx", + "X-Azure-Ref" : "0GgbJYAAAAABE25DxnYHST5sk1e1ZyeXJV1NURURHRTA4MDkAOWZjN2I1MTktYThjYy00Zjg5LTkzNWUtYzkxNDhhZTA5ZTgx", "StatusCode" : "202", - "X-Microsoft-Skype-Chain-ID" : "0aeb2c01-843d-4135-ac4f-289be71185bc", - "Body" : "{\"callLegId\":\"711f1300-7975-4f2c-b182-49ae185b88b3\",\"callConnectionId\":\"711f1300-7975-4f2c-b182-49ae185b88b3\"}", - "Date" : "Fri, 11 Jun 2021 19:09:02 GMT", - "Content-Type" : "application/json; charset=utf-8", - "Client-Request-Id" : "703b2f64-6f9f-4de4-bc94-7c6219afff20" + "X-Microsoft-Skype-Chain-ID" : "eb7bd317-28fa-44de-9a51-53f75d1399ca", + "Body" : "{\"callLegId\":\"14201300-76b2-47fa-8c34-fa0808b1a1bf\",\"callConnectionId\":\"14201300-76b2-47fa-8c34-fa0808b1a1bf\"}", + "x-ms-client-request-id" : "7956c5ac-8837-43cb-b6b9-bee767d6ae2f", + "Date" : "Tue, 15 Jun 2021 19:57:13 GMT", + "Content-Type" : "application/json; charset=utf-8" }, "Exception" : null }, { "Method" : "POST", - "Uri" : "https://REDACTED.communication.azure.com/calling/serverCalls/c400789f-e11b-4ceb-88cb-bc8df2a01568/recordings?api-version=2021-06-15-preview", + "Uri" : "https://REDACTED.communication.azure.com/calling/serverCalls/cfc5cfea-eb1d-38e1-892b-a306b184c645/recordings?api-version=2021-06-15-preview", "Headers" : { "User-Agent" : "azsdk-java-azure-communication-callingserver/1.0.0-beta.1 (11.0.11; Windows 10; 10.0)", - "x-ms-client-request-id" : "745728cc-cb9f-4259-ac68-351097d0f1bf", + "x-ms-client-request-id" : "15e03392-6aad-463a-bc68-e4d434dc7f86", "Content-Type" : "application/json" }, "Response" : { "X-Cache" : "CONFIG_NOCACHE", "content-length" : "180", "retry-after" : "0", - "X-Azure-Ref" : "00LTDYAAAAADfVm7YRvZ/SbJhN8brdpoXV1NURURHRTA4MjEAOWZjN2I1MTktYThjYy00Zjg5LTkzNWUtYzkxNDhhZTA5ZTgx", + "X-Azure-Ref" : "0GwbJYAAAAABOs9JeaIUDQ4US7s/d6qQoV1NURURHRTA4MDkAOWZjN2I1MTktYThjYy00Zjg5LTkzNWUtYzkxNDhhZTA5ZTgx", "StatusCode" : "200", - "X-Microsoft-Skype-Chain-ID" : "8b46baaf-7cfe-4a08-b672-deb335fe9536", - "Body" : "{\"recordingId\":\"eyJQbGF0Zm9ybUVuZHBvaW50SWQiOiI3MTFmMTMwMC1hYzhiLTQwZmYtOTdmNy1jMjM5ZTBkZTM2MTUiLCJSZXNvdXJjZVNwZWNpZmljSWQiOiIzM2ZhOWFkYS1mNGE2LTQwMDQtOTk2OS02YjY0NmI0NDk1ZDYifQ\"}", - "Date" : "Fri, 11 Jun 2021 19:09:05 GMT", - "Content-Type" : "application/json; charset=utf-8", - "Client-Request-Id" : "662a2c9e-32e4-4f08-a778-71762cd0ee53" + "X-Microsoft-Skype-Chain-ID" : "bebb98a0-841d-47ac-be15-60f05ff58eec", + "Body" : "{\"recordingId\":\"eyJQbGF0Zm9ybUVuZHBvaW50SWQiOiIxNDIwMTMwMC00NGFlLTQzMjMtYjI4NS1jN2U2MDIwNDc2ODciLCJSZXNvdXJjZVNwZWNpZmljSWQiOiJhYTQ2ZTkxMi04MGZiLTQxZTUtODc1NC01YmY3NzNkZmEyOTEifQ\"}", + "x-ms-client-request-id" : "15e03392-6aad-463a-bc68-e4d434dc7f86", + "Date" : "Tue, 15 Jun 2021 19:57:16 GMT", + "Content-Type" : "application/json; charset=utf-8" }, "Exception" : null }, { "Method" : "GET", - "Uri" : "https://REDACTED.communication.azure.com/calling/serverCalls/c400789f-e11b-4ceb-88cb-bc8df2a01568/recordings/eyJQbGF0Zm9ybUVuZHBvaW50SWQiOiI3MTFmMTMwMC1hYzhiLTQwZmYtOTdmNy1jMjM5ZTBkZTM2MTUiLCJSZXNvdXJjZVNwZWNpZmljSWQiOiIzM2ZhOWFkYS1mNGE2LTQwMDQtOTk2OS02YjY0NmI0NDk1ZDYifQ?api-version=2021-06-15-preview", + "Uri" : "https://REDACTED.communication.azure.com/calling/serverCalls/cfc5cfea-eb1d-38e1-892b-a306b184c645/recordings/eyJQbGF0Zm9ybUVuZHBvaW50SWQiOiIxNDIwMTMwMC00NGFlLTQzMjMtYjI4NS1jN2U2MDIwNDc2ODciLCJSZXNvdXJjZVNwZWNpZmljSWQiOiJhYTQ2ZTkxMi04MGZiLTQxZTUtODc1NC01YmY3NzNkZmEyOTEifQ?api-version=2021-06-15-preview", "Headers" : { "User-Agent" : "azsdk-java-azure-communication-callingserver/1.0.0-beta.1 (11.0.11; Windows 10; 10.0)", - "x-ms-client-request-id" : "2cdd8eb4-ef17-4d93-9537-2bb4446e9ee4" + "x-ms-client-request-id" : "86c0103b-038c-43b9-8890-b7b91f23e128" }, "Response" : { "X-Cache" : "CONFIG_NOCACHE", "content-length" : "27", "retry-after" : "0", - "X-Azure-Ref" : "02LTDYAAAAAAz80sXPdZmSrVbEeFRQo/yV1NURURHRTA4MjEAOWZjN2I1MTktYThjYy00Zjg5LTkzNWUtYzkxNDhhZTA5ZTgx", + "X-Azure-Ref" : "0IwbJYAAAAAD1dMyC2REqQLobpsBIzV1pV1NURURHRTA4MDkAOWZjN2I1MTktYThjYy00Zjg5LTkzNWUtYzkxNDhhZTA5ZTgx", "StatusCode" : "200", - "X-Microsoft-Skype-Chain-ID" : "0af7e2a2-a540-4af9-880b-c58f146ee618", + "X-Microsoft-Skype-Chain-ID" : "c50b756d-b25c-4dd7-ac43-a1c6cd482351", "Body" : "{\"recordingState\":\"active\"}", - "Date" : "Fri, 11 Jun 2021 19:09:12 GMT", - "Content-Type" : "application/json; charset=utf-8", - "Client-Request-Id" : "2dd35851-d8f0-498c-8328-07dc8f028d89" + "x-ms-client-request-id" : "86c0103b-038c-43b9-8890-b7b91f23e128", + "Date" : "Tue, 15 Jun 2021 19:57:22 GMT", + "Content-Type" : "application/json; charset=utf-8" }, "Exception" : null }, { "Method" : "POST", - "Uri" : "https://REDACTED.communication.azure.com/calling/serverCalls/c400789f-e11b-4ceb-88cb-bc8df2a01568/recordings/eyJQbGF0Zm9ybUVuZHBvaW50SWQiOiI3MTFmMTMwMC1hYzhiLTQwZmYtOTdmNy1jMjM5ZTBkZTM2MTUiLCJSZXNvdXJjZVNwZWNpZmljSWQiOiIzM2ZhOWFkYS1mNGE2LTQwMDQtOTk2OS02YjY0NmI0NDk1ZDYifQ/:pause?api-version=2021-06-15-preview", + "Uri" : "https://REDACTED.communication.azure.com/calling/serverCalls/cfc5cfea-eb1d-38e1-892b-a306b184c645/recordings/eyJQbGF0Zm9ybUVuZHBvaW50SWQiOiIxNDIwMTMwMC00NGFlLTQzMjMtYjI4NS1jN2U2MDIwNDc2ODciLCJSZXNvdXJjZVNwZWNpZmljSWQiOiJhYTQ2ZTkxMi04MGZiLTQxZTUtODc1NC01YmY3NzNkZmEyOTEifQ/:pause?api-version=2021-06-15-preview", "Headers" : { "User-Agent" : "azsdk-java-azure-communication-callingserver/1.0.0-beta.1 (11.0.11; Windows 10; 10.0)", - "x-ms-client-request-id" : "e703d07d-b96a-4352-9aaf-63761b92b5bc" + "x-ms-client-request-id" : "46100ae7-3ded-45a5-9fcb-e885b32ced8b" }, "Response" : { "X-Cache" : "CONFIG_NOCACHE", "content-length" : "0", "retry-after" : "0", - "X-Azure-Ref" : "02LTDYAAAAAASQu5d/go1S6GGaEv0PWJhV1NURURHRTA4MjEAOWZjN2I1MTktYThjYy00Zjg5LTkzNWUtYzkxNDhhZTA5ZTgx", + "X-Azure-Ref" : "0IwbJYAAAAADVekhxe2AeQYlWw04GgjITV1NURURHRTA4MDkAOWZjN2I1MTktYThjYy00Zjg5LTkzNWUtYzkxNDhhZTA5ZTgx", "StatusCode" : "200", - "X-Microsoft-Skype-Chain-ID" : "9eb4993c-4808-4500-bfc1-cee60bf1bdd5", - "Date" : "Fri, 11 Jun 2021 19:09:12 GMT", - "Client-Request-Id" : "f6145cf0-c998-41af-9004-29b00adf0ee4" + "X-Microsoft-Skype-Chain-ID" : "68a36823-7096-4aea-9409-a511a30b578e", + "x-ms-client-request-id" : "46100ae7-3ded-45a5-9fcb-e885b32ced8b", + "Date" : "Tue, 15 Jun 2021 19:57:22 GMT" }, "Exception" : null }, { "Method" : "GET", - "Uri" : "https://REDACTED.communication.azure.com/calling/serverCalls/c400789f-e11b-4ceb-88cb-bc8df2a01568/recordings/eyJQbGF0Zm9ybUVuZHBvaW50SWQiOiI3MTFmMTMwMC1hYzhiLTQwZmYtOTdmNy1jMjM5ZTBkZTM2MTUiLCJSZXNvdXJjZVNwZWNpZmljSWQiOiIzM2ZhOWFkYS1mNGE2LTQwMDQtOTk2OS02YjY0NmI0NDk1ZDYifQ?api-version=2021-06-15-preview", + "Uri" : "https://REDACTED.communication.azure.com/calling/serverCalls/cfc5cfea-eb1d-38e1-892b-a306b184c645/recordings/eyJQbGF0Zm9ybUVuZHBvaW50SWQiOiIxNDIwMTMwMC00NGFlLTQzMjMtYjI4NS1jN2U2MDIwNDc2ODciLCJSZXNvdXJjZVNwZWNpZmljSWQiOiJhYTQ2ZTkxMi04MGZiLTQxZTUtODc1NC01YmY3NzNkZmEyOTEifQ?api-version=2021-06-15-preview", "Headers" : { "User-Agent" : "azsdk-java-azure-communication-callingserver/1.0.0-beta.1 (11.0.11; Windows 10; 10.0)", - "x-ms-client-request-id" : "56f3f354-578d-434e-85fb-12e40ada475e" + "x-ms-client-request-id" : "db1ee822-d8cd-4ea0-9380-04b9d83fadb4" }, "Response" : { "X-Cache" : "CONFIG_NOCACHE", "content-length" : "29", "retry-after" : "0", - "X-Azure-Ref" : "03rTDYAAAAAB5QuA6bXQ4So0eb6wQLC4KV1NURURHRTA4MjEAOWZjN2I1MTktYThjYy00Zjg5LTkzNWUtYzkxNDhhZTA5ZTgx", + "X-Azure-Ref" : "0KQbJYAAAAABERbr3wltBQ4QpIKNGRjfbV1NURURHRTA4MDkAOWZjN2I1MTktYThjYy00Zjg5LTkzNWUtYzkxNDhhZTA5ZTgx", "StatusCode" : "200", - "X-Microsoft-Skype-Chain-ID" : "db14327d-5356-4141-b48e-e4a9090407f0", + "X-Microsoft-Skype-Chain-ID" : "50f051d1-d4e5-46a2-9690-9e38e148ad11", "Body" : "{\"recordingState\":\"inactive\"}", - "Date" : "Fri, 11 Jun 2021 19:09:18 GMT", - "Content-Type" : "application/json; charset=utf-8", - "Client-Request-Id" : "4b5f59a9-ce8e-44d5-b91f-8ad128c7510a" + "x-ms-client-request-id" : "db1ee822-d8cd-4ea0-9380-04b9d83fadb4", + "Date" : "Tue, 15 Jun 2021 19:57:30 GMT", + "Content-Type" : "application/json; charset=utf-8" }, "Exception" : null }, { "Method" : "POST", - "Uri" : "https://REDACTED.communication.azure.com/calling/serverCalls/c400789f-e11b-4ceb-88cb-bc8df2a01568/recordings/eyJQbGF0Zm9ybUVuZHBvaW50SWQiOiI3MTFmMTMwMC1hYzhiLTQwZmYtOTdmNy1jMjM5ZTBkZTM2MTUiLCJSZXNvdXJjZVNwZWNpZmljSWQiOiIzM2ZhOWFkYS1mNGE2LTQwMDQtOTk2OS02YjY0NmI0NDk1ZDYifQ/:resume?api-version=2021-06-15-preview", + "Uri" : "https://REDACTED.communication.azure.com/calling/serverCalls/cfc5cfea-eb1d-38e1-892b-a306b184c645/recordings/eyJQbGF0Zm9ybUVuZHBvaW50SWQiOiIxNDIwMTMwMC00NGFlLTQzMjMtYjI4NS1jN2U2MDIwNDc2ODciLCJSZXNvdXJjZVNwZWNpZmljSWQiOiJhYTQ2ZTkxMi04MGZiLTQxZTUtODc1NC01YmY3NzNkZmEyOTEifQ/:resume?api-version=2021-06-15-preview", "Headers" : { "User-Agent" : "azsdk-java-azure-communication-callingserver/1.0.0-beta.1 (11.0.11; Windows 10; 10.0)", - "x-ms-client-request-id" : "026684a5-6b1f-421c-a697-a5437466efa1" + "x-ms-client-request-id" : "f758331b-d393-4419-9683-b0f881dc1270" }, "Response" : { "X-Cache" : "CONFIG_NOCACHE", "content-length" : "0", "retry-after" : "0", - "X-Azure-Ref" : "03rTDYAAAAABvxfXZe27gSKFzlSKzP/eRV1NURURHRTA4MjEAOWZjN2I1MTktYThjYy00Zjg5LTkzNWUtYzkxNDhhZTA5ZTgx", + "X-Azure-Ref" : "0KgbJYAAAAADB4SHduGePQZrxkEaPisXzV1NURURHRTA4MDkAOWZjN2I1MTktYThjYy00Zjg5LTkzNWUtYzkxNDhhZTA5ZTgx", "StatusCode" : "200", - "X-Microsoft-Skype-Chain-ID" : "31d549a2-70df-48a6-9b94-402e2f139c36", - "Date" : "Fri, 11 Jun 2021 19:09:18 GMT", - "Client-Request-Id" : "837102de-72d1-4ff1-8621-feb8f32e6ca8" + "X-Microsoft-Skype-Chain-ID" : "2496ea26-ce06-44ff-be2a-0acc9ca81fa9", + "x-ms-client-request-id" : "f758331b-d393-4419-9683-b0f881dc1270", + "Date" : "Tue, 15 Jun 2021 19:57:30 GMT" }, "Exception" : null }, { "Method" : "GET", - "Uri" : "https://REDACTED.communication.azure.com/calling/serverCalls/c400789f-e11b-4ceb-88cb-bc8df2a01568/recordings/eyJQbGF0Zm9ybUVuZHBvaW50SWQiOiI3MTFmMTMwMC1hYzhiLTQwZmYtOTdmNy1jMjM5ZTBkZTM2MTUiLCJSZXNvdXJjZVNwZWNpZmljSWQiOiIzM2ZhOWFkYS1mNGE2LTQwMDQtOTk2OS02YjY0NmI0NDk1ZDYifQ?api-version=2021-06-15-preview", + "Uri" : "https://REDACTED.communication.azure.com/calling/serverCalls/cfc5cfea-eb1d-38e1-892b-a306b184c645/recordings/eyJQbGF0Zm9ybUVuZHBvaW50SWQiOiIxNDIwMTMwMC00NGFlLTQzMjMtYjI4NS1jN2U2MDIwNDc2ODciLCJSZXNvdXJjZVNwZWNpZmljSWQiOiJhYTQ2ZTkxMi04MGZiLTQxZTUtODc1NC01YmY3NzNkZmEyOTEifQ?api-version=2021-06-15-preview", "Headers" : { "User-Agent" : "azsdk-java-azure-communication-callingserver/1.0.0-beta.1 (11.0.11; Windows 10; 10.0)", - "x-ms-client-request-id" : "aafe7634-b9b8-4664-9f8d-ab0c01965693" + "x-ms-client-request-id" : "1d8c0400-bc35-4ffa-a0b4-404792339cff" }, "Response" : { "X-Cache" : "CONFIG_NOCACHE", "content-length" : "27", "retry-after" : "0", - "X-Azure-Ref" : "05LTDYAAAAAAJFqHWx3RLSbqzHFTh8rTkV1NURURHRTA4MjEAOWZjN2I1MTktYThjYy00Zjg5LTkzNWUtYzkxNDhhZTA5ZTgx", + "X-Azure-Ref" : "0MAbJYAAAAABV3ajRd168TJr5U39owHf8V1NURURHRTA4MDkAOWZjN2I1MTktYThjYy00Zjg5LTkzNWUtYzkxNDhhZTA5ZTgx", "StatusCode" : "200", - "X-Microsoft-Skype-Chain-ID" : "c1e87598-5046-42a5-8176-a041df1ee65a", + "X-Microsoft-Skype-Chain-ID" : "b2dfc219-9787-453f-8349-941b1b834f79", "Body" : "{\"recordingState\":\"active\"}", - "Date" : "Fri, 11 Jun 2021 19:09:24 GMT", - "Content-Type" : "application/json; charset=utf-8", - "Client-Request-Id" : "aefa3af8-687a-4913-aaf7-00f46af7676d" + "x-ms-client-request-id" : "1d8c0400-bc35-4ffa-a0b4-404792339cff", + "Date" : "Tue, 15 Jun 2021 19:57:36 GMT", + "Content-Type" : "application/json; charset=utf-8" }, "Exception" : null }, { "Method" : "DELETE", - "Uri" : "https://REDACTED.communication.azure.com/calling/serverCalls/c400789f-e11b-4ceb-88cb-bc8df2a01568/recordings/eyJQbGF0Zm9ybUVuZHBvaW50SWQiOiI3MTFmMTMwMC1hYzhiLTQwZmYtOTdmNy1jMjM5ZTBkZTM2MTUiLCJSZXNvdXJjZVNwZWNpZmljSWQiOiIzM2ZhOWFkYS1mNGE2LTQwMDQtOTk2OS02YjY0NmI0NDk1ZDYifQ?api-version=2021-06-15-preview", + "Uri" : "https://REDACTED.communication.azure.com/calling/serverCalls/cfc5cfea-eb1d-38e1-892b-a306b184c645/recordings/eyJQbGF0Zm9ybUVuZHBvaW50SWQiOiIxNDIwMTMwMC00NGFlLTQzMjMtYjI4NS1jN2U2MDIwNDc2ODciLCJSZXNvdXJjZVNwZWNpZmljSWQiOiJhYTQ2ZTkxMi04MGZiLTQxZTUtODc1NC01YmY3NzNkZmEyOTEifQ?api-version=2021-06-15-preview", "Headers" : { "User-Agent" : "azsdk-java-azure-communication-callingserver/1.0.0-beta.1 (11.0.11; Windows 10; 10.0)", - "x-ms-client-request-id" : "026ac5d4-081a-496a-876a-b477006b5da6" + "x-ms-client-request-id" : "02fc79f8-4497-4738-824e-3d528ee8bfc3" }, "Response" : { "X-Cache" : "CONFIG_NOCACHE", "content-length" : "0", "retry-after" : "0", - "X-Azure-Ref" : "05bTDYAAAAAA9+rgJrqmLQLmw0463HwLJV1NURURHRTA4MjEAOWZjN2I1MTktYThjYy00Zjg5LTkzNWUtYzkxNDhhZTA5ZTgx", + "X-Azure-Ref" : "0MAbJYAAAAACO5TkbJ6L8S48+Rukn180gV1NURURHRTA4MDkAOWZjN2I1MTktYThjYy00Zjg5LTkzNWUtYzkxNDhhZTA5ZTgx", "StatusCode" : "200", - "X-Microsoft-Skype-Chain-ID" : "75d5c9ac-c7e3-4e89-b843-3d473645db37", - "Date" : "Fri, 11 Jun 2021 19:09:24 GMT", - "Client-Request-Id" : "6623a873-a7ea-4ec8-8e22-01c4122a6f95" + "X-Microsoft-Skype-Chain-ID" : "dbbd5537-db7a-461b-a17a-bfdf4c3609ab", + "x-ms-client-request-id" : "02fc79f8-4497-4738-824e-3d528ee8bfc3", + "Date" : "Tue, 15 Jun 2021 19:57:36 GMT" }, "Exception" : null }, { "Method" : "POST", - "Uri" : "https://REDACTED.communication.azure.com/calling/callConnections/711f1300-ce1b-4397-b911-32aafe7161d7/:hangup?api-version=2021-06-15-preview", + "Uri" : "https://REDACTED.communication.azure.com/calling/callConnections/14201300-46da-4c4f-9069-c6b42354dd95/:hangup?api-version=2021-06-15-preview", "Headers" : { "User-Agent" : "azsdk-java-azure-communication-callingserver/1.0.0-beta.1 (11.0.11; Windows 10; 10.0)", - "x-ms-client-request-id" : "9e8bac23-14fd-43e9-a3d5-dae31abd139b" + "x-ms-client-request-id" : "331e1652-a265-461d-9079-bbb8f776a5e6" }, "Response" : { "X-Cache" : "CONFIG_NOCACHE", "content-length" : "0", "retry-after" : "0", - "X-Azure-Ref" : "05bTDYAAAAABXtYcvIg3vQrCfs9LnDy9UV1NURURHRTA4MjEAOWZjN2I1MTktYThjYy00Zjg5LTkzNWUtYzkxNDhhZTA5ZTgx", + "X-Azure-Ref" : "0MAbJYAAAAACaCVAtJde6QaO6jeL74DZzV1NURURHRTA4MDkAOWZjN2I1MTktYThjYy00Zjg5LTkzNWUtYzkxNDhhZTA5ZTgx", "StatusCode" : "202", - "X-Microsoft-Skype-Chain-ID" : "b58854fe-da55-4942-9f0b-0bc203705145", - "Date" : "Fri, 11 Jun 2021 19:09:24 GMT", - "Client-Request-Id" : "e1bf5c6b-3a28-4c93-a143-6dfd93ecfdcc" + "X-Microsoft-Skype-Chain-ID" : "f002b687-8568-49b2-821c-0a804e191d10", + "x-ms-client-request-id" : "331e1652-a265-461d-9079-bbb8f776a5e6", + "Date" : "Tue, 15 Jun 2021 19:57:36 GMT" }, "Exception" : null }, { "Method" : "POST", - "Uri" : "https://REDACTED.communication.azure.com/calling/callConnections/711f1300-7975-4f2c-b182-49ae185b88b3/:hangup?api-version=2021-06-15-preview", + "Uri" : "https://REDACTED.communication.azure.com/calling/callConnections/14201300-76b2-47fa-8c34-fa0808b1a1bf/:hangup?api-version=2021-06-15-preview", "Headers" : { "User-Agent" : "azsdk-java-azure-communication-callingserver/1.0.0-beta.1 (11.0.11; Windows 10; 10.0)", - "x-ms-client-request-id" : "38a2ef09-525d-489e-91ca-1defe3673d77" + "x-ms-client-request-id" : "fee2c1ea-131c-4834-8a91-c8f951f9423c" }, "Response" : { "X-Cache" : "CONFIG_NOCACHE", "content-length" : "0", "retry-after" : "0", - "X-Azure-Ref" : "05bTDYAAAAAAPjPwccsTPTow6DYDsJymWV1NURURHRTA4MjEAOWZjN2I1MTktYThjYy00Zjg5LTkzNWUtYzkxNDhhZTA5ZTgx", + "X-Azure-Ref" : "0MAbJYAAAAAAjdi2y/eI+QJiRApLiBYDiV1NURURHRTA4MDkAOWZjN2I1MTktYThjYy00Zjg5LTkzNWUtYzkxNDhhZTA5ZTgx", "StatusCode" : "202", - "X-Microsoft-Skype-Chain-ID" : "83fb2c68-8d99-478c-ba9d-3647d8d0851d", - "Date" : "Fri, 11 Jun 2021 19:09:24 GMT", - "Client-Request-Id" : "0d191f76-e613-4f6f-bf7a-4b28d652df1b" + "X-Microsoft-Skype-Chain-ID" : "15939323-63dd-4fea-83b8-8dfb8f1f8353", + "x-ms-client-request-id" : "fee2c1ea-131c-4834-8a91-c8f951f9423c", + "Date" : "Tue, 15 Jun 2021 19:57:36 GMT" }, "Exception" : null } ], diff --git a/sdk/communication/azure-communication-callingserver/src/test/resources/session-records/ServerCallLiveTests.runAllClientFunctions[1].json b/sdk/communication/azure-communication-callingserver/src/test/resources/session-records/ServerCallLiveTests.runAllClientFunctions[1].json index cdb6620190678..01c5ec71baa38 100644 --- a/sdk/communication/azure-communication-callingserver/src/test/resources/session-records/ServerCallLiveTests.runAllClientFunctions[1].json +++ b/sdk/communication/azure-communication-callingserver/src/test/resources/session-records/ServerCallLiveTests.runAllClientFunctions[1].json @@ -1,215 +1,215 @@ { "networkCallRecords" : [ { "Method" : "POST", - "Uri" : "https://REDACTED.communication.azure.com/calling/serverCalls/c400789f-e11b-4ceb-88cb-bc8df2a01568/:join?api-version=2021-06-15-preview", + "Uri" : "https://REDACTED.communication.azure.com/calling/serverCalls/87d467a8-904e-357d-a312-f6bd4bc8005d/:join?api-version=2021-06-15-preview", "Headers" : { "User-Agent" : "azsdk-java-azure-communication-callingserver/1.0.0-beta.1 (11.0.11; Windows 10; 10.0)", - "x-ms-client-request-id" : "785bfbff-6a4c-4160-9e88-9f9d49059b3c", + "x-ms-client-request-id" : "45da199a-3303-4e77-9810-13c63c95cd25", "Content-Type" : "application/json" }, "Response" : { "X-Cache" : "CONFIG_NOCACHE", "content-length" : "110", "retry-after" : "0", - "X-Azure-Ref" : "0rbTDYAAAAADdv40O3PW6R4iogm0qZAoSV1NURURHRTA4MjEAOWZjN2I1MTktYThjYy00Zjg5LTkzNWUtYzkxNDhhZTA5ZTgx", + "X-Azure-Ref" : "0+QXJYAAAAABIxlri0U50SIf7whVV4KHvV1NURURHRTA4MDkAOWZjN2I1MTktYThjYy00Zjg5LTkzNWUtYzkxNDhhZTA5ZTgx", "StatusCode" : "202", - "X-Microsoft-Skype-Chain-ID" : "d01eaee8-c1ca-439e-9048-2be5af0ebb0b", - "Body" : "{\"callLegId\":\"711f1300-16c6-4c44-b343-9b88885799f5\",\"callConnectionId\":\"711f1300-16c6-4c44-b343-9b88885799f5\"}", - "Date" : "Fri, 11 Jun 2021 19:08:29 GMT", - "Content-Type" : "application/json; charset=utf-8", - "Client-Request-Id" : "4e59028a-47a2-4b78-9e58-0eea71506965" + "X-Microsoft-Skype-Chain-ID" : "fd622db3-868d-47fe-ae51-a429366e0c47", + "Body" : "{\"callLegId\":\"14201300-2750-46ed-83b7-d93562909d9b\",\"callConnectionId\":\"14201300-2750-46ed-83b7-d93562909d9b\"}", + "x-ms-client-request-id" : "45da199a-3303-4e77-9810-13c63c95cd25", + "Date" : "Tue, 15 Jun 2021 19:56:40 GMT", + "Content-Type" : "application/json; charset=utf-8" }, "Exception" : null }, { "Method" : "POST", - "Uri" : "https://REDACTED.communication.azure.com/calling/serverCalls/c400789f-e11b-4ceb-88cb-bc8df2a01568/:join?api-version=2021-06-15-preview", + "Uri" : "https://REDACTED.communication.azure.com/calling/serverCalls/87d467a8-904e-357d-a312-f6bd4bc8005d/:join?api-version=2021-06-15-preview", "Headers" : { "User-Agent" : "azsdk-java-azure-communication-callingserver/1.0.0-beta.1 (11.0.11; Windows 10; 10.0)", - "x-ms-client-request-id" : "690c2e90-8886-4cd7-869a-c9587b58ad13", + "x-ms-client-request-id" : "8bc81f34-d8ba-459a-99c0-1a3f0a383869", "Content-Type" : "application/json" }, "Response" : { "X-Cache" : "CONFIG_NOCACHE", "content-length" : "110", "retry-after" : "0", - "X-Azure-Ref" : "0r7TDYAAAAACMvehoMWqOR5qdJGE23rvRV1NURURHRTA4MjEAOWZjN2I1MTktYThjYy00Zjg5LTkzNWUtYzkxNDhhZTA5ZTgx", + "X-Azure-Ref" : "0+gXJYAAAAABgc+O2LyzqQpKIEZFfL5Q5V1NURURHRTA4MDkAOWZjN2I1MTktYThjYy00Zjg5LTkzNWUtYzkxNDhhZTA5ZTgx", "StatusCode" : "202", - "X-Microsoft-Skype-Chain-ID" : "75f8c959-d8f7-4eb7-a196-4f9dd490e3d0", - "Body" : "{\"callLegId\":\"711f1300-c678-4a6e-8313-1fc0339f60b7\",\"callConnectionId\":\"711f1300-c678-4a6e-8313-1fc0339f60b7\"}", - "Date" : "Fri, 11 Jun 2021 19:08:30 GMT", - "Content-Type" : "application/json; charset=utf-8", - "Client-Request-Id" : "a512ae1e-a7b3-4a1d-8689-d9dc2778fc28" + "X-Microsoft-Skype-Chain-ID" : "10f25bae-4c68-4d99-bb77-50652aacc904", + "Body" : "{\"callLegId\":\"14201300-aa06-4195-bcfe-20594ca72495\",\"callConnectionId\":\"14201300-aa06-4195-bcfe-20594ca72495\"}", + "x-ms-client-request-id" : "8bc81f34-d8ba-459a-99c0-1a3f0a383869", + "Date" : "Tue, 15 Jun 2021 19:56:42 GMT", + "Content-Type" : "application/json; charset=utf-8" }, "Exception" : null }, { "Method" : "POST", - "Uri" : "https://REDACTED.communication.azure.com/calling/serverCalls/c400789f-e11b-4ceb-88cb-bc8df2a01568/recordings?api-version=2021-06-15-preview", + "Uri" : "https://REDACTED.communication.azure.com/calling/serverCalls/87d467a8-904e-357d-a312-f6bd4bc8005d/recordings?api-version=2021-06-15-preview", "Headers" : { "User-Agent" : "azsdk-java-azure-communication-callingserver/1.0.0-beta.1 (11.0.11; Windows 10; 10.0)", - "x-ms-client-request-id" : "ddbb1a94-11d2-4a91-ac14-568301139241", + "x-ms-client-request-id" : "25ef902a-f5dc-40a3-a0d7-1698c39223d3", "Content-Type" : "application/json" }, "Response" : { "X-Cache" : "CONFIG_NOCACHE", "content-length" : "180", "retry-after" : "0", - "X-Azure-Ref" : "0sLTDYAAAAACP8ewFfgo8SY+DmybdDs9pV1NURURHRTA4MjEAOWZjN2I1MTktYThjYy00Zjg5LTkzNWUtYzkxNDhhZTA5ZTgx", + "X-Azure-Ref" : "0+wXJYAAAAAAAW2ZdK/23SqeCfn+duJqVV1NURURHRTA4MDkAOWZjN2I1MTktYThjYy00Zjg5LTkzNWUtYzkxNDhhZTA5ZTgx", "StatusCode" : "200", - "X-Microsoft-Skype-Chain-ID" : "fb24359e-1520-4fc8-ae16-c12baf339c32", - "Body" : "{\"recordingId\":\"eyJQbGF0Zm9ybUVuZHBvaW50SWQiOiI3MTFmMTMwMC03MDI3LTQ4NDYtOGRhNC1kMTU2NWM5M2NlNTciLCJSZXNvdXJjZVNwZWNpZmljSWQiOiI4YTk5YTljMy04MWYwLTQ5MmUtYjA1ZS0wYTY1ZWIyZWNjOWUifQ\"}", - "Date" : "Fri, 11 Jun 2021 19:08:34 GMT", - "Content-Type" : "application/json; charset=utf-8", - "Client-Request-Id" : "7f960c25-8daa-419d-a5cc-c21fd06ba032" + "X-Microsoft-Skype-Chain-ID" : "71457a83-5ffd-45e3-a345-d5294aa0f5d8", + "Body" : "{\"recordingId\":\"eyJQbGF0Zm9ybUVuZHBvaW50SWQiOiIxNDIwMTMwMC1hZDk4LTQzMWUtYTJhNC00OTM1NGM3YjllYzkiLCJSZXNvdXJjZVNwZWNpZmljSWQiOiI3NDMwMzliZi05Nzc3LTRjNTYtOWM0OS03MGVjODYzNGIxOWQifQ\"}", + "x-ms-client-request-id" : "25ef902a-f5dc-40a3-a0d7-1698c39223d3", + "Date" : "Tue, 15 Jun 2021 19:56:45 GMT", + "Content-Type" : "application/json; charset=utf-8" }, "Exception" : null }, { "Method" : "GET", - "Uri" : "https://REDACTED.communication.azure.com/calling/serverCalls/c400789f-e11b-4ceb-88cb-bc8df2a01568/recordings/eyJQbGF0Zm9ybUVuZHBvaW50SWQiOiI3MTFmMTMwMC03MDI3LTQ4NDYtOGRhNC1kMTU2NWM5M2NlNTciLCJSZXNvdXJjZVNwZWNpZmljSWQiOiI4YTk5YTljMy04MWYwLTQ5MmUtYjA1ZS0wYTY1ZWIyZWNjOWUifQ?api-version=2021-06-15-preview", + "Uri" : "https://REDACTED.communication.azure.com/calling/serverCalls/87d467a8-904e-357d-a312-f6bd4bc8005d/recordings/eyJQbGF0Zm9ybUVuZHBvaW50SWQiOiIxNDIwMTMwMC1hZDk4LTQzMWUtYTJhNC00OTM1NGM3YjllYzkiLCJSZXNvdXJjZVNwZWNpZmljSWQiOiI3NDMwMzliZi05Nzc3LTRjNTYtOWM0OS03MGVjODYzNGIxOWQifQ?api-version=2021-06-15-preview", "Headers" : { "User-Agent" : "azsdk-java-azure-communication-callingserver/1.0.0-beta.1 (11.0.11; Windows 10; 10.0)", - "x-ms-client-request-id" : "737c5f43-bc9a-414e-8151-eaf5d73c580d" + "x-ms-client-request-id" : "4bbb6ad3-f7ff-423d-84f9-8999ac276e6d" }, "Response" : { "X-Cache" : "CONFIG_NOCACHE", "content-length" : "27", "retry-after" : "0", - "X-Azure-Ref" : "0ubTDYAAAAAAYS4D55EjUTKr4cZeXtwn0V1NURURHRTA4MjEAOWZjN2I1MTktYThjYy00Zjg5LTkzNWUtYzkxNDhhZTA5ZTgx", + "X-Azure-Ref" : "0BAbJYAAAAAC+HN/2fyimS40rRX/Mt6EcV1NURURHRTA4MDkAOWZjN2I1MTktYThjYy00Zjg5LTkzNWUtYzkxNDhhZTA5ZTgx", "StatusCode" : "200", - "X-Microsoft-Skype-Chain-ID" : "5afbfd52-f0e9-40de-8ddc-1a57a65705cf", + "X-Microsoft-Skype-Chain-ID" : "658028a2-6a6f-431c-9884-3fff77997d09", "Body" : "{\"recordingState\":\"active\"}", - "Date" : "Fri, 11 Jun 2021 19:08:40 GMT", - "Content-Type" : "application/json; charset=utf-8", - "Client-Request-Id" : "10025db2-dbb9-49fb-ab4c-c2014f29d5f2" + "x-ms-client-request-id" : "4bbb6ad3-f7ff-423d-84f9-8999ac276e6d", + "Date" : "Tue, 15 Jun 2021 19:56:51 GMT", + "Content-Type" : "application/json; charset=utf-8" }, "Exception" : null }, { "Method" : "POST", - "Uri" : "https://REDACTED.communication.azure.com/calling/serverCalls/c400789f-e11b-4ceb-88cb-bc8df2a01568/recordings/eyJQbGF0Zm9ybUVuZHBvaW50SWQiOiI3MTFmMTMwMC03MDI3LTQ4NDYtOGRhNC1kMTU2NWM5M2NlNTciLCJSZXNvdXJjZVNwZWNpZmljSWQiOiI4YTk5YTljMy04MWYwLTQ5MmUtYjA1ZS0wYTY1ZWIyZWNjOWUifQ/:pause?api-version=2021-06-15-preview", + "Uri" : "https://REDACTED.communication.azure.com/calling/serverCalls/87d467a8-904e-357d-a312-f6bd4bc8005d/recordings/eyJQbGF0Zm9ybUVuZHBvaW50SWQiOiIxNDIwMTMwMC1hZDk4LTQzMWUtYTJhNC00OTM1NGM3YjllYzkiLCJSZXNvdXJjZVNwZWNpZmljSWQiOiI3NDMwMzliZi05Nzc3LTRjNTYtOWM0OS03MGVjODYzNGIxOWQifQ/:pause?api-version=2021-06-15-preview", "Headers" : { "User-Agent" : "azsdk-java-azure-communication-callingserver/1.0.0-beta.1 (11.0.11; Windows 10; 10.0)", - "x-ms-client-request-id" : "60b1f488-0c02-4bfe-bfe6-8c18bae0e799" + "x-ms-client-request-id" : "7579a85c-3f47-4e4a-850b-581e055516e2" }, "Response" : { "X-Cache" : "CONFIG_NOCACHE", "content-length" : "0", "retry-after" : "0", - "X-Azure-Ref" : "0ubTDYAAAAAA/MECPAquRRYMKy0YPeCYkV1NURURHRTA4MjEAOWZjN2I1MTktYThjYy00Zjg5LTkzNWUtYzkxNDhhZTA5ZTgx", + "X-Azure-Ref" : "0BAbJYAAAAACEL6fjdRMUQYj/s+moffdcV1NURURHRTA4MDkAOWZjN2I1MTktYThjYy00Zjg5LTkzNWUtYzkxNDhhZTA5ZTgx", "StatusCode" : "200", - "X-Microsoft-Skype-Chain-ID" : "3e68d0c8-1ea5-45c7-9194-bce79f6f4b4d", - "Date" : "Fri, 11 Jun 2021 19:08:41 GMT", - "Client-Request-Id" : "2930b36d-6ddb-41f8-a1c5-bd5bad5bdb4f" + "X-Microsoft-Skype-Chain-ID" : "5ebcb474-82cd-4182-80fd-c4bfbbbb9591", + "x-ms-client-request-id" : "7579a85c-3f47-4e4a-850b-581e055516e2", + "Date" : "Tue, 15 Jun 2021 19:56:52 GMT" }, "Exception" : null }, { "Method" : "GET", - "Uri" : "https://REDACTED.communication.azure.com/calling/serverCalls/c400789f-e11b-4ceb-88cb-bc8df2a01568/recordings/eyJQbGF0Zm9ybUVuZHBvaW50SWQiOiI3MTFmMTMwMC03MDI3LTQ4NDYtOGRhNC1kMTU2NWM5M2NlNTciLCJSZXNvdXJjZVNwZWNpZmljSWQiOiI4YTk5YTljMy04MWYwLTQ5MmUtYjA1ZS0wYTY1ZWIyZWNjOWUifQ?api-version=2021-06-15-preview", + "Uri" : "https://REDACTED.communication.azure.com/calling/serverCalls/87d467a8-904e-357d-a312-f6bd4bc8005d/recordings/eyJQbGF0Zm9ybUVuZHBvaW50SWQiOiIxNDIwMTMwMC1hZDk4LTQzMWUtYTJhNC00OTM1NGM3YjllYzkiLCJSZXNvdXJjZVNwZWNpZmljSWQiOiI3NDMwMzliZi05Nzc3LTRjNTYtOWM0OS03MGVjODYzNGIxOWQifQ?api-version=2021-06-15-preview", "Headers" : { "User-Agent" : "azsdk-java-azure-communication-callingserver/1.0.0-beta.1 (11.0.11; Windows 10; 10.0)", - "x-ms-client-request-id" : "2a80afc8-dbb2-473d-bdb4-491d54c1945c" + "x-ms-client-request-id" : "14c6fbd7-a3d6-4cd3-807b-6d29c51eefb3" }, "Response" : { "X-Cache" : "CONFIG_NOCACHE", "content-length" : "29", "retry-after" : "0", - "X-Azure-Ref" : "0v7TDYAAAAACZmof/4dX0SLy1eLA7XRSWV1NURURHRTA4MjEAOWZjN2I1MTktYThjYy00Zjg5LTkzNWUtYzkxNDhhZTA5ZTgx", + "X-Azure-Ref" : "0CwbJYAAAAAAqW7p7TgdHTa3vSE5zVX5MV1NURURHRTA4MDkAOWZjN2I1MTktYThjYy00Zjg5LTkzNWUtYzkxNDhhZTA5ZTgx", "StatusCode" : "200", - "X-Microsoft-Skype-Chain-ID" : "59affe09-dfd5-4bde-a9c5-1db58efbcfb2", + "X-Microsoft-Skype-Chain-ID" : "6a2f6c17-4fdd-4210-acab-71ee1ffd8675", "Body" : "{\"recordingState\":\"inactive\"}", - "Date" : "Fri, 11 Jun 2021 19:08:47 GMT", - "Content-Type" : "application/json; charset=utf-8", - "Client-Request-Id" : "d2e3f9b4-28dc-46df-8490-76a3a76df2e7" + "x-ms-client-request-id" : "14c6fbd7-a3d6-4cd3-807b-6d29c51eefb3", + "Date" : "Tue, 15 Jun 2021 19:56:58 GMT", + "Content-Type" : "application/json; charset=utf-8" }, "Exception" : null }, { "Method" : "POST", - "Uri" : "https://REDACTED.communication.azure.com/calling/serverCalls/c400789f-e11b-4ceb-88cb-bc8df2a01568/recordings/eyJQbGF0Zm9ybUVuZHBvaW50SWQiOiI3MTFmMTMwMC03MDI3LTQ4NDYtOGRhNC1kMTU2NWM5M2NlNTciLCJSZXNvdXJjZVNwZWNpZmljSWQiOiI4YTk5YTljMy04MWYwLTQ5MmUtYjA1ZS0wYTY1ZWIyZWNjOWUifQ/:resume?api-version=2021-06-15-preview", + "Uri" : "https://REDACTED.communication.azure.com/calling/serverCalls/87d467a8-904e-357d-a312-f6bd4bc8005d/recordings/eyJQbGF0Zm9ybUVuZHBvaW50SWQiOiIxNDIwMTMwMC1hZDk4LTQzMWUtYTJhNC00OTM1NGM3YjllYzkiLCJSZXNvdXJjZVNwZWNpZmljSWQiOiI3NDMwMzliZi05Nzc3LTRjNTYtOWM0OS03MGVjODYzNGIxOWQifQ/:resume?api-version=2021-06-15-preview", "Headers" : { "User-Agent" : "azsdk-java-azure-communication-callingserver/1.0.0-beta.1 (11.0.11; Windows 10; 10.0)", - "x-ms-client-request-id" : "e611f5e9-7260-4b88-a895-185ae6469605" + "x-ms-client-request-id" : "b6c51425-f070-4734-91e8-c600057ff5b0" }, "Response" : { "X-Cache" : "CONFIG_NOCACHE", "content-length" : "0", "retry-after" : "0", - "X-Azure-Ref" : "0v7TDYAAAAADCtDUtxWUASatgxk7r+/uaV1NURURHRTA4MjEAOWZjN2I1MTktYThjYy00Zjg5LTkzNWUtYzkxNDhhZTA5ZTgx", + "X-Azure-Ref" : "0CwbJYAAAAAAvYFoLFx8rQ5DHeosvy1PnV1NURURHRTA4MDkAOWZjN2I1MTktYThjYy00Zjg5LTkzNWUtYzkxNDhhZTA5ZTgx", "StatusCode" : "200", - "X-Microsoft-Skype-Chain-ID" : "f410a2d9-064c-4767-b4d9-5beb16c5c430", - "Date" : "Fri, 11 Jun 2021 19:08:47 GMT", - "Client-Request-Id" : "8f24914e-27ac-4c44-9f5a-e83ae183d060" + "X-Microsoft-Skype-Chain-ID" : "4a65c28b-1cfa-4961-8751-4fac326dcc01", + "x-ms-client-request-id" : "b6c51425-f070-4734-91e8-c600057ff5b0", + "Date" : "Tue, 15 Jun 2021 19:56:58 GMT" }, "Exception" : null }, { "Method" : "GET", - "Uri" : "https://REDACTED.communication.azure.com/calling/serverCalls/c400789f-e11b-4ceb-88cb-bc8df2a01568/recordings/eyJQbGF0Zm9ybUVuZHBvaW50SWQiOiI3MTFmMTMwMC03MDI3LTQ4NDYtOGRhNC1kMTU2NWM5M2NlNTciLCJSZXNvdXJjZVNwZWNpZmljSWQiOiI4YTk5YTljMy04MWYwLTQ5MmUtYjA1ZS0wYTY1ZWIyZWNjOWUifQ?api-version=2021-06-15-preview", + "Uri" : "https://REDACTED.communication.azure.com/calling/serverCalls/87d467a8-904e-357d-a312-f6bd4bc8005d/recordings/eyJQbGF0Zm9ybUVuZHBvaW50SWQiOiIxNDIwMTMwMC1hZDk4LTQzMWUtYTJhNC00OTM1NGM3YjllYzkiLCJSZXNvdXJjZVNwZWNpZmljSWQiOiI3NDMwMzliZi05Nzc3LTRjNTYtOWM0OS03MGVjODYzNGIxOWQifQ?api-version=2021-06-15-preview", "Headers" : { "User-Agent" : "azsdk-java-azure-communication-callingserver/1.0.0-beta.1 (11.0.11; Windows 10; 10.0)", - "x-ms-client-request-id" : "51916d9b-eeaa-476e-98d7-7ed269da222d" + "x-ms-client-request-id" : "fde0dfda-eeba-41bc-93e1-0abb1ae8faa8" }, "Response" : { "X-Cache" : "CONFIG_NOCACHE", "content-length" : "27", "retry-after" : "0", - "X-Azure-Ref" : "0xrTDYAAAAABk3JuqmKzSQanlQRDVGF1wV1NURURHRTA4MjEAOWZjN2I1MTktYThjYy00Zjg5LTkzNWUtYzkxNDhhZTA5ZTgx", + "X-Azure-Ref" : "0EQbJYAAAAADKkARZCsPmTLVS1gQs9d+3V1NURURHRTA4MDkAOWZjN2I1MTktYThjYy00Zjg5LTkzNWUtYzkxNDhhZTA5ZTgx", "StatusCode" : "200", - "X-Microsoft-Skype-Chain-ID" : "347c0f23-8893-4ef9-9de4-69b03ae7c6d1", + "X-Microsoft-Skype-Chain-ID" : "567bbec1-d32d-4cf9-97fb-55564d399450", "Body" : "{\"recordingState\":\"active\"}", - "Date" : "Fri, 11 Jun 2021 19:08:53 GMT", - "Content-Type" : "application/json; charset=utf-8", - "Client-Request-Id" : "e06e71c4-e23f-4ea6-8604-3719ea9af832" + "x-ms-client-request-id" : "fde0dfda-eeba-41bc-93e1-0abb1ae8faa8", + "Date" : "Tue, 15 Jun 2021 19:57:04 GMT", + "Content-Type" : "application/json; charset=utf-8" }, "Exception" : null }, { "Method" : "DELETE", - "Uri" : "https://REDACTED.communication.azure.com/calling/serverCalls/c400789f-e11b-4ceb-88cb-bc8df2a01568/recordings/eyJQbGF0Zm9ybUVuZHBvaW50SWQiOiI3MTFmMTMwMC03MDI3LTQ4NDYtOGRhNC1kMTU2NWM5M2NlNTciLCJSZXNvdXJjZVNwZWNpZmljSWQiOiI4YTk5YTljMy04MWYwLTQ5MmUtYjA1ZS0wYTY1ZWIyZWNjOWUifQ?api-version=2021-06-15-preview", + "Uri" : "https://REDACTED.communication.azure.com/calling/serverCalls/87d467a8-904e-357d-a312-f6bd4bc8005d/recordings/eyJQbGF0Zm9ybUVuZHBvaW50SWQiOiIxNDIwMTMwMC1hZDk4LTQzMWUtYTJhNC00OTM1NGM3YjllYzkiLCJSZXNvdXJjZVNwZWNpZmljSWQiOiI3NDMwMzliZi05Nzc3LTRjNTYtOWM0OS03MGVjODYzNGIxOWQifQ?api-version=2021-06-15-preview", "Headers" : { "User-Agent" : "azsdk-java-azure-communication-callingserver/1.0.0-beta.1 (11.0.11; Windows 10; 10.0)", - "x-ms-client-request-id" : "c11f4f48-2b00-4ce4-917d-84e5ef9ddccb" + "x-ms-client-request-id" : "dd1cc2fa-0668-41a2-8b20-b5df35c4f211" }, "Response" : { "X-Cache" : "CONFIG_NOCACHE", "content-length" : "0", "retry-after" : "0", - "X-Azure-Ref" : "0xrTDYAAAAAA2tB0oI1P9R4lgtAcDbSigV1NURURHRTA4MjEAOWZjN2I1MTktYThjYy00Zjg5LTkzNWUtYzkxNDhhZTA5ZTgx", + "X-Azure-Ref" : "0EQbJYAAAAABQ3ZkY6AbZS4cRIbpF56SnV1NURURHRTA4MDkAOWZjN2I1MTktYThjYy00Zjg5LTkzNWUtYzkxNDhhZTA5ZTgx", "StatusCode" : "200", - "X-Microsoft-Skype-Chain-ID" : "58e201d5-490e-41ea-8ece-ee58c88431fe", - "Date" : "Fri, 11 Jun 2021 19:08:54 GMT", - "Client-Request-Id" : "7926548a-2d32-4969-a51a-2c1a3abd6f3e" + "X-Microsoft-Skype-Chain-ID" : "7aea178b-e75f-45cb-8504-f22dbbc2734e", + "x-ms-client-request-id" : "dd1cc2fa-0668-41a2-8b20-b5df35c4f211", + "Date" : "Tue, 15 Jun 2021 19:57:04 GMT" }, "Exception" : null }, { "Method" : "POST", - "Uri" : "https://REDACTED.communication.azure.com/calling/callConnections/711f1300-16c6-4c44-b343-9b88885799f5/:hangup?api-version=2021-06-15-preview", + "Uri" : "https://REDACTED.communication.azure.com/calling/callConnections/14201300-2750-46ed-83b7-d93562909d9b/:hangup?api-version=2021-06-15-preview", "Headers" : { "User-Agent" : "azsdk-java-azure-communication-callingserver/1.0.0-beta.1 (11.0.11; Windows 10; 10.0)", - "x-ms-client-request-id" : "6ebdca41-6e8e-47f7-8dab-bcf666053a69" + "x-ms-client-request-id" : "37fb05e8-1cea-4a49-ac80-147dbd5af444" }, "Response" : { "X-Cache" : "CONFIG_NOCACHE", "content-length" : "0", "retry-after" : "0", - "X-Azure-Ref" : "0xrTDYAAAAACWdHww2JlNSaf0BvANI+7MV1NURURHRTA4MjEAOWZjN2I1MTktYThjYy00Zjg5LTkzNWUtYzkxNDhhZTA5ZTgx", + "X-Azure-Ref" : "0EQbJYAAAAAD4IqfFHPb5RqydLW626Ce/V1NURURHRTA4MDkAOWZjN2I1MTktYThjYy00Zjg5LTkzNWUtYzkxNDhhZTA5ZTgx", "StatusCode" : "202", - "X-Microsoft-Skype-Chain-ID" : "c69c6a60-66db-4315-89f5-5ea91f5184cd", - "Date" : "Fri, 11 Jun 2021 19:08:54 GMT", - "Client-Request-Id" : "132d9370-352e-4f28-95c2-3bae80cdb1e0" + "X-Microsoft-Skype-Chain-ID" : "41d4c6cd-44cd-4107-958d-e8a2bdcd0c2e", + "x-ms-client-request-id" : "37fb05e8-1cea-4a49-ac80-147dbd5af444", + "Date" : "Tue, 15 Jun 2021 19:57:04 GMT" }, "Exception" : null }, { "Method" : "POST", - "Uri" : "https://REDACTED.communication.azure.com/calling/callConnections/711f1300-c678-4a6e-8313-1fc0339f60b7/:hangup?api-version=2021-06-15-preview", + "Uri" : "https://REDACTED.communication.azure.com/calling/callConnections/14201300-aa06-4195-bcfe-20594ca72495/:hangup?api-version=2021-06-15-preview", "Headers" : { "User-Agent" : "azsdk-java-azure-communication-callingserver/1.0.0-beta.1 (11.0.11; Windows 10; 10.0)", - "x-ms-client-request-id" : "803b4ee6-35ee-4c2d-a329-35a3a77483ea" + "x-ms-client-request-id" : "08508522-aa52-4bc4-8782-8d1226ac30c2" }, "Response" : { "X-Cache" : "CONFIG_NOCACHE", "content-length" : "0", "retry-after" : "0", - "X-Azure-Ref" : "0xrTDYAAAAADAO+CyTRqzSbVT2fuOy8E3V1NURURHRTA4MjEAOWZjN2I1MTktYThjYy00Zjg5LTkzNWUtYzkxNDhhZTA5ZTgx", + "X-Azure-Ref" : "0EQbJYAAAAABALdDFC2EyR4/JxPkkguVYV1NURURHRTA4MDkAOWZjN2I1MTktYThjYy00Zjg5LTkzNWUtYzkxNDhhZTA5ZTgx", "StatusCode" : "202", - "X-Microsoft-Skype-Chain-ID" : "c1353ecd-0d8e-4773-b085-4053ea6128b2", - "Date" : "Fri, 11 Jun 2021 19:08:54 GMT", - "Client-Request-Id" : "d3f6b604-3f7e-488b-8095-62bbb33ae51b" + "X-Microsoft-Skype-Chain-ID" : "2c412e90-7eb4-4192-911f-07b4f029ac19", + "x-ms-client-request-id" : "08508522-aa52-4bc4-8782-8d1226ac30c2", + "Date" : "Tue, 15 Jun 2021 19:57:04 GMT" }, "Exception" : null } ], diff --git a/sdk/communication/azure-communication-callingserver/src/test/resources/session-records/ServerCallLiveTests.runPlayAudioFunctionWithResponse[1].json b/sdk/communication/azure-communication-callingserver/src/test/resources/session-records/ServerCallLiveTests.runPlayAudioFunctionWithResponse[1].json index 58b8c0e2f8673..25c9055f9c924 100644 --- a/sdk/communication/azure-communication-callingserver/src/test/resources/session-records/ServerCallLiveTests.runPlayAudioFunctionWithResponse[1].json +++ b/sdk/communication/azure-communication-callingserver/src/test/resources/session-records/ServerCallLiveTests.runPlayAudioFunctionWithResponse[1].json @@ -1,101 +1,101 @@ { "networkCallRecords" : [ { "Method" : "POST", - "Uri" : "https://REDACTED.communication.azure.com/calling/serverCalls/c400789f-e11b-4ceb-88cb-bc8df2a01568/:join?api-version=2021-06-15-preview", + "Uri" : "https://REDACTED.communication.azure.com/calling/serverCalls/67818f63-54b9-3ca7-809a-1ce6f60f520d/:join?api-version=2021-06-15-preview", "Headers" : { "User-Agent" : "azsdk-java-azure-communication-callingserver/1.0.0-beta.1 (11.0.11; Windows 10; 10.0)", - "x-ms-client-request-id" : "44e161bf-2026-4f78-ac83-ef69ea4e9f54", + "x-ms-client-request-id" : "4b5d130b-b31e-4d2b-82eb-1864d95d254d", "Content-Type" : "application/json" }, "Response" : { "X-Cache" : "CONFIG_NOCACHE", "content-length" : "110", "retry-after" : "0", - "X-Azure-Ref" : "0yrTDYAAAAAD68ZaqcOaXR7xtuD1kv3e/V1NURURHRTA4MjEAOWZjN2I1MTktYThjYy00Zjg5LTkzNWUtYzkxNDhhZTA5ZTgx", + "X-Azure-Ref" : "0FQbJYAAAAACF1ccEyjKATJdNkhe3LAbAV1NURURHRTA4MDkAOWZjN2I1MTktYThjYy00Zjg5LTkzNWUtYzkxNDhhZTA5ZTgx", "StatusCode" : "202", - "X-Microsoft-Skype-Chain-ID" : "cc593fee-bb00-475b-8e3a-944f3f64b518", - "Body" : "{\"callLegId\":\"711f1300-a631-4228-bdab-71a7a985879d\",\"callConnectionId\":\"711f1300-a631-4228-bdab-71a7a985879d\"}", - "Date" : "Fri, 11 Jun 2021 19:08:58 GMT", - "Content-Type" : "application/json; charset=utf-8", - "Client-Request-Id" : "12a4f9b4-0683-414f-9e4c-8190c837d8d2" + "X-Microsoft-Skype-Chain-ID" : "38a80fc1-9efc-4203-9b44-cabdf339f7d3", + "Body" : "{\"callLegId\":\"14201300-6cd6-48a8-a0eb-2a40be5ad683\",\"callConnectionId\":\"14201300-6cd6-48a8-a0eb-2a40be5ad683\"}", + "x-ms-client-request-id" : "4b5d130b-b31e-4d2b-82eb-1864d95d254d", + "Date" : "Tue, 15 Jun 2021 19:57:08 GMT", + "Content-Type" : "application/json; charset=utf-8" }, "Exception" : null }, { "Method" : "POST", - "Uri" : "https://REDACTED.communication.azure.com/calling/serverCalls/c400789f-e11b-4ceb-88cb-bc8df2a01568/:join?api-version=2021-06-15-preview", + "Uri" : "https://REDACTED.communication.azure.com/calling/serverCalls/67818f63-54b9-3ca7-809a-1ce6f60f520d/:join?api-version=2021-06-15-preview", "Headers" : { "User-Agent" : "azsdk-java-azure-communication-callingserver/1.0.0-beta.1 (11.0.11; Windows 10; 10.0)", - "x-ms-client-request-id" : "fcbe23fc-d42f-485d-b83d-021021815657", + "x-ms-client-request-id" : "261bc759-34cf-4a82-a1f3-c6a63751a6d6", "Content-Type" : "application/json" }, "Response" : { "X-Cache" : "CONFIG_NOCACHE", "content-length" : "110", "retry-after" : "0", - "X-Azure-Ref" : "0zLTDYAAAAACHxpay/jbbTJWL+6OQ+T7KV1NURURHRTA4MjEAOWZjN2I1MTktYThjYy00Zjg5LTkzNWUtYzkxNDhhZTA5ZTgx", + "X-Azure-Ref" : "0FgbJYAAAAABzbzklMerQQrab9at0COLlV1NURURHRTA4MDkAOWZjN2I1MTktYThjYy00Zjg5LTkzNWUtYzkxNDhhZTA5ZTgx", "StatusCode" : "202", - "X-Microsoft-Skype-Chain-ID" : "0bf112b9-7084-4f8c-a8c5-5f15c28601e3", - "Body" : "{\"callLegId\":\"711f1300-97ee-4aed-a606-fd2a8c97f6db\",\"callConnectionId\":\"711f1300-97ee-4aed-a606-fd2a8c97f6db\"}", - "Date" : "Fri, 11 Jun 2021 19:08:59 GMT", - "Content-Type" : "application/json; charset=utf-8", - "Client-Request-Id" : "1fabd153-c146-44f4-8db6-2a5707b2d055" + "X-Microsoft-Skype-Chain-ID" : "782840e3-5456-4ac6-b7e6-d1222f3f712f", + "Body" : "{\"callLegId\":\"14201300-dfe7-4083-bdd1-73129db3352f\",\"callConnectionId\":\"14201300-dfe7-4083-bdd1-73129db3352f\"}", + "x-ms-client-request-id" : "261bc759-34cf-4a82-a1f3-c6a63751a6d6", + "Date" : "Tue, 15 Jun 2021 19:57:10 GMT", + "Content-Type" : "application/json; charset=utf-8" }, "Exception" : null }, { "Method" : "POST", - "Uri" : "https://REDACTED.communication.azure.com/calling/serverCalls/c400789f-e11b-4ceb-88cb-bc8df2a01568/:playAudio?api-version=2021-06-15-preview", + "Uri" : "https://REDACTED.communication.azure.com/calling/serverCalls/67818f63-54b9-3ca7-809a-1ce6f60f520d/:playAudio?api-version=2021-06-15-preview", "Headers" : { "User-Agent" : "azsdk-java-azure-communication-callingserver/1.0.0-beta.1 (11.0.11; Windows 10; 10.0)", - "x-ms-client-request-id" : "b1cefe60-8bee-4720-aeca-0cd7de97dbe7", + "x-ms-client-request-id" : "b1565373-6736-4258-82c3-cfb904d30d9a", "Content-Type" : "application/json" }, "Response" : { "X-Cache" : "CONFIG_NOCACHE", "content-length" : "122", "retry-after" : "0", - "X-Azure-Ref" : "0zbTDYAAAAADHoPbrIsdFRJfckldC317lV1NURURHRTA4MjEAOWZjN2I1MTktYThjYy00Zjg5LTkzNWUtYzkxNDhhZTA5ZTgx", + "X-Azure-Ref" : "0GAbJYAAAAAAobDKKmCfoSZIykDIgL6j9V1NURURHRTA4MDkAOWZjN2I1MTktYThjYy00Zjg5LTkzNWUtYzkxNDhhZTA5ZTgx", "StatusCode" : "202", - "X-Microsoft-Skype-Chain-ID" : "5b4cc20b-2d71-4ffc-9644-237e78a6d27e", - "Body" : "{\"id\":\"711f1300-12d8-423a-8a98-2810a7903497\",\"status\":\"running\",\"operationContext\":\"9a0d9a98-8044-4548-a780-4757ce77be3a\"}", - "Date" : "Fri, 11 Jun 2021 19:09:01 GMT", - "Content-Type" : "application/json; charset=utf-8", - "Client-Request-Id" : "e9b89185-725c-4059-9b82-275c99a8297e" + "X-Microsoft-Skype-Chain-ID" : "d0e5152d-ef79-4f99-bd0e-bfe6135cf737", + "Body" : "{\"id\":\"14201300-2ab6-4acc-b8e3-fdff25db4ebb\",\"status\":\"running\",\"operationContext\":\"e6d57fbc-877f-46ab-824d-72e6cf957a46\"}", + "x-ms-client-request-id" : "b1565373-6736-4258-82c3-cfb904d30d9a", + "Date" : "Tue, 15 Jun 2021 19:57:12 GMT", + "Content-Type" : "application/json; charset=utf-8" }, "Exception" : null }, { "Method" : "POST", - "Uri" : "https://REDACTED.communication.azure.com/calling/callConnections/711f1300-a631-4228-bdab-71a7a985879d/:hangup?api-version=2021-06-15-preview", + "Uri" : "https://REDACTED.communication.azure.com/calling/callConnections/14201300-6cd6-48a8-a0eb-2a40be5ad683/:hangup?api-version=2021-06-15-preview", "Headers" : { "User-Agent" : "azsdk-java-azure-communication-callingserver/1.0.0-beta.1 (11.0.11; Windows 10; 10.0)", - "x-ms-client-request-id" : "9817d6b7-43fc-4eb0-9d67-9d9cad3f2262" + "x-ms-client-request-id" : "9c49446a-d3c0-4151-bbcc-8b78a7916c7b" }, "Response" : { "X-Cache" : "CONFIG_NOCACHE", "content-length" : "0", "retry-after" : "0", - "X-Azure-Ref" : "0zrTDYAAAAAAMv8yfn4dgTpZT8Yry1T9tV1NURURHRTA4MjEAOWZjN2I1MTktYThjYy00Zjg5LTkzNWUtYzkxNDhhZTA5ZTgx", + "X-Azure-Ref" : "0GQbJYAAAAAAuySiJ68G9QbJQPt66IjydV1NURURHRTA4MDkAOWZjN2I1MTktYThjYy00Zjg5LTkzNWUtYzkxNDhhZTA5ZTgx", "StatusCode" : "202", - "X-Microsoft-Skype-Chain-ID" : "18c69c8e-78a8-4e5b-8863-1dc6d41dbe36", - "Date" : "Fri, 11 Jun 2021 19:09:01 GMT", - "Client-Request-Id" : "a4e5e4cf-4af0-4187-9fc3-3b8dd9f057b7" + "X-Microsoft-Skype-Chain-ID" : "906a74a0-0aea-4e15-b8cb-04e2280dd1dd", + "x-ms-client-request-id" : "9c49446a-d3c0-4151-bbcc-8b78a7916c7b", + "Date" : "Tue, 15 Jun 2021 19:57:12 GMT" }, "Exception" : null }, { "Method" : "POST", - "Uri" : "https://REDACTED.communication.azure.com/calling/callConnections/711f1300-97ee-4aed-a606-fd2a8c97f6db/:hangup?api-version=2021-06-15-preview", + "Uri" : "https://REDACTED.communication.azure.com/calling/callConnections/14201300-dfe7-4083-bdd1-73129db3352f/:hangup?api-version=2021-06-15-preview", "Headers" : { "User-Agent" : "azsdk-java-azure-communication-callingserver/1.0.0-beta.1 (11.0.11; Windows 10; 10.0)", - "x-ms-client-request-id" : "2a21d701-7632-4535-932b-4439806d10ba" + "x-ms-client-request-id" : "79a4531e-ba5e-43fe-a364-4ad8437be65d" }, "Response" : { "X-Cache" : "CONFIG_NOCACHE", "content-length" : "0", "retry-after" : "0", - "X-Azure-Ref" : "0zrTDYAAAAABLkItLgWV4TpKci2L9sTKmV1NURURHRTA4MjEAOWZjN2I1MTktYThjYy00Zjg5LTkzNWUtYzkxNDhhZTA5ZTgx", + "X-Azure-Ref" : "0GQbJYAAAAACXqQraMtq0QIVAaSvaQQ3lV1NURURHRTA4MDkAOWZjN2I1MTktYThjYy00Zjg5LTkzNWUtYzkxNDhhZTA5ZTgx", "StatusCode" : "202", - "X-Microsoft-Skype-Chain-ID" : "f01a2df4-9cb8-44d3-9a01-78e3f7a7ee06", - "Date" : "Fri, 11 Jun 2021 19:09:01 GMT", - "Client-Request-Id" : "5ad46571-41e4-4010-832d-64182d89f435" + "X-Microsoft-Skype-Chain-ID" : "d110ec03-9aca-47a1-9605-828688a0a3e0", + "x-ms-client-request-id" : "79a4531e-ba5e-43fe-a364-4ad8437be65d", + "Date" : "Tue, 15 Jun 2021 19:57:12 GMT" }, "Exception" : null } ], diff --git a/sdk/communication/azure-communication-callingserver/src/test/resources/session-records/ServerCallLiveTests.runPlayAudioFunction[1].json b/sdk/communication/azure-communication-callingserver/src/test/resources/session-records/ServerCallLiveTests.runPlayAudioFunction[1].json index 2fdaa8717f266..374765519eefd 100644 --- a/sdk/communication/azure-communication-callingserver/src/test/resources/session-records/ServerCallLiveTests.runPlayAudioFunction[1].json +++ b/sdk/communication/azure-communication-callingserver/src/test/resources/session-records/ServerCallLiveTests.runPlayAudioFunction[1].json @@ -1,101 +1,101 @@ { "networkCallRecords" : [ { "Method" : "POST", - "Uri" : "https://REDACTED.communication.azure.com/calling/serverCalls/c400789f-e11b-4ceb-88cb-bc8df2a01568/:join?api-version=2021-06-15-preview", + "Uri" : "https://REDACTED.communication.azure.com/calling/serverCalls/8a317faf-862b-39b6-a879-30ba625afac8/:join?api-version=2021-06-15-preview", "Headers" : { "User-Agent" : "azsdk-java-azure-communication-callingserver/1.0.0-beta.1 (11.0.11; Windows 10; 10.0)", - "x-ms-client-request-id" : "0d26fe6b-0b02-45ac-8d4d-c4a1ebc225d6", + "x-ms-client-request-id" : "a2e9d07c-d54f-4bd2-87e4-2ad7c91bec4f", "Content-Type" : "application/json" }, "Response" : { "X-Cache" : "CONFIG_NOCACHE", "content-length" : "110", "retry-after" : "0", - "X-Azure-Ref" : "0xrTDYAAAAACi+GhXqrIFQabdb7nWLfk3V1NURURHRTA4MjEAOWZjN2I1MTktYThjYy00Zjg5LTkzNWUtYzkxNDhhZTA5ZTgx", + "X-Azure-Ref" : "0EQbJYAAAAACh8hxrovqXQqT34SZafwLTV1NURURHRTA4MDkAOWZjN2I1MTktYThjYy00Zjg5LTkzNWUtYzkxNDhhZTA5ZTgx", "StatusCode" : "202", - "X-Microsoft-Skype-Chain-ID" : "055d160e-7c8f-4e20-9e00-35abbc765e4a", - "Body" : "{\"callLegId\":\"711f1300-aef8-4015-88fa-b3e296c27c51\",\"callConnectionId\":\"711f1300-aef8-4015-88fa-b3e296c27c51\"}", - "Date" : "Fri, 11 Jun 2021 19:08:54 GMT", - "Content-Type" : "application/json; charset=utf-8", - "Client-Request-Id" : "0761fefc-6701-462c-b85a-3c52f01cebde" + "X-Microsoft-Skype-Chain-ID" : "73c29012-ca7b-44ad-aac1-d1dcfb18714d", + "Body" : "{\"callLegId\":\"14201300-44eb-4ee5-98b3-33c1f62b497b\",\"callConnectionId\":\"14201300-44eb-4ee5-98b3-33c1f62b497b\"}", + "x-ms-client-request-id" : "a2e9d07c-d54f-4bd2-87e4-2ad7c91bec4f", + "Date" : "Tue, 15 Jun 2021 19:57:05 GMT", + "Content-Type" : "application/json; charset=utf-8" }, "Exception" : null }, { "Method" : "POST", - "Uri" : "https://REDACTED.communication.azure.com/calling/serverCalls/c400789f-e11b-4ceb-88cb-bc8df2a01568/:join?api-version=2021-06-15-preview", + "Uri" : "https://REDACTED.communication.azure.com/calling/serverCalls/8a317faf-862b-39b6-a879-30ba625afac8/:join?api-version=2021-06-15-preview", "Headers" : { "User-Agent" : "azsdk-java-azure-communication-callingserver/1.0.0-beta.1 (11.0.11; Windows 10; 10.0)", - "x-ms-client-request-id" : "a5acca44-11dd-48af-b515-3931ff662de1", + "x-ms-client-request-id" : "b5e4668e-6c62-43f5-be15-bd198d052fb4", "Content-Type" : "application/json" }, "Response" : { "X-Cache" : "CONFIG_NOCACHE", "content-length" : "110", "retry-after" : "0", - "X-Azure-Ref" : "0x7TDYAAAAAAwy/jkWiHuQrb9hP+53f5+V1NURURHRTA4MjEAOWZjN2I1MTktYThjYy00Zjg5LTkzNWUtYzkxNDhhZTA5ZTgx", + "X-Azure-Ref" : "0EwbJYAAAAAACKhNd5n5ZQL588II4zcPgV1NURURHRTA4MDkAOWZjN2I1MTktYThjYy00Zjg5LTkzNWUtYzkxNDhhZTA5ZTgx", "StatusCode" : "202", - "X-Microsoft-Skype-Chain-ID" : "c7e12f74-b156-43f6-8522-76ecc93ac54a", - "Body" : "{\"callLegId\":\"711f1300-caea-4e75-b8c5-6a4c99f2a0d1\",\"callConnectionId\":\"711f1300-caea-4e75-b8c5-6a4c99f2a0d1\"}", - "Date" : "Fri, 11 Jun 2021 19:08:55 GMT", - "Content-Type" : "application/json; charset=utf-8", - "Client-Request-Id" : "b390344e-6049-4d44-8539-b543c279853d" + "X-Microsoft-Skype-Chain-ID" : "b0a3619e-e57f-4221-8221-80d25dc2f300", + "Body" : "{\"callLegId\":\"14201300-d7b7-4f38-a121-76cc2d006f2b\",\"callConnectionId\":\"14201300-d7b7-4f38-a121-76cc2d006f2b\"}", + "x-ms-client-request-id" : "b5e4668e-6c62-43f5-be15-bd198d052fb4", + "Date" : "Tue, 15 Jun 2021 19:57:06 GMT", + "Content-Type" : "application/json; charset=utf-8" }, "Exception" : null }, { "Method" : "POST", - "Uri" : "https://REDACTED.communication.azure.com/calling/serverCalls/c400789f-e11b-4ceb-88cb-bc8df2a01568/:playAudio?api-version=2021-06-15-preview", + "Uri" : "https://REDACTED.communication.azure.com/calling/serverCalls/8a317faf-862b-39b6-a879-30ba625afac8/:playAudio?api-version=2021-06-15-preview", "Headers" : { "User-Agent" : "azsdk-java-azure-communication-callingserver/1.0.0-beta.1 (11.0.11; Windows 10; 10.0)", - "x-ms-client-request-id" : "08f44654-3b37-41ec-8220-e2e386b3750c", + "x-ms-client-request-id" : "b64c63e9-b69c-4cd3-adeb-c1478be61dca", "Content-Type" : "application/json" }, "Response" : { "X-Cache" : "CONFIG_NOCACHE", "content-length" : "122", "retry-after" : "0", - "X-Azure-Ref" : "0ybTDYAAAAADDIPhaL6I4Q7c++H0wNSwJV1NURURHRTA4MjEAOWZjN2I1MTktYThjYy00Zjg5LTkzNWUtYzkxNDhhZTA5ZTgx", + "X-Azure-Ref" : "0FAbJYAAAAADUU0f7St+pT4GWlPalB7VpV1NURURHRTA4MDkAOWZjN2I1MTktYThjYy00Zjg5LTkzNWUtYzkxNDhhZTA5ZTgx", "StatusCode" : "202", - "X-Microsoft-Skype-Chain-ID" : "35a3e4dc-b0cc-41ed-83cb-fdadb14a2b6c", - "Body" : "{\"id\":\"711f1300-08f1-44f6-adaa-ec6c0e7867ef\",\"status\":\"running\",\"operationContext\":\"f07dc34c-0927-4a54-8d97-951c15275660\"}", - "Date" : "Fri, 11 Jun 2021 19:08:58 GMT", - "Content-Type" : "application/json; charset=utf-8", - "Client-Request-Id" : "e116312f-b8d5-46d0-8ca5-ebf5d094bf67" + "X-Microsoft-Skype-Chain-ID" : "1f4dc675-1882-4ff8-b0f9-980d18b69f00", + "Body" : "{\"id\":\"14201300-c86d-4693-9eed-f75883892c37\",\"status\":\"running\",\"operationContext\":\"e3d84d0f-a794-48f6-8c1e-366d75e4ba4d\"}", + "x-ms-client-request-id" : "b64c63e9-b69c-4cd3-adeb-c1478be61dca", + "Date" : "Tue, 15 Jun 2021 19:57:08 GMT", + "Content-Type" : "application/json; charset=utf-8" }, "Exception" : null }, { "Method" : "POST", - "Uri" : "https://REDACTED.communication.azure.com/calling/callConnections/711f1300-aef8-4015-88fa-b3e296c27c51/:hangup?api-version=2021-06-15-preview", + "Uri" : "https://REDACTED.communication.azure.com/calling/callConnections/14201300-44eb-4ee5-98b3-33c1f62b497b/:hangup?api-version=2021-06-15-preview", "Headers" : { "User-Agent" : "azsdk-java-azure-communication-callingserver/1.0.0-beta.1 (11.0.11; Windows 10; 10.0)", - "x-ms-client-request-id" : "92e68af9-73c8-4106-be8b-03b4dfda3ced" + "x-ms-client-request-id" : "640a7791-e769-4002-a9e6-1e5ee2f653da" }, "Response" : { "X-Cache" : "CONFIG_NOCACHE", "content-length" : "0", "retry-after" : "0", - "X-Azure-Ref" : "0yrTDYAAAAAB7zFDNiyuISowJgESzxh/tV1NURURHRTA4MjEAOWZjN2I1MTktYThjYy00Zjg5LTkzNWUtYzkxNDhhZTA5ZTgx", + "X-Azure-Ref" : "0FQbJYAAAAACOucUtTw0/QKnZepFd30v7V1NURURHRTA4MDkAOWZjN2I1MTktYThjYy00Zjg5LTkzNWUtYzkxNDhhZTA5ZTgx", "StatusCode" : "202", - "X-Microsoft-Skype-Chain-ID" : "61a85e45-302b-4e82-9ccd-5216d7034786", - "Date" : "Fri, 11 Jun 2021 19:08:58 GMT", - "Client-Request-Id" : "20c1b6cd-63f8-42b1-acae-fb23bf990d29" + "X-Microsoft-Skype-Chain-ID" : "58d5e39d-3cf5-468b-958a-0eedd9b4b174", + "x-ms-client-request-id" : "640a7791-e769-4002-a9e6-1e5ee2f653da", + "Date" : "Tue, 15 Jun 2021 19:57:08 GMT" }, "Exception" : null }, { "Method" : "POST", - "Uri" : "https://REDACTED.communication.azure.com/calling/callConnections/711f1300-caea-4e75-b8c5-6a4c99f2a0d1/:hangup?api-version=2021-06-15-preview", + "Uri" : "https://REDACTED.communication.azure.com/calling/callConnections/14201300-d7b7-4f38-a121-76cc2d006f2b/:hangup?api-version=2021-06-15-preview", "Headers" : { "User-Agent" : "azsdk-java-azure-communication-callingserver/1.0.0-beta.1 (11.0.11; Windows 10; 10.0)", - "x-ms-client-request-id" : "1516b878-78be-4bad-9ec5-e53f99c85897" + "x-ms-client-request-id" : "8aad9913-11fe-4fee-8c9e-8ffc4242ee33" }, "Response" : { "X-Cache" : "CONFIG_NOCACHE", "content-length" : "0", "retry-after" : "0", - "X-Azure-Ref" : "0yrTDYAAAAACMToDca6/7RIywYhc1gN70V1NURURHRTA4MjEAOWZjN2I1MTktYThjYy00Zjg5LTkzNWUtYzkxNDhhZTA5ZTgx", + "X-Azure-Ref" : "0FQbJYAAAAACDGooQZqqdSq2hP0XsgeISV1NURURHRTA4MDkAOWZjN2I1MTktYThjYy00Zjg5LTkzNWUtYzkxNDhhZTA5ZTgx", "StatusCode" : "202", - "X-Microsoft-Skype-Chain-ID" : "c2ba9386-861c-4430-a6d9-ccb7f1dbf9b9", - "Date" : "Fri, 11 Jun 2021 19:08:58 GMT", - "Client-Request-Id" : "0d72cdc1-af5c-4617-bdb3-ac8b4b46be1d" + "X-Microsoft-Skype-Chain-ID" : "c418f312-23ef-483a-bf0d-3c2f51b0d147", + "x-ms-client-request-id" : "8aad9913-11fe-4fee-8c9e-8ffc4242ee33", + "Date" : "Tue, 15 Jun 2021 19:57:08 GMT" }, "Exception" : null } ], diff --git a/sdk/communication/azure-communication-callingserver/src/test/resources/session-records/ServerCallLiveTests.startRecordingFails[1].json b/sdk/communication/azure-communication-callingserver/src/test/resources/session-records/ServerCallLiveTests.startRecordingFails[1].json index 549bc7e87e14c..86e6ba8ede5ea 100644 --- a/sdk/communication/azure-communication-callingserver/src/test/resources/session-records/ServerCallLiveTests.startRecordingFails[1].json +++ b/sdk/communication/azure-communication-callingserver/src/test/resources/session-records/ServerCallLiveTests.startRecordingFails[1].json @@ -4,20 +4,20 @@ "Uri" : "https://REDACTED.communication.azure.com/calling/serverCalls/aHR0cHM6Ly9jb252LXVzd2UtMDkuY29udi5za3lwZS5jb20vY29udi9EZVF2WEJGVVlFV1NNZkFXYno2azN3P2k9MTEmZT02Mzc1NzIyMjk0Mjc0NTI4Nzk=/recordings?api-version=2021-06-15-preview", "Headers" : { "User-Agent" : "azsdk-java-azure-communication-callingserver/1.0.0-beta.1 (11.0.11; Windows 10; 10.0)", - "x-ms-client-request-id" : "5593f679-c772-4dfa-913e-991fadc10fa6", + "x-ms-client-request-id" : "429b38b0-33f1-4167-bf2f-b80092e0edd1", "Content-Type" : "application/json" }, "Response" : { "X-Cache" : "CONFIG_NOCACHE", "content-length" : "83", "retry-after" : "0", - "X-Azure-Ref" : "0yrTDYAAAAAAhaNuRdLLwQb+0Ow+i9sV0V1NURURHRTA4MjEAOWZjN2I1MTktYThjYy00Zjg5LTkzNWUtYzkxNDhhZTA5ZTgx", + "X-Azure-Ref" : "0FQbJYAAAAACQDDu6JrTsT45jhtV27J9xV1NURURHRTA4MDkAOWZjN2I1MTktYThjYy00Zjg5LTkzNWUtYzkxNDhhZTA5ZTgx", "StatusCode" : "400", - "X-Microsoft-Skype-Chain-ID" : "e2217417-47af-4945-8f00-6b82b33dcca7", + "X-Microsoft-Skype-Chain-ID" : "000539a7-397e-4271-861d-b721dba5d259", "Body" : "{\"code\":\"8501\",\"message\":\"Action is invalid when call is not in Established state\"}", - "Date" : "Fri, 11 Jun 2021 19:08:58 GMT", - "Content-Type" : "application/json; charset=utf-8", - "Client-Request-Id" : "83cef93f-702d-4629-985d-db634ca06157" + "x-ms-client-request-id" : "429b38b0-33f1-4167-bf2f-b80092e0edd1", + "Date" : "Tue, 15 Jun 2021 19:57:08 GMT", + "Content-Type" : "application/json; charset=utf-8" }, "Exception" : null } ], From 3f694043d0f428dfe9ebba1f6ba84d76d8329fa9 Mon Sep 17 00:00:00 2001 From: Christian Whitehead Date: Tue, 15 Jun 2021 15:50:38 -0700 Subject: [PATCH 04/11] fix(*): remove test connection string --- .../communication/callingserver/CallingServerTestBase.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sdk/communication/azure-communication-callingserver/src/test/java/com/azure/communication/callingserver/CallingServerTestBase.java b/sdk/communication/azure-communication-callingserver/src/test/java/com/azure/communication/callingserver/CallingServerTestBase.java index e7b05daeb44e5..7307e021cff6a 100644 --- a/sdk/communication/azure-communication-callingserver/src/test/java/com/azure/communication/callingserver/CallingServerTestBase.java +++ b/sdk/communication/azure-communication-callingserver/src/test/java/com/azure/communication/callingserver/CallingServerTestBase.java @@ -39,7 +39,7 @@ public class CallingServerTestBase extends TestBase { protected static final String CONNECTION_STRING = Configuration.getGlobalConfiguration() .get("COMMUNICATION_LIVETEST_STATIC_CONNECTION_STRING", - "endpoint=https://acstestbot1.communication.azure.com/;accesskey=E0Oy7HRSLiMFyuXHQA/9nOYZu2Fc0ia9DxhHtsGhtHuc2RTan24ZAmTjxl5etgZW/+O3pGrXiEpazT81u3quzg=="); + "endpoint=https://REDACTED.communication.azure.com/;accesskey=QWNjZXNzS2V5"); protected static final String RESOURCE_IDENTIFIER = Configuration.getGlobalConfiguration() .get("COMMUNICATION_LIVETEST_STATIC_RESOURCE_IDENTIFIER", From 1a259c132df9da99e4077ae18a714b9a897441cb Mon Sep 17 00:00:00 2001 From: Christian Whitehead Date: Tue, 15 Jun 2021 16:25:50 -0700 Subject: [PATCH 05/11] fix(test): raise branch coverage --- .../CallingServerClientBuilderUnitTests.java | 11 +++++++++++ .../callingserver/ServerCallLiveTests.java | 2 +- 2 files changed, 12 insertions(+), 1 deletion(-) diff --git a/sdk/communication/azure-communication-callingserver/src/test/java/com/azure/communication/callingserver/CallingServerClientBuilderUnitTests.java b/sdk/communication/azure-communication-callingserver/src/test/java/com/azure/communication/callingserver/CallingServerClientBuilderUnitTests.java index 7608722349ab2..a156839c6e3aa 100644 --- a/sdk/communication/azure-communication-callingserver/src/test/java/com/azure/communication/callingserver/CallingServerClientBuilderUnitTests.java +++ b/sdk/communication/azure-communication-callingserver/src/test/java/com/azure/communication/callingserver/CallingServerClientBuilderUnitTests.java @@ -10,6 +10,7 @@ import com.azure.core.http.HttpRequest; import com.azure.core.http.HttpResponse; import com.azure.core.http.policy.HttpLogOptions; +import com.azure.core.http.policy.RetryPolicy; import com.azure.core.util.ClientOptions; import com.azure.identity.DefaultAzureCredentialBuilder; import org.junit.jupiter.api.Test; @@ -141,6 +142,7 @@ public void addPolicy() { .addPolicy(new HmacAuthenticationPolicy(credential)) .httpClient(new NoOpHttpClient()) .pipeline(new HttpPipelineBuilder().build()) + .retryPolicy(new RetryPolicy()) .buildAsyncClient(); assertNotNull(callAsyncClient); } @@ -155,6 +157,15 @@ public void argumentExceptionOnConnectionStringAndEndpoint() { .buildAsyncClient()); } + @Test + public void argumentExceptionOnEmptyConnectionString() { + assertThrows(NullPointerException.class, + () -> builder + .connectionString("") + .httpClient(new NoOpHttpClient()) + .buildAsyncClient()); + } + @Test public void argumentExceptionOnConnectionStringAndAzureKeyCredential() { AzureKeyCredential credential = new AzureKeyCredential("key"); diff --git a/sdk/communication/azure-communication-callingserver/src/test/java/com/azure/communication/callingserver/ServerCallLiveTests.java b/sdk/communication/azure-communication-callingserver/src/test/java/com/azure/communication/callingserver/ServerCallLiveTests.java index 2e13b8f3f9906..bd8d84df3bf3f 100644 --- a/sdk/communication/azure-communication-callingserver/src/test/java/com/azure/communication/callingserver/ServerCallLiveTests.java +++ b/sdk/communication/azure-communication-callingserver/src/test/java/com/azure/communication/callingserver/ServerCallLiveTests.java @@ -196,7 +196,7 @@ public void startRecordingFails(HttpClient httpClient) { try { Response response = - serverCall.startRecordingWithResponse(CALLBACK_URI, null); + serverCall.startRecordingWithResponse(CALLBACK_URI, Context.NONE); assertEquals(response.getStatusCode(), 400); } catch (CallingServerErrorException e) { assertEquals(e.getResponse().getStatusCode(), 400); From acb491b1ee5b91d2a1b7b91f5e7c62ccc1d6031d Mon Sep 17 00:00:00 2001 From: Arif Saikat <71465659+arifsaikat-microsoft@users.noreply.github.com> Date: Tue, 15 Jun 2021 17:06:21 -0700 Subject: [PATCH 06/11] apiview review fix (#22304) --- .../callingserver/CallConnection.java | 23 +++++------ .../callingserver/CallConnectionAsync.java | 6 ++- .../callingserver/CallingServerClient.java | 8 ++-- .../CallingServerClientBuilder.java | 18 ++++----- .../CallingServerServiceVersion.java | 37 ++++++++++++++++++ .../callingserver/ServerCall.java | 38 +++++++++---------- .../callingserver/ServerCallAsync.java | 12 ++++-- .../models/events/CallingServerEventType.java | 2 +- 8 files changed, 88 insertions(+), 56 deletions(-) create mode 100644 sdk/communication/azure-communication-callingserver/src/main/java/com/azure/communication/callingserver/CallingServerServiceVersion.java diff --git a/sdk/communication/azure-communication-callingserver/src/main/java/com/azure/communication/callingserver/CallConnection.java b/sdk/communication/azure-communication-callingserver/src/main/java/com/azure/communication/callingserver/CallConnection.java index 48ec1f5fc7c2f..cd146830294b7 100644 --- a/sdk/communication/azure-communication-callingserver/src/main/java/com/azure/communication/callingserver/CallConnection.java +++ b/sdk/communication/azure-communication-callingserver/src/main/java/com/azure/communication/callingserver/CallConnection.java @@ -93,7 +93,7 @@ public Response playAudioWithResponse( String audioFileId, String callbackUri, String operationContext, - Context context) { + final Context context) { return callConnectionAsync .playAudioWithResponseInternal( audioFileUri, @@ -119,7 +119,7 @@ public Response playAudioWithResponse( public Response playAudioWithResponse( String audioFileUri, PlayAudioOptions playAudioOptions, - Context context) { + final Context context) { return callConnectionAsync .playAudioWithResponseInternal(audioFileUri, playAudioOptions, context) .block(); @@ -127,12 +127,10 @@ public Response playAudioWithResponse( /** * Disconnect the current caller in a group-call or end a p2p-call. - * - * @return response for a successful hangup request. */ @ServiceMethod(returns = ReturnType.SINGLE) - public Void hangup() { - return callConnectionAsync.hangup().block(); + public void hangup() { + callConnectionAsync.hangup().block(); } /** @@ -142,7 +140,7 @@ public Void hangup() { * @return response for a successful hangup request. */ @ServiceMethod(returns = ReturnType.SINGLE) - public Response hangupWithResponse(Context context) { + public Response hangupWithResponse(final Context context) { return callConnectionAsync.hangupWithResponse(context).block(); } @@ -169,7 +167,7 @@ public CancelAllMediaOperationsResult cancelAllMediaOperations(String operationC @ServiceMethod(returns = ReturnType.SINGLE) public Response cancelAllMediaOperationsWithResponse( String operationContext, - Context context) { + final Context context) { return callConnectionAsync.cancelAllMediaOperationsWithResponse(operationContext, context).block(); } @@ -205,7 +203,7 @@ public Response addParticipantWithResponse( CommunicationIdentifier participant, String alternateCallerId, String operationContext, - Context context) { + final Context context) { return callConnectionAsync .addParticipantWithResponse(participant, alternateCallerId, operationContext, context).block(); } @@ -214,11 +212,10 @@ public Response addParticipantWithResponse( * Remove a participant from the call. * * @param participantId Participant id. - * @return response for a successful remove participant request. */ @ServiceMethod(returns = ReturnType.SINGLE) - public Void removeParticipant(String participantId) { - return callConnectionAsync.removeParticipant(participantId).block(); + public void removeParticipant(String participantId) { + callConnectionAsync.removeParticipant(participantId).block(); } /** @@ -229,7 +226,7 @@ public Void removeParticipant(String participantId) { * @return response for a successful remove participant request. */ @ServiceMethod(returns = ReturnType.SINGLE) - public Response removeParticipantWithResponse(String participantId, Context context) { + public Response removeParticipantWithResponse(String participantId, final Context context) { return callConnectionAsync.removeParticipantWithResponse(participantId, context).block(); } } diff --git a/sdk/communication/azure-communication-callingserver/src/main/java/com/azure/communication/callingserver/CallConnectionAsync.java b/sdk/communication/azure-communication-callingserver/src/main/java/com/azure/communication/callingserver/CallConnectionAsync.java index 95438d8260736..4196ff809e975 100644 --- a/sdk/communication/azure-communication-callingserver/src/main/java/com/azure/communication/callingserver/CallConnectionAsync.java +++ b/sdk/communication/azure-communication-callingserver/src/main/java/com/azure/communication/callingserver/CallConnectionAsync.java @@ -254,7 +254,8 @@ Mono> playAudioWithResponseInternal( public Mono hangup() { try { return callConnectionInternal.hangupCallAsync(callConnectionId) - .onErrorMap(CommunicationErrorResponseException.class, CallingServerErrorConverter::translateException); + .onErrorMap(CommunicationErrorResponseException.class, CallingServerErrorConverter::translateException) + .flatMap(result -> Mono.empty()); } catch (RuntimeException ex) { return monoError(logger, ex); } @@ -411,7 +412,8 @@ Mono> addParticipantWithResponse( public Mono removeParticipant(String participantId) { try { return callConnectionInternal.removeParticipantAsync(callConnectionId, participantId) - .onErrorMap(CommunicationErrorResponseException.class, CallingServerErrorConverter::translateException); + .onErrorMap(CommunicationErrorResponseException.class, CallingServerErrorConverter::translateException) + .flatMap(result -> Mono.empty()); } catch (RuntimeException ex) { return monoError(logger, ex); } diff --git a/sdk/communication/azure-communication-callingserver/src/main/java/com/azure/communication/callingserver/CallingServerClient.java b/sdk/communication/azure-communication-callingserver/src/main/java/com/azure/communication/callingserver/CallingServerClient.java index adc0284c08513..1ab8665d967ed 100644 --- a/sdk/communication/azure-communication-callingserver/src/main/java/com/azure/communication/callingserver/CallingServerClient.java +++ b/sdk/communication/azure-communication-callingserver/src/main/java/com/azure/communication/callingserver/CallingServerClient.java @@ -70,7 +70,7 @@ public Response createCallConnectionWithResponse( CommunicationIdentifier source, CommunicationIdentifier[] targets, CreateCallOptions createCallOptions, - Context context) { + final Context context) { return callingServerAsyncClient .createCallConnectionWithResponseInternal(source, targets, createCallOptions, context).block(); } @@ -105,7 +105,7 @@ public Response joinWithResponse( String serverCallId, CommunicationIdentifier source, JoinCallOptions joinCallOptions, - Context context) { + final Context context) { return callingServerAsyncClient.joinWithResponseInternal(serverCallId, source, joinCallOptions, context).block(); } @@ -156,7 +156,7 @@ public void downloadTo(String sourceEndpoint, OutputStream destinationStream, Ht public Response downloadToWithResponse(String sourceEndpoint, OutputStream destinationStream, HttpRange httpRange, - Context context) { + final Context context) { Objects.requireNonNull(sourceEndpoint, "'sourceEndpoint' cannot be null"); Objects.requireNonNull(destinationStream, "'destinationStream' cannot be null"); return callingServerAsyncClient @@ -197,7 +197,7 @@ public Response downloadToWithResponse(String sourceEndpoint, Path destinationPath, ParallelDownloadOptions parallelDownloadOptions, boolean overwrite, - Context context) { + final Context context) { Objects.requireNonNull(sourceEndpoint, "'sourceEndpoint' cannot be null"); Objects.requireNonNull(destinationPath, "'destinationPath' cannot be null"); return callingServerAsyncClient.downloadToWithResponse(sourceEndpoint, destinationPath, diff --git a/sdk/communication/azure-communication-callingserver/src/main/java/com/azure/communication/callingserver/CallingServerClientBuilder.java b/sdk/communication/azure-communication-callingserver/src/main/java/com/azure/communication/callingserver/CallingServerClientBuilder.java index f7e0f9b929f52..5c36aeefc8b6b 100644 --- a/sdk/communication/azure-communication-callingserver/src/main/java/com/azure/communication/callingserver/CallingServerClientBuilder.java +++ b/sdk/communication/azure-communication-callingserver/src/main/java/com/azure/communication/callingserver/CallingServerClientBuilder.java @@ -157,22 +157,18 @@ public CallingServerClientBuilder httpLogOptions(HttpLogOptions logOptions) { } /** - * Sets the {@link CallingServerClientBuilder} that is used when making API requests. + * Sets the {@link CallingServerServiceVersion} that is used when making API requests. *

- * If a service version is not provided, the service version that will be used - * will be the latest known service version based on the version of the client - * library being used. If no service version is specified, updating to a newer - * version of the client library will have the result of potentially moving to a - * newer service version. + * If a service version is not provided, the service version that will be used will be the latest known service + * version based on the version of the client library being used. If no service version is specified, updating to a + * newer version of the client library will have the result of potentially moving to a newer service version. *

- * Targeting a specific service version may also mean that the service will - * return an error for newer APIs. + * Targeting a specific service version may also mean that the service will return an error for newer APIs. * - * @param version {@link CallingServerClientBuilder} of the service to be used when - * making requests. + * @param version {@link CallingServerServiceVersion} of the service to be used when making requests. * @return the updated CallingServerClientBuilder object */ - public CallingServerClientBuilder serviceVersion(CallingServerClientBuilder version) { + public CallingServerClientBuilder serviceVersion(CallingServerServiceVersion version) { return this; } diff --git a/sdk/communication/azure-communication-callingserver/src/main/java/com/azure/communication/callingserver/CallingServerServiceVersion.java b/sdk/communication/azure-communication-callingserver/src/main/java/com/azure/communication/callingserver/CallingServerServiceVersion.java new file mode 100644 index 0000000000000..bfa102b34da9e --- /dev/null +++ b/sdk/communication/azure-communication-callingserver/src/main/java/com/azure/communication/callingserver/CallingServerServiceVersion.java @@ -0,0 +1,37 @@ +// Copyright (c) Microsoft Corporation. All rights reserved. +// Licensed under the MIT License. + +package com.azure.communication.callingserver; + +import com.azure.core.util.ServiceVersion; + +/** + * The versions of CallingServer Service supported by this client library. + */ +public enum CallingServerServiceVersion implements ServiceVersion { + V2021_06_015("2021-06-15"), + V2021_06_15_preview("2021-06-15-preview"); + + private final String version; + + CallingServerServiceVersion(String version) { + this.version = version; + } + + /** + * {@inheritDoc} + */ + @Override + public String getVersion() { + return this.version; + } + + /** + * Gets the latest service version supported by this client library + * + * @return the latest {@link CallingServerServiceVersion} + */ + public static CallingServerServiceVersion getLatest() { + return V2021_06_15_preview; + } +} diff --git a/sdk/communication/azure-communication-callingserver/src/main/java/com/azure/communication/callingserver/ServerCall.java b/sdk/communication/azure-communication-callingserver/src/main/java/com/azure/communication/callingserver/ServerCall.java index b86fd08ddae4c..f0c1f42053e37 100644 --- a/sdk/communication/azure-communication-callingserver/src/main/java/com/azure/communication/callingserver/ServerCall.java +++ b/sdk/communication/azure-communication-callingserver/src/main/java/com/azure/communication/callingserver/ServerCall.java @@ -69,7 +69,7 @@ public Response addParticipantWithResponse( String callBackUri, String alternateCallerId, String operationContext, - Context context) { + final Context context) { return serverCallAsync.addParticipantWithResponse( participant, callBackUri, @@ -82,11 +82,10 @@ public Response addParticipantWithResponse( * Remove a participant from the call. * * @param participantId Participant id. - * @return response for a successful remove participant request. */ @ServiceMethod(returns = ReturnType.SINGLE) - public Void removeParticipant(String participantId) { - return serverCallAsync.removeParticipant(participantId).block(); + public void removeParticipant(String participantId) { + serverCallAsync.removeParticipant(participantId).block(); } /** @@ -97,7 +96,7 @@ public Void removeParticipant(String participantId) { * @return response for a successful remove participant request. */ @ServiceMethod(returns = ReturnType.SINGLE) - public Response removeParticipantWithResponse(String participantId, Context context) { + public Response removeParticipantWithResponse(String participantId, final Context context) { return serverCallAsync.removeParticipantWithResponse(participantId, context).block(); } @@ -122,7 +121,7 @@ public StartCallRecordingResult startRecording(String recordingStateCallbackUri) @ServiceMethod(returns = ReturnType.SINGLE) public Response startRecordingWithResponse( String recordingStateCallbackUri, - Context context) { + final Context context) { return serverCallAsync.startRecordingWithResponse(recordingStateCallbackUri, context).block(); } @@ -130,11 +129,10 @@ public Response startRecordingWithResponse( * Stop recording * * @param recordingId The recording id to stop. - * @return response for a successful stop recording request. */ @ServiceMethod(returns = ReturnType.SINGLE) - public Void stopRecording(String recordingId) { - return serverCallAsync.stopRecording(recordingId).block(); + public void stopRecording(String recordingId) { + serverCallAsync.stopRecording(recordingId).block(); } /** @@ -145,7 +143,7 @@ public Void stopRecording(String recordingId) { * @return response for a successful stop recording request. */ @ServiceMethod(returns = ReturnType.SINGLE) - public Response stopRecordingWithResponse(String recordingId, Context context) { + public Response stopRecordingWithResponse(String recordingId, final Context context) { return serverCallAsync.stopRecordingWithResponse(recordingId, context).block(); } @@ -153,11 +151,10 @@ public Response stopRecordingWithResponse(String recordingId, Context cont * Pause recording * * @param recordingId The recording id to stop. - * @return response for a successful pause recording request. */ @ServiceMethod(returns = ReturnType.SINGLE) - public Void pauseRecording(String recordingId) { - return serverCallAsync.pauseRecording(recordingId).block(); + public void pauseRecording(String recordingId) { + serverCallAsync.pauseRecording(recordingId).block(); } /** @@ -168,7 +165,7 @@ public Void pauseRecording(String recordingId) { * @return response for a successful pause recording request. */ @ServiceMethod(returns = ReturnType.SINGLE) - public Response pauseRecordingWithResponse(String recordingId, Context context) { + public Response pauseRecordingWithResponse(String recordingId, final Context context) { return serverCallAsync.pauseRecordingWithResponse(recordingId, context).block(); } @@ -176,11 +173,10 @@ public Response pauseRecordingWithResponse(String recordingId, Context con * Resume recording * * @param recordingId The recording id to stop. - * @return response for a successful resume recording request. */ @ServiceMethod(returns = ReturnType.SINGLE) - public Void resumeRecording(String recordingId) { - return serverCallAsync.resumeRecording(recordingId).block(); + public void resumeRecording(String recordingId) { + serverCallAsync.resumeRecording(recordingId).block(); } /** @@ -191,7 +187,7 @@ public Void resumeRecording(String recordingId) { * @return response for a successful resume recording request. */ @ServiceMethod(returns = ReturnType.SINGLE) - public Response resumeRecordingWithResponse(String recordingId, Context context) { + public Response resumeRecordingWithResponse(String recordingId, final Context context) { return serverCallAsync.resumeRecordingWithResponse(recordingId, context).block(); } @@ -214,7 +210,7 @@ public CallRecordingProperties getRecordingState(String recordingId) { * @return response for a successful get recording state request. */ @ServiceMethod(returns = ReturnType.SINGLE) - public Response getRecordingStateWithResponse(String recordingId, Context context) { + public Response getRecordingStateWithResponse(String recordingId, final Context context) { return serverCallAsync.getRecordingStateWithResponse(recordingId, context).block(); } @@ -272,7 +268,7 @@ public Response playAudioWithResponse( String audioFileId, String callbackUri, String operationContext, - Context context) { + final Context context) { return serverCallAsync .playAudioWithResponseInternal( audioFileUri, @@ -296,7 +292,7 @@ public Response playAudioWithResponse( public Response playAudioWithResponse( String audioFileUri, PlayAudioOptions playAudioOptions, - Context context) { + final Context context) { return serverCallAsync.playAudioWithResponseInternal(audioFileUri, playAudioOptions, context).block(); } } diff --git a/sdk/communication/azure-communication-callingserver/src/main/java/com/azure/communication/callingserver/ServerCallAsync.java b/sdk/communication/azure-communication-callingserver/src/main/java/com/azure/communication/callingserver/ServerCallAsync.java index 4734edc974bd9..6d72f20d5ea56 100644 --- a/sdk/communication/azure-communication-callingserver/src/main/java/com/azure/communication/callingserver/ServerCallAsync.java +++ b/sdk/communication/azure-communication-callingserver/src/main/java/com/azure/communication/callingserver/ServerCallAsync.java @@ -145,7 +145,8 @@ Mono> addParticipantWithResponse( public Mono removeParticipant(String participantId) { try { return serverCallInternal.removeParticipantAsync(serverCallId, participantId) - .onErrorMap(CommunicationErrorResponseException.class, CallingServerErrorConverter::translateException); + .onErrorMap(CommunicationErrorResponseException.class, CallingServerErrorConverter::translateException) + .flatMap(result -> Mono.empty()); } catch (RuntimeException ex) { return monoError(logger, ex); } @@ -248,7 +249,8 @@ Mono> startRecordingWithResponse( public Mono stopRecording(String recordingId) { try { return serverCallInternal.stopRecordingAsync(serverCallId, recordingId) - .onErrorMap(CommunicationErrorResponseException.class, CallingServerErrorConverter::translateException); + .onErrorMap(CommunicationErrorResponseException.class, CallingServerErrorConverter::translateException) + .flatMap(result -> Mono.empty()); } catch (RuntimeException ex) { return monoError(logger, ex); } @@ -288,7 +290,8 @@ Mono> stopRecordingWithResponse(String recordingId, Context conte public Mono pauseRecording(String recordingId) { try { return serverCallInternal.pauseRecordingAsync(serverCallId, recordingId) - .onErrorMap(CommunicationErrorResponseException.class, CallingServerErrorConverter::translateException); + .onErrorMap(CommunicationErrorResponseException.class, CallingServerErrorConverter::translateException) + .flatMap(result -> Mono.empty()); } catch (RuntimeException ex) { return monoError(logger, ex); } @@ -328,7 +331,8 @@ Mono> pauseRecordingWithResponse(String recordingId, Context cont public Mono resumeRecording(String recordingId) { try { return serverCallInternal.resumeRecordingAsync(serverCallId, recordingId) - .onErrorMap(CommunicationErrorResponseException.class, CallingServerErrorConverter::translateException); + .onErrorMap(CommunicationErrorResponseException.class, CallingServerErrorConverter::translateException) + .flatMap(result -> Mono.empty()); } catch (RuntimeException ex) { return monoError(logger, ex); } diff --git a/sdk/communication/azure-communication-callingserver/src/main/java/com/azure/communication/callingserver/models/events/CallingServerEventType.java b/sdk/communication/azure-communication-callingserver/src/main/java/com/azure/communication/callingserver/models/events/CallingServerEventType.java index d054b8f7a7958..765a0bbe3fb7c 100644 --- a/sdk/communication/azure-communication-callingserver/src/main/java/com/azure/communication/callingserver/models/events/CallingServerEventType.java +++ b/sdk/communication/azure-communication-callingserver/src/main/java/com/azure/communication/callingserver/models/events/CallingServerEventType.java @@ -17,7 +17,7 @@ public final class CallingServerEventType extends ExpandableStringEnum Date: Tue, 15 Jun 2021 20:39:31 -0700 Subject: [PATCH 07/11] live test fixes (#22312) --- .../CHANGELOG.md | 2 +- .../README.md | 7 +-- .../callingserver/CallConnection.java | 4 +- .../callingserver/CallConnectionAsync.java | 10 ++-- .../callingserver/ServerCall.java | 4 +- .../callingserver/ServerCallAsync.java | 10 ++-- ...va => AddParticipantRequestConverter.java} | 4 +- .../events/AddParticipantResultEvent.java | 2 +- .../models/events/CallingServerEventType.java | 4 +- .../CallConnectionAsyncLiveTests.java | 41 +++++--------- .../CallConnectionLiveTests.java | 27 ++-------- .../callingserver/CallingServerTestUtils.java | 2 +- .../ServerCallAsyncLiveTests.java | 51 +++++++----------- .../callingserver/ServerCallLiveTests.java | 39 ++++---------- ...CreateAddRemoveHangupScenarioAsync[1].json | 54 ++++++++++--------- ...oveHangupScenarioWithResponseAsync[1].json | 54 ++++++++++--------- ...ddRemoveHangupScenarioWithResponse[1].json | 54 ++++++++++--------- ...s.runCreateAddRemoveHangupScenario[1].json | 54 ++++++++++--------- ...iveTests.runAddRemoveScenarioAsync[1].json | 54 ++++++++++--------- ...AddRemoveScenarioWithResponseAsync[1].json | 54 ++++++++++--------- ...s.runAddRemoveScenarioWithResponse[1].json | 54 ++++++++++--------- ...CallLiveTests.runAddRemoveScenario[1].json | 54 ++++++++++--------- 22 files changed, 312 insertions(+), 327 deletions(-) rename sdk/communication/azure-communication-callingserver/src/main/java/com/azure/communication/callingserver/implementation/converters/{InviteParticipantRequestConverter.java => AddParticipantRequestConverter.java} (93%) diff --git a/sdk/communication/azure-communication-callingserver/CHANGELOG.md b/sdk/communication/azure-communication-callingserver/CHANGELOG.md index b8532b23f4860..03d437b41ac8e 100644 --- a/sdk/communication/azure-communication-callingserver/CHANGELOG.md +++ b/sdk/communication/azure-communication-callingserver/CHANGELOG.md @@ -11,7 +11,7 @@ This is a Public Preview version, so breaking changes are possible in subsequent - Play audio in the call. - Outbound APIs for call recording including start, pause, resume and stop. - Subscribe to tone and receive tone selections via events. -- Invite and remove participants from the call. +- Add and remove participants from the call. [read_me]: https://github.com/Azure/azure-sdk-for-java/blob/feature/communication-ServerCalling/sdk/communication/azure-communication-callingserver/README.md diff --git a/sdk/communication/azure-communication-callingserver/README.md b/sdk/communication/azure-communication-callingserver/README.md index 28ad4c684c2ea..6227e999aaf60 100644 --- a/sdk/communication/azure-communication-callingserver/README.md +++ b/sdk/communication/azure-communication-callingserver/README.md @@ -70,11 +70,12 @@ CommunicationIdentifier[] targets = new CommunicationIdentifier[] { firstCallee, String callbackUri = ""; -CallModality[] requestedMediaTypes = new CallModality[] { CallModality.AUDIO, CallModality.VIDEO }; +MediaType[] requestedMediaTypes = new MediaType[] { MediaType.AUDIO, MediaType.VIDEO }; EventSubscriptionType[] requestedCallEvents = new EventSubscriptionType[] { - EventSubscriptionType.DTMF_RECEIVED, - EventSubscriptionType.PARTICIPANTS_UPDATED }; + EventSubscriptionType.DTMF_RECEIVED, + EventSubscriptionType.PARTICIPANTS_UPDATED +}; CreateCallOptions createCallOptions = new CreateCallOptions( callbackUri, diff --git a/sdk/communication/azure-communication-callingserver/src/main/java/com/azure/communication/callingserver/CallConnection.java b/sdk/communication/azure-communication-callingserver/src/main/java/com/azure/communication/callingserver/CallConnection.java index cd146830294b7..add9b7e100c13 100644 --- a/sdk/communication/azure-communication-callingserver/src/main/java/com/azure/communication/callingserver/CallConnection.java +++ b/sdk/communication/azure-communication-callingserver/src/main/java/com/azure/communication/callingserver/CallConnection.java @@ -174,7 +174,7 @@ public Response cancelAllMediaOperationsWithResp /** * Add a participant to the call. * - * @param participant Invited participant. + * @param participant Added participant. * @param alternateCallerId The phone number to use when adding a phone number participant. * @param operationContext The value to identify context of the operation. This is used to co-relate other * communications related to this operation @@ -191,7 +191,7 @@ public AddParticipantResult addParticipant( /** * Add a participant to the call. * - * @param participant Invited participant. + * @param participant Added participant. * @param alternateCallerId The phone number to use when adding a phone number participant. * @param operationContext The value to identify context of the operation. This is used to co-relate other * communications related to this operation diff --git a/sdk/communication/azure-communication-callingserver/src/main/java/com/azure/communication/callingserver/CallConnectionAsync.java b/sdk/communication/azure-communication-callingserver/src/main/java/com/azure/communication/callingserver/CallConnectionAsync.java index 4196ff809e975..9aa425bbfdc47 100644 --- a/sdk/communication/azure-communication-callingserver/src/main/java/com/azure/communication/callingserver/CallConnectionAsync.java +++ b/sdk/communication/azure-communication-callingserver/src/main/java/com/azure/communication/callingserver/CallConnectionAsync.java @@ -6,7 +6,7 @@ import com.azure.communication.callingserver.implementation.CallConnectionsImpl; import com.azure.communication.callingserver.implementation.converters.CallingServerErrorConverter; import com.azure.communication.callingserver.implementation.converters.CancelAllMediaOperationsResultConverter; -import com.azure.communication.callingserver.implementation.converters.InviteParticipantRequestConverter; +import com.azure.communication.callingserver.implementation.converters.AddParticipantRequestConverter; import com.azure.communication.callingserver.implementation.converters.PlayAudioResultConverter; import com.azure.communication.callingserver.implementation.models.AddParticipantRequest; import com.azure.communication.callingserver.implementation.models.CancelAllMediaOperationsRequest; @@ -337,7 +337,7 @@ Mono> cancelAllMediaOperationsWithRespo /** * Add a participant to the call. * - * @param participant Invited participant. + * @param participant Added participant. * @param alternateCallerId The phone number to use when adding a phone number participant. * @param operationContext The value to identify context of the operation. This is used to co-relate other * communications related to this operation @@ -350,7 +350,7 @@ public Mono addParticipant( String operationContext) { try { Objects.requireNonNull(participant, "'participant' cannot be null."); - AddParticipantRequest request = InviteParticipantRequestConverter.convert(participant, + AddParticipantRequest request = AddParticipantRequestConverter.convert(participant, alternateCallerId, operationContext, null); @@ -365,7 +365,7 @@ public Mono addParticipant( /** * Add a participant to the call. * - * @param participant Invited participant. + * @param participant Added participant. * @param alternateCallerId The phone number to use when adding a phone number participant. * @param operationContext The value to identify context of the operation. This is used to co-relate other * communications related to this operation @@ -387,7 +387,7 @@ Mono> addParticipantWithResponse( try { Objects.requireNonNull(participant, "'participant' cannot be null."); AddParticipantRequest request = - InviteParticipantRequestConverter + AddParticipantRequestConverter .convert(participant, alternateCallerId, operationContext, null); return withContext(contextValue -> { contextValue = context == null ? contextValue : context; diff --git a/sdk/communication/azure-communication-callingserver/src/main/java/com/azure/communication/callingserver/ServerCall.java b/sdk/communication/azure-communication-callingserver/src/main/java/com/azure/communication/callingserver/ServerCall.java index f0c1f42053e37..a572ded3d9b9a 100644 --- a/sdk/communication/azure-communication-callingserver/src/main/java/com/azure/communication/callingserver/ServerCall.java +++ b/sdk/communication/azure-communication-callingserver/src/main/java/com/azure/communication/callingserver/ServerCall.java @@ -36,7 +36,7 @@ public String getServerCallId() { /** * Add a participant to the call. * - * @param participant Invited participant. + * @param participant Added participant. * @param callBackUri callBackUri to get notifications. * @param alternateCallerId The phone number to use when adding a phone number participant. * @param operationContext The value to identify context of the operation. This is used to co-relate other @@ -55,7 +55,7 @@ public AddParticipantResult addParticipant( /** * Add a participant to the call. * - * @param participant Invited participant. + * @param participant Added participant. * @param callBackUri callBackUri to get notifications. * @param alternateCallerId The phone number to use when adding a phone number participant. * @param operationContext The value to identify context of the operation. This is used to co-relate other diff --git a/sdk/communication/azure-communication-callingserver/src/main/java/com/azure/communication/callingserver/ServerCallAsync.java b/sdk/communication/azure-communication-callingserver/src/main/java/com/azure/communication/callingserver/ServerCallAsync.java index 6d72f20d5ea56..43e6af1eabea0 100644 --- a/sdk/communication/azure-communication-callingserver/src/main/java/com/azure/communication/callingserver/ServerCallAsync.java +++ b/sdk/communication/azure-communication-callingserver/src/main/java/com/azure/communication/callingserver/ServerCallAsync.java @@ -5,7 +5,7 @@ import com.azure.communication.callingserver.implementation.ServerCallsImpl; import com.azure.communication.callingserver.implementation.converters.CallingServerErrorConverter; -import com.azure.communication.callingserver.implementation.converters.InviteParticipantRequestConverter; +import com.azure.communication.callingserver.implementation.converters.AddParticipantRequestConverter; import com.azure.communication.callingserver.implementation.converters.PlayAudioResultConverter; import com.azure.communication.callingserver.implementation.models.AddParticipantRequest; import com.azure.communication.callingserver.implementation.models.CommunicationErrorResponseException; @@ -58,7 +58,7 @@ public String getServerCallId() { /** * Add a participant to the call. * - * @param participant Invited participant. + * @param participant Added participant. * @param callBackUri callBackUri to get notifications. * @param alternateCallerId The phone number to use when adding a phone number participant. * @param operationContext The value to identify context of the operation. This is used to co-relate other @@ -74,7 +74,7 @@ public Mono addParticipant( try { Objects.requireNonNull(participant, "'participant' cannot be null."); AddParticipantRequest request = - InviteParticipantRequestConverter.convert(participant, + AddParticipantRequestConverter.convert(participant, alternateCallerId, operationContext, callBackUri); @@ -89,7 +89,7 @@ public Mono addParticipant( /** * Add a participant to the call. * - * @param participant Invited participant. + * @param participant Added participant. * @param callBackUri callBackUri to get notifications. * @param alternateCallerId The phone number to use when adding a phone number participant. * @param operationContext The value to identify context of the operation. This is used to co-relate other @@ -118,7 +118,7 @@ Mono> addParticipantWithResponse( try { Objects.requireNonNull(participant, "'participant' cannot be null."); AddParticipantRequest request = - InviteParticipantRequestConverter.convert(participant, + AddParticipantRequestConverter.convert(participant, alternateCallerId, operationContext, callBackUri); diff --git a/sdk/communication/azure-communication-callingserver/src/main/java/com/azure/communication/callingserver/implementation/converters/InviteParticipantRequestConverter.java b/sdk/communication/azure-communication-callingserver/src/main/java/com/azure/communication/callingserver/implementation/converters/AddParticipantRequestConverter.java similarity index 93% rename from sdk/communication/azure-communication-callingserver/src/main/java/com/azure/communication/callingserver/implementation/converters/InviteParticipantRequestConverter.java rename to sdk/communication/azure-communication-callingserver/src/main/java/com/azure/communication/callingserver/implementation/converters/AddParticipantRequestConverter.java index ddce0648ba0d9..647f18aa75b93 100644 --- a/sdk/communication/azure-communication-callingserver/src/main/java/com/azure/communication/callingserver/implementation/converters/InviteParticipantRequestConverter.java +++ b/sdk/communication/azure-communication-callingserver/src/main/java/com/azure/communication/callingserver/implementation/converters/AddParticipantRequestConverter.java @@ -11,7 +11,7 @@ /** * A converter for {@link AddParticipantRequest} */ -public final class InviteParticipantRequestConverter { +public final class AddParticipantRequestConverter { /** * Converts to {@link AddParticipantRequest}. @@ -37,6 +37,6 @@ public static AddParticipantRequest convert( .setCallbackUri(callBackUri); } - private InviteParticipantRequestConverter() { + private AddParticipantRequestConverter() { } } diff --git a/sdk/communication/azure-communication-callingserver/src/main/java/com/azure/communication/callingserver/models/events/AddParticipantResultEvent.java b/sdk/communication/azure-communication-callingserver/src/main/java/com/azure/communication/callingserver/models/events/AddParticipantResultEvent.java index 122beb9cfcf4c..f3e2758ba2683 100644 --- a/sdk/communication/azure-communication-callingserver/src/main/java/com/azure/communication/callingserver/models/events/AddParticipantResultEvent.java +++ b/sdk/communication/azure-communication-callingserver/src/main/java/com/azure/communication/callingserver/models/events/AddParticipantResultEvent.java @@ -56,7 +56,7 @@ public OperationStatus getStatus() { } /** - * Initializes a new instance of InviteParticipantResultEvent. + * Initializes a new instance of AddParticipantResultEvent. * * @param resultInfo the resultInfo value. * @param operationContext The value to identify context of the operation. This is used to co-relate other diff --git a/sdk/communication/azure-communication-callingserver/src/main/java/com/azure/communication/callingserver/models/events/CallingServerEventType.java b/sdk/communication/azure-communication-callingserver/src/main/java/com/azure/communication/callingserver/models/events/CallingServerEventType.java index 765a0bbe3fb7c..2fc7a73dcd8d7 100644 --- a/sdk/communication/azure-communication-callingserver/src/main/java/com/azure/communication/callingserver/models/events/CallingServerEventType.java +++ b/sdk/communication/azure-communication-callingserver/src/main/java/com/azure/communication/callingserver/models/events/CallingServerEventType.java @@ -16,7 +16,7 @@ public final class CallingServerEventType extends ExpandableStringEnum values() { return values(CallingServerEventType.class); } diff --git a/sdk/communication/azure-communication-callingserver/src/test/java/com/azure/communication/callingserver/CallConnectionAsyncLiveTests.java b/sdk/communication/azure-communication-callingserver/src/test/java/com/azure/communication/callingserver/CallConnectionAsyncLiveTests.java index 4a81fedfb85f2..dc3fa8d60de99 100644 --- a/sdk/communication/azure-communication-callingserver/src/test/java/com/azure/communication/callingserver/CallConnectionAsyncLiveTests.java +++ b/sdk/communication/azure-communication-callingserver/src/test/java/com/azure/communication/callingserver/CallConnectionAsyncLiveTests.java @@ -2,12 +2,10 @@ // Licensed under the MIT License. package com.azure.communication.callingserver; -import java.util.UUID; - import com.azure.communication.callingserver.models.AddParticipantResult; import com.azure.communication.callingserver.models.CancelAllMediaOperationsResult; -import com.azure.communication.callingserver.models.EventSubscriptionType; import com.azure.communication.callingserver.models.CreateCallOptions; +import com.azure.communication.callingserver.models.EventSubscriptionType; import com.azure.communication.callingserver.models.JoinCallOptions; import com.azure.communication.callingserver.models.MediaType; import com.azure.communication.callingserver.models.PlayAudioResult; @@ -17,11 +15,11 @@ import com.azure.core.http.HttpClient; import com.azure.core.http.rest.Response; import com.azure.core.test.TestMode; - -import org.junit.jupiter.api.Disabled; import org.junit.jupiter.params.ParameterizedTest; import org.junit.jupiter.params.provider.MethodSource; +import java.util.UUID; + public class CallConnectionAsyncLiveTests extends CallingServerTestBase { private final String fromUser = getNewUserId(); @@ -36,7 +34,7 @@ public void runCreatePlayCancelHangupScenarioAsync(HttpClient httpClient) { if (this.getTestMode() == TestMode.LIVE) { System.out.println("Warning: Test is skipped, does not support live mode."); return; - } + } CallingServerClientBuilder builder = getCallClientUsingConnectionString(httpClient); CallingServerAsyncClient callingServerAsyncClient = @@ -174,22 +172,16 @@ public void runCreateAddRemoveHangupScenarioAsync(HttpClient httpClient) { CallingServerTestUtils.validateCallConnectionAsync(callConnectionAsync); - // Invite User + // Add User String operationContext = UUID.randomUUID().toString(); assert callConnectionAsync != null; - callConnectionAsync.addParticipant( + AddParticipantResult addParticipantResult = callConnectionAsync.addParticipant( new CommunicationUserIdentifier(toUser), null, operationContext).block(); - // Remove Participant - /* - There is an update that we require to be able to get - the participantId from the service when a user is - added to a call. Until that is fixed this recorded - value needs to be used. - */ - String participantId = "e3560385-776f-41d1-bf04-07ef738f2fc1"; + assert addParticipantResult != null; + String participantId = addParticipantResult.getParticipantId(); callConnectionAsync.removeParticipant(participantId).block(); // Hang up @@ -201,7 +193,6 @@ public void runCreateAddRemoveHangupScenarioAsync(HttpClient httpClient) { } @ParameterizedTest - @Disabled @MethodSource("com.azure.core.test.TestBase#getHttpClients") public void runCreateAddRemoveHangupScenarioWithResponseAsync(HttpClient httpClient) { @@ -235,23 +226,17 @@ public void runCreateAddRemoveHangupScenarioWithResponseAsync(HttpClient httpCli assert callConnectionAsyncResponse != null; CallConnectionAsync callConnectionAsync = callConnectionAsyncResponse.getValue(); - // Invite User + // Add User String operationContext = UUID.randomUUID().toString(); - Response inviteParticipantResponse = + Response addParticipantResponse = callConnectionAsync.addParticipantWithResponse( new CommunicationUserIdentifier(toUser), null, operationContext).block(); - CallingServerTestUtils.validateAddParticipantResponse(inviteParticipantResponse); + CallingServerTestUtils.validateAddParticipantResponse(addParticipantResponse); - // Remove Participant - /* - There is an update that we require to be able to get - the participantId from the service when a user is - added to a call. Until that is fixed this recorded - value needs to be used. - */ - String participantId = "80238d5f-9eda-481a-b911-e2e12eba9eda"; + assert addParticipantResponse != null; + String participantId = addParticipantResponse.getValue().getParticipantId(); Response removeParticipantResponse = callConnectionAsync.removeParticipantWithResponse(participantId).block(); CallingServerTestUtils.validateResponse(removeParticipantResponse); diff --git a/sdk/communication/azure-communication-callingserver/src/test/java/com/azure/communication/callingserver/CallConnectionLiveTests.java b/sdk/communication/azure-communication-callingserver/src/test/java/com/azure/communication/callingserver/CallConnectionLiveTests.java index 4b3244f73c5cb..8543845297775 100644 --- a/sdk/communication/azure-communication-callingserver/src/test/java/com/azure/communication/callingserver/CallConnectionLiveTests.java +++ b/sdk/communication/azure-communication-callingserver/src/test/java/com/azure/communication/callingserver/CallConnectionLiveTests.java @@ -15,8 +15,6 @@ import com.azure.core.http.HttpClient; import com.azure.core.http.rest.Response; import com.azure.core.test.TestMode; - -import org.junit.jupiter.api.Disabled; import org.junit.jupiter.params.ParameterizedTest; import org.junit.jupiter.params.provider.MethodSource; @@ -174,16 +172,9 @@ public void runCreateAddRemoveHangupScenario(HttpClient httpClient) { // Add User String operationContext = UUID.randomUUID().toString(); - callConnection.addParticipant(new CommunicationUserIdentifier(toUser), null, operationContext); + AddParticipantResult addParticipantResult = callConnection.addParticipant(new CommunicationUserIdentifier(toUser), null, operationContext); - // Remove Participant - /* - There is an update that we require to be able to get - the participantId from the service when a user is - added to a call. Until that is fixed this recorded - value needs to be used. - */ - String participantId = "f29f70e3-1eaf-44c0-839c-b4e8a74ffec3"; + String participantId = addParticipantResult.getParticipantId(); callConnection.removeParticipant(participantId); // Hang up @@ -195,7 +186,6 @@ public void runCreateAddRemoveHangupScenario(HttpClient httpClient) { } @ParameterizedTest - @Disabled @MethodSource("com.azure.core.test.TestBase#getHttpClients") public void runCreateAddRemoveHangupScenarioWithResponse(HttpClient httpClient) { @@ -231,22 +221,15 @@ public void runCreateAddRemoveHangupScenarioWithResponse(HttpClient httpClient) // Add User String operationContext = UUID.randomUUID().toString(); - Response inviteParticipantResponse = callConnection + Response addParticipantResponse = callConnection .addParticipantWithResponse( new CommunicationUserIdentifier(toUser), null, operationContext, null); - CallingServerTestUtils.validateAddParticipantResponse(inviteParticipantResponse); + CallingServerTestUtils.validateAddParticipantResponse(addParticipantResponse); - // Remove Participant - /* - There is an update that we require to be able to get - the participantId from the service when a user is - added to a call. Until that is fixed this recorded - value needs to be used. - */ - String participantId = "71ed956b-366e-450c-9a61-3bbccf42baa5"; + String participantId = addParticipantResponse.getValue().getParticipantId(); Response removeParticipantResponse = callConnection.removeParticipantWithResponse(participantId, null); CallingServerTestUtils.validateResponse(removeParticipantResponse); diff --git a/sdk/communication/azure-communication-callingserver/src/test/java/com/azure/communication/callingserver/CallingServerTestUtils.java b/sdk/communication/azure-communication-callingserver/src/test/java/com/azure/communication/callingserver/CallingServerTestUtils.java index 4762c0947cf25..4a0ec22a11ddc 100644 --- a/sdk/communication/azure-communication-callingserver/src/test/java/com/azure/communication/callingserver/CallingServerTestUtils.java +++ b/sdk/communication/azure-communication-callingserver/src/test/java/com/azure/communication/callingserver/CallingServerTestUtils.java @@ -93,7 +93,7 @@ protected static void validateResponse(Response response) { protected static void validateAddParticipantResponse(Response response) { assertNotNull(response); - Assertions.assertEquals(200, response.getStatusCode()); + Assertions.assertEquals(202, response.getStatusCode()); assertNotNull(response.getValue()); validateAddParticipantResult(response.getValue()); } diff --git a/sdk/communication/azure-communication-callingserver/src/test/java/com/azure/communication/callingserver/ServerCallAsyncLiveTests.java b/sdk/communication/azure-communication-callingserver/src/test/java/com/azure/communication/callingserver/ServerCallAsyncLiveTests.java index 041a06b07d8c9..bd1fd5254e8f3 100644 --- a/sdk/communication/azure-communication-callingserver/src/test/java/com/azure/communication/callingserver/ServerCallAsyncLiveTests.java +++ b/sdk/communication/azure-communication-callingserver/src/test/java/com/azure/communication/callingserver/ServerCallAsyncLiveTests.java @@ -3,21 +3,14 @@ package com.azure.communication.callingserver; -import static org.junit.jupiter.api.Assertions.assertEquals; -import static org.junit.jupiter.api.Assertions.assertNotNull; - -import java.util.ArrayList; -import java.util.List; -import java.util.UUID; - import com.azure.communication.callingserver.models.AddParticipantResult; -import com.azure.communication.callingserver.models.CallRecordingState; import com.azure.communication.callingserver.models.CallRecordingProperties; +import com.azure.communication.callingserver.models.CallRecordingState; import com.azure.communication.callingserver.models.CallingServerErrorException; import com.azure.communication.callingserver.models.CreateCallOptions; import com.azure.communication.callingserver.models.EventSubscriptionType; -import com.azure.communication.callingserver.models.PlayAudioOptions; import com.azure.communication.callingserver.models.MediaType; +import com.azure.communication.callingserver.models.PlayAudioOptions; import com.azure.communication.callingserver.models.PlayAudioResult; import com.azure.communication.callingserver.models.StartCallRecordingResult; import com.azure.communication.common.CommunicationIdentifier; @@ -26,11 +19,16 @@ import com.azure.core.http.HttpClient; import com.azure.core.http.rest.Response; import com.azure.core.test.TestMode; - -import org.junit.jupiter.api.Disabled; import org.junit.jupiter.params.ParameterizedTest; import org.junit.jupiter.params.provider.MethodSource; +import java.util.ArrayList; +import java.util.List; +import java.util.UUID; + +import static org.junit.jupiter.api.Assertions.assertEquals; +import static org.junit.jupiter.api.Assertions.assertNotNull; + public class ServerCallAsyncLiveTests extends CallingServerTestBase { private final String fromUser = getNewUserId(); @@ -244,12 +242,12 @@ public void runAddRemoveScenarioAsync(HttpClient httpClient) { Waiting for an update to be able to get this serverCallId when using createCallConnection() */ - String serverCallId = "aHR0cHM6Ly94LWNvbnYtdXN3ZS0wMS5jb252LnNreXBlLmNvbS9jb252L3NXdWxkazBmMEVpdnAxWjhiU2NuUHc_aT0yJmU9NjM3NTg0Mzk2NDM5NzQ5NzY4"; + String serverCallId = "aHR0cHM6Ly94LWNvbnYtdXN3ZS0wMS5jb252LnNreXBlLmNvbS9jb252L19JbTJUcm1MejBpLWlaYkZRREtxaGc_aT0xJmU9NjM3NTg0MzkzMzg3ODg3MDI3"; ServerCallAsync serverCallAsync = callingServerAsyncClient.initializeServerCall(serverCallId); // Add User String operationContext = UUID.randomUUID().toString(); - serverCallAsync + AddParticipantResult addParticipantResult = serverCallAsync .addParticipant( new CommunicationUserIdentifier(toUser), null, @@ -257,14 +255,8 @@ public void runAddRemoveScenarioAsync(HttpClient httpClient) { CALLBACK_URI) .block(); - // Remove User - /* - There is an update that we require to be able to get - the participantId from the service when a user is - added to a call. Until that is fixed this recorded - value needs to be used. - */ - String participantId = "206ac04a-1aae-4d82-9015-9c30cb174888"; + assert addParticipantResult != null; + String participantId = addParticipantResult.getParticipantId(); serverCallAsync.removeParticipant(participantId).block(); // Hang up @@ -277,7 +269,6 @@ public void runAddRemoveScenarioAsync(HttpClient httpClient) { } @ParameterizedTest - @Disabled @MethodSource("com.azure.core.test.TestBase#getHttpClients") public void runAddRemoveScenarioWithResponseAsync(HttpClient httpClient) { @@ -312,12 +303,12 @@ public void runAddRemoveScenarioWithResponseAsync(HttpClient httpClient) { Waiting for an update to be able to get this serverCallId when using createCallConnection() */ - String serverCallId = "aHR0cHM6Ly94LWNvbnYtdXN3ZS0wMS5jb252LnNreXBlLmNvbS9jb252L0NUT014YmNIRmttZ1BqbE5kYjExNlE_aT0yJmU9NjM3NTg0Mzk2NDM5NzQ5NzY4"; + String serverCallId = "aHR0cHM6Ly94LWNvbnYtdXN3ZS0wMS5jb252LnNreXBlLmNvbS9jb252L0pndHZNTW5mYUU2N3ViU3FKb19ndFE_aT0xJmU9NjM3NTg0MzkzMzg3ODg3MDI3"; ServerCallAsync serverCallAsync = callingServerAsyncClient.initializeServerCall(serverCallId); // Add User String operationContext = UUID.randomUUID().toString(); - Response addResponse = + Response addParticipantResultResponse = serverCallAsync .addParticipantWithResponse( new CommunicationUserIdentifier(toUser), @@ -325,16 +316,10 @@ public void runAddRemoveScenarioWithResponseAsync(HttpClient httpClient) { operationContext, CALLBACK_URI) .block(); - CallingServerTestUtils.validateAddParticipantResponse(addResponse); + CallingServerTestUtils.validateAddParticipantResponse(addParticipantResultResponse); - // Remove User - /* - There is an update that we require to be able to get - the participantId from the service when a user is - added to a call. Until that is fixed this recorded - value needs to be used. - */ - String participantId = "b133b1f3-4a11-49e4-abe0-ac9fdd660634"; + assert addParticipantResultResponse != null; + String participantId = addParticipantResultResponse.getValue().getParticipantId(); Response removeResponse = serverCallAsync.removeParticipantWithResponse(participantId).block(); CallingServerTestUtils.validateResponse(removeResponse); diff --git a/sdk/communication/azure-communication-callingserver/src/test/java/com/azure/communication/callingserver/ServerCallLiveTests.java b/sdk/communication/azure-communication-callingserver/src/test/java/com/azure/communication/callingserver/ServerCallLiveTests.java index bd8d84df3bf3f..d58468ed7b60b 100644 --- a/sdk/communication/azure-communication-callingserver/src/test/java/com/azure/communication/callingserver/ServerCallLiveTests.java +++ b/sdk/communication/azure-communication-callingserver/src/test/java/com/azure/communication/callingserver/ServerCallLiveTests.java @@ -4,13 +4,13 @@ package com.azure.communication.callingserver; import com.azure.communication.callingserver.models.AddParticipantResult; -import com.azure.communication.callingserver.models.CallRecordingState; import com.azure.communication.callingserver.models.CallRecordingProperties; +import com.azure.communication.callingserver.models.CallRecordingState; import com.azure.communication.callingserver.models.CallingServerErrorException; import com.azure.communication.callingserver.models.CreateCallOptions; import com.azure.communication.callingserver.models.EventSubscriptionType; -import com.azure.communication.callingserver.models.PlayAudioOptions; import com.azure.communication.callingserver.models.MediaType; +import com.azure.communication.callingserver.models.PlayAudioOptions; import com.azure.communication.callingserver.models.PlayAudioResult; import com.azure.communication.callingserver.models.StartCallRecordingResult; import com.azure.communication.common.CommunicationIdentifier; @@ -20,8 +20,6 @@ import com.azure.core.http.rest.Response; import com.azure.core.test.TestMode; import com.azure.core.util.Context; - -import org.junit.jupiter.api.Disabled; import org.junit.jupiter.params.ParameterizedTest; import org.junit.jupiter.params.provider.MethodSource; @@ -212,7 +210,7 @@ public void runAddRemoveScenario(HttpClient httpClient) { if (this.getTestMode() == TestMode.LIVE) { System.out.println("Warning: Test is skipped, does not support live mode."); return; - } + } CallingServerClientBuilder builder = getConversationClientUsingConnectionString(httpClient); CallingServerClient callingServerClient = setupClient(builder, "runAddRemoveScenario"); @@ -237,26 +235,19 @@ public void runAddRemoveScenario(HttpClient httpClient) { Waiting for an update to be able to get this serverCallId when using createCallConnection() */ - String serverCallId = "aHR0cHM6Ly94LWNvbnYtdXN3ZS0wMS5jb252LnNreXBlLmNvbS9jb252L1ktWjZ5dzFzWVVTUUdWX2xPQWk1X2c_aT0xJmU9NjM3NTg0MzkzMzg3ODg3MDI3"; + String serverCallId = "aHR0cHM6Ly94LWNvbnYtdXN3ZS0wMS5jb252LnNreXBlLmNvbS9jb252L1VDRl9RMVVlUGsyb0Y1YlJSMXliVXc_aT0xJmU9NjM3NTg0MzkzMzg3ODg3MDI3"; ServerCall serverCall = callingServerClient.initializeServerCall(serverCallId); // Add User String operationContext = UUID.randomUUID().toString(); - serverCall + AddParticipantResult addParticipantResult = serverCall .addParticipant( new CommunicationUserIdentifier(toUser), null, operationContext, CALLBACK_URI); - // Remove User - /* - There is an update that we require to be able to get - the participantId from the service when a user is - added to a call. Until that is fixed this recorded - value needs to be used. - */ - String participantId = "72647661-033a-4d1a-b858-465375977be0"; + String participantId = addParticipantResult.getParticipantId(); serverCall.removeParticipant(participantId); // Hangup @@ -268,7 +259,6 @@ public void runAddRemoveScenario(HttpClient httpClient) { } @ParameterizedTest - @Disabled @MethodSource("com.azure.core.test.TestBase#getHttpClients") public void runAddRemoveScenarioWithResponse(HttpClient httpClient) { @@ -277,7 +267,7 @@ public void runAddRemoveScenarioWithResponse(HttpClient httpClient) { if (this.getTestMode() == TestMode.LIVE) { System.out.println("Warning: Test is skipped, does not support live mode."); return; - } + } CallingServerClientBuilder builder = getConversationClientUsingConnectionString(httpClient); CallingServerClient callingServerClient = setupClient(builder, "runAddRemoveScenarioWithResponse"); @@ -303,27 +293,20 @@ public void runAddRemoveScenarioWithResponse(HttpClient httpClient) { Waiting for an update to be able to get this serverCallId when using createCallConnection() */ - String serverCallId = "aHR0cHM6Ly94LWNvbnYtdXN3ZS0wMS5jb252LnNreXBlLmNvbS9jb252L1lXS2R2TTNRc0Vpc0VNYVUtNlhvSlE_aT0yJmU9NjM3NTg0Mzk2NDM5NzQ5NzY4"; + String serverCallId = "aHR0cHM6Ly94LWNvbnYtdXN3ZS0wMS5jb252LnNreXBlLmNvbS9jb252L0Z1MENEVF9lLWtPalRtdjlXMDFuSXc_aT0wJmU9NjM3NTg0MzkwMjcxMzg0MTc3"; ServerCall serverCall = callingServerClient.initializeServerCall(serverCallId); // Add User String operationContext = UUID.randomUUID().toString(); - Response addResponse = + Response addParticipantResultResponse = serverCall.addParticipantWithResponse( new CommunicationUserIdentifier(toUser), null, operationContext, CALLBACK_URI, null); - CallingServerTestUtils.validateAddParticipantResponse(addResponse); + CallingServerTestUtils.validateAddParticipantResponse(addParticipantResultResponse); - // Remove User - /* - There is an update that we require to be able to get - the participantId from the service when a user is - added to a call. Until that is fixed this recorded - values needs to be used. - */ - String participantId = "76b33acb-5097-4af0-a646-e07ccee48957"; + String participantId = addParticipantResultResponse.getValue().getParticipantId(); Response removeResponse = serverCall.removeParticipantWithResponse(participantId, null); validateResponse(removeResponse); diff --git a/sdk/communication/azure-communication-callingserver/src/test/resources/session-records/CallConnectionAsyncLiveTests.runCreateAddRemoveHangupScenarioAsync[1].json b/sdk/communication/azure-communication-callingserver/src/test/resources/session-records/CallConnectionAsyncLiveTests.runCreateAddRemoveHangupScenarioAsync[1].json index 6b9800527f558..7ae5b6f8c3204 100644 --- a/sdk/communication/azure-communication-callingserver/src/test/resources/session-records/CallConnectionAsyncLiveTests.runCreateAddRemoveHangupScenarioAsync[1].json +++ b/sdk/communication/azure-communication-callingserver/src/test/resources/session-records/CallConnectionAsyncLiveTests.runCreateAddRemoveHangupScenarioAsync[1].json @@ -4,71 +4,77 @@ "Uri" : "https://REDACTED.communication.azure.com/calling/callConnections?api-version=2021-06-15-preview", "Headers" : { "User-Agent" : "azsdk-java-azure-communication-callingserver/1.0.0-beta.1 (16.0.1; Windows 10; 10.0)", + "x-ms-client-request-id" : "ad1eff5f-ccbf-4680-99f3-5e34375c64fe", "Content-Type" : "application/json" }, "Response" : { "X-Cache" : "CONFIG_NOCACHE", "content-length" : "110", "retry-after" : "0", - "X-Azure-Ref" : "0g6/BYAAAAAC5tIq/4AviQoljmgzCwywqQ0hHRURHRTE2MTkAOWZjN2I1MTktYThjYy00Zjg5LTkzNWUtYzkxNDhhZTA5ZTgx", + "X-Azure-Ref" : "0gGbJYAAAAABSe8ADYMajR5j34RSsisw8Q0hHRURHRTE2MDgAOWZjN2I1MTktYThjYy00Zjg5LTkzNWUtYzkxNDhhZTA5ZTgx", "StatusCode" : "201", - "X-Microsoft-Skype-Chain-ID" : "99b7c872-47fb-442d-86ef-fbd9e8cf6276", - "Body" : "{\"callLegId\":\"23201300-e9cb-4e9f-aafc-723c9927ed3b\",\"callConnectionId\":\"23201300-e9cb-4e9f-aafc-723c9927ed3b\"}", - "Date" : "Thu, 10 Jun 2021 06:21:54 GMT", - "Content-Type" : "application/json; charset=utf-8", - "Client-Request-Id" : "98bab7f8-0a45-46ce-b96b-444dea287328" + "X-Microsoft-Skype-Chain-ID" : "172c5552-9c18-4d83-aa41-d3bb8a01bcef", + "Body" : "{\"callLegId\":\"90201300-75f3-4c00-b47f-d736432da731\",\"callConnectionId\":\"90201300-75f3-4c00-b47f-d736432da731\"}", + "x-ms-client-request-id" : "ad1eff5f-ccbf-4680-99f3-5e34375c64fe", + "Date" : "Wed, 16 Jun 2021 02:48:33 GMT", + "Content-Type" : "application/json; charset=utf-8" }, "Exception" : null }, { "Method" : "POST", - "Uri" : "https://REDACTED.communication.azure.com/calling/callConnections/23201300-e9cb-4e9f-aafc-723c9927ed3b/participants?api-version=2021-06-15-preview", + "Uri" : "https://REDACTED.communication.azure.com/calling/callConnections/90201300-75f3-4c00-b47f-d736432da731/participants?api-version=2021-06-15-preview", "Headers" : { "User-Agent" : "azsdk-java-azure-communication-callingserver/1.0.0-beta.1 (16.0.1; Windows 10; 10.0)", + "x-ms-client-request-id" : "ef2efc19-b1c2-4e39-a761-b067fbe1fd9a", "Content-Type" : "application/json" }, "Response" : { "X-Cache" : "CONFIG_NOCACHE", - "content-length" : "0", + "content-length" : "56", "retry-after" : "0", - "X-Azure-Ref" : "0j6/BYAAAAACd5NLDqXwxQYQuljIjMJRSQ0hHRURHRTE2MTkAOWZjN2I1MTktYThjYy00Zjg5LTkzNWUtYzkxNDhhZTA5ZTgx", + "X-Azure-Ref" : "0jGbJYAAAAAAFDsQOVUZCTbKLlma1QY8qQ0hHRURHRTE2MDgAOWZjN2I1MTktYThjYy00Zjg5LTkzNWUtYzkxNDhhZTA5ZTgx", "StatusCode" : "202", - "X-Microsoft-Skype-Chain-ID" : "59d5c622-ee66-46fd-9eb1-321f2a8c7b34", - "Date" : "Thu, 10 Jun 2021 06:22:07 GMT", - "Client-Request-Id" : "934f0e4d-3730-4b13-be1a-9d433a8591ef" + "X-Microsoft-Skype-Chain-ID" : "43b550bb-9263-45a3-9e3f-adb6167671b7", + "Body" : "{\"participantId\":\"52a4f699-7cfb-46ba-adda-e25e0d5d85b0\"}", + "x-ms-client-request-id" : "ef2efc19-b1c2-4e39-a761-b067fbe1fd9a", + "Date" : "Wed, 16 Jun 2021 02:48:43 GMT", + "Content-Type" : "application/json; charset=utf-8" }, "Exception" : null }, { "Method" : "DELETE", - "Uri" : "https://REDACTED.communication.azure.com/calling/callConnections/23201300-e9cb-4e9f-aafc-723c9927ed3b/participants/e3560385-776f-41d1-bf04-07ef738f2fc1?api-version=2021-06-15-preview", + "Uri" : "https://REDACTED.communication.azure.com/calling/callConnections/90201300-75f3-4c00-b47f-d736432da731/participants/52a4f699-7cfb-46ba-adda-e25e0d5d85b0?api-version=2021-06-15-preview", "Headers" : { - "User-Agent" : "azsdk-java-azure-communication-callingserver/1.0.0-beta.1 (16.0.1; Windows 10; 10.0)" + "User-Agent" : "azsdk-java-azure-communication-callingserver/1.0.0-beta.1 (16.0.1; Windows 10; 10.0)", + "x-ms-client-request-id" : "f856e20e-96a6-4d5c-bf2a-0afa4b804c3f" }, "Response" : { "X-Cache" : "CONFIG_NOCACHE", "content-length" : "0", "retry-after" : "0", - "X-Azure-Ref" : "0sK/BYAAAAACDUE2SAY0iS79tU/9jgC0VQ0hHRURHRTE2MTkAOWZjN2I1MTktYThjYy00Zjg5LTkzNWUtYzkxNDhhZTA5ZTgx", + "X-Azure-Ref" : "0lmbJYAAAAABUyldm5t0fRpmA6K8gBBz2Q0hHRURHRTE2MDgAOWZjN2I1MTktYThjYy00Zjg5LTkzNWUtYzkxNDhhZTA5ZTgx", "StatusCode" : "202", - "X-Microsoft-Skype-Chain-ID" : "63c5b9de-8f21-40df-8c82-6ee10cb500d4", - "Date" : "Thu, 10 Jun 2021 06:22:40 GMT", - "Client-Request-Id" : "4af9e778-7f7f-4b42-af7d-e92a7861ac19" + "X-Microsoft-Skype-Chain-ID" : "b9111533-6ea9-4416-b294-d47eb32fd17c", + "x-ms-client-request-id" : "f856e20e-96a6-4d5c-bf2a-0afa4b804c3f", + "Date" : "Wed, 16 Jun 2021 02:48:54 GMT" }, "Exception" : null }, { "Method" : "POST", - "Uri" : "https://REDACTED.communication.azure.com/calling/callConnections/23201300-e9cb-4e9f-aafc-723c9927ed3b/:hangup?api-version=2021-06-15-preview", + "Uri" : "https://REDACTED.communication.azure.com/calling/callConnections/90201300-75f3-4c00-b47f-d736432da731/:hangup?api-version=2021-06-15-preview", "Headers" : { - "User-Agent" : "azsdk-java-azure-communication-callingserver/1.0.0-beta.1 (16.0.1; Windows 10; 10.0)" + "User-Agent" : "azsdk-java-azure-communication-callingserver/1.0.0-beta.1 (16.0.1; Windows 10; 10.0)", + "x-ms-client-request-id" : "2fc657cc-f759-4f77-959d-6c92a1f802b4" }, "Response" : { "X-Cache" : "CONFIG_NOCACHE", "content-length" : "0", "retry-after" : "0", - "X-Azure-Ref" : "0va/BYAAAAAC7CRS+ZcsFQLfj1P+lwHVUQ0hHRURHRTE2MTkAOWZjN2I1MTktYThjYy00Zjg5LTkzNWUtYzkxNDhhZTA5ZTgx", + "X-Azure-Ref" : "0mGbJYAAAAAC+t5u5CCdgR5684lW6gB3rQ0hHRURHRTE2MDgAOWZjN2I1MTktYThjYy00Zjg5LTkzNWUtYzkxNDhhZTA5ZTgx", "StatusCode" : "202", - "X-Microsoft-Skype-Chain-ID" : "f571efc2-8305-4401-8050-80a434d3150d", - "Date" : "Thu, 10 Jun 2021 06:22:52 GMT", - "Client-Request-Id" : "7e7b29cd-e859-408a-9eb4-4c9067daa0cc" + "X-Microsoft-Skype-Chain-ID" : "89668ad5-f453-4b98-869f-e7c963014c0e", + "x-ms-client-request-id" : "2fc657cc-f759-4f77-959d-6c92a1f802b4", + "Date" : "Wed, 16 Jun 2021 02:48:55 GMT" }, "Exception" : null } ], diff --git a/sdk/communication/azure-communication-callingserver/src/test/resources/session-records/CallConnectionAsyncLiveTests.runCreateAddRemoveHangupScenarioWithResponseAsync[1].json b/sdk/communication/azure-communication-callingserver/src/test/resources/session-records/CallConnectionAsyncLiveTests.runCreateAddRemoveHangupScenarioWithResponseAsync[1].json index 635d7a6a902a0..80d9292509cd6 100644 --- a/sdk/communication/azure-communication-callingserver/src/test/resources/session-records/CallConnectionAsyncLiveTests.runCreateAddRemoveHangupScenarioWithResponseAsync[1].json +++ b/sdk/communication/azure-communication-callingserver/src/test/resources/session-records/CallConnectionAsyncLiveTests.runCreateAddRemoveHangupScenarioWithResponseAsync[1].json @@ -4,71 +4,77 @@ "Uri" : "https://REDACTED.communication.azure.com/calling/callConnections?api-version=2021-06-15-preview", "Headers" : { "User-Agent" : "azsdk-java-azure-communication-callingserver/1.0.0-beta.1 (16.0.1; Windows 10; 10.0)", + "x-ms-client-request-id" : "5f042247-d152-4513-8299-af36ef3745a9", "Content-Type" : "application/json" }, "Response" : { "X-Cache" : "CONFIG_NOCACHE", "content-length" : "110", "retry-after" : "0", - "X-Azure-Ref" : "06K/BYAAAAAAN9wbfZannTpOQceLWBzNAREZXMzBFREdFMDUxNAA5ZmM3YjUxOS1hOGNjLTRmODktOTM1ZS1jOTE0OGFlMDllODE=", + "X-Azure-Ref" : "0AVbJYAAAAABNNpP5yhhIS5fIrPKapr2wREZXMzBFREdFMDUxMgA5ZmM3YjUxOS1hOGNjLTRmODktOTM1ZS1jOTE0OGFlMDllODE=", "StatusCode" : "201", - "X-Microsoft-Skype-Chain-ID" : "108155da-5e7f-4139-ad3a-b26caf20e4e8", - "Body" : "{\"callLegId\":\"4a201300-dd6b-4743-9f72-3bd93a226187\",\"callConnectionId\":\"4a201300-dd6b-4743-9f72-3bd93a226187\"}", - "Date" : "Thu, 10 Jun 2021 06:23:37 GMT", - "Content-Type" : "application/json; charset=utf-8", - "Client-Request-Id" : "69b44cb6-9d94-429a-abbb-dd577866e343" + "X-Microsoft-Skype-Chain-ID" : "900263dc-c94e-42d0-a377-8dbccb9ad9b4", + "Body" : "{\"callLegId\":\"44201300-ca3b-409d-8938-9ea2c6e19fe1\",\"callConnectionId\":\"44201300-ca3b-409d-8938-9ea2c6e19fe1\"}", + "x-ms-client-request-id" : "5f042247-d152-4513-8299-af36ef3745a9", + "Date" : "Wed, 16 Jun 2021 01:38:10 GMT", + "Content-Type" : "application/json; charset=utf-8" }, "Exception" : null }, { "Method" : "POST", - "Uri" : "https://REDACTED.communication.azure.com/calling/callConnections/4a201300-dd6b-4743-9f72-3bd93a226187/participants?api-version=2021-06-15-preview", + "Uri" : "https://REDACTED.communication.azure.com/calling/callConnections/44201300-ca3b-409d-8938-9ea2c6e19fe1/participants?api-version=2021-06-15-preview", "Headers" : { "User-Agent" : "azsdk-java-azure-communication-callingserver/1.0.0-beta.1 (16.0.1; Windows 10; 10.0)", + "x-ms-client-request-id" : "018844eb-2d76-486b-9bc0-2cb76238e83d", "Content-Type" : "application/json" }, "Response" : { "X-Cache" : "CONFIG_NOCACHE", - "content-length" : "0", + "content-length" : "56", "retry-after" : "0", - "X-Azure-Ref" : "0+q/BYAAAAADt8lJ4jRXzRbnu/jS3NDmzREZXMzBFREdFMDUxNAA5ZmM3YjUxOS1hOGNjLTRmODktOTM1ZS1jOTE0OGFlMDllODE=", + "X-Azure-Ref" : "0ElbJYAAAAAB97T7D+KtRSZ3ZBw9eDG1+REZXMzBFREdFMDUxMgA5ZmM3YjUxOS1hOGNjLTRmODktOTM1ZS1jOTE0OGFlMDllODE=", "StatusCode" : "202", - "X-Microsoft-Skype-Chain-ID" : "54894a95-0a4a-43ce-8114-9ca615173fd3", - "Date" : "Thu, 10 Jun 2021 06:23:53 GMT", - "Client-Request-Id" : "a9e41c63-d2fc-4919-b2fd-1e84cbac1bc8" + "X-Microsoft-Skype-Chain-ID" : "ff29f230-fb6e-4017-9f9d-7425e9c72ef2", + "Body" : "{\"participantId\":\"8127832a-aa61-4a42-a3d7-1d01b98d52fa\"}", + "x-ms-client-request-id" : "018844eb-2d76-486b-9bc0-2cb76238e83d", + "Date" : "Wed, 16 Jun 2021 01:38:26 GMT", + "Content-Type" : "application/json; charset=utf-8" }, "Exception" : null }, { "Method" : "DELETE", - "Uri" : "https://REDACTED.communication.azure.com/calling/callConnections/4a201300-dd6b-4743-9f72-3bd93a226187/participants/80238d5f-9eda-481a-b911-e2e12eba9eda?api-version=2021-06-15-preview", + "Uri" : "https://REDACTED.communication.azure.com/calling/callConnections/44201300-ca3b-409d-8938-9ea2c6e19fe1/participants/8127832a-aa61-4a42-a3d7-1d01b98d52fa?api-version=2021-06-15-preview", "Headers" : { - "User-Agent" : "azsdk-java-azure-communication-callingserver/1.0.0-beta.1 (16.0.1; Windows 10; 10.0)" + "User-Agent" : "azsdk-java-azure-communication-callingserver/1.0.0-beta.1 (16.0.1; Windows 10; 10.0)", + "x-ms-client-request-id" : "2a84e953-4989-41ce-8651-e068afa6aae8" }, "Response" : { "X-Cache" : "CONFIG_NOCACHE", "content-length" : "0", "retry-after" : "0", - "X-Azure-Ref" : "0LrDBYAAAAADjjidTX1wcQpJMnWmXm8ADREZXMzBFREdFMDUxNAA5ZmM3YjUxOS1hOGNjLTRmODktOTM1ZS1jOTE0OGFlMDllODE=", + "X-Azure-Ref" : "0JlbJYAAAAACeQr1/vvwjRbIRNckVc+vgREZXMzBFREdFMDUxMgA5ZmM3YjUxOS1hOGNjLTRmODktOTM1ZS1jOTE0OGFlMDllODE=", "StatusCode" : "202", - "X-Microsoft-Skype-Chain-ID" : "4f9e6379-8238-40f1-b017-dfc76b58e687", - "Date" : "Thu, 10 Jun 2021 06:24:45 GMT", - "Client-Request-Id" : "87328aca-8f5e-4806-b529-22ef87517ef3" + "X-Microsoft-Skype-Chain-ID" : "1ede19ad-9e12-4fe2-a765-dbad2dc01ddb", + "x-ms-client-request-id" : "2a84e953-4989-41ce-8651-e068afa6aae8", + "Date" : "Wed, 16 Jun 2021 01:38:46 GMT" }, "Exception" : null }, { "Method" : "POST", - "Uri" : "https://REDACTED.communication.azure.com/calling/callConnections/4a201300-dd6b-4743-9f72-3bd93a226187/:hangup?api-version=2021-06-15-preview", + "Uri" : "https://REDACTED.communication.azure.com/calling/callConnections/44201300-ca3b-409d-8938-9ea2c6e19fe1/:hangup?api-version=2021-06-15-preview", "Headers" : { - "User-Agent" : "azsdk-java-azure-communication-callingserver/1.0.0-beta.1 (16.0.1; Windows 10; 10.0)" + "User-Agent" : "azsdk-java-azure-communication-callingserver/1.0.0-beta.1 (16.0.1; Windows 10; 10.0)", + "x-ms-client-request-id" : "416261ad-46fc-48b7-aa75-d0ca225762ba" }, "Response" : { "X-Cache" : "CONFIG_NOCACHE", "content-length" : "0", "retry-after" : "0", - "X-Azure-Ref" : "0MrDBYAAAAAAPJfufWdZNT7RmykxwPrGoREZXMzBFREdFMDUxNAA5ZmM3YjUxOS1hOGNjLTRmODktOTM1ZS1jOTE0OGFlMDllODE=", + "X-Azure-Ref" : "0LFbJYAAAAADqBf3C6DfUTLhMOW2OAjDMREZXMzBFREdFMDUxMgA5ZmM3YjUxOS1hOGNjLTRmODktOTM1ZS1jOTE0OGFlMDllODE=", "StatusCode" : "202", - "X-Microsoft-Skype-Chain-ID" : "9288a08a-a906-4926-ba1c-7a6d1f942345", - "Date" : "Thu, 10 Jun 2021 06:24:50 GMT", - "Client-Request-Id" : "849b2df1-7a22-471c-b262-30827a720ac5" + "X-Microsoft-Skype-Chain-ID" : "deac6cda-123c-4ce7-a9e3-fe0a3ffed3d9", + "x-ms-client-request-id" : "416261ad-46fc-48b7-aa75-d0ca225762ba", + "Date" : "Wed, 16 Jun 2021 01:38:52 GMT" }, "Exception" : null } ], diff --git a/sdk/communication/azure-communication-callingserver/src/test/resources/session-records/CallConnectionLiveTests.runCreateAddRemoveHangupScenarioWithResponse[1].json b/sdk/communication/azure-communication-callingserver/src/test/resources/session-records/CallConnectionLiveTests.runCreateAddRemoveHangupScenarioWithResponse[1].json index d312080fabc17..d904fb3f783c7 100644 --- a/sdk/communication/azure-communication-callingserver/src/test/resources/session-records/CallConnectionLiveTests.runCreateAddRemoveHangupScenarioWithResponse[1].json +++ b/sdk/communication/azure-communication-callingserver/src/test/resources/session-records/CallConnectionLiveTests.runCreateAddRemoveHangupScenarioWithResponse[1].json @@ -4,71 +4,77 @@ "Uri" : "https://REDACTED.communication.azure.com/calling/callConnections?api-version=2021-06-15-preview", "Headers" : { "User-Agent" : "azsdk-java-azure-communication-callingserver/1.0.0-beta.1 (16.0.1; Windows 10; 10.0)", + "x-ms-client-request-id" : "00ffa74a-bb9a-4981-8497-2f70a6e525d6", "Content-Type" : "application/json" }, "Response" : { "X-Cache" : "CONFIG_NOCACHE", "content-length" : "110", "retry-after" : "0", - "X-Azure-Ref" : "0PqfBYAAAAABDyBPAypUpTbDDAtp9C/5QREZXMzBFREdFMDUxMAA5ZmM3YjUxOS1hOGNjLTRmODktOTM1ZS1jOTE0OGFlMDllODE=", + "X-Azure-Ref" : "0WFTJYAAAAAA3l/U6A5B/R5L/wDhfoTAUREZXMzBFREdFMDUyMQA5ZmM3YjUxOS1hOGNjLTRmODktOTM1ZS1jOTE0OGFlMDllODE=", "StatusCode" : "201", - "X-Microsoft-Skype-Chain-ID" : "6edec820-c43f-4dda-b96d-758be5519392", - "Body" : "{\"callLegId\":\"c2201300-372b-4248-ae00-eb35cdea6a77\",\"callConnectionId\":\"c2201300-372b-4248-ae00-eb35cdea6a77\"}", - "Date" : "Thu, 10 Jun 2021 05:46:40 GMT", - "Content-Type" : "application/json; charset=utf-8", - "Client-Request-Id" : "fc0d69a2-038b-4bca-9939-97b0e47af87d" + "X-Microsoft-Skype-Chain-ID" : "5b27563b-5625-4a5f-9558-b660d9043f2b", + "Body" : "{\"callLegId\":\"d91f1300-071e-49e0-af6d-44ebd92eeb9b\",\"callConnectionId\":\"d91f1300-071e-49e0-af6d-44ebd92eeb9b\"}", + "x-ms-client-request-id" : "00ffa74a-bb9a-4981-8497-2f70a6e525d6", + "Date" : "Wed, 16 Jun 2021 01:31:05 GMT", + "Content-Type" : "application/json; charset=utf-8" }, "Exception" : null }, { "Method" : "POST", - "Uri" : "https://REDACTED.communication.azure.com/calling/callConnections/c2201300-372b-4248-ae00-eb35cdea6a77/participants?api-version=2021-06-15-preview", + "Uri" : "https://REDACTED.communication.azure.com/calling/callConnections/d91f1300-071e-49e0-af6d-44ebd92eeb9b/participants?api-version=2021-06-15-preview", "Headers" : { "User-Agent" : "azsdk-java-azure-communication-callingserver/1.0.0-beta.1 (16.0.1; Windows 10; 10.0)", + "x-ms-client-request-id" : "7cebcdb7-f239-4460-a8df-0de3396cb155", "Content-Type" : "application/json" }, "Response" : { "X-Cache" : "CONFIG_NOCACHE", - "content-length" : "0", + "content-length" : "56", "retry-after" : "0", - "X-Azure-Ref" : "0TqfBYAAAAABzlxhDFy8ZSoB8m9jWy1fQREZXMzBFREdFMDUxMAA5ZmM3YjUxOS1hOGNjLTRmODktOTM1ZS1jOTE0OGFlMDllODE=", + "X-Azure-Ref" : "0Z1TJYAAAAAAPJQmNWYd6T7t7RPT2zBzDREZXMzBFREdFMDUyMQA5ZmM3YjUxOS1hOGNjLTRmODktOTM1ZS1jOTE0OGFlMDllODE=", "StatusCode" : "202", - "X-Microsoft-Skype-Chain-ID" : "05038067-e3fc-42ee-9671-6fead242b7ad", - "Date" : "Thu, 10 Jun 2021 05:46:53 GMT", - "Client-Request-Id" : "acaba54e-0ba5-4628-aa8d-246abe8ab456" + "X-Microsoft-Skype-Chain-ID" : "1d92c078-b038-4201-84d4-a81e3a47d71a", + "Body" : "{\"participantId\":\"4318b68b-3b37-46e1-a4fa-69cd9623435a\"}", + "x-ms-client-request-id" : "7cebcdb7-f239-4460-a8df-0de3396cb155", + "Date" : "Wed, 16 Jun 2021 01:31:19 GMT", + "Content-Type" : "application/json; charset=utf-8" }, "Exception" : null }, { "Method" : "DELETE", - "Uri" : "https://REDACTED.communication.azure.com/calling/callConnections/c2201300-372b-4248-ae00-eb35cdea6a77/participants/71ed956b-366e-450c-9a61-3bbccf42baa5?api-version=2021-06-15-preview", + "Uri" : "https://REDACTED.communication.azure.com/calling/callConnections/d91f1300-071e-49e0-af6d-44ebd92eeb9b/participants/4318b68b-3b37-46e1-a4fa-69cd9623435a?api-version=2021-06-15-preview", "Headers" : { - "User-Agent" : "azsdk-java-azure-communication-callingserver/1.0.0-beta.1 (16.0.1; Windows 10; 10.0)" + "User-Agent" : "azsdk-java-azure-communication-callingserver/1.0.0-beta.1 (16.0.1; Windows 10; 10.0)", + "x-ms-client-request-id" : "a8f4cdea-d4a8-4fe0-9e3e-e31f70f3fad2" }, "Response" : { "X-Cache" : "CONFIG_NOCACHE", "content-length" : "0", "retry-after" : "0", - "X-Azure-Ref" : "0dqfBYAAAAAAF8z+KH8V/QZ7SX/mINltfREZXMzBFREdFMDUxMAA5ZmM3YjUxOS1hOGNjLTRmODktOTM1ZS1jOTE0OGFlMDllODE=", + "X-Azure-Ref" : "0gFTJYAAAAAB+4crslKDhQJklnGatCXcdREZXMzBFREdFMDUyMQA5ZmM3YjUxOS1hOGNjLTRmODktOTM1ZS1jOTE0OGFlMDllODE=", "StatusCode" : "202", - "X-Microsoft-Skype-Chain-ID" : "45c6895c-71fa-44b5-b2bb-8692268feb35", - "Date" : "Thu, 10 Jun 2021 05:47:33 GMT", - "Client-Request-Id" : "f7946816-80cc-4794-a640-bd6693451fc1" + "X-Microsoft-Skype-Chain-ID" : "0304508e-eb91-4f3d-b3ad-cc2bcb98d84a", + "x-ms-client-request-id" : "a8f4cdea-d4a8-4fe0-9e3e-e31f70f3fad2", + "Date" : "Wed, 16 Jun 2021 01:31:43 GMT" }, "Exception" : null }, { "Method" : "POST", - "Uri" : "https://REDACTED.communication.azure.com/calling/callConnections/c2201300-372b-4248-ae00-eb35cdea6a77/:hangup?api-version=2021-06-15-preview", + "Uri" : "https://REDACTED.communication.azure.com/calling/callConnections/d91f1300-071e-49e0-af6d-44ebd92eeb9b/:hangup?api-version=2021-06-15-preview", "Headers" : { - "User-Agent" : "azsdk-java-azure-communication-callingserver/1.0.0-beta.1 (16.0.1; Windows 10; 10.0)" + "User-Agent" : "azsdk-java-azure-communication-callingserver/1.0.0-beta.1 (16.0.1; Windows 10; 10.0)", + "x-ms-client-request-id" : "e2867240-12c1-40d1-a08d-2e277a0785a4" }, "Response" : { "X-Cache" : "CONFIG_NOCACHE", "content-length" : "0", "retry-after" : "0", - "X-Azure-Ref" : "0eafBYAAAAAAhH5AQSjKXR5cbQKfuCz+CREZXMzBFREdFMDUxMAA5ZmM3YjUxOS1hOGNjLTRmODktOTM1ZS1jOTE0OGFlMDllODE=", + "X-Azure-Ref" : "0iFTJYAAAAABcZFDtcvdxTKYmOxIt6dIUREZXMzBFREdFMDUyMQA5ZmM3YjUxOS1hOGNjLTRmODktOTM1ZS1jOTE0OGFlMDllODE=", "StatusCode" : "202", - "X-Microsoft-Skype-Chain-ID" : "7851c5ce-e6d4-42f9-b94e-b003145be827", - "Date" : "Thu, 10 Jun 2021 05:47:36 GMT", - "Client-Request-Id" : "b85e142e-6d69-41d0-96f6-820591d8a0cc" + "X-Microsoft-Skype-Chain-ID" : "0aaedcc4-9dc7-4546-9a99-4972abdc06d0", + "x-ms-client-request-id" : "e2867240-12c1-40d1-a08d-2e277a0785a4", + "Date" : "Wed, 16 Jun 2021 01:31:52 GMT" }, "Exception" : null } ], diff --git a/sdk/communication/azure-communication-callingserver/src/test/resources/session-records/CallConnectionLiveTests.runCreateAddRemoveHangupScenario[1].json b/sdk/communication/azure-communication-callingserver/src/test/resources/session-records/CallConnectionLiveTests.runCreateAddRemoveHangupScenario[1].json index 52efba7f8e1b4..049f7dcdce451 100644 --- a/sdk/communication/azure-communication-callingserver/src/test/resources/session-records/CallConnectionLiveTests.runCreateAddRemoveHangupScenario[1].json +++ b/sdk/communication/azure-communication-callingserver/src/test/resources/session-records/CallConnectionLiveTests.runCreateAddRemoveHangupScenario[1].json @@ -4,71 +4,77 @@ "Uri" : "https://REDACTED.communication.azure.com/calling/callConnections?api-version=2021-06-15-preview", "Headers" : { "User-Agent" : "azsdk-java-azure-communication-callingserver/1.0.0-beta.1 (16.0.1; Windows 10; 10.0)", + "x-ms-client-request-id" : "b05cd0a0-2274-4371-a9ca-2ca9913b6bf4", "Content-Type" : "application/json" }, "Response" : { "X-Cache" : "CONFIG_NOCACHE", "content-length" : "110", "retry-after" : "0", - "X-Azure-Ref" : "0NabBYAAAAABqOtzlzgj3Qp5ink0HfTPCQ0hHRURHRTE2MTkAOWZjN2I1MTktYThjYy00Zjg5LTkzNWUtYzkxNDhhZTA5ZTgx", + "X-Azure-Ref" : "0/2XJYAAAAABCC2w7V7t3SKJxutnMJWOQREZXMzBFREdFMDUxOAA5ZmM3YjUxOS1hOGNjLTRmODktOTM1ZS1jOTE0OGFlMDllODE=", "StatusCode" : "201", - "X-Microsoft-Skype-Chain-ID" : "b8cff5a1-fa0e-4a78-b638-65d4042356b6", - "Body" : "{\"callLegId\":\"2e201300-7de3-419a-a20d-c31ff293b3e9\",\"callConnectionId\":\"2e201300-7de3-419a-a20d-c31ff293b3e9\"}", - "Date" : "Thu, 10 Jun 2021 05:42:14 GMT", - "Content-Type" : "application/json; charset=utf-8", - "Client-Request-Id" : "ba6b7eca-6205-4e44-b171-f390a35d5744" + "X-Microsoft-Skype-Chain-ID" : "79908075-6156-498e-86db-5b807eaa7d08", + "Body" : "{\"callLegId\":\"4a1f1300-3096-4446-bfb0-8b8f9b53aac3\",\"callConnectionId\":\"4a1f1300-3096-4446-bfb0-8b8f9b53aac3\"}", + "x-ms-client-request-id" : "b05cd0a0-2274-4371-a9ca-2ca9913b6bf4", + "Date" : "Wed, 16 Jun 2021 02:46:22 GMT", + "Content-Type" : "application/json; charset=utf-8" }, "Exception" : null }, { "Method" : "POST", - "Uri" : "https://REDACTED.communication.azure.com/calling/callConnections/2e201300-7de3-419a-a20d-c31ff293b3e9/participants?api-version=2021-06-15-preview", + "Uri" : "https://REDACTED.communication.azure.com/calling/callConnections/4a1f1300-3096-4446-bfb0-8b8f9b53aac3/participants?api-version=2021-06-15-preview", "Headers" : { "User-Agent" : "azsdk-java-azure-communication-callingserver/1.0.0-beta.1 (16.0.1; Windows 10; 10.0)", + "x-ms-client-request-id" : "51a87d07-ccec-4b6e-b63f-9f72e2b1f219", "Content-Type" : "application/json" }, "Response" : { "X-Cache" : "CONFIG_NOCACHE", - "content-length" : "0", + "content-length" : "56", "retry-after" : "0", - "X-Azure-Ref" : "0RabBYAAAAAA7deQkC15VSKN0zxVmFplxQ0hHRURHRTE2MTkAOWZjN2I1MTktYThjYy00Zjg5LTkzNWUtYzkxNDhhZTA5ZTgx", + "X-Azure-Ref" : "0D2bJYAAAAAD9sY3hou1RQKewZVWSNG4tREZXMzBFREdFMDUxOAA5ZmM3YjUxOS1hOGNjLTRmODktOTM1ZS1jOTE0OGFlMDllODE=", "StatusCode" : "202", - "X-Microsoft-Skype-Chain-ID" : "48d9e35d-50d2-4d08-a10c-cd46b130c317", - "Date" : "Thu, 10 Jun 2021 05:42:29 GMT", - "Client-Request-Id" : "2c468a21-f8f4-4575-8ef9-678158a7aacd" + "X-Microsoft-Skype-Chain-ID" : "4997e592-44c5-4a43-a0ed-0612fb0e6588", + "Body" : "{\"participantId\":\"fc2cf742-1aeb-4ff9-a8e3-d0e71ac02253\"}", + "x-ms-client-request-id" : "51a87d07-ccec-4b6e-b63f-9f72e2b1f219", + "Date" : "Wed, 16 Jun 2021 02:46:39 GMT", + "Content-Type" : "application/json; charset=utf-8" }, "Exception" : null }, { "Method" : "DELETE", - "Uri" : "https://REDACTED.communication.azure.com/calling/callConnections/2e201300-7de3-419a-a20d-c31ff293b3e9/participants/f29f70e3-1eaf-44c0-839c-b4e8a74ffec3?api-version=2021-06-15-preview", + "Uri" : "https://REDACTED.communication.azure.com/calling/callConnections/4a1f1300-3096-4446-bfb0-8b8f9b53aac3/participants/fc2cf742-1aeb-4ff9-a8e3-d0e71ac02253?api-version=2021-06-15-preview", "Headers" : { - "User-Agent" : "azsdk-java-azure-communication-callingserver/1.0.0-beta.1 (16.0.1; Windows 10; 10.0)" + "User-Agent" : "azsdk-java-azure-communication-callingserver/1.0.0-beta.1 (16.0.1; Windows 10; 10.0)", + "x-ms-client-request-id" : "270a1217-a76f-44bd-9675-d115de2ff993" }, "Response" : { "X-Cache" : "CONFIG_NOCACHE", "content-length" : "0", "retry-after" : "0", - "X-Azure-Ref" : "0c6bBYAAAAAD33QWwVsIEQ56OQHv9L6EsQ0hHRURHRTE2MTkAOWZjN2I1MTktYThjYy00Zjg5LTkzNWUtYzkxNDhhZTA5ZTgx", + "X-Azure-Ref" : "0HmbJYAAAAACly2Bv+347RJ5TU9PK2kEuREZXMzBFREdFMDUxOAA5ZmM3YjUxOS1hOGNjLTRmODktOTM1ZS1jOTE0OGFlMDllODE=", "StatusCode" : "202", - "X-Microsoft-Skype-Chain-ID" : "17146e98-9532-48f1-b44a-37b4703f698b", - "Date" : "Thu, 10 Jun 2021 05:43:15 GMT", - "Client-Request-Id" : "29e9935a-cd73-43ed-88f0-c89f3f5540df" + "X-Microsoft-Skype-Chain-ID" : "b86abddf-e778-4fa2-aa63-f5ddfc75dc50", + "x-ms-client-request-id" : "270a1217-a76f-44bd-9675-d115de2ff993", + "Date" : "Wed, 16 Jun 2021 02:46:54 GMT" }, "Exception" : null }, { "Method" : "POST", - "Uri" : "https://REDACTED.communication.azure.com/calling/callConnections/2e201300-7de3-419a-a20d-c31ff293b3e9/:hangup?api-version=2021-06-15-preview", + "Uri" : "https://REDACTED.communication.azure.com/calling/callConnections/4a1f1300-3096-4446-bfb0-8b8f9b53aac3/:hangup?api-version=2021-06-15-preview", "Headers" : { - "User-Agent" : "azsdk-java-azure-communication-callingserver/1.0.0-beta.1 (16.0.1; Windows 10; 10.0)" + "User-Agent" : "azsdk-java-azure-communication-callingserver/1.0.0-beta.1 (16.0.1; Windows 10; 10.0)", + "x-ms-client-request-id" : "b9e2542b-f87a-48a7-bc81-a98e379876e0" }, "Response" : { "X-Cache" : "CONFIG_NOCACHE", "content-length" : "0", "retry-after" : "0", - "X-Azure-Ref" : "0e6bBYAAAAAD9gfarByZWQ4HmiU85MbSUQ0hHRURHRTE2MTkAOWZjN2I1MTktYThjYy00Zjg5LTkzNWUtYzkxNDhhZTA5ZTgx", + "X-Azure-Ref" : "0IGbJYAAAAAAdwxFcOdsURo2rTBrICIQ8REZXMzBFREdFMDUxOAA5ZmM3YjUxOS1hOGNjLTRmODktOTM1ZS1jOTE0OGFlMDllODE=", "StatusCode" : "202", - "X-Microsoft-Skype-Chain-ID" : "af9d0938-0f39-4a15-8166-a9587dd36f20", - "Date" : "Thu, 10 Jun 2021 05:43:22 GMT", - "Client-Request-Id" : "3b2230b7-361b-4bdc-a9eb-84fd271e6da2" + "X-Microsoft-Skype-Chain-ID" : "5564465a-6239-4c2d-9ba2-483ae937cca8", + "x-ms-client-request-id" : "b9e2542b-f87a-48a7-bc81-a98e379876e0", + "Date" : "Wed, 16 Jun 2021 02:46:56 GMT" }, "Exception" : null } ], diff --git a/sdk/communication/azure-communication-callingserver/src/test/resources/session-records/ServerCallAsyncLiveTests.runAddRemoveScenarioAsync[1].json b/sdk/communication/azure-communication-callingserver/src/test/resources/session-records/ServerCallAsyncLiveTests.runAddRemoveScenarioAsync[1].json index ecbcff49b8048..c988de8e32f90 100644 --- a/sdk/communication/azure-communication-callingserver/src/test/resources/session-records/ServerCallAsyncLiveTests.runAddRemoveScenarioAsync[1].json +++ b/sdk/communication/azure-communication-callingserver/src/test/resources/session-records/ServerCallAsyncLiveTests.runAddRemoveScenarioAsync[1].json @@ -4,71 +4,77 @@ "Uri" : "https://REDACTED.communication.azure.com/calling/callConnections?api-version=2021-06-15-preview", "Headers" : { "User-Agent" : "azsdk-java-azure-communication-callingserver/1.0.0-beta.1 (16.0.1; Windows 10; 10.0)", + "x-ms-client-request-id" : "4dfa26f9-8862-4d9c-8b8b-b2ffa152f965", "Content-Type" : "application/json" }, "Response" : { "X-Cache" : "CONFIG_NOCACHE", "content-length" : "110", "retry-after" : "0", - "X-Azure-Ref" : "0OcjBYAAAAADzW8ZTDBKsTq21yxFYY9OWREZXMzBFREdFMDUwNgA5ZmM3YjUxOS1hOGNjLTRmODktOTM1ZS1jOTE0OGFlMDllODE=", + "X-Azure-Ref" : "0kGjJYAAAAAB4aBasJclhQrh5oAdjbecQREZXMzBFREdFMDUyMAA5ZmM3YjUxOS1hOGNjLTRmODktOTM1ZS1jOTE0OGFlMDllODE=", "StatusCode" : "201", - "X-Microsoft-Skype-Chain-ID" : "82742b74-df60-4a19-8da6-3b0e3ae692de", - "Body" : "{\"callLegId\":\"1a201300-71e3-4213-8948-ef00e41c86eb\",\"callConnectionId\":\"1a201300-71e3-4213-8948-ef00e41c86eb\"}", - "Date" : "Thu, 10 Jun 2021 08:07:22 GMT", - "Content-Type" : "application/json; charset=utf-8", - "Client-Request-Id" : "218c4162-ca90-4679-894e-5f59331c2707" + "X-Microsoft-Skype-Chain-ID" : "36490895-b9d1-4129-8a43-52ea481117a1", + "Body" : "{\"callLegId\":\"681f1300-ac06-4e6d-b10d-52a5faf27f39\",\"callConnectionId\":\"681f1300-ac06-4e6d-b10d-52a5faf27f39\"}", + "x-ms-client-request-id" : "4dfa26f9-8862-4d9c-8b8b-b2ffa152f965", + "Date" : "Wed, 16 Jun 2021 02:57:21 GMT", + "Content-Type" : "application/json; charset=utf-8" }, "Exception" : null }, { "Method" : "POST", - "Uri" : "https://REDACTED.communication.azure.com/calling/serverCalls/aHR0cHM6Ly94LWNvbnYtdXN3ZS0wMS5jb252LnNreXBlLmNvbS9jb252L3NXdWxkazBmMEVpdnAxWjhiU2NuUHc_aT0yJmU9NjM3NTg0Mzk2NDM5NzQ5NzY4/participants?api-version=2021-06-15-preview", + "Uri" : "https://REDACTED.communication.azure.com/calling/serverCalls/aHR0cHM6Ly94LWNvbnYtdXN3ZS0wMS5jb252LnNreXBlLmNvbS9jb252L19JbTJUcm1MejBpLWlaYkZRREtxaGc_aT0xJmU9NjM3NTg0MzkzMzg3ODg3MDI3/participants?api-version=2021-06-15-preview", "Headers" : { "User-Agent" : "azsdk-java-azure-communication-callingserver/1.0.0-beta.1 (16.0.1; Windows 10; 10.0)", + "x-ms-client-request-id" : "548086a9-8bfc-4f82-ad51-dbc449434fbd", "Content-Type" : "application/json" }, "Response" : { "X-Cache" : "CONFIG_NOCACHE", - "content-length" : "0", + "content-length" : "56", "retry-after" : "0", - "X-Azure-Ref" : "0XMjBYAAAAADIiDOyF3E/T53NVWLhJHjoREZXMzBFREdFMDUwNgA5ZmM3YjUxOS1hOGNjLTRmODktOTM1ZS1jOTE0OGFlMDllODE=", + "X-Azure-Ref" : "0s2jJYAAAAACEQ7iTorwkQ5xI52Bm5qOlREZXMzBFREdFMDUyMAA5ZmM3YjUxOS1hOGNjLTRmODktOTM1ZS1jOTE0OGFlMDllODE=", "StatusCode" : "202", - "X-Microsoft-Skype-Chain-ID" : "4911578f-008d-461e-a423-76b935c0210e", - "Date" : "Thu, 10 Jun 2021 08:07:55 GMT", - "Client-Request-Id" : "9dfe019d-033d-444a-95d1-7cc0f1f089dc" + "X-Microsoft-Skype-Chain-ID" : "f3d74b67-79b7-492c-8d61-24de039fa933", + "Body" : "{\"participantId\":\"79d0dfa9-4211-4250-a682-9e64f8ac6381\"}", + "x-ms-client-request-id" : "548086a9-8bfc-4f82-ad51-dbc449434fbd", + "Date" : "Wed, 16 Jun 2021 02:57:58 GMT", + "Content-Type" : "application/json; charset=utf-8" }, "Exception" : null }, { "Method" : "DELETE", - "Uri" : "https://REDACTED.communication.azure.com/calling/serverCalls/aHR0cHM6Ly94LWNvbnYtdXN3ZS0wMS5jb252LnNreXBlLmNvbS9jb252L3NXdWxkazBmMEVpdnAxWjhiU2NuUHc_aT0yJmU9NjM3NTg0Mzk2NDM5NzQ5NzY4/participants/206ac04a-1aae-4d82-9015-9c30cb174888?api-version=2021-06-15-preview", + "Uri" : "https://REDACTED.communication.azure.com/calling/serverCalls/aHR0cHM6Ly94LWNvbnYtdXN3ZS0wMS5jb252LnNreXBlLmNvbS9jb252L19JbTJUcm1MejBpLWlaYkZRREtxaGc_aT0xJmU9NjM3NTg0MzkzMzg3ODg3MDI3/participants/79d0dfa9-4211-4250-a682-9e64f8ac6381?api-version=2021-06-15-preview", "Headers" : { - "User-Agent" : "azsdk-java-azure-communication-callingserver/1.0.0-beta.1 (16.0.1; Windows 10; 10.0)" + "User-Agent" : "azsdk-java-azure-communication-callingserver/1.0.0-beta.1 (16.0.1; Windows 10; 10.0)", + "x-ms-client-request-id" : "84b52101-3880-4f42-ba9c-6855b07ca751" }, "Response" : { "X-Cache" : "CONFIG_NOCACHE", "content-length" : "0", "retry-after" : "0", - "X-Azure-Ref" : "0fMjBYAAAAABG2y1vltVGT7qfGYgMfgmfREZXMzBFREdFMDUwNgA5ZmM3YjUxOS1hOGNjLTRmODktOTM1ZS1jOTE0OGFlMDllODE=", + "X-Azure-Ref" : "0xGjJYAAAAABtylnL1VbWQ7R8WBl3GXojREZXMzBFREdFMDUyMAA5ZmM3YjUxOS1hOGNjLTRmODktOTM1ZS1jOTE0OGFlMDllODE=", "StatusCode" : "202", - "X-Microsoft-Skype-Chain-ID" : "f30173fe-0445-4ea2-97cf-ff1872c5645f", - "Date" : "Thu, 10 Jun 2021 08:08:28 GMT", - "Client-Request-Id" : "65b2bedf-eecf-42ab-92f0-3058dd96501c" + "X-Microsoft-Skype-Chain-ID" : "abe152c6-6991-4fe0-ba96-59f5d3542431", + "x-ms-client-request-id" : "84b52101-3880-4f42-ba9c-6855b07ca751", + "Date" : "Wed, 16 Jun 2021 02:58:13 GMT" }, "Exception" : null }, { "Method" : "POST", - "Uri" : "https://REDACTED.communication.azure.com/calling/callConnections/1a201300-71e3-4213-8948-ef00e41c86eb/:hangup?api-version=2021-06-15-preview", + "Uri" : "https://REDACTED.communication.azure.com/calling/callConnections/681f1300-ac06-4e6d-b10d-52a5faf27f39/:hangup?api-version=2021-06-15-preview", "Headers" : { - "User-Agent" : "azsdk-java-azure-communication-callingserver/1.0.0-beta.1 (16.0.1; Windows 10; 10.0)" + "User-Agent" : "azsdk-java-azure-communication-callingserver/1.0.0-beta.1 (16.0.1; Windows 10; 10.0)", + "x-ms-client-request-id" : "44513fbc-12eb-4e6e-8b38-d9d107d7b65f" }, "Response" : { "X-Cache" : "CONFIG_NOCACHE", "content-length" : "0", "retry-after" : "0", - "X-Azure-Ref" : "0gcjBYAAAAACfuBACVyiaSbWz12G4eejZREZXMzBFREdFMDUwNgA5ZmM3YjUxOS1hOGNjLTRmODktOTM1ZS1jOTE0OGFlMDllODE=", + "X-Azure-Ref" : "0zGjJYAAAAADnf5XsJ+L+Q4Qm4G/xH+4pREZXMzBFREdFMDUyMAA5ZmM3YjUxOS1hOGNjLTRmODktOTM1ZS1jOTE0OGFlMDllODE=", "StatusCode" : "202", - "X-Microsoft-Skype-Chain-ID" : "2b591cf6-16f4-4bda-ba5e-e1a513d69399", - "Date" : "Thu, 10 Jun 2021 08:08:33 GMT", - "Client-Request-Id" : "aed39731-e425-463e-9a08-16b4ca4606c9" + "X-Microsoft-Skype-Chain-ID" : "564ead7b-6efc-4668-8d22-c56e9c1f7312", + "x-ms-client-request-id" : "44513fbc-12eb-4e6e-8b38-d9d107d7b65f", + "Date" : "Wed, 16 Jun 2021 02:58:20 GMT" }, "Exception" : null } ], diff --git a/sdk/communication/azure-communication-callingserver/src/test/resources/session-records/ServerCallAsyncLiveTests.runAddRemoveScenarioWithResponseAsync[1].json b/sdk/communication/azure-communication-callingserver/src/test/resources/session-records/ServerCallAsyncLiveTests.runAddRemoveScenarioWithResponseAsync[1].json index 4d61978964da9..3239df33ca65b 100644 --- a/sdk/communication/azure-communication-callingserver/src/test/resources/session-records/ServerCallAsyncLiveTests.runAddRemoveScenarioWithResponseAsync[1].json +++ b/sdk/communication/azure-communication-callingserver/src/test/resources/session-records/ServerCallAsyncLiveTests.runAddRemoveScenarioWithResponseAsync[1].json @@ -4,71 +4,77 @@ "Uri" : "https://REDACTED.communication.azure.com/calling/callConnections?api-version=2021-06-15-preview", "Headers" : { "User-Agent" : "azsdk-java-azure-communication-callingserver/1.0.0-beta.1 (16.0.1; Windows 10; 10.0)", + "x-ms-client-request-id" : "e6a3f395-a275-4e5b-8366-f4067cc2424c", "Content-Type" : "application/json" }, "Response" : { "X-Cache" : "CONFIG_NOCACHE", "content-length" : "110", "retry-after" : "0", - "X-Azure-Ref" : "0YMnBYAAAAABubX4mfQ8KS6SLXpHWvdSCREZXMzBFREdFMDUxNAA5ZmM3YjUxOS1hOGNjLTRmODktOTM1ZS1jOTE0OGFlMDllODE=", + "X-Azure-Ref" : "0HVrJYAAAAABOhvhJp0fIQ5dYIgTig2U5REZXMzBFREdFMDUwNwA5ZmM3YjUxOS1hOGNjLTRmODktOTM1ZS1jOTE0OGFlMDllODE=", "StatusCode" : "201", - "X-Microsoft-Skype-Chain-ID" : "1ba536ab-1a96-46ee-9ff5-0313529f1a8f", - "Body" : "{\"callLegId\":\"841f1300-1337-4a7c-9e2e-843ea6ee00fd\",\"callConnectionId\":\"841f1300-1337-4a7c-9e2e-843ea6ee00fd\"}", - "Date" : "Thu, 10 Jun 2021 08:12:17 GMT", - "Content-Type" : "application/json; charset=utf-8", - "Client-Request-Id" : "8faa6ad1-2a47-47fb-92b1-d1f74da10305" + "X-Microsoft-Skype-Chain-ID" : "db8807ff-a257-4954-9d33-d7c41b656bab", + "Body" : "{\"callLegId\":\"28201300-cb09-4fa2-83af-4a5047999d33\",\"callConnectionId\":\"28201300-cb09-4fa2-83af-4a5047999d33\"}", + "x-ms-client-request-id" : "e6a3f395-a275-4e5b-8366-f4067cc2424c", + "Date" : "Wed, 16 Jun 2021 01:55:42 GMT", + "Content-Type" : "application/json; charset=utf-8" }, "Exception" : null }, { "Method" : "POST", - "Uri" : "https://REDACTED.communication.azure.com/calling/serverCalls/aHR0cHM6Ly94LWNvbnYtdXN3ZS0wMS5jb252LnNreXBlLmNvbS9jb252L0NUT014YmNIRmttZ1BqbE5kYjExNlE_aT0yJmU9NjM3NTg0Mzk2NDM5NzQ5NzY4/participants?api-version=2021-06-15-preview", + "Uri" : "https://REDACTED.communication.azure.com/calling/serverCalls/aHR0cHM6Ly94LWNvbnYtdXN3ZS0wMS5jb252LnNreXBlLmNvbS9jb252L0pndHZNTW5mYUU2N3ViU3FKb19ndFE_aT0xJmU9NjM3NTg0MzkzMzg3ODg3MDI3/participants?api-version=2021-06-15-preview", "Headers" : { "User-Agent" : "azsdk-java-azure-communication-callingserver/1.0.0-beta.1 (16.0.1; Windows 10; 10.0)", + "x-ms-client-request-id" : "399296a2-a96a-4993-8fc0-3d048c0f2d32", "Content-Type" : "application/json" }, "Response" : { "X-Cache" : "CONFIG_NOCACHE", - "content-length" : "0", + "content-length" : "56", "retry-after" : "0", - "X-Azure-Ref" : "0hsnBYAAAAAAbk5Bb74xVSqHaTlc3/pYnREZXMzBFREdFMDUxNAA5ZmM3YjUxOS1hOGNjLTRmODktOTM1ZS1jOTE0OGFlMDllODE=", + "X-Azure-Ref" : "0QVrJYAAAAACzEhN0JacUSLsyU1ERejaYREZXMzBFREdFMDUwNwA5ZmM3YjUxOS1hOGNjLTRmODktOTM1ZS1jOTE0OGFlMDllODE=", "StatusCode" : "202", - "X-Microsoft-Skype-Chain-ID" : "b732e3f0-12b3-429d-aed7-846dbe0de149", - "Date" : "Thu, 10 Jun 2021 08:12:54 GMT", - "Client-Request-Id" : "ba8d41fa-d366-4a39-a3fd-d30f2a8dfd07" + "X-Microsoft-Skype-Chain-ID" : "988677f8-d2c6-487a-8da4-3ec63bb74f5a", + "Body" : "{\"participantId\":\"4d10b38c-5a66-4bd2-9324-dae6b9c2a5f0\"}", + "x-ms-client-request-id" : "399296a2-a96a-4993-8fc0-3d048c0f2d32", + "Date" : "Wed, 16 Jun 2021 01:56:21 GMT", + "Content-Type" : "application/json; charset=utf-8" }, "Exception" : null }, { "Method" : "DELETE", - "Uri" : "https://REDACTED.communication.azure.com/calling/serverCalls/aHR0cHM6Ly94LWNvbnYtdXN3ZS0wMS5jb252LnNreXBlLmNvbS9jb252L0NUT014YmNIRmttZ1BqbE5kYjExNlE_aT0yJmU9NjM3NTg0Mzk2NDM5NzQ5NzY4/participants/b133b1f3-4a11-49e4-abe0-ac9fdd660634?api-version=2021-06-15-preview", + "Uri" : "https://REDACTED.communication.azure.com/calling/serverCalls/aHR0cHM6Ly94LWNvbnYtdXN3ZS0wMS5jb252LnNreXBlLmNvbS9jb252L0pndHZNTW5mYUU2N3ViU3FKb19ndFE_aT0xJmU9NjM3NTg0MzkzMzg3ODg3MDI3/participants/4d10b38c-5a66-4bd2-9324-dae6b9c2a5f0?api-version=2021-06-15-preview", "Headers" : { - "User-Agent" : "azsdk-java-azure-communication-callingserver/1.0.0-beta.1 (16.0.1; Windows 10; 10.0)" + "User-Agent" : "azsdk-java-azure-communication-callingserver/1.0.0-beta.1 (16.0.1; Windows 10; 10.0)", + "x-ms-client-request-id" : "b4f50ae7-7837-4ae9-ae9d-4b4e9866aa74" }, "Response" : { "X-Cache" : "CONFIG_NOCACHE", "content-length" : "0", "retry-after" : "0", - "X-Azure-Ref" : "0psnBYAAAAACjREq/ejDiSovPTuo6B1RFREZXMzBFREdFMDUxNAA5ZmM3YjUxOS1hOGNjLTRmODktOTM1ZS1jOTE0OGFlMDllODE=", + "X-Azure-Ref" : "0VVrJYAAAAADzCxQEmLS9Q7GWH3tar9S5REZXMzBFREdFMDUwNwA5ZmM3YjUxOS1hOGNjLTRmODktOTM1ZS1jOTE0OGFlMDllODE=", "StatusCode" : "202", - "X-Microsoft-Skype-Chain-ID" : "83f7ce54-d253-401e-a7e4-527e020a39f2", - "Date" : "Thu, 10 Jun 2021 08:13:26 GMT", - "Client-Request-Id" : "74fd86de-709d-4d7d-b4f6-0e941f01ea13" + "X-Microsoft-Skype-Chain-ID" : "fc4160a1-3188-4333-8f5e-1054f4519fd8", + "x-ms-client-request-id" : "b4f50ae7-7837-4ae9-ae9d-4b4e9866aa74", + "Date" : "Wed, 16 Jun 2021 01:56:39 GMT" }, "Exception" : null }, { "Method" : "POST", - "Uri" : "https://REDACTED.communication.azure.com/calling/callConnections/841f1300-1337-4a7c-9e2e-843ea6ee00fd/:hangup?api-version=2021-06-15-preview", + "Uri" : "https://REDACTED.communication.azure.com/calling/callConnections/28201300-cb09-4fa2-83af-4a5047999d33/:hangup?api-version=2021-06-15-preview", "Headers" : { - "User-Agent" : "azsdk-java-azure-communication-callingserver/1.0.0-beta.1 (16.0.1; Windows 10; 10.0)" + "User-Agent" : "azsdk-java-azure-communication-callingserver/1.0.0-beta.1 (16.0.1; Windows 10; 10.0)", + "x-ms-client-request-id" : "c37951e7-4cfe-47da-ae09-eef1bd63f564" }, "Response" : { "X-Cache" : "CONFIG_NOCACHE", "content-length" : "0", "retry-after" : "0", - "X-Azure-Ref" : "0rMnBYAAAAABekUSsuaL8TpN3SYsaq/lYREZXMzBFREdFMDUxNAA5ZmM3YjUxOS1hOGNjLTRmODktOTM1ZS1jOTE0OGFlMDllODE=", + "X-Azure-Ref" : "0b1rJYAAAAAAj2r+UnuLJQYitLxSvwhwZREZXMzBFREdFMDUwNwA5ZmM3YjUxOS1hOGNjLTRmODktOTM1ZS1jOTE0OGFlMDllODE=", "StatusCode" : "202", - "X-Microsoft-Skype-Chain-ID" : "63d62f4c-7b2e-4f27-9d5e-7a64ccf9b612", - "Date" : "Thu, 10 Jun 2021 08:13:32 GMT", - "Client-Request-Id" : "f24ddcbf-5eb8-4caa-8b80-71e06f473a85" + "X-Microsoft-Skype-Chain-ID" : "84e2f1a2-d90b-48c8-aa5f-56acd9fdf818", + "x-ms-client-request-id" : "c37951e7-4cfe-47da-ae09-eef1bd63f564", + "Date" : "Wed, 16 Jun 2021 01:57:02 GMT" }, "Exception" : null } ], diff --git a/sdk/communication/azure-communication-callingserver/src/test/resources/session-records/ServerCallLiveTests.runAddRemoveScenarioWithResponse[1].json b/sdk/communication/azure-communication-callingserver/src/test/resources/session-records/ServerCallLiveTests.runAddRemoveScenarioWithResponse[1].json index 7efc291049395..baefb5b46b47c 100644 --- a/sdk/communication/azure-communication-callingserver/src/test/resources/session-records/ServerCallLiveTests.runAddRemoveScenarioWithResponse[1].json +++ b/sdk/communication/azure-communication-callingserver/src/test/resources/session-records/ServerCallLiveTests.runAddRemoveScenarioWithResponse[1].json @@ -4,71 +4,77 @@ "Uri" : "https://REDACTED.communication.azure.com/calling/callConnections?api-version=2021-06-15-preview", "Headers" : { "User-Agent" : "azsdk-java-azure-communication-callingserver/1.0.0-beta.1 (16.0.1; Windows 10; 10.0)", + "x-ms-client-request-id" : "9a43d203-3996-4317-b7a4-25f70bdf2ef6", "Content-Type" : "application/json" }, "Response" : { "X-Cache" : "CONFIG_NOCACHE", "content-length" : "110", "retry-after" : "0", - "X-Azure-Ref" : "0csXBYAAAAAD8TwvuuVaQSZs0/7eyxTguREZXMzBFREdFMDUyMgA5ZmM3YjUxOS1hOGNjLTRmODktOTM1ZS1jOTE0OGFlMDllODE=", + "X-Azure-Ref" : "0VFfJYAAAAABngC9JAXHATbCAGuJlFvdiREZXMzBFREdFMDUxNwA5ZmM3YjUxOS1hOGNjLTRmODktOTM1ZS1jOTE0OGFlMDllODE=", "StatusCode" : "201", - "X-Microsoft-Skype-Chain-ID" : "24cbd24f-2e98-42dd-b8f9-a71a24d8a636", - "Body" : "{\"callLegId\":\"bf201300-7563-4daf-9b7a-3f0c759b645f\",\"callConnectionId\":\"bf201300-7563-4daf-9b7a-3f0c759b645f\"}", - "Date" : "Thu, 10 Jun 2021 07:55:31 GMT", - "Content-Type" : "application/json; charset=utf-8", - "Client-Request-Id" : "81c06d4f-03ad-4dac-b115-24d3c75c1075" + "X-Microsoft-Skype-Chain-ID" : "4cd9c7af-1867-4f2e-80d0-8425037e42f8", + "Body" : "{\"callLegId\":\"91201300-acfa-412e-b0cb-112334a659c1\",\"callConnectionId\":\"91201300-acfa-412e-b0cb-112334a659c1\"}", + "x-ms-client-request-id" : "9a43d203-3996-4317-b7a4-25f70bdf2ef6", + "Date" : "Wed, 16 Jun 2021 01:43:49 GMT", + "Content-Type" : "application/json; charset=utf-8" }, "Exception" : null }, { "Method" : "POST", - "Uri" : "https://REDACTED.communication.azure.com/calling/serverCalls/aHR0cHM6Ly94LWNvbnYtdXN3ZS0wMS5jb252LnNreXBlLmNvbS9jb252L1lXS2R2TTNRc0Vpc0VNYVUtNlhvSlE_aT0yJmU9NjM3NTg0Mzk2NDM5NzQ5NzY4/participants?api-version=2021-06-15-preview", + "Uri" : "https://REDACTED.communication.azure.com/calling/serverCalls/aHR0cHM6Ly94LWNvbnYtdXN3ZS0wMS5jb252LnNreXBlLmNvbS9jb252L0Z1MENEVF9lLWtPalRtdjlXMDFuSXc_aT0wJmU9NjM3NTg0MzkwMjcxMzg0MTc3/participants?api-version=2021-06-15-preview", "Headers" : { "User-Agent" : "azsdk-java-azure-communication-callingserver/1.0.0-beta.1 (16.0.1; Windows 10; 10.0)", + "x-ms-client-request-id" : "081e5bcb-abdd-42f5-bfbd-1bea428f7a60", "Content-Type" : "application/json" }, "Response" : { "X-Cache" : "CONFIG_NOCACHE", - "content-length" : "0", + "content-length" : "56", "retry-after" : "0", - "X-Azure-Ref" : "0o8XBYAAAAABl5a6WccLzTYKEt0d0YVkKREZXMzBFREdFMDUyMgA5ZmM3YjUxOS1hOGNjLTRmODktOTM1ZS1jOTE0OGFlMDllODE=", + "X-Azure-Ref" : "0gFfJYAAAAAC2PcJr27m1Qp1WWa9Dy8VUREZXMzBFREdFMDUxNwA5ZmM3YjUxOS1hOGNjLTRmODktOTM1ZS1jOTE0OGFlMDllODE=", "StatusCode" : "202", - "X-Microsoft-Skype-Chain-ID" : "e8177e83-7a99-4999-9ed5-2d361e1af7ee", - "Date" : "Thu, 10 Jun 2021 07:56:19 GMT", - "Client-Request-Id" : "32339b79-6aea-49cb-aca4-37eaf3a08176" + "X-Microsoft-Skype-Chain-ID" : "382661b0-0767-480c-b674-afdb0bec5aeb", + "Body" : "{\"participantId\":\"7680f30d-8ebc-4233-85f2-6994bf5c7eee\"}", + "x-ms-client-request-id" : "081e5bcb-abdd-42f5-bfbd-1bea428f7a60", + "Date" : "Wed, 16 Jun 2021 01:44:34 GMT", + "Content-Type" : "application/json; charset=utf-8" }, "Exception" : null }, { "Method" : "DELETE", - "Uri" : "https://REDACTED.communication.azure.com/calling/serverCalls/aHR0cHM6Ly94LWNvbnYtdXN3ZS0wMS5jb252LnNreXBlLmNvbS9jb252L1lXS2R2TTNRc0Vpc0VNYVUtNlhvSlE_aT0yJmU9NjM3NTg0Mzk2NDM5NzQ5NzY4/participants/76b33acb-5097-4af0-a646-e07ccee48957?api-version=2021-06-15-preview", + "Uri" : "https://REDACTED.communication.azure.com/calling/serverCalls/aHR0cHM6Ly94LWNvbnYtdXN3ZS0wMS5jb252LnNreXBlLmNvbS9jb252L0Z1MENEVF9lLWtPalRtdjlXMDFuSXc_aT0wJmU9NjM3NTg0MzkwMjcxMzg0MTc3/participants/7680f30d-8ebc-4233-85f2-6994bf5c7eee?api-version=2021-06-15-preview", "Headers" : { - "User-Agent" : "azsdk-java-azure-communication-callingserver/1.0.0-beta.1 (16.0.1; Windows 10; 10.0)" + "User-Agent" : "azsdk-java-azure-communication-callingserver/1.0.0-beta.1 (16.0.1; Windows 10; 10.0)", + "x-ms-client-request-id" : "19d2ce57-3be4-4a1c-a27c-890c0e192d9a" }, "Response" : { "X-Cache" : "CONFIG_NOCACHE", "content-length" : "0", "retry-after" : "0", - "X-Azure-Ref" : "0ycXBYAAAAAAN4NnqJX2IQ44vzNuFBHpVREZXMzBFREdFMDUyMgA5ZmM3YjUxOS1hOGNjLTRmODktOTM1ZS1jOTE0OGFlMDllODE=", + "X-Azure-Ref" : "0jVfJYAAAAADDL5h88N/jTpOSyB9Vstr1REZXMzBFREdFMDUxNwA5ZmM3YjUxOS1hOGNjLTRmODktOTM1ZS1jOTE0OGFlMDllODE=", "StatusCode" : "202", - "X-Microsoft-Skype-Chain-ID" : "37291ab9-cc92-4a7a-8759-97329c2d6d4e", - "Date" : "Thu, 10 Jun 2021 07:56:58 GMT", - "Client-Request-Id" : "7e2eab4f-43c6-4efb-87ae-fe3469f3a53f" + "X-Microsoft-Skype-Chain-ID" : "d6c9c5df-257d-4125-9c18-366f386131e7", + "x-ms-client-request-id" : "19d2ce57-3be4-4a1c-a27c-890c0e192d9a", + "Date" : "Wed, 16 Jun 2021 01:44:47 GMT" }, "Exception" : null }, { "Method" : "POST", - "Uri" : "https://REDACTED.communication.azure.com/calling/callConnections/bf201300-7563-4daf-9b7a-3f0c759b645f/:hangup?api-version=2021-06-15-preview", + "Uri" : "https://REDACTED.communication.azure.com/calling/callConnections/91201300-acfa-412e-b0cb-112334a659c1/:hangup?api-version=2021-06-15-preview", "Headers" : { - "User-Agent" : "azsdk-java-azure-communication-callingserver/1.0.0-beta.1 (16.0.1; Windows 10; 10.0)" + "User-Agent" : "azsdk-java-azure-communication-callingserver/1.0.0-beta.1 (16.0.1; Windows 10; 10.0)", + "x-ms-client-request-id" : "b3b49b35-dd8f-42ba-8894-1f7ab96074c5" }, "Response" : { "X-Cache" : "CONFIG_NOCACHE", "content-length" : "0", "retry-after" : "0", - "X-Azure-Ref" : "0zMXBYAAAAABfEyALuTz4S5BX8j7vKyaxREZXMzBFREdFMDUyMgA5ZmM3YjUxOS1hOGNjLTRmODktOTM1ZS1jOTE0OGFlMDllODE=", + "X-Azure-Ref" : "0llfJYAAAAACAeo9AeS6xRas9CGR0+aDjREZXMzBFREdFMDUxNwA5ZmM3YjUxOS1hOGNjLTRmODktOTM1ZS1jOTE0OGFlMDllODE=", "StatusCode" : "202", - "X-Microsoft-Skype-Chain-ID" : "ea2bfc55-cf96-48b2-9fcf-2a2583352f76", - "Date" : "Thu, 10 Jun 2021 07:56:59 GMT", - "Client-Request-Id" : "dd759dce-79c7-4690-b8dd-ac66fa8cb337" + "X-Microsoft-Skype-Chain-ID" : "c798a7c3-92b8-4d26-bc31-0be6b2d0ae34", + "x-ms-client-request-id" : "b3b49b35-dd8f-42ba-8894-1f7ab96074c5", + "Date" : "Wed, 16 Jun 2021 01:44:53 GMT" }, "Exception" : null } ], diff --git a/sdk/communication/azure-communication-callingserver/src/test/resources/session-records/ServerCallLiveTests.runAddRemoveScenario[1].json b/sdk/communication/azure-communication-callingserver/src/test/resources/session-records/ServerCallLiveTests.runAddRemoveScenario[1].json index ac1dc7360f4e1..1962e07a1ccce 100644 --- a/sdk/communication/azure-communication-callingserver/src/test/resources/session-records/ServerCallLiveTests.runAddRemoveScenario[1].json +++ b/sdk/communication/azure-communication-callingserver/src/test/resources/session-records/ServerCallLiveTests.runAddRemoveScenario[1].json @@ -4,71 +4,77 @@ "Uri" : "https://REDACTED.communication.azure.com/calling/callConnections?api-version=2021-06-15-preview", "Headers" : { "User-Agent" : "azsdk-java-azure-communication-callingserver/1.0.0-beta.1 (16.0.1; Windows 10; 10.0)", + "x-ms-client-request-id" : "820e2db2-4d0f-4238-a9d0-2fa11586cfb2", "Content-Type" : "application/json" }, "Response" : { "X-Cache" : "CONFIG_NOCACHE", "content-length" : "110", "retry-after" : "0", - "X-Azure-Ref" : "0ksTBYAAAAADYFgWmLmlmSIyjgN7n/OiKQ0hHRURHRTE2MTMAOWZjN2I1MTktYThjYy00Zjg5LTkzNWUtYzkxNDhhZTA5ZTgx", + "X-Azure-Ref" : "022fJYAAAAAA61Ng8t7DdSoRVM/3In7HhREZXMzBFREdFMDUxNgA5ZmM3YjUxOS1hOGNjLTRmODktOTM1ZS1jOTE0OGFlMDllODE=", "StatusCode" : "201", - "X-Microsoft-Skype-Chain-ID" : "5f3b3522-1472-4c56-9e31-b1f1fc4aee58", - "Body" : "{\"callLegId\":\"5b1f1300-2023-41f9-9ff8-1f61191e18b3\",\"callConnectionId\":\"5b1f1300-2023-41f9-9ff8-1f61191e18b3\"}", - "Date" : "Thu, 10 Jun 2021 07:51:47 GMT", - "Content-Type" : "application/json; charset=utf-8", - "Client-Request-Id" : "8aa11694-a230-4096-bfff-81fd9be7bead" + "X-Microsoft-Skype-Chain-ID" : "7bca3ee0-b954-477f-938e-12ba71b60ed1", + "Body" : "{\"callLegId\":\"a61f1300-d786-4929-a850-4e41c0ae8db1\",\"callConnectionId\":\"a61f1300-d786-4929-a850-4e41c0ae8db1\"}", + "x-ms-client-request-id" : "820e2db2-4d0f-4238-a9d0-2fa11586cfb2", + "Date" : "Wed, 16 Jun 2021 02:54:20 GMT", + "Content-Type" : "application/json; charset=utf-8" }, "Exception" : null }, { "Method" : "POST", - "Uri" : "https://REDACTED.communication.azure.com/calling/serverCalls/aHR0cHM6Ly94LWNvbnYtdXN3ZS0wMS5jb252LnNreXBlLmNvbS9jb252L1ktWjZ5dzFzWVVTUUdWX2xPQWk1X2c_aT0xJmU9NjM3NTg0MzkzMzg3ODg3MDI3/participants?api-version=2021-06-15-preview", + "Uri" : "https://REDACTED.communication.azure.com/calling/serverCalls/aHR0cHM6Ly94LWNvbnYtdXN3ZS0wMS5jb252LnNreXBlLmNvbS9jb252L1VDRl9RMVVlUGsyb0Y1YlJSMXliVXc_aT0xJmU9NjM3NTg0MzkzMzg3ODg3MDI3/participants?api-version=2021-06-15-preview", "Headers" : { "User-Agent" : "azsdk-java-azure-communication-callingserver/1.0.0-beta.1 (16.0.1; Windows 10; 10.0)", + "x-ms-client-request-id" : "a24ec21a-f9c2-4b74-a8f8-ff3b1a650478", "Content-Type" : "application/json" }, "Response" : { "X-Cache" : "CONFIG_NOCACHE", - "content-length" : "0", + "content-length" : "56", "retry-after" : "0", - "X-Azure-Ref" : "0scTBYAAAAAADoWtTLrSPS6r+ycoTKN9lQ0hHRURHRTE2MTMAOWZjN2I1MTktYThjYy00Zjg5LTkzNWUtYzkxNDhhZTA5ZTgx", + "X-Azure-Ref" : "0CWjJYAAAAABznlDRsaQ9RIIqADbG+4iYREZXMzBFREdFMDUxNgA5ZmM3YjUxOS1hOGNjLTRmODktOTM1ZS1jOTE0OGFlMDllODE=", "StatusCode" : "202", - "X-Microsoft-Skype-Chain-ID" : "a5619337-8e2d-4016-9de9-f7ffbcb27f7a", - "Date" : "Thu, 10 Jun 2021 07:52:17 GMT", - "Client-Request-Id" : "c61c1a4d-4411-4353-a78e-394da9de2968" + "X-Microsoft-Skype-Chain-ID" : "12f79f4b-8b72-453a-af35-9d234000dd48", + "Body" : "{\"participantId\":\"525e6e46-0a1a-4899-9f62-bf0cc8c3cb0d\"}", + "x-ms-client-request-id" : "a24ec21a-f9c2-4b74-a8f8-ff3b1a650478", + "Date" : "Wed, 16 Jun 2021 02:55:09 GMT", + "Content-Type" : "application/json; charset=utf-8" }, "Exception" : null }, { "Method" : "DELETE", - "Uri" : "https://REDACTED.communication.azure.com/calling/serverCalls/aHR0cHM6Ly94LWNvbnYtdXN3ZS0wMS5jb252LnNreXBlLmNvbS9jb252L1ktWjZ5dzFzWVVTUUdWX2xPQWk1X2c_aT0xJmU9NjM3NTg0MzkzMzg3ODg3MDI3/participants/72647661-033a-4d1a-b858-465375977be0?api-version=2021-06-15-preview", + "Uri" : "https://REDACTED.communication.azure.com/calling/serverCalls/aHR0cHM6Ly94LWNvbnYtdXN3ZS0wMS5jb252LnNreXBlLmNvbS9jb252L1VDRl9RMVVlUGsyb0Y1YlJSMXliVXc_aT0xJmU9NjM3NTg0MzkzMzg3ODg3MDI3/participants/525e6e46-0a1a-4899-9f62-bf0cc8c3cb0d?api-version=2021-06-15-preview", "Headers" : { - "User-Agent" : "azsdk-java-azure-communication-callingserver/1.0.0-beta.1 (16.0.1; Windows 10; 10.0)" + "User-Agent" : "azsdk-java-azure-communication-callingserver/1.0.0-beta.1 (16.0.1; Windows 10; 10.0)", + "x-ms-client-request-id" : "7a7f6511-4f19-4ebb-a793-0dacb6c70cbb" }, "Response" : { "X-Cache" : "CONFIG_NOCACHE", "content-length" : "0", "retry-after" : "0", - "X-Azure-Ref" : "02MTBYAAAAABfV+k0Qca0QqmmBsR1O00QQ0hHRURHRTE2MTMAOWZjN2I1MTktYThjYy00Zjg5LTkzNWUtYzkxNDhhZTA5ZTgx", + "X-Azure-Ref" : "0IGjJYAAAAACn6KtC5ZCEQJkqiBzAMdv8REZXMzBFREdFMDUxNgA5ZmM3YjUxOS1hOGNjLTRmODktOTM1ZS1jOTE0OGFlMDllODE=", "StatusCode" : "202", - "X-Microsoft-Skype-Chain-ID" : "fca27eb7-a86a-457c-82c3-a2d52e0ae9cd", - "Date" : "Thu, 10 Jun 2021 07:52:55 GMT", - "Client-Request-Id" : "1652deef-be42-4e58-a016-58e2e1871b5c" + "X-Microsoft-Skype-Chain-ID" : "dd923aed-f463-46f8-a3d1-ee4349c5d88c", + "x-ms-client-request-id" : "7a7f6511-4f19-4ebb-a793-0dacb6c70cbb", + "Date" : "Wed, 16 Jun 2021 02:55:29 GMT" }, "Exception" : null }, { "Method" : "POST", - "Uri" : "https://REDACTED.communication.azure.com/calling/callConnections/5b1f1300-2023-41f9-9ff8-1f61191e18b3/:hangup?api-version=2021-06-15-preview", + "Uri" : "https://REDACTED.communication.azure.com/calling/callConnections/a61f1300-d786-4929-a850-4e41c0ae8db1/:hangup?api-version=2021-06-15-preview", "Headers" : { - "User-Agent" : "azsdk-java-azure-communication-callingserver/1.0.0-beta.1 (16.0.1; Windows 10; 10.0)" + "User-Agent" : "azsdk-java-azure-communication-callingserver/1.0.0-beta.1 (16.0.1; Windows 10; 10.0)", + "x-ms-client-request-id" : "47c03438-59bd-44a2-bccc-6401b0c92f90" }, "Response" : { "X-Cache" : "CONFIG_NOCACHE", "content-length" : "0", "retry-after" : "0", - "X-Azure-Ref" : "03MTBYAAAAACatTaHAzB2SKJWBGpW7Sj6Q0hHRURHRTE2MTMAOWZjN2I1MTktYThjYy00Zjg5LTkzNWUtYzkxNDhhZTA5ZTgx", + "X-Azure-Ref" : "0JGjJYAAAAADxSAVGV68IQLGVuui7jxk3REZXMzBFREdFMDUxNgA5ZmM3YjUxOS1hOGNjLTRmODktOTM1ZS1jOTE0OGFlMDllODE=", "StatusCode" : "202", - "X-Microsoft-Skype-Chain-ID" : "ddf56d8b-9b3e-4468-9018-f3d7ac44aa56", - "Date" : "Thu, 10 Jun 2021 07:52:59 GMT", - "Client-Request-Id" : "0a7658bc-6048-4f5a-af64-397f1d0a7289" + "X-Microsoft-Skype-Chain-ID" : "3dec0465-dc66-4462-a104-4892c7565231", + "x-ms-client-request-id" : "47c03438-59bd-44a2-bccc-6401b0c92f90", + "Date" : "Wed, 16 Jun 2021 02:55:31 GMT" }, "Exception" : null } ], From 2fde4dd3f644d361e2aa76378017f2b902a9485f Mon Sep 17 00:00:00 2001 From: Arif Saikat <71465659+arifsaikat-microsoft@users.noreply.github.com> Date: Wed, 16 Jun 2021 00:41:44 -0700 Subject: [PATCH 08/11] fix links (#22318) --- .../azure-communication-callingserver/CHANGELOG.md | 2 +- sdk/communication/azure-communication-callingserver/README.md | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/sdk/communication/azure-communication-callingserver/CHANGELOG.md b/sdk/communication/azure-communication-callingserver/CHANGELOG.md index 03d437b41ac8e..0814eb8642b9e 100644 --- a/sdk/communication/azure-communication-callingserver/CHANGELOG.md +++ b/sdk/communication/azure-communication-callingserver/CHANGELOG.md @@ -14,6 +14,6 @@ This is a Public Preview version, so breaking changes are possible in subsequent - Add and remove participants from the call. -[read_me]: https://github.com/Azure/azure-sdk-for-java/blob/feature/communication-ServerCalling/sdk/communication/azure-communication-callingserver/README.md +[read_me]: https://github.com/Azure/azure-sdk-for-java/tree/master/sdk/communication/azure-communication-callingserver/README.md diff --git a/sdk/communication/azure-communication-callingserver/README.md b/sdk/communication/azure-communication-callingserver/README.md index 6227e999aaf60..8b5d665635f24 100644 --- a/sdk/communication/azure-communication-callingserver/README.md +++ b/sdk/communication/azure-communication-callingserver/README.md @@ -174,4 +174,4 @@ Check out other client libraries for Azure Communication Services [product_docs]: https://docs.microsoft.com/azure/communication-services/ [package]: https://search.maven.org/artifact/com.azure/azure-communication-callingserver [api_documentation]: https://aka.ms/java-docs -[source]: https://github.com/Azure/azure-sdk-for-java/tree/feature/communication-ServerCalling/sdk/communication/azure-communication-callingserver/src +[source]: https://github.com/Azure/azure-sdk-for-java/tree/master/sdk/communication/azure-communication-callingserver/src From 853706563483fedd6fd6351f379261380e9e2dae Mon Sep 17 00:00:00 2001 From: Arif Saikat <71465659+arifsaikat-microsoft@users.noreply.github.com> Date: Wed, 16 Jun 2021 11:21:27 -0700 Subject: [PATCH 09/11] skip test refactor (#22324) --- .../CallConnectionAsyncLiveTests.java | 68 ++++++------------- .../CallConnectionLiveTests.java | 68 ++++++------------- .../DownloadContentAsyncLiveTests.java | 61 +++++------------ .../DownloadContentLiveTests.java | 26 ++----- .../ServerCallAsyncLiveTests.java | 24 ++----- .../callingserver/ServerCallLiveTests.java | 24 ++----- 6 files changed, 77 insertions(+), 194 deletions(-) diff --git a/sdk/communication/azure-communication-callingserver/src/test/java/com/azure/communication/callingserver/CallConnectionAsyncLiveTests.java b/sdk/communication/azure-communication-callingserver/src/test/java/com/azure/communication/callingserver/CallConnectionAsyncLiveTests.java index dc3fa8d60de99..f3c2426363c7b 100644 --- a/sdk/communication/azure-communication-callingserver/src/test/java/com/azure/communication/callingserver/CallConnectionAsyncLiveTests.java +++ b/sdk/communication/azure-communication-callingserver/src/test/java/com/azure/communication/callingserver/CallConnectionAsyncLiveTests.java @@ -14,7 +14,7 @@ import com.azure.communication.common.PhoneNumberIdentifier; import com.azure.core.http.HttpClient; import com.azure.core.http.rest.Response; -import com.azure.core.test.TestMode; +import org.junit.jupiter.api.condition.DisabledIfEnvironmentVariable; import org.junit.jupiter.params.ParameterizedTest; import org.junit.jupiter.params.provider.MethodSource; @@ -27,15 +27,10 @@ public class CallConnectionAsyncLiveTests extends CallingServerTestBase { @ParameterizedTest @MethodSource("com.azure.core.test.TestBase#getHttpClients") + @DisabledIfEnvironmentVariable( + named = "COMMUNICATION_SKIP_INT_CALLINGSERVER_TEST", + matches = "(?i)(true)") public void runCreatePlayCancelHangupScenarioAsync(HttpClient httpClient) { - - // This test requires human intervention to record and - // will not function in live mode. - if (this.getTestMode() == TestMode.LIVE) { - System.out.println("Warning: Test is skipped, does not support live mode."); - return; - } - CallingServerClientBuilder builder = getCallClientUsingConnectionString(httpClient); CallingServerAsyncClient callingServerAsyncClient = setupAsyncClient(builder, "runCreatePlayCancelHangupScenarioAsync"); @@ -83,15 +78,10 @@ public void runCreatePlayCancelHangupScenarioAsync(HttpClient httpClient) { @ParameterizedTest @MethodSource("com.azure.core.test.TestBase#getHttpClients") + @DisabledIfEnvironmentVariable( + named = "COMMUNICATION_SKIP_INT_CALLINGSERVER_TEST", + matches = "(?i)(true)") public void runCreatePlayCancelHangupScenarioWithResponseAsync(HttpClient httpClient) { - - // This test requires human intervention to record and - // will not function in live mode. - if (this.getTestMode() == TestMode.LIVE) { - System.out.println("Warning: Test is skipped, does not support live mode."); - return; - } - CallingServerClientBuilder builder = getCallClientUsingConnectionString(httpClient); CallingServerAsyncClient callingServerAsyncClient = setupAsyncClient(builder, "runCreatePlayCancelHangupScenarioWithResponseAsync"); @@ -143,15 +133,10 @@ public void runCreatePlayCancelHangupScenarioWithResponseAsync(HttpClient httpCl @ParameterizedTest @MethodSource("com.azure.core.test.TestBase#getHttpClients") + @DisabledIfEnvironmentVariable( + named = "COMMUNICATION_SKIP_INT_CALLINGSERVER_TEST", + matches = "(?i)(true)") public void runCreateAddRemoveHangupScenarioAsync(HttpClient httpClient) { - - // This test requires human intervention to record and - // will not function in live mode. - if (this.getTestMode() == TestMode.LIVE) { - System.out.println("Warning: Test is skipped, does not support live mode."); - return; - } - CallingServerClientBuilder builder = getCallClientUsingConnectionString(httpClient); CallingServerAsyncClient callingServerAsyncClient = setupAsyncClient(builder, "runCreateAddRemoveHangupScenarioAsync"); @@ -194,15 +179,10 @@ public void runCreateAddRemoveHangupScenarioAsync(HttpClient httpClient) { @ParameterizedTest @MethodSource("com.azure.core.test.TestBase#getHttpClients") + @DisabledIfEnvironmentVariable( + named = "COMMUNICATION_SKIP_INT_CALLINGSERVER_TEST", + matches = "(?i)(true)") public void runCreateAddRemoveHangupScenarioWithResponseAsync(HttpClient httpClient) { - - // This test requires human intervention to record and - // will not function in live mode. - if (this.getTestMode() == TestMode.LIVE) { - System.out.println("Warning: Test is skipped, does not support live mode."); - return; - } - CallingServerClientBuilder builder = getCallClientUsingConnectionString(httpClient); CallingServerAsyncClient callingServerAsyncClient = setupAsyncClient(builder, "runCreateAddRemoveHangupScenarioWithResponseAsync"); @@ -252,15 +232,10 @@ public void runCreateAddRemoveHangupScenarioWithResponseAsync(HttpClient httpCli @ParameterizedTest @MethodSource("com.azure.core.test.TestBase#getHttpClients") + @DisabledIfEnvironmentVariable( + named = "COMMUNICATION_SKIP_INT_CALLINGSERVER_TEST", + matches = "(?i)(true)") public void runCreateJoinHangupScenarioAsync(HttpClient httpClient) { - - // This test requires human intervention to record and - // will not function in live mode. - if (this.getTestMode() == TestMode.LIVE) { - System.out.println("Warning: Test is skipped, does not support live mode."); - return; - } - CallingServerClientBuilder builder = getCallClientUsingConnectionString(httpClient); CallingServerAsyncClient callingServerAsyncClient = setupAsyncClient(builder, "runCreateJoinHangupScenarioAsync"); @@ -311,15 +286,10 @@ public void runCreateJoinHangupScenarioAsync(HttpClient httpClient) { @ParameterizedTest @MethodSource("com.azure.core.test.TestBase#getHttpClients") + @DisabledIfEnvironmentVariable( + named = "COMMUNICATION_SKIP_INT_CALLINGSERVER_TEST", + matches = "(?i)(true)") public void runCreateJoinHangupScenarioWithResponseAsync(HttpClient httpClient) { - - // This test requires human intervention to record and - // will not function in live mode. - if (this.getTestMode() == TestMode.LIVE) { - System.out.println("Warning: Test is skipped, does not support live mode."); - return; - } - CallingServerClientBuilder builder = getCallClientUsingConnectionString(httpClient); CallingServerAsyncClient callingServerAsyncClient = setupAsyncClient(builder, "runCreateJoinHangupScenarioWithResponseAsync"); diff --git a/sdk/communication/azure-communication-callingserver/src/test/java/com/azure/communication/callingserver/CallConnectionLiveTests.java b/sdk/communication/azure-communication-callingserver/src/test/java/com/azure/communication/callingserver/CallConnectionLiveTests.java index 8543845297775..6a4bffdd10ba3 100644 --- a/sdk/communication/azure-communication-callingserver/src/test/java/com/azure/communication/callingserver/CallConnectionLiveTests.java +++ b/sdk/communication/azure-communication-callingserver/src/test/java/com/azure/communication/callingserver/CallConnectionLiveTests.java @@ -14,7 +14,7 @@ import com.azure.communication.common.PhoneNumberIdentifier; import com.azure.core.http.HttpClient; import com.azure.core.http.rest.Response; -import com.azure.core.test.TestMode; +import org.junit.jupiter.api.condition.DisabledIfEnvironmentVariable; import org.junit.jupiter.params.ParameterizedTest; import org.junit.jupiter.params.provider.MethodSource; @@ -27,15 +27,10 @@ public class CallConnectionLiveTests extends CallingServerTestBase { @ParameterizedTest @MethodSource("com.azure.core.test.TestBase#getHttpClients") + @DisabledIfEnvironmentVariable( + named = "COMMUNICATION_SKIP_INT_CALLINGSERVER_TEST", + matches = "(?i)(true)") public void runCreatePlayCancelHangupScenario(HttpClient httpClient) { - - // This test requires human intervention to record and - // will not function in live mode. - if (this.getTestMode() == TestMode.LIVE) { - System.out.println("Warning: Test is skipped, does not support live mode."); - return; - } - CallingServerClientBuilder builder = getCallClientUsingConnectionString(httpClient); CallingServerClient callingServerClient = setupClient(builder, "runCreatePlayCancelHangupScenario"); @@ -81,15 +76,10 @@ public void runCreatePlayCancelHangupScenario(HttpClient httpClient) { @ParameterizedTest @MethodSource("com.azure.core.test.TestBase#getHttpClients") + @DisabledIfEnvironmentVariable( + named = "COMMUNICATION_SKIP_INT_CALLINGSERVER_TEST", + matches = "(?i)(true)") public void runCreatePlayCancelHangupScenarioWithResponse(HttpClient httpClient) { - - // This test requires human intervention to record and - // will not function in live mode. - if (this.getTestMode() == TestMode.LIVE) { - System.out.println("Warning: Test is skipped, does not support live mode."); - return; - } - CallingServerClientBuilder builder = getCallClientUsingConnectionString(httpClient); CallingServerClient callingServerClient = setupClient(builder, "runCreatePlayCancelHangupScenarioWithResponse"); @@ -142,15 +132,10 @@ public void runCreatePlayCancelHangupScenarioWithResponse(HttpClient httpClient) @ParameterizedTest @MethodSource("com.azure.core.test.TestBase#getHttpClients") + @DisabledIfEnvironmentVariable( + named = "COMMUNICATION_SKIP_INT_CALLINGSERVER_TEST", + matches = "(?i)(true)") public void runCreateAddRemoveHangupScenario(HttpClient httpClient) { - - // This test requires human intervention to record and - // will not function in live mode. - if (this.getTestMode() == TestMode.LIVE) { - System.out.println("Warning: Test is skipped, does not support live mode."); - return; - } - CallingServerClientBuilder builder = getCallClientUsingConnectionString(httpClient); CallingServerClient callingServerClient = setupClient(builder, "runCreateAddRemoveHangupScenario"); @@ -187,15 +172,10 @@ public void runCreateAddRemoveHangupScenario(HttpClient httpClient) { @ParameterizedTest @MethodSource("com.azure.core.test.TestBase#getHttpClients") + @DisabledIfEnvironmentVariable( + named = "COMMUNICATION_SKIP_INT_CALLINGSERVER_TEST", + matches = "(?i)(true)") public void runCreateAddRemoveHangupScenarioWithResponse(HttpClient httpClient) { - - // This test requires human intervention to record and - // will not function in live mode. - if (this.getTestMode() == TestMode.LIVE) { - System.out.println("Warning: Test is skipped, does not support live mode."); - return; - } - CallingServerClientBuilder builder = getCallClientUsingConnectionString(httpClient); CallingServerClient callingServerClient = setupClient(builder, "runCreateAddRemoveHangupScenarioWithResponse"); @@ -245,15 +225,10 @@ public void runCreateAddRemoveHangupScenarioWithResponse(HttpClient httpClient) @ParameterizedTest @MethodSource("com.azure.core.test.TestBase#getHttpClients") + @DisabledIfEnvironmentVariable( + named = "COMMUNICATION_SKIP_INT_CALLINGSERVER_TEST", + matches = "(?i)(true)") public void runCreateJoinHangupScenario(HttpClient httpClient) { - - // This test requires human intervention to record and - // will not function in live mode. - if (this.getTestMode() == TestMode.LIVE) { - System.out.println("Warning: Test is skipped, does not support live mode."); - return; - } - CallingServerClientBuilder builder = getCallClientUsingConnectionString(httpClient); CallingServerClient callingServerClient = setupClient(builder, "runCreateJoinHangupScenario"); @@ -298,15 +273,10 @@ public void runCreateJoinHangupScenario(HttpClient httpClient) { @ParameterizedTest @MethodSource("com.azure.core.test.TestBase#getHttpClients") + @DisabledIfEnvironmentVariable( + named = "COMMUNICATION_SKIP_INT_CALLINGSERVER_TEST", + matches = "(?i)(true)") public void runCreateJoinHangupScenarioWithResponse(HttpClient httpClient) { - - // This test requires human intervention to record and - // will not function in live mode. - if (this.getTestMode() == TestMode.LIVE) { - System.out.println("Warning: Test is skipped, does not support live mode."); - return; - } - CallingServerClientBuilder builder = getCallClientUsingConnectionString(httpClient); CallingServerClient callingServerClient = setupClient(builder, "runCreateJoinHangupScenarioWithResponse"); diff --git a/sdk/communication/azure-communication-callingserver/src/test/java/com/azure/communication/callingserver/DownloadContentAsyncLiveTests.java b/sdk/communication/azure-communication-callingserver/src/test/java/com/azure/communication/callingserver/DownloadContentAsyncLiveTests.java index 223cf15d9d6b8..ff209eb28b95f 100644 --- a/sdk/communication/azure-communication-callingserver/src/test/java/com/azure/communication/callingserver/DownloadContentAsyncLiveTests.java +++ b/sdk/communication/azure-communication-callingserver/src/test/java/com/azure/communication/callingserver/DownloadContentAsyncLiveTests.java @@ -7,8 +7,8 @@ import com.azure.communication.callingserver.models.ParallelDownloadOptions; import com.azure.core.http.HttpClient; import com.azure.core.http.rest.Response; -import com.azure.core.test.TestMode; import com.azure.core.util.FluxUtil; +import org.junit.jupiter.api.condition.DisabledIfEnvironmentVariable; import org.junit.jupiter.params.ParameterizedTest; import org.junit.jupiter.params.provider.MethodSource; import org.mockito.Mockito; @@ -21,10 +21,10 @@ import java.nio.file.Paths; import static org.hamcrest.CoreMatchers.equalTo; +import static org.hamcrest.CoreMatchers.is; import static org.hamcrest.CoreMatchers.notNullValue; -import static org.junit.jupiter.api.Assertions.assertThrows; import static org.hamcrest.MatcherAssert.assertThat; -import static org.hamcrest.CoreMatchers.is; +import static org.junit.jupiter.api.Assertions.assertThrows; import static org.junit.jupiter.api.Assertions.assertTrue; import static org.mockito.ArgumentMatchers.any; import static org.mockito.ArgumentMatchers.anyLong; @@ -35,15 +35,10 @@ public class DownloadContentAsyncLiveTests extends CallingServerTestBase { @ParameterizedTest @MethodSource("com.azure.core.test.TestBase#getHttpClients") + @DisabledIfEnvironmentVariable( + named = "COMMUNICATION_SKIP_INT_CALLINGSERVER_TEST", + matches = "(?i)(true)") public void downloadMetadataAsync(HttpClient httpClient) { - - // This test requires human intervention to record and - // will not function in live mode. - if (this.getTestMode() == TestMode.LIVE) { - System.out.println("Warning: Test is skipped, does not support live mode."); - return; - } - CallingServerClientBuilder builder = getConversationClientUsingConnectionString(httpClient); CallingServerAsyncClient conversationAsyncClient = setupAsyncClient(builder, "downloadMetadataAsync"); @@ -61,15 +56,10 @@ public void downloadMetadataAsync(HttpClient httpClient) { @ParameterizedTest @MethodSource("com.azure.core.test.TestBase#getHttpClients") + @DisabledIfEnvironmentVariable( + named = "COMMUNICATION_SKIP_INT_CALLINGSERVER_TEST", + matches = "(?i)(true)") public void downloadMetadataRetryingAsync(HttpClient httpClient) { - - // This test requires human intervention to record and - // will not function in live mode. - if (this.getTestMode() == TestMode.LIVE) { - System.out.println("Warning: Test is skipped, does not support live mode."); - return; - } - CallingServerClientBuilder builder = getConversationClientUsingConnectionString(httpClient); CallingServerAsyncClient conversationAsyncClient = setupAsyncClient(builder, "downloadMetadataAsync"); @@ -87,15 +77,10 @@ public void downloadMetadataRetryingAsync(HttpClient httpClient) { @ParameterizedTest @MethodSource("com.azure.core.test.TestBase#getHttpClients") + @DisabledIfEnvironmentVariable( + named = "COMMUNICATION_SKIP_INT_CALLINGSERVER_TEST", + matches = "(?i)(true)") public void downloadVideoAsync(HttpClient httpClient) { - - // This test requires human intervention to record and - // will not function in live mode. - if (this.getTestMode() == TestMode.LIVE) { - System.out.println("Warning: Test is skipped, does not support live mode."); - return; - } - CallingServerClientBuilder builder = getConversationClientUsingConnectionString(httpClient); CallingServerAsyncClient conversationAsyncClient = setupAsyncClient(builder, "downloadVideoAsync"); @@ -113,15 +98,10 @@ public void downloadVideoAsync(HttpClient httpClient) { @ParameterizedTest @MethodSource("com.azure.core.test.TestBase#getHttpClients") + @DisabledIfEnvironmentVariable( + named = "COMMUNICATION_SKIP_INT_CALLINGSERVER_TEST", + matches = "(?i)(true)") public void downloadToFileAsync(HttpClient httpClient) { - - // This test requires human intervention to record and - // will not function in live mode. - if (this.getTestMode() == TestMode.LIVE) { - System.out.println("Warning: Test is skipped, does not support live mode."); - return; - } - CallingServerClientBuilder builder = getConversationClientUsingConnectionString(httpClient); CallingServerAsyncClient conversationAsyncClient = setupAsyncClient(builder, "downloadToFileAsync"); AsynchronousFileChannel channel = Mockito.mock(AsynchronousFileChannel.class); @@ -152,15 +132,10 @@ public void downloadToFileAsync(HttpClient httpClient) { @ParameterizedTest @MethodSource("com.azure.core.test.TestBase#getHttpClients") + @DisabledIfEnvironmentVariable( + named = "COMMUNICATION_SKIP_INT_CALLINGSERVER_TEST", + matches = "(?i)(true)") public void downloadToFileRetryingAsync(HttpClient httpClient) { - - // This test requires human intervention to record and - // will not function in live mode. - if (this.getTestMode() == TestMode.LIVE) { - System.out.println("Warning: Test is skipped, does not support live mode."); - return; - } - CallingServerClientBuilder builder = getConversationClientUsingConnectionString(httpClient); CallingServerAsyncClient conversationAsyncClient = setupAsyncClient(builder, "downloadToFileAsync"); AsynchronousFileChannel channel = Mockito.mock(AsynchronousFileChannel.class); diff --git a/sdk/communication/azure-communication-callingserver/src/test/java/com/azure/communication/callingserver/DownloadContentLiveTests.java b/sdk/communication/azure-communication-callingserver/src/test/java/com/azure/communication/callingserver/DownloadContentLiveTests.java index 8689ca625fce9..fc0c00135073d 100644 --- a/sdk/communication/azure-communication-callingserver/src/test/java/com/azure/communication/callingserver/DownloadContentLiveTests.java +++ b/sdk/communication/azure-communication-callingserver/src/test/java/com/azure/communication/callingserver/DownloadContentLiveTests.java @@ -6,8 +6,7 @@ import com.azure.communication.callingserver.models.CallingServerErrorException; import com.azure.core.http.HttpClient; import com.azure.core.http.rest.Response; -import com.azure.core.test.TestMode; - +import org.junit.jupiter.api.condition.DisabledIfEnvironmentVariable; import org.junit.jupiter.params.ParameterizedTest; import org.junit.jupiter.params.provider.MethodSource; import org.mockito.Mockito; @@ -22,7 +21,6 @@ import static org.hamcrest.CoreMatchers.is; import static org.hamcrest.CoreMatchers.notNullValue; import static org.hamcrest.MatcherAssert.assertThat; - import static org.junit.jupiter.api.Assertions.assertThrows; import static org.mockito.Mockito.doThrow; @@ -30,15 +28,10 @@ public class DownloadContentLiveTests extends CallingServerTestBase { @ParameterizedTest @MethodSource("com.azure.core.test.TestBase#getHttpClients") + @DisabledIfEnvironmentVariable( + named = "COMMUNICATION_SKIP_INT_CALLINGSERVER_TEST", + matches = "(?i)(true)") public void downloadMetadata(HttpClient httpClient) throws UnsupportedEncodingException { - - // This test requires human intervention to record and - // will not function in live mode. - if (this.getTestMode() == TestMode.LIVE) { - System.out.println("Warning: Test is skipped, does not support live mode."); - return; - } - CallingServerClientBuilder builder = getConversationClientUsingConnectionString(httpClient); CallingServerClient conversationClient = setupClient(builder, "downloadMetadata"); @@ -55,15 +48,10 @@ public void downloadMetadata(HttpClient httpClient) throws UnsupportedEncodingEx @ParameterizedTest @MethodSource("com.azure.core.test.TestBase#getHttpClients") + @DisabledIfEnvironmentVariable( + named = "COMMUNICATION_SKIP_INT_CALLINGSERVER_TEST", + matches = "(?i)(true)") public void downloadVideo(HttpClient httpClient) { - - // This test requires human intervention to record and - // will not function in live mode. - if (this.getTestMode() == TestMode.LIVE) { - System.out.println("Warning: Test is skipped, does not support live mode."); - return; - } - CallingServerClientBuilder builder = getConversationClientUsingConnectionString(httpClient); CallingServerClient conversationClient = setupClient(builder, "downloadVideo"); diff --git a/sdk/communication/azure-communication-callingserver/src/test/java/com/azure/communication/callingserver/ServerCallAsyncLiveTests.java b/sdk/communication/azure-communication-callingserver/src/test/java/com/azure/communication/callingserver/ServerCallAsyncLiveTests.java index bd1fd5254e8f3..3c92fa4b2735f 100644 --- a/sdk/communication/azure-communication-callingserver/src/test/java/com/azure/communication/callingserver/ServerCallAsyncLiveTests.java +++ b/sdk/communication/azure-communication-callingserver/src/test/java/com/azure/communication/callingserver/ServerCallAsyncLiveTests.java @@ -18,7 +18,7 @@ import com.azure.communication.common.PhoneNumberIdentifier; import com.azure.core.http.HttpClient; import com.azure.core.http.rest.Response; -import com.azure.core.test.TestMode; +import org.junit.jupiter.api.condition.DisabledIfEnvironmentVariable; import org.junit.jupiter.params.ParameterizedTest; import org.junit.jupiter.params.provider.MethodSource; @@ -208,15 +208,10 @@ public void startRecordingFailsAsync(HttpClient httpClient) { @ParameterizedTest @MethodSource("com.azure.core.test.TestBase#getHttpClients") + @DisabledIfEnvironmentVariable( + named = "COMMUNICATION_SKIP_INT_CALLINGSERVER_TEST", + matches = "(?i)(true)") public void runAddRemoveScenarioAsync(HttpClient httpClient) { - - // This test requires human intervention to record and - // will not function in live mode. - if (this.getTestMode() == TestMode.LIVE) { - System.out.println("Warning: Test is skipped, does not support live mode."); - return; - } - CallingServerClientBuilder builder = getConversationClientUsingConnectionString(httpClient); CallingServerAsyncClient callingServerAsyncClient = setupAsyncClient(builder, "runAddRemoveScenarioAsync"); @@ -270,15 +265,10 @@ public void runAddRemoveScenarioAsync(HttpClient httpClient) { @ParameterizedTest @MethodSource("com.azure.core.test.TestBase#getHttpClients") + @DisabledIfEnvironmentVariable( + named = "COMMUNICATION_SKIP_INT_CALLINGSERVER_TEST", + matches = "(?i)(true)") public void runAddRemoveScenarioWithResponseAsync(HttpClient httpClient) { - - // This test requires human intervention to record and - // will not function in live mode. - if (this.getTestMode() == TestMode.LIVE) { - System.out.println("Warning: Test is skipped, does not support live mode."); - return; - } - CallingServerClientBuilder builder = getConversationClientUsingConnectionString(httpClient); CallingServerAsyncClient callingServerAsyncClient = setupAsyncClient(builder, "runAddRemoveScenarioWithResponseAsync"); diff --git a/sdk/communication/azure-communication-callingserver/src/test/java/com/azure/communication/callingserver/ServerCallLiveTests.java b/sdk/communication/azure-communication-callingserver/src/test/java/com/azure/communication/callingserver/ServerCallLiveTests.java index d58468ed7b60b..cd646e1c90dec 100644 --- a/sdk/communication/azure-communication-callingserver/src/test/java/com/azure/communication/callingserver/ServerCallLiveTests.java +++ b/sdk/communication/azure-communication-callingserver/src/test/java/com/azure/communication/callingserver/ServerCallLiveTests.java @@ -18,8 +18,8 @@ import com.azure.communication.common.PhoneNumberIdentifier; import com.azure.core.http.HttpClient; import com.azure.core.http.rest.Response; -import com.azure.core.test.TestMode; import com.azure.core.util.Context; +import org.junit.jupiter.api.condition.DisabledIfEnvironmentVariable; import org.junit.jupiter.params.ParameterizedTest; import org.junit.jupiter.params.provider.MethodSource; @@ -203,15 +203,10 @@ public void startRecordingFails(HttpClient httpClient) { @ParameterizedTest @MethodSource("com.azure.core.test.TestBase#getHttpClients") + @DisabledIfEnvironmentVariable( + named = "COMMUNICATION_SKIP_INT_CALLINGSERVER_TEST", + matches = "(?i)(true)") public void runAddRemoveScenario(HttpClient httpClient) { - - // This test requires human intervention to record and - // will not function in live mode. - if (this.getTestMode() == TestMode.LIVE) { - System.out.println("Warning: Test is skipped, does not support live mode."); - return; - } - CallingServerClientBuilder builder = getConversationClientUsingConnectionString(httpClient); CallingServerClient callingServerClient = setupClient(builder, "runAddRemoveScenario"); try { @@ -260,15 +255,10 @@ public void runAddRemoveScenario(HttpClient httpClient) { @ParameterizedTest @MethodSource("com.azure.core.test.TestBase#getHttpClients") + @DisabledIfEnvironmentVariable( + named = "COMMUNICATION_SKIP_INT_CALLINGSERVER_TEST", + matches = "(?i)(true)") public void runAddRemoveScenarioWithResponse(HttpClient httpClient) { - - // This test requires human intervention to record and - // will not function in live mode. - if (this.getTestMode() == TestMode.LIVE) { - System.out.println("Warning: Test is skipped, does not support live mode."); - return; - } - CallingServerClientBuilder builder = getConversationClientUsingConnectionString(httpClient); CallingServerClient callingServerClient = setupClient(builder, "runAddRemoveScenarioWithResponse"); From 9ea3e4072721631674ec0a10a45910dd4bbb885b Mon Sep 17 00:00:00 2001 From: Arif Saikat <71465659+arifsaikat-microsoft@users.noreply.github.com> Date: Wed, 16 Jun 2021 12:49:58 -0700 Subject: [PATCH 10/11] skip test refactor (#22327) --- .../CallConnectionAsyncLiveTests.java | 44 +++++++++++-------- .../CallConnectionLiveTests.java | 44 +++++++++++-------- .../DownloadContentAsyncLiveTests.java | 37 +++++++++------- .../DownloadContentLiveTests.java | 16 ++++--- .../ServerCallAsyncLiveTests.java | 16 ++++--- .../callingserver/ServerCallLiveTests.java | 16 ++++--- 6 files changed, 98 insertions(+), 75 deletions(-) diff --git a/sdk/communication/azure-communication-callingserver/src/test/java/com/azure/communication/callingserver/CallConnectionAsyncLiveTests.java b/sdk/communication/azure-communication-callingserver/src/test/java/com/azure/communication/callingserver/CallConnectionAsyncLiveTests.java index f3c2426363c7b..80a776f34a17e 100644 --- a/sdk/communication/azure-communication-callingserver/src/test/java/com/azure/communication/callingserver/CallConnectionAsyncLiveTests.java +++ b/sdk/communication/azure-communication-callingserver/src/test/java/com/azure/communication/callingserver/CallConnectionAsyncLiveTests.java @@ -14,7 +14,7 @@ import com.azure.communication.common.PhoneNumberIdentifier; import com.azure.core.http.HttpClient; import com.azure.core.http.rest.Response; -import org.junit.jupiter.api.condition.DisabledIfEnvironmentVariable; +import org.junit.jupiter.api.condition.EnabledIfEnvironmentVariable; import org.junit.jupiter.params.ParameterizedTest; import org.junit.jupiter.params.provider.MethodSource; @@ -27,9 +27,10 @@ public class CallConnectionAsyncLiveTests extends CallingServerTestBase { @ParameterizedTest @MethodSource("com.azure.core.test.TestBase#getHttpClients") - @DisabledIfEnvironmentVariable( - named = "COMMUNICATION_SKIP_INT_CALLINGSERVER_TEST", - matches = "(?i)(true)") + @EnabledIfEnvironmentVariable( + named = "RUN_CALLINGSERVER_TEST_RECORD", + matches = "(?i)(true)", + disabledReason = "Requires human intervention") public void runCreatePlayCancelHangupScenarioAsync(HttpClient httpClient) { CallingServerClientBuilder builder = getCallClientUsingConnectionString(httpClient); CallingServerAsyncClient callingServerAsyncClient = @@ -78,9 +79,10 @@ public void runCreatePlayCancelHangupScenarioAsync(HttpClient httpClient) { @ParameterizedTest @MethodSource("com.azure.core.test.TestBase#getHttpClients") - @DisabledIfEnvironmentVariable( - named = "COMMUNICATION_SKIP_INT_CALLINGSERVER_TEST", - matches = "(?i)(true)") + @EnabledIfEnvironmentVariable( + named = "RUN_CALLINGSERVER_TEST_RECORD", + matches = "(?i)(true)", + disabledReason = "Requires human intervention") public void runCreatePlayCancelHangupScenarioWithResponseAsync(HttpClient httpClient) { CallingServerClientBuilder builder = getCallClientUsingConnectionString(httpClient); CallingServerAsyncClient callingServerAsyncClient = @@ -133,9 +135,10 @@ public void runCreatePlayCancelHangupScenarioWithResponseAsync(HttpClient httpCl @ParameterizedTest @MethodSource("com.azure.core.test.TestBase#getHttpClients") - @DisabledIfEnvironmentVariable( - named = "COMMUNICATION_SKIP_INT_CALLINGSERVER_TEST", - matches = "(?i)(true)") + @EnabledIfEnvironmentVariable( + named = "RUN_CALLINGSERVER_TEST_RECORD", + matches = "(?i)(true)", + disabledReason = "Requires human intervention") public void runCreateAddRemoveHangupScenarioAsync(HttpClient httpClient) { CallingServerClientBuilder builder = getCallClientUsingConnectionString(httpClient); CallingServerAsyncClient callingServerAsyncClient = @@ -179,9 +182,10 @@ public void runCreateAddRemoveHangupScenarioAsync(HttpClient httpClient) { @ParameterizedTest @MethodSource("com.azure.core.test.TestBase#getHttpClients") - @DisabledIfEnvironmentVariable( - named = "COMMUNICATION_SKIP_INT_CALLINGSERVER_TEST", - matches = "(?i)(true)") + @EnabledIfEnvironmentVariable( + named = "RUN_CALLINGSERVER_TEST_RECORD", + matches = "(?i)(true)", + disabledReason = "Requires human intervention") public void runCreateAddRemoveHangupScenarioWithResponseAsync(HttpClient httpClient) { CallingServerClientBuilder builder = getCallClientUsingConnectionString(httpClient); CallingServerAsyncClient callingServerAsyncClient = @@ -232,9 +236,10 @@ public void runCreateAddRemoveHangupScenarioWithResponseAsync(HttpClient httpCli @ParameterizedTest @MethodSource("com.azure.core.test.TestBase#getHttpClients") - @DisabledIfEnvironmentVariable( - named = "COMMUNICATION_SKIP_INT_CALLINGSERVER_TEST", - matches = "(?i)(true)") + @EnabledIfEnvironmentVariable( + named = "RUN_CALLINGSERVER_TEST_RECORD", + matches = "(?i)(true)", + disabledReason = "Requires human intervention") public void runCreateJoinHangupScenarioAsync(HttpClient httpClient) { CallingServerClientBuilder builder = getCallClientUsingConnectionString(httpClient); CallingServerAsyncClient callingServerAsyncClient = @@ -286,9 +291,10 @@ public void runCreateJoinHangupScenarioAsync(HttpClient httpClient) { @ParameterizedTest @MethodSource("com.azure.core.test.TestBase#getHttpClients") - @DisabledIfEnvironmentVariable( - named = "COMMUNICATION_SKIP_INT_CALLINGSERVER_TEST", - matches = "(?i)(true)") + @EnabledIfEnvironmentVariable( + named = "RUN_CALLINGSERVER_TEST_RECORD", + matches = "(?i)(true)", + disabledReason = "Requires human intervention") public void runCreateJoinHangupScenarioWithResponseAsync(HttpClient httpClient) { CallingServerClientBuilder builder = getCallClientUsingConnectionString(httpClient); CallingServerAsyncClient callingServerAsyncClient = diff --git a/sdk/communication/azure-communication-callingserver/src/test/java/com/azure/communication/callingserver/CallConnectionLiveTests.java b/sdk/communication/azure-communication-callingserver/src/test/java/com/azure/communication/callingserver/CallConnectionLiveTests.java index 6a4bffdd10ba3..e6d8e66de9e85 100644 --- a/sdk/communication/azure-communication-callingserver/src/test/java/com/azure/communication/callingserver/CallConnectionLiveTests.java +++ b/sdk/communication/azure-communication-callingserver/src/test/java/com/azure/communication/callingserver/CallConnectionLiveTests.java @@ -14,7 +14,7 @@ import com.azure.communication.common.PhoneNumberIdentifier; import com.azure.core.http.HttpClient; import com.azure.core.http.rest.Response; -import org.junit.jupiter.api.condition.DisabledIfEnvironmentVariable; +import org.junit.jupiter.api.condition.EnabledIfEnvironmentVariable; import org.junit.jupiter.params.ParameterizedTest; import org.junit.jupiter.params.provider.MethodSource; @@ -27,9 +27,10 @@ public class CallConnectionLiveTests extends CallingServerTestBase { @ParameterizedTest @MethodSource("com.azure.core.test.TestBase#getHttpClients") - @DisabledIfEnvironmentVariable( - named = "COMMUNICATION_SKIP_INT_CALLINGSERVER_TEST", - matches = "(?i)(true)") + @EnabledIfEnvironmentVariable( + named = "RUN_CALLINGSERVER_TEST_RECORD", + matches = "(?i)(true)", + disabledReason = "Requires human intervention") public void runCreatePlayCancelHangupScenario(HttpClient httpClient) { CallingServerClientBuilder builder = getCallClientUsingConnectionString(httpClient); CallingServerClient callingServerClient = setupClient(builder, "runCreatePlayCancelHangupScenario"); @@ -76,9 +77,10 @@ public void runCreatePlayCancelHangupScenario(HttpClient httpClient) { @ParameterizedTest @MethodSource("com.azure.core.test.TestBase#getHttpClients") - @DisabledIfEnvironmentVariable( - named = "COMMUNICATION_SKIP_INT_CALLINGSERVER_TEST", - matches = "(?i)(true)") + @EnabledIfEnvironmentVariable( + named = "RUN_CALLINGSERVER_TEST_RECORD", + matches = "(?i)(true)", + disabledReason = "Requires human intervention") public void runCreatePlayCancelHangupScenarioWithResponse(HttpClient httpClient) { CallingServerClientBuilder builder = getCallClientUsingConnectionString(httpClient); CallingServerClient callingServerClient = @@ -132,9 +134,10 @@ public void runCreatePlayCancelHangupScenarioWithResponse(HttpClient httpClient) @ParameterizedTest @MethodSource("com.azure.core.test.TestBase#getHttpClients") - @DisabledIfEnvironmentVariable( - named = "COMMUNICATION_SKIP_INT_CALLINGSERVER_TEST", - matches = "(?i)(true)") + @EnabledIfEnvironmentVariable( + named = "RUN_CALLINGSERVER_TEST_RECORD", + matches = "(?i)(true)", + disabledReason = "Requires human intervention") public void runCreateAddRemoveHangupScenario(HttpClient httpClient) { CallingServerClientBuilder builder = getCallClientUsingConnectionString(httpClient); CallingServerClient callingServerClient = setupClient(builder, "runCreateAddRemoveHangupScenario"); @@ -172,9 +175,10 @@ public void runCreateAddRemoveHangupScenario(HttpClient httpClient) { @ParameterizedTest @MethodSource("com.azure.core.test.TestBase#getHttpClients") - @DisabledIfEnvironmentVariable( - named = "COMMUNICATION_SKIP_INT_CALLINGSERVER_TEST", - matches = "(?i)(true)") + @EnabledIfEnvironmentVariable( + named = "RUN_CALLINGSERVER_TEST_RECORD", + matches = "(?i)(true)", + disabledReason = "Requires human intervention") public void runCreateAddRemoveHangupScenarioWithResponse(HttpClient httpClient) { CallingServerClientBuilder builder = getCallClientUsingConnectionString(httpClient); CallingServerClient callingServerClient = @@ -225,9 +229,10 @@ public void runCreateAddRemoveHangupScenarioWithResponse(HttpClient httpClient) @ParameterizedTest @MethodSource("com.azure.core.test.TestBase#getHttpClients") - @DisabledIfEnvironmentVariable( - named = "COMMUNICATION_SKIP_INT_CALLINGSERVER_TEST", - matches = "(?i)(true)") + @EnabledIfEnvironmentVariable( + named = "RUN_CALLINGSERVER_TEST_RECORD", + matches = "(?i)(true)", + disabledReason = "Requires human intervention") public void runCreateJoinHangupScenario(HttpClient httpClient) { CallingServerClientBuilder builder = getCallClientUsingConnectionString(httpClient); CallingServerClient callingServerClient = setupClient(builder, "runCreateJoinHangupScenario"); @@ -273,9 +278,10 @@ public void runCreateJoinHangupScenario(HttpClient httpClient) { @ParameterizedTest @MethodSource("com.azure.core.test.TestBase#getHttpClients") - @DisabledIfEnvironmentVariable( - named = "COMMUNICATION_SKIP_INT_CALLINGSERVER_TEST", - matches = "(?i)(true)") + @EnabledIfEnvironmentVariable( + named = "RUN_CALLINGSERVER_TEST_RECORD", + matches = "(?i)(true)", + disabledReason = "Requires human intervention") public void runCreateJoinHangupScenarioWithResponse(HttpClient httpClient) { CallingServerClientBuilder builder = getCallClientUsingConnectionString(httpClient); CallingServerClient callingServerClient = diff --git a/sdk/communication/azure-communication-callingserver/src/test/java/com/azure/communication/callingserver/DownloadContentAsyncLiveTests.java b/sdk/communication/azure-communication-callingserver/src/test/java/com/azure/communication/callingserver/DownloadContentAsyncLiveTests.java index ff209eb28b95f..cbbcd18842af2 100644 --- a/sdk/communication/azure-communication-callingserver/src/test/java/com/azure/communication/callingserver/DownloadContentAsyncLiveTests.java +++ b/sdk/communication/azure-communication-callingserver/src/test/java/com/azure/communication/callingserver/DownloadContentAsyncLiveTests.java @@ -8,7 +8,7 @@ import com.azure.core.http.HttpClient; import com.azure.core.http.rest.Response; import com.azure.core.util.FluxUtil; -import org.junit.jupiter.api.condition.DisabledIfEnvironmentVariable; +import org.junit.jupiter.api.condition.EnabledIfEnvironmentVariable; import org.junit.jupiter.params.ParameterizedTest; import org.junit.jupiter.params.provider.MethodSource; import org.mockito.Mockito; @@ -35,9 +35,10 @@ public class DownloadContentAsyncLiveTests extends CallingServerTestBase { @ParameterizedTest @MethodSource("com.azure.core.test.TestBase#getHttpClients") - @DisabledIfEnvironmentVariable( - named = "COMMUNICATION_SKIP_INT_CALLINGSERVER_TEST", - matches = "(?i)(true)") + @EnabledIfEnvironmentVariable( + named = "RUN_CALLINGSERVER_TEST_RECORD", + matches = "(?i)(true)", + disabledReason = "Requires human intervention") public void downloadMetadataAsync(HttpClient httpClient) { CallingServerClientBuilder builder = getConversationClientUsingConnectionString(httpClient); CallingServerAsyncClient conversationAsyncClient = setupAsyncClient(builder, "downloadMetadataAsync"); @@ -56,9 +57,10 @@ public void downloadMetadataAsync(HttpClient httpClient) { @ParameterizedTest @MethodSource("com.azure.core.test.TestBase#getHttpClients") - @DisabledIfEnvironmentVariable( - named = "COMMUNICATION_SKIP_INT_CALLINGSERVER_TEST", - matches = "(?i)(true)") + @EnabledIfEnvironmentVariable( + named = "RUN_CALLINGSERVER_TEST_RECORD", + matches = "(?i)(true)", + disabledReason = "Requires human intervention") public void downloadMetadataRetryingAsync(HttpClient httpClient) { CallingServerClientBuilder builder = getConversationClientUsingConnectionString(httpClient); CallingServerAsyncClient conversationAsyncClient = setupAsyncClient(builder, "downloadMetadataAsync"); @@ -77,9 +79,10 @@ public void downloadMetadataRetryingAsync(HttpClient httpClient) { @ParameterizedTest @MethodSource("com.azure.core.test.TestBase#getHttpClients") - @DisabledIfEnvironmentVariable( - named = "COMMUNICATION_SKIP_INT_CALLINGSERVER_TEST", - matches = "(?i)(true)") + @EnabledIfEnvironmentVariable( + named = "RUN_CALLINGSERVER_TEST_RECORD", + matches = "(?i)(true)", + disabledReason = "Requires human intervention") public void downloadVideoAsync(HttpClient httpClient) { CallingServerClientBuilder builder = getConversationClientUsingConnectionString(httpClient); CallingServerAsyncClient conversationAsyncClient = setupAsyncClient(builder, "downloadVideoAsync"); @@ -98,9 +101,10 @@ public void downloadVideoAsync(HttpClient httpClient) { @ParameterizedTest @MethodSource("com.azure.core.test.TestBase#getHttpClients") - @DisabledIfEnvironmentVariable( - named = "COMMUNICATION_SKIP_INT_CALLINGSERVER_TEST", - matches = "(?i)(true)") + @EnabledIfEnvironmentVariable( + named = "RUN_CALLINGSERVER_TEST_RECORD", + matches = "(?i)(true)", + disabledReason = "Requires human intervention") public void downloadToFileAsync(HttpClient httpClient) { CallingServerClientBuilder builder = getConversationClientUsingConnectionString(httpClient); CallingServerAsyncClient conversationAsyncClient = setupAsyncClient(builder, "downloadToFileAsync"); @@ -132,9 +136,10 @@ public void downloadToFileAsync(HttpClient httpClient) { @ParameterizedTest @MethodSource("com.azure.core.test.TestBase#getHttpClients") - @DisabledIfEnvironmentVariable( - named = "COMMUNICATION_SKIP_INT_CALLINGSERVER_TEST", - matches = "(?i)(true)") + @EnabledIfEnvironmentVariable( + named = "RUN_CALLINGSERVER_TEST_RECORD", + matches = "(?i)(true)", + disabledReason = "Requires human intervention") public void downloadToFileRetryingAsync(HttpClient httpClient) { CallingServerClientBuilder builder = getConversationClientUsingConnectionString(httpClient); CallingServerAsyncClient conversationAsyncClient = setupAsyncClient(builder, "downloadToFileAsync"); diff --git a/sdk/communication/azure-communication-callingserver/src/test/java/com/azure/communication/callingserver/DownloadContentLiveTests.java b/sdk/communication/azure-communication-callingserver/src/test/java/com/azure/communication/callingserver/DownloadContentLiveTests.java index fc0c00135073d..7ff2806fc4d9a 100644 --- a/sdk/communication/azure-communication-callingserver/src/test/java/com/azure/communication/callingserver/DownloadContentLiveTests.java +++ b/sdk/communication/azure-communication-callingserver/src/test/java/com/azure/communication/callingserver/DownloadContentLiveTests.java @@ -6,7 +6,7 @@ import com.azure.communication.callingserver.models.CallingServerErrorException; import com.azure.core.http.HttpClient; import com.azure.core.http.rest.Response; -import org.junit.jupiter.api.condition.DisabledIfEnvironmentVariable; +import org.junit.jupiter.api.condition.EnabledIfEnvironmentVariable; import org.junit.jupiter.params.ParameterizedTest; import org.junit.jupiter.params.provider.MethodSource; import org.mockito.Mockito; @@ -28,9 +28,10 @@ public class DownloadContentLiveTests extends CallingServerTestBase { @ParameterizedTest @MethodSource("com.azure.core.test.TestBase#getHttpClients") - @DisabledIfEnvironmentVariable( - named = "COMMUNICATION_SKIP_INT_CALLINGSERVER_TEST", - matches = "(?i)(true)") + @EnabledIfEnvironmentVariable( + named = "RUN_CALLINGSERVER_TEST_RECORD", + matches = "(?i)(true)", + disabledReason = "Requires human intervention") public void downloadMetadata(HttpClient httpClient) throws UnsupportedEncodingException { CallingServerClientBuilder builder = getConversationClientUsingConnectionString(httpClient); CallingServerClient conversationClient = setupClient(builder, "downloadMetadata"); @@ -48,9 +49,10 @@ public void downloadMetadata(HttpClient httpClient) throws UnsupportedEncodingEx @ParameterizedTest @MethodSource("com.azure.core.test.TestBase#getHttpClients") - @DisabledIfEnvironmentVariable( - named = "COMMUNICATION_SKIP_INT_CALLINGSERVER_TEST", - matches = "(?i)(true)") + @EnabledIfEnvironmentVariable( + named = "RUN_CALLINGSERVER_TEST_RECORD", + matches = "(?i)(true)", + disabledReason = "Requires human intervention") public void downloadVideo(HttpClient httpClient) { CallingServerClientBuilder builder = getConversationClientUsingConnectionString(httpClient); CallingServerClient conversationClient = setupClient(builder, "downloadVideo"); diff --git a/sdk/communication/azure-communication-callingserver/src/test/java/com/azure/communication/callingserver/ServerCallAsyncLiveTests.java b/sdk/communication/azure-communication-callingserver/src/test/java/com/azure/communication/callingserver/ServerCallAsyncLiveTests.java index 3c92fa4b2735f..0d94b095cb2f2 100644 --- a/sdk/communication/azure-communication-callingserver/src/test/java/com/azure/communication/callingserver/ServerCallAsyncLiveTests.java +++ b/sdk/communication/azure-communication-callingserver/src/test/java/com/azure/communication/callingserver/ServerCallAsyncLiveTests.java @@ -18,7 +18,7 @@ import com.azure.communication.common.PhoneNumberIdentifier; import com.azure.core.http.HttpClient; import com.azure.core.http.rest.Response; -import org.junit.jupiter.api.condition.DisabledIfEnvironmentVariable; +import org.junit.jupiter.api.condition.EnabledIfEnvironmentVariable; import org.junit.jupiter.params.ParameterizedTest; import org.junit.jupiter.params.provider.MethodSource; @@ -208,9 +208,10 @@ public void startRecordingFailsAsync(HttpClient httpClient) { @ParameterizedTest @MethodSource("com.azure.core.test.TestBase#getHttpClients") - @DisabledIfEnvironmentVariable( - named = "COMMUNICATION_SKIP_INT_CALLINGSERVER_TEST", - matches = "(?i)(true)") + @EnabledIfEnvironmentVariable( + named = "RUN_CALLINGSERVER_TEST_RECORD", + matches = "(?i)(true)", + disabledReason = "Requires human intervention") public void runAddRemoveScenarioAsync(HttpClient httpClient) { CallingServerClientBuilder builder = getConversationClientUsingConnectionString(httpClient); CallingServerAsyncClient callingServerAsyncClient = @@ -265,9 +266,10 @@ public void runAddRemoveScenarioAsync(HttpClient httpClient) { @ParameterizedTest @MethodSource("com.azure.core.test.TestBase#getHttpClients") - @DisabledIfEnvironmentVariable( - named = "COMMUNICATION_SKIP_INT_CALLINGSERVER_TEST", - matches = "(?i)(true)") + @EnabledIfEnvironmentVariable( + named = "RUN_CALLINGSERVER_TEST_RECORD", + matches = "(?i)(true)", + disabledReason = "Requires human intervention") public void runAddRemoveScenarioWithResponseAsync(HttpClient httpClient) { CallingServerClientBuilder builder = getConversationClientUsingConnectionString(httpClient); CallingServerAsyncClient callingServerAsyncClient = setupAsyncClient(builder, "runAddRemoveScenarioWithResponseAsync"); diff --git a/sdk/communication/azure-communication-callingserver/src/test/java/com/azure/communication/callingserver/ServerCallLiveTests.java b/sdk/communication/azure-communication-callingserver/src/test/java/com/azure/communication/callingserver/ServerCallLiveTests.java index cd646e1c90dec..5f675bc726834 100644 --- a/sdk/communication/azure-communication-callingserver/src/test/java/com/azure/communication/callingserver/ServerCallLiveTests.java +++ b/sdk/communication/azure-communication-callingserver/src/test/java/com/azure/communication/callingserver/ServerCallLiveTests.java @@ -19,7 +19,7 @@ import com.azure.core.http.HttpClient; import com.azure.core.http.rest.Response; import com.azure.core.util.Context; -import org.junit.jupiter.api.condition.DisabledIfEnvironmentVariable; +import org.junit.jupiter.api.condition.EnabledIfEnvironmentVariable; import org.junit.jupiter.params.ParameterizedTest; import org.junit.jupiter.params.provider.MethodSource; @@ -203,9 +203,10 @@ public void startRecordingFails(HttpClient httpClient) { @ParameterizedTest @MethodSource("com.azure.core.test.TestBase#getHttpClients") - @DisabledIfEnvironmentVariable( - named = "COMMUNICATION_SKIP_INT_CALLINGSERVER_TEST", - matches = "(?i)(true)") + @EnabledIfEnvironmentVariable( + named = "RUN_CALLINGSERVER_TEST_RECORD", + matches = "(?i)(true)", + disabledReason = "Requires human intervention") public void runAddRemoveScenario(HttpClient httpClient) { CallingServerClientBuilder builder = getConversationClientUsingConnectionString(httpClient); CallingServerClient callingServerClient = setupClient(builder, "runAddRemoveScenario"); @@ -255,9 +256,10 @@ public void runAddRemoveScenario(HttpClient httpClient) { @ParameterizedTest @MethodSource("com.azure.core.test.TestBase#getHttpClients") - @DisabledIfEnvironmentVariable( - named = "COMMUNICATION_SKIP_INT_CALLINGSERVER_TEST", - matches = "(?i)(true)") + @EnabledIfEnvironmentVariable( + named = "RUN_CALLINGSERVER_TEST_RECORD", + matches = "(?i)(true)", + disabledReason = "Requires human intervention") public void runAddRemoveScenarioWithResponse(HttpClient httpClient) { CallingServerClientBuilder builder = getConversationClientUsingConnectionString(httpClient); CallingServerClient callingServerClient = setupClient(builder, "runAddRemoveScenarioWithResponse"); From 5e8a756f83bf1a093dd49d7ec3fadb4c9f67f9de Mon Sep 17 00:00:00 2001 From: Arif Saikat <71465659+arifsaikat-microsoft@users.noreply.github.com> Date: Wed, 16 Jun 2021 14:16:21 -0700 Subject: [PATCH 11/11] skip test refactor (#22328) --- .../CallConnectionAsyncLiveTests.java | 14 +++++++------- .../callingserver/CallConnectionLiveTests.java | 14 +++++++------- .../DownloadContentAsyncLiveTests.java | 12 ++++++------ .../callingserver/DownloadContentLiveTests.java | 6 +++--- .../callingserver/ServerCallAsyncLiveTests.java | 6 +++--- .../callingserver/ServerCallLiveTests.java | 6 +++--- 6 files changed, 29 insertions(+), 29 deletions(-) diff --git a/sdk/communication/azure-communication-callingserver/src/test/java/com/azure/communication/callingserver/CallConnectionAsyncLiveTests.java b/sdk/communication/azure-communication-callingserver/src/test/java/com/azure/communication/callingserver/CallConnectionAsyncLiveTests.java index 80a776f34a17e..f2f56f02a7264 100644 --- a/sdk/communication/azure-communication-callingserver/src/test/java/com/azure/communication/callingserver/CallConnectionAsyncLiveTests.java +++ b/sdk/communication/azure-communication-callingserver/src/test/java/com/azure/communication/callingserver/CallConnectionAsyncLiveTests.java @@ -14,7 +14,7 @@ import com.azure.communication.common.PhoneNumberIdentifier; import com.azure.core.http.HttpClient; import com.azure.core.http.rest.Response; -import org.junit.jupiter.api.condition.EnabledIfEnvironmentVariable; +import org.junit.jupiter.api.condition.DisabledIfEnvironmentVariable; import org.junit.jupiter.params.ParameterizedTest; import org.junit.jupiter.params.provider.MethodSource; @@ -27,7 +27,7 @@ public class CallConnectionAsyncLiveTests extends CallingServerTestBase { @ParameterizedTest @MethodSource("com.azure.core.test.TestBase#getHttpClients") - @EnabledIfEnvironmentVariable( + @DisabledIfEnvironmentVariable( named = "RUN_CALLINGSERVER_TEST_RECORD", matches = "(?i)(true)", disabledReason = "Requires human intervention") @@ -79,7 +79,7 @@ public void runCreatePlayCancelHangupScenarioAsync(HttpClient httpClient) { @ParameterizedTest @MethodSource("com.azure.core.test.TestBase#getHttpClients") - @EnabledIfEnvironmentVariable( + @DisabledIfEnvironmentVariable( named = "RUN_CALLINGSERVER_TEST_RECORD", matches = "(?i)(true)", disabledReason = "Requires human intervention") @@ -135,7 +135,7 @@ public void runCreatePlayCancelHangupScenarioWithResponseAsync(HttpClient httpCl @ParameterizedTest @MethodSource("com.azure.core.test.TestBase#getHttpClients") - @EnabledIfEnvironmentVariable( + @DisabledIfEnvironmentVariable( named = "RUN_CALLINGSERVER_TEST_RECORD", matches = "(?i)(true)", disabledReason = "Requires human intervention") @@ -182,7 +182,7 @@ public void runCreateAddRemoveHangupScenarioAsync(HttpClient httpClient) { @ParameterizedTest @MethodSource("com.azure.core.test.TestBase#getHttpClients") - @EnabledIfEnvironmentVariable( + @DisabledIfEnvironmentVariable( named = "RUN_CALLINGSERVER_TEST_RECORD", matches = "(?i)(true)", disabledReason = "Requires human intervention") @@ -236,7 +236,7 @@ public void runCreateAddRemoveHangupScenarioWithResponseAsync(HttpClient httpCli @ParameterizedTest @MethodSource("com.azure.core.test.TestBase#getHttpClients") - @EnabledIfEnvironmentVariable( + @DisabledIfEnvironmentVariable( named = "RUN_CALLINGSERVER_TEST_RECORD", matches = "(?i)(true)", disabledReason = "Requires human intervention") @@ -291,7 +291,7 @@ public void runCreateJoinHangupScenarioAsync(HttpClient httpClient) { @ParameterizedTest @MethodSource("com.azure.core.test.TestBase#getHttpClients") - @EnabledIfEnvironmentVariable( + @DisabledIfEnvironmentVariable( named = "RUN_CALLINGSERVER_TEST_RECORD", matches = "(?i)(true)", disabledReason = "Requires human intervention") diff --git a/sdk/communication/azure-communication-callingserver/src/test/java/com/azure/communication/callingserver/CallConnectionLiveTests.java b/sdk/communication/azure-communication-callingserver/src/test/java/com/azure/communication/callingserver/CallConnectionLiveTests.java index e6d8e66de9e85..4f3b5003bc763 100644 --- a/sdk/communication/azure-communication-callingserver/src/test/java/com/azure/communication/callingserver/CallConnectionLiveTests.java +++ b/sdk/communication/azure-communication-callingserver/src/test/java/com/azure/communication/callingserver/CallConnectionLiveTests.java @@ -14,7 +14,7 @@ import com.azure.communication.common.PhoneNumberIdentifier; import com.azure.core.http.HttpClient; import com.azure.core.http.rest.Response; -import org.junit.jupiter.api.condition.EnabledIfEnvironmentVariable; +import org.junit.jupiter.api.condition.DisabledIfEnvironmentVariable; import org.junit.jupiter.params.ParameterizedTest; import org.junit.jupiter.params.provider.MethodSource; @@ -27,7 +27,7 @@ public class CallConnectionLiveTests extends CallingServerTestBase { @ParameterizedTest @MethodSource("com.azure.core.test.TestBase#getHttpClients") - @EnabledIfEnvironmentVariable( + @DisabledIfEnvironmentVariable( named = "RUN_CALLINGSERVER_TEST_RECORD", matches = "(?i)(true)", disabledReason = "Requires human intervention") @@ -77,7 +77,7 @@ public void runCreatePlayCancelHangupScenario(HttpClient httpClient) { @ParameterizedTest @MethodSource("com.azure.core.test.TestBase#getHttpClients") - @EnabledIfEnvironmentVariable( + @DisabledIfEnvironmentVariable( named = "RUN_CALLINGSERVER_TEST_RECORD", matches = "(?i)(true)", disabledReason = "Requires human intervention") @@ -134,7 +134,7 @@ public void runCreatePlayCancelHangupScenarioWithResponse(HttpClient httpClient) @ParameterizedTest @MethodSource("com.azure.core.test.TestBase#getHttpClients") - @EnabledIfEnvironmentVariable( + @DisabledIfEnvironmentVariable( named = "RUN_CALLINGSERVER_TEST_RECORD", matches = "(?i)(true)", disabledReason = "Requires human intervention") @@ -175,7 +175,7 @@ public void runCreateAddRemoveHangupScenario(HttpClient httpClient) { @ParameterizedTest @MethodSource("com.azure.core.test.TestBase#getHttpClients") - @EnabledIfEnvironmentVariable( + @DisabledIfEnvironmentVariable( named = "RUN_CALLINGSERVER_TEST_RECORD", matches = "(?i)(true)", disabledReason = "Requires human intervention") @@ -229,7 +229,7 @@ public void runCreateAddRemoveHangupScenarioWithResponse(HttpClient httpClient) @ParameterizedTest @MethodSource("com.azure.core.test.TestBase#getHttpClients") - @EnabledIfEnvironmentVariable( + @DisabledIfEnvironmentVariable( named = "RUN_CALLINGSERVER_TEST_RECORD", matches = "(?i)(true)", disabledReason = "Requires human intervention") @@ -278,7 +278,7 @@ public void runCreateJoinHangupScenario(HttpClient httpClient) { @ParameterizedTest @MethodSource("com.azure.core.test.TestBase#getHttpClients") - @EnabledIfEnvironmentVariable( + @DisabledIfEnvironmentVariable( named = "RUN_CALLINGSERVER_TEST_RECORD", matches = "(?i)(true)", disabledReason = "Requires human intervention") diff --git a/sdk/communication/azure-communication-callingserver/src/test/java/com/azure/communication/callingserver/DownloadContentAsyncLiveTests.java b/sdk/communication/azure-communication-callingserver/src/test/java/com/azure/communication/callingserver/DownloadContentAsyncLiveTests.java index cbbcd18842af2..899ffe2d8f77c 100644 --- a/sdk/communication/azure-communication-callingserver/src/test/java/com/azure/communication/callingserver/DownloadContentAsyncLiveTests.java +++ b/sdk/communication/azure-communication-callingserver/src/test/java/com/azure/communication/callingserver/DownloadContentAsyncLiveTests.java @@ -8,7 +8,7 @@ import com.azure.core.http.HttpClient; import com.azure.core.http.rest.Response; import com.azure.core.util.FluxUtil; -import org.junit.jupiter.api.condition.EnabledIfEnvironmentVariable; +import org.junit.jupiter.api.condition.DisabledIfEnvironmentVariable; import org.junit.jupiter.params.ParameterizedTest; import org.junit.jupiter.params.provider.MethodSource; import org.mockito.Mockito; @@ -35,7 +35,7 @@ public class DownloadContentAsyncLiveTests extends CallingServerTestBase { @ParameterizedTest @MethodSource("com.azure.core.test.TestBase#getHttpClients") - @EnabledIfEnvironmentVariable( + @DisabledIfEnvironmentVariable( named = "RUN_CALLINGSERVER_TEST_RECORD", matches = "(?i)(true)", disabledReason = "Requires human intervention") @@ -57,7 +57,7 @@ public void downloadMetadataAsync(HttpClient httpClient) { @ParameterizedTest @MethodSource("com.azure.core.test.TestBase#getHttpClients") - @EnabledIfEnvironmentVariable( + @DisabledIfEnvironmentVariable( named = "RUN_CALLINGSERVER_TEST_RECORD", matches = "(?i)(true)", disabledReason = "Requires human intervention") @@ -79,7 +79,7 @@ public void downloadMetadataRetryingAsync(HttpClient httpClient) { @ParameterizedTest @MethodSource("com.azure.core.test.TestBase#getHttpClients") - @EnabledIfEnvironmentVariable( + @DisabledIfEnvironmentVariable( named = "RUN_CALLINGSERVER_TEST_RECORD", matches = "(?i)(true)", disabledReason = "Requires human intervention") @@ -101,7 +101,7 @@ public void downloadVideoAsync(HttpClient httpClient) { @ParameterizedTest @MethodSource("com.azure.core.test.TestBase#getHttpClients") - @EnabledIfEnvironmentVariable( + @DisabledIfEnvironmentVariable( named = "RUN_CALLINGSERVER_TEST_RECORD", matches = "(?i)(true)", disabledReason = "Requires human intervention") @@ -136,7 +136,7 @@ public void downloadToFileAsync(HttpClient httpClient) { @ParameterizedTest @MethodSource("com.azure.core.test.TestBase#getHttpClients") - @EnabledIfEnvironmentVariable( + @DisabledIfEnvironmentVariable( named = "RUN_CALLINGSERVER_TEST_RECORD", matches = "(?i)(true)", disabledReason = "Requires human intervention") diff --git a/sdk/communication/azure-communication-callingserver/src/test/java/com/azure/communication/callingserver/DownloadContentLiveTests.java b/sdk/communication/azure-communication-callingserver/src/test/java/com/azure/communication/callingserver/DownloadContentLiveTests.java index 7ff2806fc4d9a..24433330c0696 100644 --- a/sdk/communication/azure-communication-callingserver/src/test/java/com/azure/communication/callingserver/DownloadContentLiveTests.java +++ b/sdk/communication/azure-communication-callingserver/src/test/java/com/azure/communication/callingserver/DownloadContentLiveTests.java @@ -6,7 +6,7 @@ import com.azure.communication.callingserver.models.CallingServerErrorException; import com.azure.core.http.HttpClient; import com.azure.core.http.rest.Response; -import org.junit.jupiter.api.condition.EnabledIfEnvironmentVariable; +import org.junit.jupiter.api.condition.DisabledIfEnvironmentVariable; import org.junit.jupiter.params.ParameterizedTest; import org.junit.jupiter.params.provider.MethodSource; import org.mockito.Mockito; @@ -28,7 +28,7 @@ public class DownloadContentLiveTests extends CallingServerTestBase { @ParameterizedTest @MethodSource("com.azure.core.test.TestBase#getHttpClients") - @EnabledIfEnvironmentVariable( + @DisabledIfEnvironmentVariable( named = "RUN_CALLINGSERVER_TEST_RECORD", matches = "(?i)(true)", disabledReason = "Requires human intervention") @@ -49,7 +49,7 @@ public void downloadMetadata(HttpClient httpClient) throws UnsupportedEncodingEx @ParameterizedTest @MethodSource("com.azure.core.test.TestBase#getHttpClients") - @EnabledIfEnvironmentVariable( + @DisabledIfEnvironmentVariable( named = "RUN_CALLINGSERVER_TEST_RECORD", matches = "(?i)(true)", disabledReason = "Requires human intervention") diff --git a/sdk/communication/azure-communication-callingserver/src/test/java/com/azure/communication/callingserver/ServerCallAsyncLiveTests.java b/sdk/communication/azure-communication-callingserver/src/test/java/com/azure/communication/callingserver/ServerCallAsyncLiveTests.java index 0d94b095cb2f2..f6c5c62a50c60 100644 --- a/sdk/communication/azure-communication-callingserver/src/test/java/com/azure/communication/callingserver/ServerCallAsyncLiveTests.java +++ b/sdk/communication/azure-communication-callingserver/src/test/java/com/azure/communication/callingserver/ServerCallAsyncLiveTests.java @@ -18,7 +18,7 @@ import com.azure.communication.common.PhoneNumberIdentifier; import com.azure.core.http.HttpClient; import com.azure.core.http.rest.Response; -import org.junit.jupiter.api.condition.EnabledIfEnvironmentVariable; +import org.junit.jupiter.api.condition.DisabledIfEnvironmentVariable; import org.junit.jupiter.params.ParameterizedTest; import org.junit.jupiter.params.provider.MethodSource; @@ -208,7 +208,7 @@ public void startRecordingFailsAsync(HttpClient httpClient) { @ParameterizedTest @MethodSource("com.azure.core.test.TestBase#getHttpClients") - @EnabledIfEnvironmentVariable( + @DisabledIfEnvironmentVariable( named = "RUN_CALLINGSERVER_TEST_RECORD", matches = "(?i)(true)", disabledReason = "Requires human intervention") @@ -266,7 +266,7 @@ public void runAddRemoveScenarioAsync(HttpClient httpClient) { @ParameterizedTest @MethodSource("com.azure.core.test.TestBase#getHttpClients") - @EnabledIfEnvironmentVariable( + @DisabledIfEnvironmentVariable( named = "RUN_CALLINGSERVER_TEST_RECORD", matches = "(?i)(true)", disabledReason = "Requires human intervention") diff --git a/sdk/communication/azure-communication-callingserver/src/test/java/com/azure/communication/callingserver/ServerCallLiveTests.java b/sdk/communication/azure-communication-callingserver/src/test/java/com/azure/communication/callingserver/ServerCallLiveTests.java index 5f675bc726834..bd98c67c09beb 100644 --- a/sdk/communication/azure-communication-callingserver/src/test/java/com/azure/communication/callingserver/ServerCallLiveTests.java +++ b/sdk/communication/azure-communication-callingserver/src/test/java/com/azure/communication/callingserver/ServerCallLiveTests.java @@ -19,7 +19,7 @@ import com.azure.core.http.HttpClient; import com.azure.core.http.rest.Response; import com.azure.core.util.Context; -import org.junit.jupiter.api.condition.EnabledIfEnvironmentVariable; +import org.junit.jupiter.api.condition.DisabledIfEnvironmentVariable; import org.junit.jupiter.params.ParameterizedTest; import org.junit.jupiter.params.provider.MethodSource; @@ -203,7 +203,7 @@ public void startRecordingFails(HttpClient httpClient) { @ParameterizedTest @MethodSource("com.azure.core.test.TestBase#getHttpClients") - @EnabledIfEnvironmentVariable( + @DisabledIfEnvironmentVariable( named = "RUN_CALLINGSERVER_TEST_RECORD", matches = "(?i)(true)", disabledReason = "Requires human intervention") @@ -256,7 +256,7 @@ public void runAddRemoveScenario(HttpClient httpClient) { @ParameterizedTest @MethodSource("com.azure.core.test.TestBase#getHttpClients") - @EnabledIfEnvironmentVariable( + @DisabledIfEnvironmentVariable( named = "RUN_CALLINGSERVER_TEST_RECORD", matches = "(?i)(true)", disabledReason = "Requires human intervention")