diff options
author | Henning Baldersheim <balder@yahoo-inc.com> | 2022-11-30 10:04:50 +0100 |
---|---|---|
committer | Henning Baldersheim <balder@yahoo-inc.com> | 2022-11-30 10:04:50 +0100 |
commit | 448231f18ba53edf5c0e7ab4b6732ef69328281c (patch) | |
tree | 289f528fd6adac2a39e636c449c633c26fdb838e /jdisc_core/src/main/java/com | |
parent | 711362f17d4bbece0dc2d0833a22063374ae3e04 (diff) |
Reduce the simple usage of guava where java has caught up
Diffstat (limited to 'jdisc_core/src/main/java/com')
-rw-r--r-- | jdisc_core/src/main/java/com/yahoo/jdisc/application/BundleInstallationException.java | 5 | ||||
-rw-r--r-- | jdisc_core/src/main/java/com/yahoo/jdisc/application/ServerRepository.java | 10 |
2 files changed, 7 insertions, 8 deletions
diff --git a/jdisc_core/src/main/java/com/yahoo/jdisc/application/BundleInstallationException.java b/jdisc_core/src/main/java/com/yahoo/jdisc/application/BundleInstallationException.java index 6b3f4d6e7d7..ab75b499e20 100644 --- a/jdisc_core/src/main/java/com/yahoo/jdisc/application/BundleInstallationException.java +++ b/jdisc_core/src/main/java/com/yahoo/jdisc/application/BundleInstallationException.java @@ -1,13 +1,10 @@ // Copyright Yahoo. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. package com.yahoo.jdisc.application; -import com.google.common.collect.ImmutableList; import org.osgi.framework.Bundle; import org.osgi.framework.BundleException; -import java.util.ArrayList; import java.util.Collection; -import java.util.Collections; import java.util.List; /** @@ -25,7 +22,7 @@ public final class BundleInstallationException extends BundleException { public BundleInstallationException(Collection<Bundle> installedBundles, Throwable cause) { super(cause.getMessage(), cause); - this.installedBundles = ImmutableList.copyOf(installedBundles); + this.installedBundles = List.copyOf(installedBundles); } public List<Bundle> installedBundles() { diff --git a/jdisc_core/src/main/java/com/yahoo/jdisc/application/ServerRepository.java b/jdisc_core/src/main/java/com/yahoo/jdisc/application/ServerRepository.java index 39e7eb29c0f..b6121337e3d 100644 --- a/jdisc_core/src/main/java/com/yahoo/jdisc/application/ServerRepository.java +++ b/jdisc_core/src/main/java/com/yahoo/jdisc/application/ServerRepository.java @@ -1,12 +1,14 @@ // Copyright Yahoo. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. package com.yahoo.jdisc.application; -import com.google.common.collect.ImmutableList; import com.yahoo.jdisc.Container; import com.yahoo.jdisc.service.ServerProvider; import org.osgi.framework.Bundle; -import java.util.*; +import java.util.Collection; +import java.util.Iterator; +import java.util.LinkedList; +import java.util.List; import java.util.logging.Logger; /** @@ -25,7 +27,7 @@ public class ServerRepository implements Iterable<ServerProvider> { this.guice = guice; } - public Iterable<ServerProvider> activate() { return ImmutableList.copyOf(servers); } + public Iterable<ServerProvider> activate() { return List.copyOf(servers); } public List<ServerProvider> installAll(Bundle bundle, Iterable<String> serverNames) throws ClassNotFoundException { List<ServerProvider> lst = new LinkedList<>(); @@ -65,7 +67,7 @@ public class ServerRepository implements Iterable<ServerProvider> { } public Collection<ServerProvider> collection() { - return Collections.unmodifiableCollection(servers); + return List.copyOf(servers); } @Override |