diff options
author | Martin Polden <mpolden@mpolden.no> | 2019-08-14 09:57:17 +0200 |
---|---|---|
committer | Martin Polden <mpolden@mpolden.no> | 2019-08-14 09:57:17 +0200 |
commit | 6655499227a5dde8001be8e145d20da9697a58b8 (patch) | |
tree | 95d2781ed8d2809e8f1f4acf4817e37ef149fe11 | |
parent | d04b8d00d2c3421d1506dceb171491993206dc24 (diff) |
Less Guava
-rw-r--r-- | config-model-api/src/main/java/com/yahoo/config/application/api/DeploymentSpec.java | 10 |
1 files changed, 4 insertions, 6 deletions
diff --git a/config-model-api/src/main/java/com/yahoo/config/application/api/DeploymentSpec.java b/config-model-api/src/main/java/com/yahoo/config/application/api/DeploymentSpec.java index 5b5f89fd8d1..efe75d191b8 100644 --- a/config-model-api/src/main/java/com/yahoo/config/application/api/DeploymentSpec.java +++ b/config-model-api/src/main/java/com/yahoo/config/application/api/DeploymentSpec.java @@ -1,12 +1,10 @@ // Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. package com.yahoo.config.application.api; -import com.google.common.collect.ImmutableList; import com.yahoo.config.application.api.xml.DeploymentSpecXmlReader; import com.yahoo.config.provision.AthenzDomain; import com.yahoo.config.provision.AthenzService; import com.yahoo.config.provision.Environment; -import com.yahoo.config.provision.Flavor; import com.yahoo.config.provision.RegionName; import java.io.BufferedReader; @@ -69,12 +67,12 @@ public class DeploymentSpec { this.upgradePolicy = upgradePolicy; this.majorVersion = majorVersion; this.changeBlockers = changeBlockers; - this.steps = ImmutableList.copyOf(completeSteps(new ArrayList<>(steps))); + this.steps = List.copyOf(completeSteps(new ArrayList<>(steps))); this.xmlForm = xmlForm; this.athenzDomain = athenzDomain; this.athenzService = athenzService; this.notifications = notifications; - this.endpoints = ImmutableList.copyOf(validateEndpoints(endpoints, this.steps)); + this.endpoints = List.copyOf(validateEndpoints(endpoints, this.steps)); validateZones(this.steps); validateAthenz(); validateEndpoints(this.steps, globalServiceId, this.endpoints); @@ -102,7 +100,7 @@ public class DeploymentSpec { } } - return ImmutableList.copyOf(rebuiltEndpointsList); + return List.copyOf(rebuiltEndpointsList); } /** Throw an IllegalArgumentException if the total delay exceeds 24 hours */ @@ -481,7 +479,7 @@ public class DeploymentSpec { private final List<DeclaredZone> zones; public ParallelZones(List<DeclaredZone> zones) { - this.zones = ImmutableList.copyOf(zones); + this.zones = List.copyOf(zones); } @Override |