diff options
| author | Valerij Fredriksen <valerijf@verizonmedia.com> | 2019-09-13 11:45:14 +0200 |
|---|---|---|
| committer | Valerij Fredriksen <valerijf@verizonmedia.com> | 2019-09-13 11:45:14 +0200 |
| commit | 48b7e80212ab83a18fcd9338764b8b12fb4635b0 (patch) | |
| tree | e132a49c3c30dadceff90fe6fd2c73ba5d0ef9f1 | |
| parent | 5fd8f3b78bc5968290d4fb7cd316e8cecde95666 (diff) | |
Bring back canonicalName()
| -rw-r--r-- | config-provisioning/abi-spec.json | 1 | ||||
| -rw-r--r-- | config-provisioning/src/main/java/com/yahoo/config/provision/Flavor.java | 5 |
2 files changed, 4 insertions, 2 deletions
diff --git a/config-provisioning/abi-spec.json b/config-provisioning/abi-spec.json index b41bf96332d..55b96cc9808 100644 --- a/config-provisioning/abi-spec.json +++ b/config-provisioning/abi-spec.json @@ -403,6 +403,7 @@ "public double getMinCpuCores()", "public com.yahoo.config.provision.Flavor$Type getType()", "public boolean isDocker()", + "public java.lang.String canonicalName()", "public int hashCode()", "public boolean equals(java.lang.Object)", "public java.lang.String toString()" 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 e511e272497..c430765ef1d 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 @@ -4,8 +4,6 @@ package com.yahoo.config.provision; import com.yahoo.config.provision.host.FlavorOverrides; import com.yahoo.config.provisioning.FlavorsConfig; -import java.util.Collections; -import java.util.List; import java.util.Objects; import java.util.Optional; @@ -118,6 +116,9 @@ public class Flavor { /** Convenience, returns getType() == Type.DOCKER_CONTAINER */ public boolean isDocker() { return type == Type.DOCKER_CONTAINER; } + // TODO: Remove after Vespa 6 is gone + public String canonicalName() { return name; } + @Override public int hashCode() { return Objects.hash(name, flavorOverrides); } |