From dec3a87d21b7e43292dba60edc710bf0f8742af0 Mon Sep 17 00:00:00 2001 From: bgrozev Date: Mon, 2 May 2022 15:20:20 -0500 Subject: [PATCH] ref: Remove use of JMap. (#259) * ref: Remove use of JMap and the guava dependency * Update jitsi-utils * Remove the guava dependency (jitsi/jitsi-utils#119) * Don't use "jnilib" as the suffix for mac native libs; it's just "dylib". (jitsi/jitsi-utils#118) * Make BucketStats.toJson() overridable. (jitsi/jitsi-utils#117) * Move routeLoudestOnly filtering. (jitsi/jitsi-utils#116) * Add DominantSpeakerIdentification.isAmongLoudest (jitsi/jitsi-utils#115) * feat: Add an option to close the queue without interrupting the running task. (jitsi/jitsi-utils#114) * ref(EventEmitter): use error lvl for throwables Pawel Domas --- pom.xml | 2 +- src/main/java/org/ice4j/ice/Agent.java | 7 +++++-- src/main/java/org/ice4j/ice/Component.java | 4 +--- src/main/java/org/ice4j/ice/IceMediaStream.java | 4 +++- 4 files changed, 10 insertions(+), 7 deletions(-) diff --git a/pom.xml b/pom.xml index 881f976..5f774ac 100644 --- a/pom.xml +++ b/pom.xml @@ -58,7 +58,7 @@ ${project.groupId} jitsi-utils - 1.0-107-g566f8f8 + 1.0-114-g43815ed ${project.groupId} diff --git a/src/main/java/org/ice4j/ice/Agent.java b/src/main/java/org/ice4j/ice/Agent.java index 44ced99..a9e6876 100644 --- a/src/main/java/org/ice4j/ice/Agent.java +++ b/src/main/java/org/ice4j/ice/Agent.java @@ -335,11 +335,14 @@ public class Agent this.ufrag = ufrag; if (parentLogger != null) { - logger = parentLogger.createChildLogger(this.getClass().getName(), JMap.of("ufrag", this.ufrag)); + + logger = parentLogger.createChildLogger( + this.getClass().getName(), + Collections.singletonMap("ufrag", this.ufrag)); } else { - logger = new LoggerImpl(Agent.class.getName(), new LogContext(JMap.of("ufrag", this.ufrag))); + logger = new LoggerImpl(Agent.class.getName(), new LogContext("ufrag", this.ufrag)); } connCheckServer = new ConnectivityCheckServer(this); diff --git a/src/main/java/org/ice4j/ice/Component.java b/src/main/java/org/ice4j/ice/Component.java index 42c1eca..681a2a9 100644 --- a/src/main/java/org/ice4j/ice/Component.java +++ b/src/main/java/org/ice4j/ice/Component.java @@ -18,14 +18,12 @@ package org.ice4j.ice; import java.beans.*; -import java.io.*; import java.net.*; import java.util.*; import java.util.concurrent.*; import org.ice4j.*; import org.ice4j.socket.*; -import org.jitsi.utils.collections.*; import org.jitsi.utils.logging2.*; /** @@ -194,7 +192,7 @@ public class Component = Objects.requireNonNull(keepAliveStrategy, "keepAliveStrategy"); this.logger = parentLogger.createChildLogger( this.getClass().getName(), - JMap.of("componentId", Integer.toString(componentID)) + Collections.singletonMap("componentId", Integer.toString(componentID)) ); if (useComponentSocket) diff --git a/src/main/java/org/ice4j/ice/IceMediaStream.java b/src/main/java/org/ice4j/ice/IceMediaStream.java index 10e0500..6ac0f49 100644 --- a/src/main/java/org/ice4j/ice/IceMediaStream.java +++ b/src/main/java/org/ice4j/ice/IceMediaStream.java @@ -155,7 +155,9 @@ public class IceMediaStream */ protected IceMediaStream(Agent parentAgent, String name) { - logger = parentAgent.getLogger().createChildLogger(IceMediaStream.class.getName(), JMap.of("name", name)); + logger = parentAgent.getLogger().createChildLogger( + IceMediaStream.class.getName(), + Collections.singletonMap("name", name)); this.name = name; this.parentAgent = parentAgent; checkList = new CheckList(this);