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
This commit is contained in:
bgrozev 2022-05-02 15:20:20 -05:00 committed by GitHub
parent 1f97cf2b26
commit dec3a87d21
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
4 changed files with 10 additions and 7 deletions

View File

@ -58,7 +58,7 @@
<dependency> <dependency>
<groupId>${project.groupId}</groupId> <groupId>${project.groupId}</groupId>
<artifactId>jitsi-utils</artifactId> <artifactId>jitsi-utils</artifactId>
<version>1.0-107-g566f8f8</version> <version>1.0-114-g43815ed</version>
</dependency> </dependency>
<dependency> <dependency>
<groupId>${project.groupId}</groupId> <groupId>${project.groupId}</groupId>

View File

@ -335,11 +335,14 @@ public class Agent
this.ufrag = ufrag; this.ufrag = ufrag;
if (parentLogger != null) 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 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); connCheckServer = new ConnectivityCheckServer(this);

View File

@ -18,14 +18,12 @@
package org.ice4j.ice; package org.ice4j.ice;
import java.beans.*; import java.beans.*;
import java.io.*;
import java.net.*; import java.net.*;
import java.util.*; import java.util.*;
import java.util.concurrent.*; import java.util.concurrent.*;
import org.ice4j.*; import org.ice4j.*;
import org.ice4j.socket.*; import org.ice4j.socket.*;
import org.jitsi.utils.collections.*;
import org.jitsi.utils.logging2.*; import org.jitsi.utils.logging2.*;
/** /**
@ -194,7 +192,7 @@ public class Component
= Objects.requireNonNull(keepAliveStrategy, "keepAliveStrategy"); = Objects.requireNonNull(keepAliveStrategy, "keepAliveStrategy");
this.logger = parentLogger.createChildLogger( this.logger = parentLogger.createChildLogger(
this.getClass().getName(), this.getClass().getName(),
JMap.of("componentId", Integer.toString(componentID)) Collections.singletonMap("componentId", Integer.toString(componentID))
); );
if (useComponentSocket) if (useComponentSocket)

View File

@ -155,7 +155,9 @@ public class IceMediaStream
*/ */
protected IceMediaStream(Agent parentAgent, String name) 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.name = name;
this.parentAgent = parentAgent; this.parentAgent = parentAgent;
checkList = new CheckList(this); checkList = new CheckList(this);