From b1d57232cba2120375dba64708083cfcf0ffc7e3 Mon Sep 17 00:00:00 2001 From: pabloFuente Date: Fri, 20 Nov 2020 11:53:23 +0100 Subject: [PATCH] openvidu-server: remove KmsManager getter only used in test --- .../java/io/openvidu/server/kurento/kms/KmsManager.java | 6 +----- .../integration/config/IntegrationTestConfiguration.java | 4 +++- 2 files changed, 4 insertions(+), 6 deletions(-) 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 c63c3ebf..e93581df 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 @@ -295,7 +295,7 @@ public abstract class KmsManager { kmsReconnectionLocks.get(kms.getId()).unlock(); } } - }, () -> new Long(dynamicReconnectLoopSeconds(ITERATION.getAndIncrement()) * 1000)); + }, () -> Long.valueOf(dynamicReconnectLoopSeconds(ITERATION.getAndIncrement()) * 1000)); kurentoReconnectTimer.updateTimer(); } @@ -353,10 +353,6 @@ public abstract class KmsManager { public abstract List initializeKurentoClients(List kmsProperties, boolean disconnectUponFailure) throws Exception; - public LoadManager getLoadManager() { - return this.loadManager; - } - @PostConstruct protected abstract void postConstructInitKurentoClients(); diff --git a/openvidu-server/src/test/java/io/openvidu/server/test/integration/config/IntegrationTestConfiguration.java b/openvidu-server/src/test/java/io/openvidu/server/test/integration/config/IntegrationTestConfiguration.java index 02dc465d..56b022b2 100644 --- a/openvidu-server/src/test/java/io/openvidu/server/test/integration/config/IntegrationTestConfiguration.java +++ b/openvidu-server/src/test/java/io/openvidu/server/test/integration/config/IntegrationTestConfiguration.java @@ -14,6 +14,7 @@ import org.kurento.client.KurentoClient; import org.kurento.client.MediaPipeline; import org.kurento.client.ServerManager; import org.mockito.Mockito; +import org.powermock.reflect.Whitebox; import org.springframework.boot.test.context.TestConfiguration; import org.springframework.context.annotation.Bean; @@ -37,7 +38,8 @@ public class IntegrationTestConfiguration { List successfullyConnectedKmss = new ArrayList<>(); List kmsProperties = invocation.getArgument(0); for (KmsProperties kmsProp : kmsProperties) { - Kms kms = new Kms(kmsProp, spy.getLoadManager()); + Kms kms = new Kms(kmsProp, Whitebox.getInternalState(spy, "loadManager"), + Whitebox.getInternalState(spy, "quarantineKiller")); KurentoClient kClient = mock(KurentoClient.class); doAnswer(i -> {