From 32d88ec864f7ac00c5568eea5e7ddf45fc3a9780 Mon Sep 17 00:00:00 2001 From: Amari West Date: Tue, 2 Jul 2024 12:56:03 -0500 Subject: [PATCH 1/5] init commit --- .../communication/callautomation/CallRecordingAsync.java | 4 ++-- .../callautomation/models/StartRecordingOptions.java | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/sdk/communication/azure-communication-callautomation/src/main/java/com/azure/communication/callautomation/CallRecordingAsync.java b/sdk/communication/azure-communication-callautomation/src/main/java/com/azure/communication/callautomation/CallRecordingAsync.java index f2c87037b337..515fcc43c983 100644 --- a/sdk/communication/azure-communication-callautomation/src/main/java/com/azure/communication/callautomation/CallRecordingAsync.java +++ b/sdk/communication/azure-communication-callautomation/src/main/java/com/azure/communication/callautomation/CallRecordingAsync.java @@ -178,8 +178,8 @@ private StartCallRecordingRequestInternal getStartCallRecordingRequest(StartReco request.setExternalStorage(recordingStorageInternal); } } - if (options.getPauseOnStart() != null) { - request.setPauseOnStart(options.getPauseOnStart()); + if (options.isPauseOnStart() != null) { + request.setPauseOnStart(options.isPauseOnStart()); } return request; diff --git a/sdk/communication/azure-communication-callautomation/src/main/java/com/azure/communication/callautomation/models/StartRecordingOptions.java b/sdk/communication/azure-communication-callautomation/src/main/java/com/azure/communication/callautomation/models/StartRecordingOptions.java index ee2e83c488f1..7b7f758f2c03 100644 --- a/sdk/communication/azure-communication-callautomation/src/main/java/com/azure/communication/callautomation/models/StartRecordingOptions.java +++ b/sdk/communication/azure-communication-callautomation/src/main/java/com/azure/communication/callautomation/models/StartRecordingOptions.java @@ -139,7 +139,7 @@ public StartRecordingOptions setRecordingFormat(RecordingFormat recordingFormat) * * @return pause on start. */ - public Boolean getPauseOnStart() { + public Boolean isPauseOnStart() { return pauseOnStart; } From f61f4dc881613b1ba774db4579a4f94e03d5e216 Mon Sep 17 00:00:00 2001 From: Amari West Date: Tue, 2 Jul 2024 14:39:17 -0500 Subject: [PATCH 2/5] added recordingKind --- .../callautomation/models/RecordingStateResult.java | 11 +++++++++++ 1 file changed, 11 insertions(+) diff --git a/sdk/communication/azure-communication-callautomation/src/main/java/com/azure/communication/callautomation/models/RecordingStateResult.java b/sdk/communication/azure-communication-callautomation/src/main/java/com/azure/communication/callautomation/models/RecordingStateResult.java index 0f6da16fb54b..d59f0fb33ea4 100644 --- a/sdk/communication/azure-communication-callautomation/src/main/java/com/azure/communication/callautomation/models/RecordingStateResult.java +++ b/sdk/communication/azure-communication-callautomation/src/main/java/com/azure/communication/callautomation/models/RecordingStateResult.java @@ -29,6 +29,15 @@ public String getRecordingId() { return this.recordingId; } + /** + * Get the RecordingKind property: The recording kind status of the recording. + * + * @return the recordingKind value. + */ + public RecordingState getRecordingKind() { + return this.recordingKind; + } + /** * Get the RecordingState property: The recording status of the recording. * @@ -44,6 +53,7 @@ public RecordingState getRecordingState() { */ public RecordingStateResult() { this.recordingId = null; + this.recordingKind = null; this.recordingState = null; } @@ -54,6 +64,7 @@ public RecordingStateResult() { */ RecordingStateResult(RecordingStateResponseInternal recordingStateResponseInternal) { this.recordingId = recordingStateResponseInternal.getRecordingId(); + this.recordingKind = RecordingKind.fromString(recordingStateResponseInternal.getRecordingKind().toString()); this.recordingState = RecordingState.fromString(recordingStateResponseInternal.getRecordingState().toString()); } } From dba5a439d28b9d8f71e10393cad3ec242b7b777f Mon Sep 17 00:00:00 2001 From: Amari West Date: Fri, 5 Jul 2024 12:26:05 -0500 Subject: [PATCH 3/5] fixed typo --- .../callautomation/models/RecordingStateResult.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sdk/communication/azure-communication-callautomation/src/main/java/com/azure/communication/callautomation/models/RecordingStateResult.java b/sdk/communication/azure-communication-callautomation/src/main/java/com/azure/communication/callautomation/models/RecordingStateResult.java index d59f0fb33ea4..60e72261b249 100644 --- a/sdk/communication/azure-communication-callautomation/src/main/java/com/azure/communication/callautomation/models/RecordingStateResult.java +++ b/sdk/communication/azure-communication-callautomation/src/main/java/com/azure/communication/callautomation/models/RecordingStateResult.java @@ -34,7 +34,7 @@ public String getRecordingId() { * * @return the recordingKind value. */ - public RecordingState getRecordingKind() { + public RecordingKind getRecordingKind() { return this.recordingKind; } From 2cbe7b08d293906d3448552394e05b15bab8c952 Mon Sep 17 00:00:00 2001 From: Amari West Date: Fri, 5 Jul 2024 12:53:06 -0500 Subject: [PATCH 4/5] added recordingKind --- .../callautomation/models/RecordingStateResult.java | 2 ++ 1 file changed, 2 insertions(+) diff --git a/sdk/communication/azure-communication-callautomation/src/main/java/com/azure/communication/callautomation/models/RecordingStateResult.java b/sdk/communication/azure-communication-callautomation/src/main/java/com/azure/communication/callautomation/models/RecordingStateResult.java index 60e72261b249..55467ee72121 100644 --- a/sdk/communication/azure-communication-callautomation/src/main/java/com/azure/communication/callautomation/models/RecordingStateResult.java +++ b/sdk/communication/azure-communication-callautomation/src/main/java/com/azure/communication/callautomation/models/RecordingStateResult.java @@ -18,6 +18,8 @@ public final class RecordingStateResult { */ private final String recordingId; + private final RecordingKind recordingKind; + private final RecordingState recordingState; /** From 6680a7e6b9e8fba0c7a9ca6103295cf4c18b0a1f Mon Sep 17 00:00:00 2001 From: Amari West Date: Fri, 5 Jul 2024 16:19:40 -0500 Subject: [PATCH 5/5] changed tests for recordingKind --- .../CallRecordingUnitTestBase.java | 19 ++++++++++++++++--- 1 file changed, 16 insertions(+), 3 deletions(-) diff --git a/sdk/communication/azure-communication-callautomation/src/test/java/com/azure/communication/callautomation/CallRecordingUnitTestBase.java b/sdk/communication/azure-communication-callautomation/src/test/java/com/azure/communication/callautomation/CallRecordingUnitTestBase.java index 82359566df32..f3b1048ba907 100644 --- a/sdk/communication/azure-communication-callautomation/src/test/java/com/azure/communication/callautomation/CallRecordingUnitTestBase.java +++ b/sdk/communication/azure-communication-callautomation/src/test/java/com/azure/communication/callautomation/CallRecordingUnitTestBase.java @@ -4,10 +4,11 @@ package com.azure.communication.callautomation; import com.azure.communication.callautomation.implementation.models.RecordingStateInternal; +import com.azure.communication.callautomation.implementation.models.RecordingKind; import com.azure.communication.callautomation.implementation.models.RecordingStateResponseInternal; + import com.azure.json.JsonProviders; import com.azure.json.JsonWriter; - import java.io.ByteArrayOutputStream; import java.io.IOException; import java.util.AbstractMap; @@ -18,9 +19,11 @@ public class CallRecordingUnitTestBase { static final String SERVER_CALL_ID = "aHR0cHM6Ly9jb252LXVzd2UtMDguY29udi5za3lwZS5jb20vY29udi8tby1FWjVpMHJrS3RFTDBNd0FST1J3P2k9ODgmZT02Mzc1Nzc0MTY4MDc4MjQyOTM"; static final String RECORDING_ID = "recordingId"; + private final RecordingStateResponseInternal recordingState = new RecordingStateResponseInternal().setRecordingId(RECORDING_ID); - private final String recordingActive = serializeObject(recordingState.setRecordingState(RecordingStateInternal.ACTIVE)); - private final String recordingInactive = serializeObject(recordingState.setRecordingState(RecordingStateInternal.INACTIVE)); + + private final String recordingActive = generateGetParticipantResponse(RecordingStateInternal.ACTIVE, RecordingKind.TEAMS); + private final String recordingInactive = generateGetParticipantResponse(RecordingStateInternal.INACTIVE, RecordingKind.TEAMS); ArrayList> recordingOperationsResponses = new ArrayList<>(Arrays.asList( new AbstractMap.SimpleEntry<>(recordingActive, 200), //startRecording @@ -42,4 +45,14 @@ private String serializeObject(RecordingStateResponseInternal o) { throw new RuntimeException(e); } } + + private String generateGetParticipantResponse(RecordingStateInternal recordingState, RecordingKind recordingKind) { + + RecordingStateResponseInternal response = new RecordingStateResponseInternal(); + response.setRecordingState(recordingState); + response.setRecordingKind(recordingKind); + response.setRecordingId(RECORDING_ID); + + return serializeObject(response); + } }