openvidu-server: LoadManager interface

openvidu-server/pom.xml

@@ -5,7 +5,7 @@
 	<parent>
 		<groupId>io.openvidu</groupId>
 		<artifactId>openvidu-parent</artifactId>
-		<version>1.9.0-beta-1</version>
+		<version>2.0.0</version>
 	</parent>
 
 	<artifactId>openvidu-server</artifactId>

openvidu-server/src/main/java/io/openvidu/server/OpenViduServer.java

@@ -105,7 +105,7 @@ public class OpenViduServer implements JsonRpcConfigurer {
 
 		String firstKmsWsUri = kmsWsUris.get(0);
 		log.info("OpenVidu Server using one KMS: {}", kmsWsUris);
-		return new FixedOneKmsManager(firstKmsWsUri);
+		return new FixedOneKmsManager(firstKmsWsUri, new DummyLoadManager());
 	}
 
 	@Bean
@@ -150,12 +150,6 @@ public class OpenViduServer implements JsonRpcConfigurer {
 		return new TokenGeneratorDefault();
 	}
 
-	@Bean
-	@ConditionalOnMissingBean
-	public LoadManager loadManager() {
-		return new DummyLoadManager();
-	}
-
 	@Bean
 	@ConditionalOnMissingBean
 	public OpenviduConfig openviduConfig() {

openvidu-server/src/main/java/io/openvidu/server/core/TokenGenerator.java

@@ -17,9 +17,12 @@
 
 package io.openvidu.server.core;
 
+import org.springframework.stereotype.Service;
+
 import io.openvidu.java.client.OpenViduRole;
 import io.openvidu.server.kurento.core.KurentoTokenOptions;
 
+@Service
 public interface TokenGenerator {
 
 	public Token generateToken(String sessionId, OpenViduRole role, String serverMetadata,

openvidu-server/src/main/java/io/openvidu/server/kurento/core/KurentoSession.java

@@ -287,11 +287,6 @@ public class KurentoSession extends Session {
 		if (recordingManager.sessionIsBeingRecorded(this.sessionId)) {
 			Recording stoppedRecording = this.recordingManager.forceStopRecording(this,
 					EndReason.mediaServerDisconnect);
-			if (OutputMode.COMPOSED.equals(stoppedRecording.getOutputMode()) && stoppedRecording.hasVideo()) {
-				recordingManager.getSessionManager().evictParticipant(
-						this.getParticipantByPublicId(ProtocolElements.RECORDER_PARTICIPANT_PUBLICID), null, null,
-						null);
-			}
 		}
 
 		// Close all MediaEndpoints of participants

openvidu-server/src/main/java/io/openvidu/server/kurento/kms/DummyLoadManager.java

@@ -17,6 +17,9 @@
 
 package io.openvidu.server.kurento.kms;
 
+import org.springframework.stereotype.Service;
+
+@Service
 public class DummyLoadManager implements LoadManager {
 
 	@Override

openvidu-server/src/main/java/io/openvidu/server/kurento/kms/FixedOneKmsManager.java

@@ -29,7 +29,9 @@ public class FixedOneKmsManager extends KmsManager {
 
 	private static final Logger log = LoggerFactory.getLogger(FixedOneKmsManager.class);
 
-	public FixedOneKmsManager(String kmsWsUri) {
+	public FixedOneKmsManager(String kmsWsUri, LoadManager loadManager) {
+		super(loadManager);
+
 		KurentoClient kClient = KurentoClient.create(kmsWsUri, new KurentoConnectionListener() {
 
 			@Override

openvidu-server/src/main/java/io/openvidu/server/kurento/kms/KmsManager.java

@@ -61,7 +61,6 @@ public abstract class KmsManager {
 	@Autowired
 	protected SessionManager sessionManager;
 
-	@Autowired
 	protected LoadManager loadManager;
 
 	private final Logger log = LoggerFactory.getLogger(KmsManager.class);
@@ -71,6 +70,10 @@ public abstract class KmsManager {
 
 	private Iterator<Kms> usageIterator = null;
 
+	public KmsManager(LoadManager loadManager) {
+		this.loadManager = loadManager;
+	}
+
 	public synchronized void addKms(Kms kms) {
 		this.kmss.put(kms.getUri(), kms);
 	}

openvidu-server/src/main/java/io/openvidu/server/kurento/kms/LoadManager.java

@@ -17,13 +17,10 @@
 
 package io.openvidu.server.kurento.kms;
 
-import org.springframework.stereotype.Service;
-
-@Service
 public interface LoadManager {
 
-  double calculateLoad(Kms kms);
+	double calculateLoad(Kms kms);
 
-  boolean allowMoreElements(Kms kms);
+	boolean allowMoreElements(Kms kms);
 
 }

openvidu-server/src/main/java/io/openvidu/server/recording/service/RecordingManager.java

@@ -219,6 +219,11 @@ public class RecordingManager {
 		switch (recording.getOutputMode()) {
 		case COMPOSED:
 			recording = this.composedRecordingService.stopRecording(session, recording, reason);
+			if (recording.hasVideo()) {
+				this.sessionManager.evictParticipant(
+						session.getParticipantByPublicId(ProtocolElements.RECORDER_PARTICIPANT_PUBLICID), null, null,
+						null);
+			}
 			break;
 		case INDIVIDUAL:
 			recording = this.singleStreamRecordingService.stopRecording(session, recording, reason);

pom.xml

@@ -5,7 +5,7 @@
 
 	<groupId>io.openvidu</groupId>
 	<artifactId>openvidu-parent</artifactId>
-	<version>1.9.0-beta-1</version>
+	<version>2.0.0</version>
 	<packaging>pom</packaging>
 
 	<name>OpenVidu</name>