From bf56fe02a7a60857333de8e269f784597395e1c8 Mon Sep 17 00:00:00 2001 From: pabloFuente Date: Tue, 11 Nov 2025 18:46:16 +0100 Subject: [PATCH] openvidu-server: fix deprecations and remove warnings --- .../io/openvidu/java/client/RecordingProperties.java | 1 + .../server/kurento/endpoint/PublisherEndpoint.java | 2 +- .../main/java/io/openvidu/server/kurento/kms/Kms.java | 1 - .../java/io/openvidu/server/recording/Recording.java | 2 +- .../service/SingleStreamRecordingService.java | 11 +++++++---- .../config/IntegrationTestConfiguration.java | 11 ++++++----- 6 files changed, 16 insertions(+), 12 deletions(-) diff --git a/openvidu-java-client/src/main/java/io/openvidu/java/client/RecordingProperties.java b/openvidu-java-client/src/main/java/io/openvidu/java/client/RecordingProperties.java index 37752e907..e407c59fc 100644 --- a/openvidu-java-client/src/main/java/io/openvidu/java/client/RecordingProperties.java +++ b/openvidu-java-client/src/main/java/io/openvidu/java/client/RecordingProperties.java @@ -544,6 +544,7 @@ public class RecordingProperties { Boolean ignoreFailedStreamsParam; try { + @SuppressWarnings("unused") String session = (String) params.get("session"); nameParam = (String) params.get("name"); hasAudioParam = (Boolean) params.get("hasAudio"); diff --git a/openvidu-server/src/main/java/io/openvidu/server/kurento/endpoint/PublisherEndpoint.java b/openvidu-server/src/main/java/io/openvidu/server/kurento/endpoint/PublisherEndpoint.java index 0d56e299b..9fe2d76e0 100644 --- a/openvidu-server/src/main/java/io/openvidu/server/kurento/endpoint/PublisherEndpoint.java +++ b/openvidu-server/src/main/java/io/openvidu/server/kurento/endpoint/PublisherEndpoint.java @@ -353,7 +353,7 @@ public class PublisherEndpoint extends MediaEndpoint { public JsonElement execMethod(String method, JsonObject params) throws OpenViduException { Props props = new JsonUtils().fromJsonObjectToProps(params); - return (JsonElement) ((GenericMediaElement) this.filter).invoke(method, props, JsonElement.class); + return (JsonElement) this.filter.invoke(method, props, JsonElement.class); } public synchronized void mute(TrackType muteType) { diff --git a/openvidu-server/src/main/java/io/openvidu/server/kurento/kms/Kms.java b/openvidu-server/src/main/java/io/openvidu/server/kurento/kms/Kms.java index 3c42f9aa6..0fc2be1fb 100644 --- a/openvidu-server/src/main/java/io/openvidu/server/kurento/kms/Kms.java +++ b/openvidu-server/src/main/java/io/openvidu/server/kurento/kms/Kms.java @@ -20,7 +20,6 @@ package io.openvidu.server.kurento.kms; import java.net.URI; import java.net.URISyntaxException; import java.util.Collection; -import java.util.HashSet; import java.util.Map; import java.util.Map.Entry; import java.util.Set; diff --git a/openvidu-server/src/main/java/io/openvidu/server/recording/Recording.java b/openvidu-server/src/main/java/io/openvidu/server/recording/Recording.java index d86c81996..d5bc42831 100644 --- a/openvidu-server/src/main/java/io/openvidu/server/recording/Recording.java +++ b/openvidu-server/src/main/java/io/openvidu/server/recording/Recording.java @@ -59,7 +59,7 @@ public class Recording { try { this.duration = json.get("duration").getAsDouble(); } catch (Exception e) { - this.duration = Long.valueOf((long) json.get("duration").getAsLong()).doubleValue(); + this.duration = Long.valueOf(json.get("duration").getAsLong()).doubleValue(); } if (json.get("url").isJsonNull()) { this.url = null; diff --git a/openvidu-server/src/main/java/io/openvidu/server/recording/service/SingleStreamRecordingService.java b/openvidu-server/src/main/java/io/openvidu/server/recording/service/SingleStreamRecordingService.java index d064cbd34..ef1e2a97c 100644 --- a/openvidu-server/src/main/java/io/openvidu/server/recording/service/SingleStreamRecordingService.java +++ b/openvidu-server/src/main/java/io/openvidu/server/recording/service/SingleStreamRecordingService.java @@ -165,14 +165,16 @@ public class SingleStreamRecordingService extends RecordingService { }); final CountDownLatch stoppedCountDown = new CountDownLatch(wrappers.size()); - ForkJoinPool customThreadPool = new ForkJoinPool(4); - try { + try (ForkJoinPool customThreadPool = new ForkJoinPool(4)) { customThreadPool.submit(() -> wrappers.parallelStream().forEach(wrapper -> { this.stopRecorderEndpointOfPublisherEndpoint(recording.getId(), wrapper.getStreamId(), stoppedCountDown, kmsDisconnectionTime); })); - } finally { customThreadPool.shutdown(); + customThreadPool.awaitTermination(Long.MAX_VALUE, TimeUnit.NANOSECONDS); + } catch (InterruptedException e) { + recording.setStatus(io.openvidu.java.client.Recording.Status.failed); + log.error("Exception while stopping recorder endpoints", e); } try { @@ -253,7 +255,8 @@ public class SingleStreamRecordingService extends RecordingService { RecorderEndpoint recorder = new RecorderEndpoint.Builder(pipeline, "file://" + openviduConfig.getOpenViduRecordingPath(kmsUri) + recordingId + "/" + fileName - + fileExtension).withMediaProfile(profile).build(); + + fileExtension) + .withMediaProfile(profile).build(); recorder.addRecordingListener(new EventListener() { @Override 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 cc0f629d2..0e9596aa1 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 @@ -1,6 +1,7 @@ package io.openvidu.server.test.integration.config; -import static org.mockito.ArgumentMatchers.any; +import static org.mockito.ArgumentMatchers.anyBoolean; +import static org.mockito.ArgumentMatchers.anyList; import static org.mockito.Mockito.doAnswer; import static org.mockito.Mockito.mock; import static org.mockito.Mockito.when; @@ -44,7 +45,7 @@ public class IntegrationTestConfiguration { List successfullyConnectedKmss = new ArrayList<>(); List kmsProperties = null; try { - kmsProperties = invocation.getArgument(0); + kmsProperties = invocation.>getArgument(0); } catch (Exception e) { Assertions.fail("Error getting argument from stubbed method: " + e.getMessage()); } @@ -63,13 +64,13 @@ public class IntegrationTestConfiguration { Thread.sleep((long) (Math.random() * 1000)); Continuation continuation = null; try { - continuation = i.getArgument(0); + continuation = i.>getArgument(0); } catch (Exception e) { System.err.println("Error getting argument from stubbed method: " + e.getMessage()); } continuation.onSuccess(mock(MediaPipeline.class)); return null; - }).when(kClient).createMediaPipeline((Continuation) any()); + }).when(kClient).createMediaPipeline(Mockito.>any()); ServerManager serverManagerMock = mock(ServerManager.class); ServerInfo serverInfoMock = new ServerInfo("6.16.0", new ArrayList<>(), ServerType.KMS, @@ -85,7 +86,7 @@ public class IntegrationTestConfiguration { successfullyConnectedKmss.add(kms); } return successfullyConnectedKmss; - }).when(spy).initializeKurentoClients(any(List.class), any(Boolean.class)); + }).when(spy).initializeKurentoClients(anyList(), anyBoolean()); return spy; }