From c247de00bc55d409d8d91f7d94b59a968c2892d4 Mon Sep 17 00:00:00 2001
From: pabloFuente <pablofuenteperez@gmail.com>
Date: Tue, 29 Jan 2019 12:31:38 +0100
Subject: [PATCH] openvidu server clients: configure defaultOutputMode in
 Session entities

---
 .../src/main/java/io/openvidu/java/client/Session.java      | 6 +++++-
 openvidu-node-client/src/Session.ts                         | 4 ++++
 2 files changed, 9 insertions(+), 1 deletion(-)

diff --git a/openvidu-java-client/src/main/java/io/openvidu/java/client/Session.java b/openvidu-java-client/src/main/java/io/openvidu/java/client/Session.java
index 9f55cf0c..7c6c1c93 100644
--- a/openvidu-java-client/src/main/java/io/openvidu/java/client/Session.java
+++ b/openvidu-java-client/src/main/java/io/openvidu/java/client/Session.java
@@ -215,7 +215,8 @@ public class Session {
 	 * {@link io.openvidu.java.client.Session#forceDisconnect(Connection)} or
 	 * {@link io.openvidu.java.client.Session#forceUnpublish(Publisher)}. <br>
 	 * 
-	 * To update every Session object owned by OpenVidu object, call {@link io.openvidu.java.client.OpenVidu#fetch()}
+	 * To update every Session object owned by OpenVidu object, call
+	 * {@link io.openvidu.java.client.OpenVidu#fetch()}
 	 * 
 	 * @return true if the Session status has changed with respect to the server,
 	 *         false if not. This applies to any property or sub-property of the
@@ -449,6 +450,7 @@ public class Session {
 		JSONObject json = new JSONObject();
 		json.put("mediaMode", properties.mediaMode().name());
 		json.put("recordingMode", properties.recordingMode().name());
+		json.put("defaultOutputMode", properties.defaultOutputMode().name());
 		json.put("defaultRecordingLayout", properties.defaultRecordingLayout().name());
 		json.put("defaultCustomLayout", properties.defaultCustomLayout());
 		json.put("customSessionId", properties.customSessionId());
@@ -509,6 +511,7 @@ public class Session {
 		SessionProperties.Builder builder = new SessionProperties.Builder()
 				.mediaMode(MediaMode.valueOf((String) json.get("mediaMode")))
 				.recordingMode(RecordingMode.valueOf((String) json.get("recordingMode")))
+				.defaultOutputMode(Recording.OutputMode.valueOf((String) json.get("defaultOutputMode")))
 				.defaultRecordingLayout(RecordingLayout.valueOf((String) json.get("defaultRecordingLayout")));
 		if (json.containsKey("defaultCustomLayout")) {
 			builder.defaultCustomLayout((String) json.get("defaultCustomLayout"));
@@ -560,6 +563,7 @@ public class Session {
 		json.put("recording", this.recording);
 		json.put("mediaMode", this.properties.mediaMode());
 		json.put("recordingMode", this.properties.recordingMode());
+		json.put("defaultOutputMode", this.properties.defaultOutputMode());
 		json.put("defaultRecordingLayout", this.properties.defaultRecordingLayout());
 		json.put("defaultCustomLayout", this.properties.defaultCustomLayout());
 		JSONObject connections = new JSONObject();
diff --git a/openvidu-node-client/src/Session.ts b/openvidu-node-client/src/Session.ts
index 965eb091..298fae7e 100644
--- a/openvidu-node-client/src/Session.ts
+++ b/openvidu-node-client/src/Session.ts
@@ -21,6 +21,7 @@ import { MediaMode } from './MediaMode';
 import { OpenVidu } from './OpenVidu';
 import { OpenViduRole } from './OpenViduRole';
 import { Publisher } from './Publisher';
+import { Recording } from './Recording';
 import { RecordingLayout } from './RecordingLayout';
 import { RecordingMode } from './RecordingMode';
 import { SessionProperties } from './SessionProperties';
@@ -80,6 +81,7 @@ export class Session {
         }
         this.properties.mediaMode = !!this.properties.mediaMode ? this.properties.mediaMode : MediaMode.ROUTED;
         this.properties.recordingMode = !!this.properties.recordingMode ? this.properties.recordingMode : RecordingMode.MANUAL;
+        this.properties.defaultOutputMode = !!this.properties.defaultOutputMode ? this.properties.defaultOutputMode : Recording.OutputMode.COMPOSED;
         this.properties.defaultRecordingLayout = !!this.properties.defaultRecordingLayout ? this.properties.defaultRecordingLayout : RecordingLayout.BEST_FIT;
     }
 
@@ -396,6 +398,7 @@ export class Session {
             const data = JSON.stringify({
                 mediaMode: !!this.properties.mediaMode ? this.properties.mediaMode : MediaMode.ROUTED,
                 recordingMode: !!this.properties.recordingMode ? this.properties.recordingMode : RecordingMode.MANUAL,
+                defaultOutputMode: !!this.properties.defaultOutputMode ? this.properties.defaultOutputMode : Recording.OutputMode.COMPOSED,
                 defaultRecordingLayout: !!this.properties.defaultRecordingLayout ? this.properties.defaultRecordingLayout : RecordingLayout.BEST_FIT,
                 defaultCustomLayout: !!this.properties.defaultCustomLayout ? this.properties.defaultCustomLayout : '',
                 customSessionId: !!this.properties.customSessionId ? this.properties.customSessionId : ''
@@ -462,6 +465,7 @@ export class Session {
         this.properties = {
             mediaMode: json.mediaMode,
             recordingMode: json.recordingMode,
+            defaultOutputMode: json.defaultOutputMode,
             defaultRecordingLayout: json.defaultRecordingLayout
         };
         if (!!customSessionId) {