From 2a435db320d3cf19c2f7f7f0c1b0537ee79b01d1 Mon Sep 17 00:00:00 2001
From: pabloFuente <pablofuenteperez@gmail.com>
Date: Tue, 17 Jul 2018 13:50:27 +0200
Subject: [PATCH] openvidu-server: "customLayout" JSON field returned for GET
 sessions and recordings

---
 .../io/openvidu/server/kurento/core/KurentoSession.java     | 6 +++---
 .../main/java/io/openvidu/server/recording/Recording.java   | 3 +++
 2 files changed, 6 insertions(+), 3 deletions(-)

diff --git a/openvidu-server/src/main/java/io/openvidu/server/kurento/core/KurentoSession.java b/openvidu-server/src/main/java/io/openvidu/server/kurento/core/KurentoSession.java
index 15ebec7a..dc3b7b07 100644
--- a/openvidu-server/src/main/java/io/openvidu/server/kurento/core/KurentoSession.java
+++ b/openvidu-server/src/main/java/io/openvidu/server/kurento/core/KurentoSession.java
@@ -40,6 +40,7 @@ import org.slf4j.LoggerFactory;
 import io.openvidu.client.OpenViduException;
 import io.openvidu.client.OpenViduException.Code;
 import io.openvidu.client.internal.ProtocolElements;
+import io.openvidu.java.client.RecordingLayout;
 import io.openvidu.java.client.SessionProperties;
 import io.openvidu.server.cdr.CallDetailRecord;
 import io.openvidu.server.config.OpenviduConfig;
@@ -375,11 +376,10 @@ public class KurentoSession implements Session {
 		json.put("sessionId", this.sessionId);
 		json.put("mediaMode", this.sessionProperties.mediaMode().name());
 		json.put("recordingMode", this.sessionProperties.recordingMode().name());
-		if (this.sessionProperties.defaultCustomLayout() != null
-				&& !this.sessionProperties.defaultCustomLayout().isEmpty()) {
+		json.put("defaultRecordingLayout", this.sessionProperties.defaultRecordingLayout().name());
+		if (RecordingLayout.CUSTOM.equals(this.sessionProperties.defaultRecordingLayout())) {
 			json.put("defaultCustomLayout", this.sessionProperties.defaultCustomLayout());
 		}
-		json.put("defaultRecordingLayout", this.sessionProperties.defaultRecordingLayout().name());
 		JSONObject connections = new JSONObject();
 		JSONArray participants = new JSONArray();
 		this.participants.values().forEach(p -> {
diff --git a/openvidu-server/src/main/java/io/openvidu/server/recording/Recording.java b/openvidu-server/src/main/java/io/openvidu/server/recording/Recording.java
index c9819408..299e4088 100644
--- a/openvidu-server/src/main/java/io/openvidu/server/recording/Recording.java
+++ b/openvidu-server/src/main/java/io/openvidu/server/recording/Recording.java
@@ -161,6 +161,9 @@ public class Recording {
 		json.put("id", this.id);
 		json.put("name", this.recordingProperties.name());
 		json.put("recordingLayout", this.recordingProperties.recordingLayout().name());
+		if (RecordingLayout.CUSTOM.equals(this.recordingProperties.recordingLayout())) {
+			json.put("customLayout", this.recordingProperties.customLayout());
+		}
 		json.put("sessionId", this.sessionId);
 		json.put("createdAt", this.createdAt);
 		json.put("size", this.size);