From 56c4cbdd9811a181f53c6affdcb8473184daf393 Mon Sep 17 00:00:00 2001
From: pabloFuente <pablofuenteperez@gmail.com>
Date: Tue, 11 Jun 2019 16:27:19 +0200
Subject: [PATCH] openvidu-server: update WebMvcConfigurer to new
 non-deprecated API

---
 .../src/main/java/io/openvidu/server/OpenViduServer.java      | 3 +--
 .../src/main/java/io/openvidu/server/core/SessionManager.java | 3 ---
 .../openvidu/server/recording/CustomLayoutsHttpHandler.java   | 4 ++--
 .../io/openvidu/server/recording/RecordingsHttpHandler.java   | 4 ++--
 pom.xml                                                       | 2 +-
 5 files changed, 6 insertions(+), 10 deletions(-)

diff --git a/openvidu-server/src/main/java/io/openvidu/server/OpenViduServer.java b/openvidu-server/src/main/java/io/openvidu/server/OpenViduServer.java
index 36b1bfc1..d957f4e9 100644
--- a/openvidu-server/src/main/java/io/openvidu/server/OpenViduServer.java
+++ b/openvidu-server/src/main/java/io/openvidu/server/OpenViduServer.java
@@ -62,7 +62,6 @@ import io.openvidu.server.kurento.core.KurentoSessionManager;
 import io.openvidu.server.kurento.kms.DummyLoadManager;
 import io.openvidu.server.kurento.kms.FixedOneKmsManager;
 import io.openvidu.server.kurento.kms.KmsManager;
-import io.openvidu.server.kurento.kms.LoadManager;
 import io.openvidu.server.recording.service.RecordingManager;
 import io.openvidu.server.rpc.RpcHandler;
 import io.openvidu.server.rpc.RpcNotificationService;
@@ -104,7 +103,7 @@ public class OpenViduServer implements JsonRpcConfigurer {
 		}
 
 		String firstKmsWsUri = kmsWsUris.get(0);
-		log.info("OpenVidu Server using one KMS: {}", kmsWsUris);
+		log.info("OpenVidu Server using one KMS: {}", firstKmsWsUri);
 		return new FixedOneKmsManager(firstKmsWsUri, new DummyLoadManager());
 	}
 
diff --git a/openvidu-server/src/main/java/io/openvidu/server/core/SessionManager.java b/openvidu-server/src/main/java/io/openvidu/server/core/SessionManager.java
index 05f5c007..55d591f5 100644
--- a/openvidu-server/src/main/java/io/openvidu/server/core/SessionManager.java
+++ b/openvidu-server/src/main/java/io/openvidu/server/core/SessionManager.java
@@ -80,8 +80,6 @@ public abstract class SessionManager {
 	protected ConcurrentMap<String, Boolean> insecureUsers = new ConcurrentHashMap<>();
 	public ConcurrentMap<String, ConcurrentHashMap<String, Token>> sessionidTokenTokenobj = new ConcurrentHashMap<>();
 
-	private volatile boolean closed = false;
-
 	public abstract void joinRoom(Participant participant, String sessionId, Integer transactionId);
 
 	public abstract void leaveRoom(Participant participant, Integer transactionId, EndReason reason,
@@ -407,7 +405,6 @@ public abstract class SessionManager {
 	 */
 	@PreDestroy
 	public void close() {
-		closed = true;
 		log.info("Closing all sessions");
 		for (String sessionId : sessions.keySet()) {
 			try {
diff --git a/openvidu-server/src/main/java/io/openvidu/server/recording/CustomLayoutsHttpHandler.java b/openvidu-server/src/main/java/io/openvidu/server/recording/CustomLayoutsHttpHandler.java
index 3068224e..312387c9 100644
--- a/openvidu-server/src/main/java/io/openvidu/server/recording/CustomLayoutsHttpHandler.java
+++ b/openvidu-server/src/main/java/io/openvidu/server/recording/CustomLayoutsHttpHandler.java
@@ -21,13 +21,13 @@ import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.boot.autoconfigure.condition.ConditionalOnProperty;
 import org.springframework.context.annotation.Configuration;
 import org.springframework.web.servlet.config.annotation.ResourceHandlerRegistry;
-import org.springframework.web.servlet.config.annotation.WebMvcConfigurerAdapter;
+import org.springframework.web.servlet.config.annotation.WebMvcConfigurer;
 
 import io.openvidu.server.config.OpenviduConfig;
 
 @Configuration
 @ConditionalOnProperty(name = "openvidu.recording", havingValue = "true")
-public class CustomLayoutsHttpHandler extends WebMvcConfigurerAdapter {
+public class CustomLayoutsHttpHandler implements WebMvcConfigurer {
 
 	@Autowired
 	OpenviduConfig openviduConfig;
diff --git a/openvidu-server/src/main/java/io/openvidu/server/recording/RecordingsHttpHandler.java b/openvidu-server/src/main/java/io/openvidu/server/recording/RecordingsHttpHandler.java
index b2a1b00f..08edd2f1 100644
--- a/openvidu-server/src/main/java/io/openvidu/server/recording/RecordingsHttpHandler.java
+++ b/openvidu-server/src/main/java/io/openvidu/server/recording/RecordingsHttpHandler.java
@@ -20,12 +20,12 @@ package io.openvidu.server.recording;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.context.annotation.Configuration;
 import org.springframework.web.servlet.config.annotation.ResourceHandlerRegistry;
-import org.springframework.web.servlet.config.annotation.WebMvcConfigurerAdapter;
+import org.springframework.web.servlet.config.annotation.WebMvcConfigurer;
 
 import io.openvidu.server.config.OpenviduConfig;
 
 @Configuration
-public class RecordingsHttpHandler extends WebMvcConfigurerAdapter {
+public class RecordingsHttpHandler implements WebMvcConfigurer {
 
 	@Autowired
 	OpenviduConfig openviduConfig;
diff --git a/pom.xml b/pom.xml
index e3c4a4a0..cbd15cc2 100644
--- a/pom.xml
+++ b/pom.xml
@@ -42,7 +42,7 @@
 	</developers>
 
 	<properties>
-		<version.kurento>6.10.1-SNAPSHOT</version.kurento>
+		<version.kurento>6.10.0</version.kurento>
 		<version.spring-boot>2.1.5.RELEASE</version.spring-boot>
 		<version.junit>4.12</version.junit>
 		<version.junit.jupiter>5.5.0-M1</version.junit.jupiter>