diff options
author | gjoranv <gv@yahoo-inc.com> | 2017-02-24 23:56:04 +0100 |
---|---|---|
committer | gjoranv <gv@yahoo-inc.com> | 2017-02-24 23:56:04 +0100 |
commit | 1a4eb36a67cb3731bfa3c200cdd7aaa4f65b9886 (patch) | |
tree | 0e8fce5364dc88ca49fadf469e82860d0bf9388d /config-model/src | |
parent | 47eb9aab11a1c8e1f864cc86e040adc9192fb53e (diff) |
Use Flavor object instead of String.
Diffstat (limited to 'config-model/src')
-rw-r--r-- | config-model/src/main/java/com/yahoo/vespa/model/HostResource.java | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/config-model/src/main/java/com/yahoo/vespa/model/HostResource.java b/config-model/src/main/java/com/yahoo/vespa/model/HostResource.java index f3e3abeff91..a0ad80c3070 100644 --- a/config-model/src/main/java/com/yahoo/vespa/model/HostResource.java +++ b/config-model/src/main/java/com/yahoo/vespa/model/HostResource.java @@ -3,6 +3,7 @@ package com.yahoo.vespa.model; import com.yahoo.config.model.api.HostInfo; import com.yahoo.config.provision.ClusterMembership; +import com.yahoo.config.provision.Flavor; import javax.annotation.Nullable; import java.util.ArrayList; @@ -40,7 +41,7 @@ public class HostResource implements Comparable<HostResource> { private Set<ClusterMembership> clusterMemberships = new LinkedHashSet<>(); // Empty for self-hosted Vespa. - private Optional<String> flavor = Optional.empty(); + private Optional<Flavor> flavor = Optional.empty(); /** * Create a new {@link HostResource} bound to a specific {@link com.yahoo.vespa.model.Host}. @@ -225,10 +226,10 @@ public class HostResource implements Comparable<HostResource> { .collect(Collectors.toSet())); } - public void setFlavor(Optional<String> flavor) { this.flavor = flavor; } + public void setFlavor(Optional<Flavor> flavor) { this.flavor = flavor; } /** Returns the flavor of this resource. Empty for self-hosted Vespa. */ - public Optional<String> getFlavor() { return flavor; } + public Optional<Flavor> getFlavor() { return flavor; } public void addClusterMembership(@Nullable ClusterMembership clusterMembership) { if (clusterMembership != null) |