From c0a2a4c5b8c595b3f523026a9684d505cabedf05 Mon Sep 17 00:00:00 2001
From: Henning Baldersheim <balder@yahoo-inc.com>
Date: Fri, 2 Dec 2022 22:44:23 +0100
Subject: Revert "Revert "Let list handling catch up with Java 17""

---
 .../src/main/java/com/yahoo/config/model/admin/AdminModel.java   | 9 ++++-----
 .../src/main/java/com/yahoo/config/model/provision/Host.java     | 9 ++++-----
 2 files changed, 8 insertions(+), 10 deletions(-)

(limited to 'config-model/src/main/java/com/yahoo/config')

diff --git a/config-model/src/main/java/com/yahoo/config/model/admin/AdminModel.java b/config-model/src/main/java/com/yahoo/config/model/admin/AdminModel.java
index 4ae9834b87f..7fe7c4b9f68 100644
--- a/config-model/src/main/java/com/yahoo/config/model/admin/AdminModel.java
+++ b/config-model/src/main/java/com/yahoo/config/model/admin/AdminModel.java
@@ -1,7 +1,6 @@
 // Copyright Yahoo. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
 package com.yahoo.config.model.admin;
 
-import com.google.common.collect.ImmutableList;
 import com.yahoo.config.model.ApplicationConfigProducerRoot;
 import com.yahoo.config.model.ConfigModel;
 import com.yahoo.config.model.ConfigModelContext;
@@ -65,8 +64,8 @@ public class AdminModel extends ConfigModel {
     public static class BuilderV2 extends ConfigModelBuilder<AdminModel> {
 
         public static final List<ConfigModelId> configModelIds =
-                ImmutableList.of(ConfigModelId.fromNameAndVersion("admin", "2.0"),
-                                 ConfigModelId.fromNameAndVersion("admin", "1.0"));
+                List.of(ConfigModelId.fromNameAndVersion("admin", "2.0"),
+                        ConfigModelId.fromNameAndVersion("admin", "1.0"));
 
         public BuilderV2() {
             super(AdminModel.class);
@@ -98,8 +97,8 @@ public class AdminModel extends ConfigModel {
     public static class BuilderV4 extends ConfigModelBuilder<AdminModel> {
 
         public static final List<ConfigModelId> configModelIds =
-                ImmutableList.of(ConfigModelId.fromNameAndVersion("admin", "3.0"),
-                                 ConfigModelId.fromNameAndVersion("admin", "4.0"));
+                List.of(ConfigModelId.fromNameAndVersion("admin", "3.0"),
+                        ConfigModelId.fromNameAndVersion("admin", "4.0"));
 
         public BuilderV4() {
             super(AdminModel.class);
diff --git a/config-model/src/main/java/com/yahoo/config/model/provision/Host.java b/config-model/src/main/java/com/yahoo/config/model/provision/Host.java
index ea7a0bc0504..e4bbf55b541 100644
--- a/config-model/src/main/java/com/yahoo/config/model/provision/Host.java
+++ b/config-model/src/main/java/com/yahoo/config/model/provision/Host.java
@@ -1,7 +1,6 @@
 // Copyright Yahoo. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
 package com.yahoo.config.model.provision;
 
-import com.google.common.collect.ImmutableList;
 import com.yahoo.component.Version;
 import com.yahoo.config.provision.Flavor;
 
@@ -16,12 +15,12 @@ import java.util.Optional;
 public class Host {
 
     private final String hostname;
-    private final ImmutableList<String> aliases;
+    private final List<String> aliases;
     private final Optional<Flavor> flavor;
     private final Optional<Version> version;
 
     public Host(String hostname) {
-        this(hostname, ImmutableList.of(), Optional.empty());
+        this(hostname, List.of(), Optional.empty());
     }
 
     public Host(String hostname, List<String> hostAliases) {
@@ -34,7 +33,7 @@ public class Host {
 
     public Host(String hostname, List<String> hostAliases, Optional<Flavor> flavor, Optional<Version> version) {
         this.hostname = hostname;
-        this.aliases = ImmutableList.copyOf(hostAliases);
+        this.aliases = List.copyOf(hostAliases);
         this.flavor = flavor;
         this.version = version;
     }
@@ -52,7 +51,7 @@ public class Host {
     @Override
     public String toString() {
         return hostname + (aliases.size() > 0 ? " (aliases: " + aliases + ")" : "" ) +
-                (flavor.isPresent() ? " (flavor: " + flavor.get() + ")" : "");
+                (flavor.map(value -> " (flavor: " + value + ")").orElse(""));
     }
 
 }
-- 
cgit v1.2.3