From 6eca1f1e71f88d91f91f09b237f5d36612fc235d Mon Sep 17 00:00:00 2001 From: pabloFuente Date: Tue, 13 Apr 2021 13:52:50 +0200 Subject: [PATCH] openvidu-java-client: fix Recording initialization from JSON --- .../java/io/openvidu/java/client/Recording.java | 17 +---------------- .../java/client/RecordingProperties.java | 6 +++++- 2 files changed, 6 insertions(+), 17 deletions(-) diff --git a/openvidu-java-client/src/main/java/io/openvidu/java/client/Recording.java b/openvidu-java-client/src/main/java/io/openvidu/java/client/Recording.java index 4bf75994..36e7152d 100644 --- a/openvidu-java-client/src/main/java/io/openvidu/java/client/Recording.java +++ b/openvidu-java-client/src/main/java/io/openvidu/java/client/Recording.java @@ -120,22 +120,7 @@ public class Recording { } this.status = Recording.Status.valueOf(json.get("status").getAsString()); - boolean hasAudio = json.get("hasAudio").getAsBoolean(); - boolean hasVideo = json.get("hasVideo").getAsBoolean(); - - OutputMode outputMode = OutputMode.valueOf(json.get("outputMode").getAsString()); - RecordingProperties.Builder builder = new RecordingProperties.Builder().name(json.get("name").getAsString()) - .outputMode(outputMode).hasAudio(hasAudio).hasVideo(hasVideo); - if ((OutputMode.COMPOSED.equals(outputMode) || OutputMode.COMPOSED_QUICK_START.equals(outputMode)) - && hasVideo) { - builder.resolution(json.get("resolution").getAsString()); - builder.recordingLayout(RecordingLayout.valueOf(json.get("recordingLayout").getAsString())); - JsonElement customLayout = json.get("customLayout"); - if (customLayout != null) { - builder.customLayout(customLayout.getAsString()); - } - } - this.recordingProperties = builder.build(); + this.recordingProperties = RecordingProperties.fromJson(json); } /** diff --git a/openvidu-java-client/src/main/java/io/openvidu/java/client/RecordingProperties.java b/openvidu-java-client/src/main/java/io/openvidu/java/client/RecordingProperties.java index 4beb83ae..10a0d127 100644 --- a/openvidu-java-client/src/main/java/io/openvidu/java/client/RecordingProperties.java +++ b/openvidu-java-client/src/main/java/io/openvidu/java/client/RecordingProperties.java @@ -450,7 +450,11 @@ public class RecordingProperties { } } if (json.has("mediaNode")) { - builder.mediaNode(json.get("mediaNode").getAsString()); + if (json.get("mediaNode").isJsonObject()) { + builder.mediaNode(json.get("mediaNode").getAsJsonObject().get("id").getAsString()); + } else if (json.get("mediaNode").isJsonPrimitive()) { + builder.mediaNode(json.get("mediaNode").getAsString()); + } } return builder.build(); }