From 2cc608cc44522d046f0609899cd39ccf6a96b251 Mon Sep 17 00:00:00 2001 From: Bjørn Christian Seime Date: Wed, 13 Mar 2019 17:27:21 +0100 Subject: Replace use of Guava with standard library --- .../java/com/yahoo/container/jdisc/ConfiguredApplication.java | 9 ++------- 1 file changed, 2 insertions(+), 7 deletions(-) (limited to 'container-disc') diff --git a/container-disc/src/main/java/com/yahoo/container/jdisc/ConfiguredApplication.java b/container-disc/src/main/java/com/yahoo/container/jdisc/ConfiguredApplication.java index eae121604e4..accc844c93e 100644 --- a/container-disc/src/main/java/com/yahoo/container/jdisc/ConfiguredApplication.java +++ b/container-disc/src/main/java/com/yahoo/container/jdisc/ConfiguredApplication.java @@ -1,7 +1,6 @@ // Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. package com.yahoo.container.jdisc; -import com.google.common.collect.MapMaker; import com.google.inject.AbstractModule; import com.google.inject.Inject; import com.google.inject.Injector; @@ -48,6 +47,7 @@ import java.util.IdentityHashMap; import java.util.List; import java.util.Map; import java.util.Set; +import java.util.WeakHashMap; import java.util.concurrent.ScheduledThreadPoolExecutor; import java.util.concurrent.TimeUnit; import java.util.logging.Level; @@ -70,7 +70,7 @@ public final class ConfiguredApplication implements Application { } private static final Logger log = Logger.getLogger(ConfiguredApplication.class.getName()); - private static final Set startedClients = newWeakIdentitySet(); + private static final Set startedClients = Collections.newSetFromMap(new WeakHashMap<>()); private static final Set startedServers = Collections.newSetFromMap(new IdentityHashMap<>()); private final SubscriberFactory subscriberFactory; @@ -411,9 +411,4 @@ public final class ConfiguredApplication implements Application { } } - private static Set newWeakIdentitySet() { - Map weakIdentityHashMap = new MapMaker().weakKeys().makeMap(); - return Collections.newSetFromMap(weakIdentityHashMap); - } - } -- cgit v1.2.3