Less guava

7 files changed, 12 insertions, 19 deletions

diff --git a/config-provisioning/src/main/java/com/yahoo/config/provision/AllocatedHosts.java b/config-provisioning/src/main/java/com/yahoo/config/provision/AllocatedHosts.java
index 895325c502d..c6228dc71e9 100644
--- a/config-provisioning/src/main/java/com/yahoo/config/provision/AllocatedHosts.java
+++ b/config-provisioning/src/main/java/com/yahoo/config/provision/AllocatedHosts.java
@@ -15,7 +15,7 @@ import java.util.Set;
  */
 public class AllocatedHosts {
 
-    private final ImmutableSet<HostSpec> hosts;
+    private final Set<HostSpec> hosts;
 
     private AllocatedHosts(Set<HostSpec> hosts) {
         this.hosts = ImmutableSet.copyOf(hosts);
diff --git a/config-provisioning/src/main/java/com/yahoo/config/provision/Flavor.java b/config-provisioning/src/main/java/com/yahoo/config/provision/Flavor.java
index b393d9ee22a..48c84b8ecb7 100644
--- a/config-provisioning/src/main/java/com/yahoo/config/provision/Flavor.java
+++ b/config-provisioning/src/main/java/com/yahoo/config/provision/Flavor.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.config.provision;
 
-import com.google.common.collect.ImmutableList;
 import com.yahoo.config.provisioning.FlavorsConfig;
 
 import java.util.ArrayList;
@@ -151,7 +150,7 @@ public class Flavor {
 
     /** Irreversibly freezes the content of this */
     public void freeze() {
-        replacesFlavors = ImmutableList.copyOf(replacesFlavors);
+        replacesFlavors = List.copyOf(replacesFlavors);
     }
 
     @Override
diff --git a/config-provisioning/src/main/java/com/yahoo/config/provision/HostFilter.java b/config-provisioning/src/main/java/com/yahoo/config/provision/HostFilter.java
index 5615cdbd2f1..95eec2ac0fb 100644
--- a/config-provisioning/src/main/java/com/yahoo/config/provision/HostFilter.java
+++ b/config-provisioning/src/main/java/com/yahoo/config/provision/HostFilter.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.config.provision;
 
-import com.google.common.collect.ImmutableSet;
 import com.yahoo.text.StringUtilities;
 
 import java.util.Collection;
@@ -78,10 +77,10 @@ public class HostFilter {
                                   Collection<String> flavors,
                                   Collection<ClusterSpec.Type> clusterTypes,
                                   Collection<ClusterSpec.Id> clusterIds) {
-        return new HostFilter(ImmutableSet.copyOf(hostNames),
-                              ImmutableSet.copyOf(flavors),
-                              ImmutableSet.copyOf(clusterTypes),
-                              ImmutableSet.copyOf(clusterIds));
+        return new HostFilter(Set.copyOf(hostNames),
+                              Set.copyOf(flavors),
+                              Set.copyOf(clusterTypes),
+                              Set.copyOf(clusterIds));
     }
 
     /** Returns a host filter from three comma and-or space separated string lists. The strings may be null or empty. */
diff --git a/config-provisioning/src/main/java/com/yahoo/config/provision/HostSpec.java b/config-provisioning/src/main/java/com/yahoo/config/provision/HostSpec.java
index e5d4aadb988..ba7a3c2f06b 100644
--- a/config-provisioning/src/main/java/com/yahoo/config/provision/HostSpec.java
+++ b/config-provisioning/src/main/java/com/yahoo/config/provision/HostSpec.java
@@ -1,8 +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.config.provision;
 
-import com.google.common.collect.ImmutableList;
-
 import java.util.ArrayList;
 import java.util.List;
 import java.util.Objects;
@@ -20,7 +18,7 @@ public class HostSpec implements Comparable<HostSpec> {
     private final String hostname;
 
     /** Aliases of this host */
-    private final ImmutableList<String> aliases;
+    private final List<String> aliases;
 
     /** The current membership role of this host in the cluster it belongs to */
     private final Optional<ClusterMembership> membership;
@@ -67,7 +65,7 @@ public class HostSpec implements Comparable<HostSpec> {
         Objects.requireNonNull(version, "Version cannot be null but can be empty");
         Objects.requireNonNull(networkPorts, "Network ports cannot be null but can be empty");
         this.hostname = hostname;
-        this.aliases = ImmutableList.copyOf(aliases);
+        this.aliases = List.copyOf(aliases);
         this.flavor = flavor;
         this.membership = membership;
         this.version = version;
diff --git a/config-provisioning/src/main/java/com/yahoo/config/provision/NodeFlavors.java b/config-provisioning/src/main/java/com/yahoo/config/provision/NodeFlavors.java
index 762c7cbaba5..4d4d3c8cf86 100644
--- a/config-provisioning/src/main/java/com/yahoo/config/provision/NodeFlavors.java
+++ b/config-provisioning/src/main/java/com/yahoo/config/provision/NodeFlavors.java
@@ -1,12 +1,12 @@
 // Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
 package com.yahoo.config.provision;
 
-import com.google.common.collect.ImmutableMap;
 import com.google.inject.Inject;
 import com.yahoo.config.provisioning.FlavorsConfig;
 
 import java.util.ArrayList;
 import java.util.Collection;
+import java.util.Collections;
 import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
@@ -21,14 +21,14 @@ import java.util.stream.Collectors;
 public class NodeFlavors {
 
     /** Flavors which are configured in this zone */
-    private final ImmutableMap<String, Flavor> configuredFlavors;
+    private final Map<String, Flavor> configuredFlavors;
 
     @Inject
     public NodeFlavors(FlavorsConfig config) {
-        ImmutableMap.Builder<String, Flavor> b = new ImmutableMap.Builder<>();
+        HashMap<String, Flavor> b = new HashMap<>();
         for (Flavor flavor : toFlavors(config))
             b.put(flavor.name(), flavor);
-        this.configuredFlavors = b.build();
+        this.configuredFlavors = Collections.unmodifiableMap(b);
     }
 
     public List<Flavor> getFlavors() {
diff --git a/config-provisioning/src/main/java/com/yahoo/config/provision/Zone.java b/config-provisioning/src/main/java/com/yahoo/config/provision/Zone.java
index eebedd15e2c..33a13b1aa9f 100644
--- a/config-provisioning/src/main/java/com/yahoo/config/provision/Zone.java
+++ b/config-provisioning/src/main/java/com/yahoo/config/provision/Zone.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.config.provision;
 
-import com.google.common.base.Strings;
 import com.google.inject.Inject;
 import com.yahoo.cloud.config.ConfigserverConfig;
 
diff --git a/config-provisioning/src/main/java/com/yahoo/config/provision/zone/ZoneList.java b/config-provisioning/src/main/java/com/yahoo/config/provision/zone/ZoneList.java
index 776f925c424..4f9e335e4d8 100644
--- a/config-provisioning/src/main/java/com/yahoo/config/provision/zone/ZoneList.java
+++ b/config-provisioning/src/main/java/com/yahoo/config/provision/zone/ZoneList.java
@@ -1,10 +1,8 @@
 // Copyright 2018 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
 package com.yahoo.config.provision.zone;
 
-import com.google.common.collect.ImmutableList;
 import com.yahoo.config.provision.Environment;
 import com.yahoo.config.provision.RegionName;
-import com.yahoo.config.provision.Zone;
 
 import java.util.List;
 import java.util.stream.Collectors;