From 7ceba5e0988a57c72eea3d055cb7e9411512780c Mon Sep 17 00:00:00 2001 From: Saul Pablo Labajo Izquierdo Date: Sat, 12 Sep 2020 14:37:45 +0200 Subject: [PATCH] Respected Java naming conventions --- .../server/cdr/CDREventWebrtcConnection.java | 2 +- .../server/kurento/core/KurentoMediaOptions.java | 12 ++++++------ .../server/kurento/endpoint/MediaEndpoint.java | 4 ++-- .../server/rest/SessionRestController.java | 14 +++++++------- 4 files changed, 16 insertions(+), 16 deletions(-) diff --git a/openvidu-server/src/main/java/io/openvidu/server/cdr/CDREventWebrtcConnection.java b/openvidu-server/src/main/java/io/openvidu/server/cdr/CDREventWebrtcConnection.java index e3ff0024..eaa8e9a5 100644 --- a/openvidu-server/src/main/java/io/openvidu/server/cdr/CDREventWebrtcConnection.java +++ b/openvidu-server/src/main/java/io/openvidu/server/cdr/CDREventWebrtcConnection.java @@ -69,7 +69,7 @@ public class CDREventWebrtcConnection extends CDREventEnd implements Comparable< if (kMediaOptions.rtspUri != null) { json.addProperty("rtspUri", kMediaOptions.rtspUri); json.addProperty("adaptativeBitrate", kMediaOptions.adaptativeBitrate); - json.addProperty("networkCache", kMediaOptions.network_cache); + json.addProperty("networkCache", kMediaOptions.networkCache); json.addProperty("onlyPlayWithSubscribers", kMediaOptions.onlyPlayWithSubscribers); } } diff --git a/openvidu-server/src/main/java/io/openvidu/server/kurento/core/KurentoMediaOptions.java b/openvidu-server/src/main/java/io/openvidu/server/kurento/core/KurentoMediaOptions.java index fa5feddc..1e477356 100644 --- a/openvidu-server/src/main/java/io/openvidu/server/kurento/core/KurentoMediaOptions.java +++ b/openvidu-server/src/main/java/io/openvidu/server/kurento/core/KurentoMediaOptions.java @@ -32,7 +32,7 @@ public class KurentoMediaOptions extends MediaOptions { public String rtspUri; public Boolean adaptativeBitrate; public Boolean onlyPlayWithSubscribers; - public Integer network_cache; + public Integer networkCache; public KurentoMediaOptions(boolean isOffer, String sdpOffer, Boolean hasAudio, Boolean hasVideo, Boolean audioActive, Boolean videoActive, String typeOfVideo, Integer frameRate, String videoDimensions, @@ -46,7 +46,7 @@ public class KurentoMediaOptions extends MediaOptions { public KurentoMediaOptions(boolean isOffer, String sdpOffer, Boolean hasAudio, Boolean hasVideo, Boolean audioActive, Boolean videoActive, String typeOfVideo, Integer frameRate, String videoDimensions, KurentoFilter filter, boolean doLoopback, String rtspUri, Boolean adaptativeBitrate, - Boolean onlyPlayWithSubscribers, Integer network_cache) { + Boolean onlyPlayWithSubscribers, Integer networkCache) { super(hasAudio, hasVideo, audioActive, videoActive, typeOfVideo, frameRate, videoDimensions, filter); this.isOffer = isOffer; this.sdpOffer = sdpOffer; @@ -54,7 +54,7 @@ public class KurentoMediaOptions extends MediaOptions { this.rtspUri = rtspUri; this.adaptativeBitrate = adaptativeBitrate; this.onlyPlayWithSubscribers = onlyPlayWithSubscribers; - this.network_cache = network_cache; + this.networkCache = networkCache; } public KurentoMediaOptions(Boolean hasAudio, Boolean hasVideo, Boolean audioActive, Boolean videoActive, @@ -67,7 +67,7 @@ public class KurentoMediaOptions extends MediaOptions { this.rtspUri = streamProperties.rtspUri; this.adaptativeBitrate = streamProperties.adaptativeBitrate; this.onlyPlayWithSubscribers = streamProperties.onlyPlayWithSubscribers; - this.network_cache = streamProperties.network_cache; + this.networkCache = streamProperties.networkCache; } @Override @@ -79,8 +79,8 @@ public class KurentoMediaOptions extends MediaOptions { if (onlyPlayWithSubscribers != null) { json.addProperty("onlyPlayWithSubscribers", onlyPlayWithSubscribers); } - if (network_cache != null) { - json.addProperty("networkCache", network_cache); + if (networkCache != null) { + json.addProperty("networkCache", networkCache); } return json; } diff --git a/openvidu-server/src/main/java/io/openvidu/server/kurento/endpoint/MediaEndpoint.java b/openvidu-server/src/main/java/io/openvidu/server/kurento/endpoint/MediaEndpoint.java index bf634138..77b216f2 100644 --- a/openvidu-server/src/main/java/io/openvidu/server/kurento/endpoint/MediaEndpoint.java +++ b/openvidu-server/src/main/java/io/openvidu/server/kurento/endpoint/MediaEndpoint.java @@ -364,8 +364,8 @@ public abstract class MediaEndpoint { if (!mediaOptions.adaptativeBitrate) { playerBuilder = playerBuilder.useEncodedMedia(); } - if (mediaOptions.network_cache != null) { - playerBuilder = playerBuilder.withNetworkCache(mediaOptions.network_cache); + if (mediaOptions.networkCache != null) { + playerBuilder = playerBuilder.withNetworkCache(mediaOptions.networkCache); } playerBuilder.buildAsync(new Continuation() { diff --git a/openvidu-server/src/main/java/io/openvidu/server/rest/SessionRestController.java b/openvidu-server/src/main/java/io/openvidu/server/rest/SessionRestController.java index 5ce98fb2..a22db8c1 100644 --- a/openvidu-server/src/main/java/io/openvidu/server/rest/SessionRestController.java +++ b/openvidu-server/src/main/java/io/openvidu/server/rest/SessionRestController.java @@ -755,19 +755,19 @@ public class SessionRestController { String rtspUri; Boolean adaptativeBitrate; Boolean onlyPlayWithSubscribers; - String network_cache_str; - Integer network_cache; + String networkCacheStr; + Integer networkCache; String data; try { type = (String) params.get("type"); rtspUri = (String) params.get("rtspUri"); adaptativeBitrate = (Boolean) params.get("adaptativeBitrate"); onlyPlayWithSubscribers = (Boolean) params.get("onlyPlayWithSubscribers"); - network_cache_str = (String) params.get("networkCache"); - if (network_cache_str != null) - network_cache = Integer.parseInt(network_cache_str); + networkCacheStr = (String) params.get("networkCache"); + if (networkCacheStr != null) + networkCache = Integer.parseInt(networkCacheStr); else - network_cache = null; + networkCache = null; data = (String) params.get("data"); } catch (ClassCastException e) { return this.generateErrorResponse("Type error in some parameter", @@ -792,7 +792,7 @@ public class SessionRestController { String videoDimensions = null; KurentoMediaOptions mediaOptions = new KurentoMediaOptions(true, null, hasAudio, hasVideo, audioActive, videoActive, typeOfVideo, frameRate, videoDimensions, null, false, rtspUri, adaptativeBitrate, - onlyPlayWithSubscribers, network_cache); + onlyPlayWithSubscribers, networkCache); // While closing a session IP cameras can't be published if (session.closingLock.readLock().tryLock()) {