diff options
author | Bjørn Christian Seime <bjorn.christian@seime.no> | 2022-12-02 14:52:26 +0100 |
---|---|---|
committer | GitHub <noreply@github.com> | 2022-12-02 14:52:26 +0100 |
commit | 81b884ac555806ae2f0a75773accfd8fe27ecbe1 (patch) | |
tree | 0f92b9ef73a90854cacc96796562d3f21ff1cff6 /config-model/src/main/java/com/yahoo/config | |
parent | c956ac4cb73b329243072aabe35f0da508c02d0f (diff) |
Revert "Let list handling catch up with Java 17"
Diffstat (limited to 'config-model/src/main/java/com/yahoo/config')
-rw-r--r-- | config-model/src/main/java/com/yahoo/config/model/admin/AdminModel.java | 9 | ||||
-rw-r--r-- | config-model/src/main/java/com/yahoo/config/model/provision/Host.java | 9 |
2 files changed, 10 insertions, 8 deletions
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 7fe7c4b9f68..4ae9834b87f 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,6 +1,7 @@ // 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; @@ -64,8 +65,8 @@ public class AdminModel extends ConfigModel { public static class BuilderV2 extends ConfigModelBuilder<AdminModel> { public static final List<ConfigModelId> configModelIds = - List.of(ConfigModelId.fromNameAndVersion("admin", "2.0"), - ConfigModelId.fromNameAndVersion("admin", "1.0")); + ImmutableList.of(ConfigModelId.fromNameAndVersion("admin", "2.0"), + ConfigModelId.fromNameAndVersion("admin", "1.0")); public BuilderV2() { super(AdminModel.class); @@ -97,8 +98,8 @@ public class AdminModel extends ConfigModel { public static class BuilderV4 extends ConfigModelBuilder<AdminModel> { public static final List<ConfigModelId> configModelIds = - List.of(ConfigModelId.fromNameAndVersion("admin", "3.0"), - ConfigModelId.fromNameAndVersion("admin", "4.0")); + ImmutableList.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 e4bbf55b541..ea7a0bc0504 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,6 +1,7 @@ // 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; @@ -15,12 +16,12 @@ import java.util.Optional; public class Host { private final String hostname; - private final List<String> aliases; + private final ImmutableList<String> aliases; private final Optional<Flavor> flavor; private final Optional<Version> version; public Host(String hostname) { - this(hostname, List.of(), Optional.empty()); + this(hostname, ImmutableList.of(), Optional.empty()); } public Host(String hostname, List<String> hostAliases) { @@ -33,7 +34,7 @@ public class Host { public Host(String hostname, List<String> hostAliases, Optional<Flavor> flavor, Optional<Version> version) { this.hostname = hostname; - this.aliases = List.copyOf(hostAliases); + this.aliases = ImmutableList.copyOf(hostAliases); this.flavor = flavor; this.version = version; } @@ -51,7 +52,7 @@ public class Host { @Override public String toString() { return hostname + (aliases.size() > 0 ? " (aliases: " + aliases + ")" : "" ) + - (flavor.map(value -> " (flavor: " + value + ")").orElse("")); + (flavor.isPresent() ? " (flavor: " + flavor.get() + ")" : ""); } } |