moving transport url

sdk/communication/azure-communication-callautomation/src/main/java/com/azure/communication/callautomation/CallAutomationAsyncClient.java

@@ -292,7 +292,8 @@ private CreateCallRequestInternal getCreateCallRequestInternal(CreateGroupCallOp
             .setEnableBidirectional(mediaStreamingOptions.isEnableBidirectional())
             .setAudioFormat(AudioFormatInternal.fromString(mediaStreamingOptions.getAudioFormat() != null
                 ? mediaStreamingOptions.getAudioFormat().toString()
-                : null));
+                : null))
+            .setEnableDtmfTones(mediaStreamingOptions.isEnableDtmfTones());
     }
 
     private TranscriptionOptionsInternal getTranscriptionOptionsInternal(TranscriptionOptions transcriptionOptions) {

sdk/communication/azure-communication-callautomation/src/main/java/com/azure/communication/callautomation/models/MediaStreamingOptions.java

@@ -11,7 +11,7 @@ public final class MediaStreamingOptions {
     /*
      * Transport URL for media streaming
      */
-    private final String transportUrl;
+    private String transportUrl;
 
     /*
      * The type of transport to be used for media streaming, eg. Websocket
@@ -53,14 +53,22 @@ public final class MediaStreamingOptions {
      * @param transportUrl - The Transport URL
      * @param audioChannelType - Audio Channel Type
      */
-    public MediaStreamingOptions(String transportUrl, MediaStreamingAudioChannel audioChannelType) {
-        this.transportUrl = transportUrl;
+    public MediaStreamingOptions(MediaStreamingAudioChannel audioChannelType, StreamingTransport transportType) {
         this.transportType = StreamingTransport.WEBSOCKET;
         this.contentType = MediaStreamingContentType.AUDIO;
         this.audioChannelType = audioChannelType;
         this.startMediaStreaming = false;
     }
 
+    /**
+     * Creates a new instance of TranscriptionOptions with default transportType as WEBSOCKET.
+     * @param transportUrl - The Transport URL
+     * @param locale - Locale
+     */
+    public MediaStreamingOptions(MediaStreamingAudioChannel audioChannelType) {
+        this(audioChannelType, StreamingTransport.WEBSOCKET);
+    }
+
     /**
      * Get the transportUrl property: Transport URL for media streaming.
      *
@@ -70,6 +78,17 @@ public String getTransportUrl() {
         return this.transportUrl;
     }
 
+    /**
+     * Set the transportUrl property: Transport URL for media streaming.
+     *
+     * @param transportUrl the transportUrl value to set.
+     * @return the MediaStreamingOptions object itself.
+     */
+    public MediaStreamingOptions setTransportUrl(String transportUrl) {
+        this.transportUrl = transportUrl;
+        return this;
+    }
+
     /**
      * Get the transportType property: The type of tranport to be used for media streaming, eg. Websocket.
      *

sdk/communication/azure-communication-callautomation/src/main/java/com/azure/communication/callautomation/models/TranscriptionOptions.java

@@ -8,11 +8,6 @@
 /** The TranscriptionOptions model. */
 @Fluent
 public final class TranscriptionOptions {
-    /*
-     * Transport URL for live transcription
-     */
-    private final String transportUrl;
-
     /*
      * The type of transport to be used for live transcription, eg. Websocket
      */
@@ -38,18 +33,31 @@ public final class TranscriptionOptions {
      */
     private Boolean enableIntermediateResults;
 
+    /*
+     * Transport URL for live transcription
+     */
+    private String transportUrl;
+
     /**
-     * Creates a new instance of MediaStreamingConfiguration
-     * @param transportUrl - The Transport URL
+     * Creates a new instance of TranscriptionOptions
      * @param locale - Locale
+     * @param transportType - The type of transport to be used for live transcription
      */
-    public TranscriptionOptions(String transportUrl, String locale) {
-        this.transportUrl = transportUrl;
-        this.transportType = StreamingTransport.WEBSOCKET;
+    public TranscriptionOptions(String locale, StreamingTransport transportType) {
+        this.transportType = transportType;
         this.locale = locale;
         this.startTranscription = false;
     }
 
+    /**
+     * Creates a new instance of TranscriptionOptions with default transportType as WEBSOCKET.
+     * @param transportUrl - The Transport URL
+     * @param locale - Locale
+     */
+    public TranscriptionOptions(String locale) {
+        this(locale, StreamingTransport.WEBSOCKET);
+    }
+
     /**
      * Get the transportUrl property: Transport URL for live transcription.
      *
@@ -59,6 +67,17 @@ public String getTransportUrl() {
         return this.transportUrl;
     }
 
+    /**
+     * Set the transportUrl property: Transport URL for live transcription.
+     *
+     * @param transportUrl the transportUrl value to set.
+     * @return the TranscriptionOptions object itself.
+     */
+    public TranscriptionOptions setTransportUrl(String transportUrl) {
+        this.transportUrl = transportUrl;
+        return this;
+    }
+
     /**
      * Get the transportType property: The type of transport to be used for live transcription, eg. Websocket.
      *

sdk/communication/azure-communication-callautomation/src/test/java/com/azure/communication/callautomation/CallAutomationUnitTestBase.java

@@ -60,11 +60,11 @@ public class CallAutomationUnitTestBase {
     static final String BOT_APP_ID = "botAppId";
 
     static final MediaStreamingOptions MEDIA_STREAMING_CONFIGURATION
-        = new MediaStreamingOptions("https://websocket.url.com", MediaStreamingAudioChannel.MIXED)
+        = new MediaStreamingOptions(MediaStreamingAudioChannel.MIXED).setTransportUrl("https://websocket.url.com")
             .setStartMediaStreaming(true);
 
     static final TranscriptionOptions TRANSCRIPTION_CONFIGURATION
-        = new TranscriptionOptions("https://websocket.url.com", "en-US").setStartTranscription(true);
+        = new TranscriptionOptions("en-US").setTransportUrl("https://websocket.url.com").setStartTranscription(true);
 
     public static String generateDownloadResult(String content) {
         return content;

sdk/communication/azure-communication-callautomation/src/test/java/com/azure/communication/callautomation/CallMediaAsyncAutomatedLiveTests.java

@@ -422,7 +422,7 @@ public void createVOIPCallAndMediaStreamingTest(HttpClient httpClient) {
             // create options
             List<CommunicationIdentifier> targets = new ArrayList<>(Collections.singletonList(target));
             MediaStreamingOptions mediaStreamingOptions
-                = new MediaStreamingOptions(TRANSPORT_URL, MediaStreamingAudioChannel.MIXED);
+                = new MediaStreamingOptions(MediaStreamingAudioChannel.MIXED).setTransportUrl(TRANSPORT_URL);
             CreateGroupCallOptions createCallOptions
                 = new CreateGroupCallOptions(targets, DISPATCHER_CALLBACK + String.format("?q=%s", uniqueId));
 
@@ -537,7 +537,8 @@ public void createVOIPCallAndTranscriptionTest(HttpClient httpClient) {
 
             // create a call
             List<CommunicationIdentifier> targets = new ArrayList<>(Collections.singletonList(target));
-            TranscriptionOptions transcriptionOptions = new TranscriptionOptions(TRANSPORT_URL, "en-US");
+            TranscriptionOptions transcriptionOptions
+                = new TranscriptionOptions("en-US").setTransportUrl(TRANSPORT_URL);
             CreateGroupCallOptions createCallOptions
                 = new CreateGroupCallOptions(targets, DISPATCHER_CALLBACK + String.format("?q=%s", uniqueId));
             createCallOptions.setTranscriptionOptions(transcriptionOptions);