[Azure.Communication.CallAutomation] Fix URI required (Azure#30665)

* [Azure.Communication.CallAutomation] Fix URI required

* Update URI to string

* Remove imports

Author: williamzhao87

sdk/communication/azure-communication-callingserver/src/main/java/com/azure/communication/callingserver/CallRecordingAsync.java

@@ -42,6 +42,8 @@
 import java.io.IOException;
 import java.io.OutputStream;
 import java.net.MalformedURLException;
+import java.net.URI;
+import java.net.URISyntaxException;
 import java.net.URL;
 import java.nio.ByteBuffer;
 import java.nio.channels.AsynchronousFileChannel;
@@ -112,7 +114,8 @@ public Mono<Response<RecordingStateResult>> startRecordingWithResponse(StartReco
 
     Mono<Response<RecordingStateResult>> startRecordingWithResponseInternal(StartRecordingOptions options, Context context) {
         try {
-            if (!Boolean.TRUE.equals(options.getRecordingStateCallbackUri().isAbsolute())) {
+            String callbackUrl = options.getRecordingStateCallbackUrl();
+            if (callbackUrl != null && !callbackUrl.isEmpty() && !Boolean.TRUE.equals(new URI(callbackUrl).isAbsolute())) {
                 throw logger.logExceptionAsError(new InvalidParameterException("'recordingStateCallbackUri' has to be an absolute Uri"));
             }
             StartCallRecordingRequestInternal request = getStartCallRecordingRequest(options);
@@ -128,6 +131,8 @@ Mono<Response<RecordingStateResult>> startRecordingWithResponseInternal(StartRec
             });
         } catch (RuntimeException ex) {
             return monoError(logger, ex);
+        } catch (URISyntaxException ex) {
+            return monoError(logger, new RuntimeException(ex));
         }
     }
 
@@ -156,8 +161,8 @@ private StartCallRecordingRequestInternal getStartCallRecordingRequest(StartReco
         if (options.getRecordingChannel() != null) {
             request.setRecordingChannelType(RecordingChannelInternal.fromString(options.getRecordingChannel().toString()));
         }
-        if (options.getRecordingStateCallbackUri() != null) {
-            request.setRecordingStateCallbackUri(options.getRecordingStateCallbackUri().toString());
+        if (options.getRecordingStateCallbackUrl() != null) {
+            request.setRecordingStateCallbackUri(options.getRecordingStateCallbackUrl());
         }
         if (options.getChannelAffinity() != null) {
             List<ChannelAffinityInternal> channelAffinityInternal = options.getChannelAffinity()

sdk/communication/azure-communication-callingserver/src/main/java/com/azure/communication/callingserver/models/StartRecordingOptions.java

@@ -5,7 +5,6 @@
 
 import com.azure.core.annotation.Fluent;
 
-import java.net.URI;
 import java.util.List;
 import java.util.Objects;
 
@@ -19,7 +18,7 @@ public class StartRecordingOptions {
      */
     private final CallLocator callLocator;
 
-    private URI recordingStateCallbackUri;
+    private String recordingStateCallbackUrl;
 
     private RecordingChannel recordingChannel;
 
@@ -52,20 +51,20 @@ public CallLocator getCallLocator() {
     /**
      * Uri to send state change callbacks.
      *
-     * @return {@link URI} to send state change callbacks.
+     * @return url to send state change callbacks.
      */
-    public URI getRecordingStateCallbackUri() {
-        return recordingStateCallbackUri;
+    public String getRecordingStateCallbackUrl() {
+        return recordingStateCallbackUrl;
     }
 
     /**
-     * Set the recordingStateCallbackUri
+     * Set the recordingStateCallbackUrl
      *
-     * @param recordingStateCallbackUri a {@link URI} to send state change callbacks.
+     * @param recordingStateCallbackUrl to send state change callbacks.
      * @return the {@link StartRecordingOptions}
      */
-    public StartRecordingOptions setRecordingStateCallbackUri(URI recordingStateCallbackUri) {
-        this.recordingStateCallbackUri = recordingStateCallbackUri;
+    public StartRecordingOptions setRecordingStateCallbackUrl(String recordingStateCallbackUrl) {
+        this.recordingStateCallbackUrl = recordingStateCallbackUrl;
         return this;
     }
 

sdk/communication/azure-communication-callingserver/src/test/java/com/azure/communication/callingserver/CallRecordingAsyncLiveTests.java

@@ -13,8 +13,6 @@
 import org.junit.jupiter.params.ParameterizedTest;
 import org.junit.jupiter.params.provider.MethodSource;
 
-import java.net.URI;
-
 import static org.junit.jupiter.api.Assertions.assertEquals;
 import static org.junit.jupiter.api.Assertions.assertNotNull;
 import static org.junit.jupiter.api.Assertions.assertThrows;
@@ -39,7 +37,7 @@ public void recordingOperations(HttpClient httpClient) {
             CallRecordingAsync callRecording = client.getCallRecordingAsync();
             RecordingStateResult recordingResponse = callRecording.startRecording(
                 new StartRecordingOptions(new ServerCallLocator(serverCallId))
-                    .setRecordingStateCallbackUri(new URI(ngrok)))
+                    .setRecordingStateCallbackUrl(ngrok))
                 .block();
             assertNotNull(recordingResponse);
             String recordingId = recordingResponse.getRecordingId();

sdk/communication/azure-communication-callingserver/src/test/java/com/azure/communication/callingserver/CallRecordingAsyncUnitTests.java

@@ -18,7 +18,6 @@
 import org.reactivestreams.Publisher;
 import reactor.test.StepVerifier;
 
-import java.net.URI;
 import java.security.InvalidParameterException;
 import java.util.ArrayList;
 import java.util.Arrays;
@@ -38,7 +37,7 @@ public void setup() {
     public void startRecordingRelativeUriFails() {
         validateError(InvalidParameterException.class,
             callRecording.startRecording(new StartRecordingOptions(new ServerCallLocator(SERVER_CALL_ID))
-                .setRecordingStateCallbackUri(URI.create("/not/absolute/uri"))
+                .setRecordingStateCallbackUrl("/not/absolute/uri")
         ));
     }
 
@@ -48,7 +47,7 @@ public void startRecordingWithFullParamsFails() {
             .setRecordingContent(RecordingContent.AUDIO_VIDEO)
             .setRecordingChannel(RecordingChannel.MIXED)
             .setRecordingFormat(RecordingFormat.MP4)
-            .setRecordingStateCallbackUri(URI.create("/not/absolute/uri"))
+            .setRecordingStateCallbackUrl("/not/absolute/uri")
             .setChannelAffinity(new ArrayList<ChannelAffinity>(Arrays.asList(
                 new ChannelAffinity(0, new CommunicationUserIdentifier("rawId1")),
                 new ChannelAffinity(1, new CommunicationUserIdentifier("rawId2")))));
@@ -65,7 +64,7 @@ public void recordingOperationsTest() {
 
         validateRecordingState(
             callRecording.startRecording(new StartRecordingOptions(new ServerCallLocator(SERVER_CALL_ID))
-                    .setRecordingStateCallbackUri(URI.create("https://localhost/"))),
+                    .setRecordingStateCallbackUrl("https://localhost/")),
             RecordingState.ACTIVE
         );
 

sdk/communication/azure-communication-callingserver/src/test/java/com/azure/communication/callingserver/CallRecordingLiveTests.java

@@ -13,8 +13,6 @@
 import org.junit.jupiter.params.ParameterizedTest;
 import org.junit.jupiter.params.provider.MethodSource;
 
-import java.net.URI;
-
 import static org.junit.jupiter.api.Assertions.assertEquals;
 import static org.junit.jupiter.api.Assertions.assertNotNull;
 import static org.junit.jupiter.api.Assertions.assertThrows;
@@ -39,7 +37,7 @@ public void recordingOperations(HttpClient httpClient) {
             CallRecording callRecording = client.getCallRecording();
             RecordingStateResult recordingResponse = callRecording.startRecording(
                 new StartRecordingOptions(new ServerCallLocator(serverCallId))
-                    .setRecordingStateCallbackUri(new URI(ngrok)));
+                    .setRecordingStateCallbackUrl(ngrok));
             assertNotNull(recordingResponse);
             String recordingId = recordingResponse.getRecordingId();
             assertNotNull(recordingId);

sdk/communication/azure-communication-callingserver/src/test/java/com/azure/communication/callingserver/CallRecordingUnitTests.java

@@ -17,7 +17,6 @@
 import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.api.Test;
 
-import java.net.URI;
 import java.security.InvalidParameterException;
 import java.util.ArrayList;
 import java.util.Arrays;
@@ -38,7 +37,7 @@ public void startRecordingRelativeUriFails() {
         assertThrows(
             InvalidParameterException.class,
             () -> callRecording.startRecording(new StartRecordingOptions(new ServerCallLocator(SERVER_CALL_ID))
-                    .setRecordingStateCallbackUri(URI.create("/not/absolute/uri"))
+                    .setRecordingStateCallbackUrl("/not/absolute/uri")
             ));
     }
 
@@ -48,7 +47,7 @@ public void startRecordingWithFullParamsFails() {
             .setRecordingContent(RecordingContent.AUDIO_VIDEO)
             .setRecordingChannel(RecordingChannel.MIXED)
             .setRecordingFormat(RecordingFormat.MP4)
-            .setRecordingStateCallbackUri(URI.create("/not/absolute/uri"))
+            .setRecordingStateCallbackUrl("/not/absolute/uri")
             .setChannelAffinity(new ArrayList<ChannelAffinity>(Arrays.asList(
                 new ChannelAffinity(0, new CommunicationUserIdentifier("rawId1")),
                 new ChannelAffinity(1, new CommunicationUserIdentifier("rawId2")))));
@@ -69,7 +68,7 @@ public void recordingOperationsTest() {
 
         validateRecording(
             callRecording.startRecording(new StartRecordingOptions(new ServerCallLocator(SERVER_CALL_ID))
-                .setRecordingStateCallbackUri(URI.create("https://localhost/"))),
+                .setRecordingStateCallbackUrl("https://localhost/")),
             RecordingState.ACTIVE
         );