From 00484937bde11c54ae7efd4bf6769a306a69315b Mon Sep 17 00:00:00 2001
From: pabloFuente <pablofuenteperez@gmail.com>
Date: Fri, 25 Oct 2019 00:07:30 +0200
Subject: [PATCH] openvidu-server: KmsManager @PostConstruct abstract

---
 .../kurento/kms/FixedOneKmsManager.java       | 21 +++++++++++++++
 .../server/kurento/kms/KmsManager.java        | 27 +------------------
 2 files changed, 22 insertions(+), 26 deletions(-)

diff --git a/openvidu-server/src/main/java/io/openvidu/server/kurento/kms/FixedOneKmsManager.java b/openvidu-server/src/main/java/io/openvidu/server/kurento/kms/FixedOneKmsManager.java
index dd9029db..46ee0e2f 100644
--- a/openvidu-server/src/main/java/io/openvidu/server/kurento/kms/FixedOneKmsManager.java
+++ b/openvidu-server/src/main/java/io/openvidu/server/kurento/kms/FixedOneKmsManager.java
@@ -17,9 +17,13 @@
 
 package io.openvidu.server.kurento.kms;
 
+import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.List;
 
+import javax.annotation.PostConstruct;
+
+import org.apache.commons.lang3.RandomStringUtils;
 import org.kurento.client.KurentoClient;
 import org.kurento.commons.exception.KurentoException;
 
@@ -46,4 +50,21 @@ public class FixedOneKmsManager extends KmsManager {
 		return Arrays.asList(kms);
 	}
 
+	@Override
+	@PostConstruct
+	protected void postConstructInitKurentoClients() {
+		try {
+			List<KmsProperties> kmsProps = new ArrayList<>();
+			for (String kmsUri : this.openviduConfig.getKmsUris()) {
+				String kmsId = "kms-" + RandomStringUtils.randomAlphanumeric(6).toUpperCase();
+				kmsProps.add(new KmsProperties(kmsId, kmsUri));
+			}
+			this.initializeKurentoClients(kmsProps, true, false);
+		} catch (Exception e) {
+			// Some KMS wasn't reachable
+			log.error("Shutting down OpenVidu Server");
+			System.exit(1);
+		}
+	}
+
 }
diff --git a/openvidu-server/src/main/java/io/openvidu/server/kurento/kms/KmsManager.java b/openvidu-server/src/main/java/io/openvidu/server/kurento/kms/KmsManager.java
index e02e7622..12c140df 100644
--- a/openvidu-server/src/main/java/io/openvidu/server/kurento/kms/KmsManager.java
+++ b/openvidu-server/src/main/java/io/openvidu/server/kurento/kms/KmsManager.java
@@ -29,7 +29,6 @@ import java.util.stream.Collectors;
 import javax.annotation.PostConstruct;
 import javax.annotation.PreDestroy;
 
-import org.apache.commons.lang3.RandomStringUtils;
 import org.kurento.client.KurentoConnectionListener;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
@@ -91,8 +90,6 @@ public abstract class KmsManager {
 
 	final protected Map<String, Kms> kmss = new ConcurrentHashMap<>();
 
-	protected Map<String, String> forceKmsUrisToHaveKmsIds;
-
 	public synchronized void addKms(Kms kms) {
 		this.kmss.put(kms.getId(), kms);
 	}
@@ -203,29 +200,7 @@ public abstract class KmsManager {
 	}
 
 	@PostConstruct
-	protected List<Kms> postConstruct() {
-		try {
-			List<KmsProperties> kmsProps = new ArrayList<>();
-			if (forceKmsUrisToHaveKmsIds != null) {
-				for (String kmsUri : this.openviduConfig.getKmsUris()) {
-					String kmsId = forceKmsUrisToHaveKmsIds.get(kmsUri);
-					kmsProps.add(new KmsProperties(kmsId, kmsUri));
-				}
-				return this.initializeKurentoClients(kmsProps, true, true);
-			} else {
-				for (String kmsUri : this.openviduConfig.getKmsUris()) {
-					String kmsId = "kms-" + RandomStringUtils.randomAlphanumeric(6).toUpperCase();
-					kmsProps.add(new KmsProperties(kmsId, kmsUri));
-				}
-				return this.initializeKurentoClients(kmsProps, true, false);
-			}
-		} catch (Exception e) {
-			// Some KMS wasn't reachable
-			log.error("Shutting down OpenVidu Server");
-			System.exit(1);
-		}
-		return null;
-	}
+	protected abstract void postConstructInitKurentoClients();
 
 	@PreDestroy
 	public void close() {