ProvisionInfo -> AllocatedHosts

3 files changed, 128 insertions, 83 deletions

diff --git a/config-provisioning/src/main/java/com/yahoo/config/provision/AllocatedHosts.java b/config-provisioning/src/main/java/com/yahoo/config/provision/AllocatedHosts.java
new file mode 100644
index 00000000000..13efc2b3337
--- /dev/null
+++ b/config-provisioning/src/main/java/com/yahoo/config/provision/AllocatedHosts.java
@@ -0,0 +1,116 @@
+// Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
+package com.yahoo.config.provision;
+
+import com.google.common.collect.ImmutableSet;
+import com.yahoo.slime.ArrayTraverser;
+import com.yahoo.slime.Cursor;
+import com.yahoo.slime.Inspector;
+import com.yahoo.slime.Slime;
+import com.yahoo.vespa.config.SlimeUtils;
+
+import java.io.IOException;
+import java.util.Collections;
+import java.util.LinkedHashSet;
+import java.util.Optional;
+import java.util.Set;
+
+/**
+ * The hosts allocated to an application.
+ * This can be serialized to/from JSON.
+ * This is immutable.
+ *
+ * @author Ulf Lilleengen
+ * @author bratseth
+ */
+public class AllocatedHosts {
+
+    private static final String mappingKey = "mapping";
+    private static final String hostSpecKey = "hostSpec";
+    private static final String hostSpecHostName = "hostName";
+    private static final String hostSpecMembership = "membership";
+    private static final String hostSpecFlavor = "flavor";
+    private static final String hostSpecVespaVersion = "vespaVersion";
+
+    private final ImmutableSet<HostSpec> hosts;
+
+    AllocatedHosts(Set<HostSpec> hosts) {
+        this.hosts = ImmutableSet.copyOf(hosts);
+    }
+
+    public static AllocatedHosts withHosts(Set<HostSpec> hosts) {
+        return new AllocatedHosts(hosts);
+    }
+
+    private void toSlime(Cursor cursor) {
+        Cursor array = cursor.setArray(mappingKey);
+        for (HostSpec host : hosts)
+            toSlime(host, array.addObject().setObject(hostSpecKey));
+    }
+
+    private void toSlime(HostSpec host, Cursor cursor) {
+        cursor.setString(hostSpecHostName, host.hostname());
+        if (host.membership().isPresent()) {
+            cursor.setString(hostSpecMembership, host.membership().get().stringValue());
+            cursor.setString(hostSpecVespaVersion, host.membership().get().cluster().vespaVersion().toString());
+        }
+        if (host.flavor().isPresent())
+            cursor.setString(hostSpecFlavor, host.flavor().get().name());
+    }
+
+    /** Returns the hosts of this allocation */
+    public Set<HostSpec> getHosts() { return hosts; }
+
+    private static AllocatedHosts fromSlime(Inspector inspector, Optional<NodeFlavors> nodeFlavors) {
+        Inspector array = inspector.field(mappingKey);
+        Set<HostSpec> hosts = new LinkedHashSet<>();
+        array.traverse(new ArrayTraverser() {
+            @Override
+            public void entry(int i, Inspector inspector) {
+                hosts.add(hostsFromSlime(inspector.field(hostSpecKey), nodeFlavors));
+            }
+        });
+        return new AllocatedHosts(hosts);
+    }
+
+    static HostSpec hostsFromSlime(Inspector object, Optional<NodeFlavors> nodeFlavors) {
+        Optional<ClusterMembership> membership =
+                object.field(hostSpecMembership).valid() ? Optional.of(membershipFromSlime(object)) : Optional.empty();
+        Optional<Flavor> flavor =
+                object.field(hostSpecFlavor).valid() ? flavorFromSlime(object, nodeFlavors) : Optional.empty();
+
+        return new HostSpec(object.field(hostSpecHostName).asString(),Collections.emptyList(), flavor, membership);
+    }
+
+    private static ClusterMembership membershipFromSlime(Inspector object) {
+        return ClusterMembership.from(object.field(hostSpecMembership).asString(),
+                                      com.yahoo.component.Version.fromString(object.field(hostSpecVespaVersion).asString()));
+    }
+
+    private static Optional<Flavor> flavorFromSlime(Inspector object, Optional<NodeFlavors> nodeFlavors) {
+        return nodeFlavors.map(flavorMapper ->  flavorMapper.getFlavor(object.field(hostSpecFlavor).asString()))
+                .orElse(Optional.empty());
+    }
+
+    public byte[] toJson() throws IOException {
+        Slime slime = new Slime();
+        toSlime(slime.setObject());
+        return SlimeUtils.toJsonBytes(slime);
+    }
+
+    public static AllocatedHosts fromJson(byte[] json, Optional<NodeFlavors> nodeFlavors) {
+        return fromSlime(SlimeUtils.jsonToSlime(json).get(), nodeFlavors);
+    }
+    
+    @Override
+    public boolean equals(Object other) {
+        if (other == this) return true;
+        if ( ! (other instanceof AllocatedHosts)) return false;
+        return ((AllocatedHosts) other).hosts.equals(this.hosts);
+    }
+    
+    @Override
+    public int hashCode() {
+        return hosts.hashCode();
+    }
+
+}
diff --git a/config-provisioning/src/main/java/com/yahoo/config/provision/ProvisionInfo.java b/config-provisioning/src/main/java/com/yahoo/config/provision/ProvisionInfo.java
index a09e198dbf1..dbb1b55aeb9 100644
--- a/config-provisioning/src/main/java/com/yahoo/config/provision/ProvisionInfo.java
+++ b/config-provisioning/src/main/java/com/yahoo/config/provision/ProvisionInfo.java
@@ -1,66 +1,37 @@
-// Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
 package com.yahoo.config.provision;
 
-import com.google.common.collect.ImmutableSet;
 import com.yahoo.slime.ArrayTraverser;
-import com.yahoo.slime.Cursor;
 import com.yahoo.slime.Inspector;
-import com.yahoo.slime.Slime;
 import com.yahoo.vespa.config.SlimeUtils;
 
-import java.io.IOException;
-import java.util.Collection;
-import java.util.Collections;
 import java.util.LinkedHashSet;
 import java.util.Optional;
 import java.util.Set;
 
 /**
- * The hosts allocated to an application (a better name would be "AllocatedHosts").
- * This can be serialized to/from JSON.
- * This is immutable.
- *
- * @author Ulf Lilleengen
  * @author bratseth
+ * @deprecated use AllocatedHosts
  */
-public class ProvisionInfo {
+// TODO: Remove when no version older than 6.143 is in production anywhere
+@Deprecated
+@SuppressWarnings("unused")
+public class ProvisionInfo extends AllocatedHosts {
 
     private static final String mappingKey = "mapping";
     private static final String hostSpecKey = "hostSpec";
-    private static final String hostSpecHostName = "hostName";
-    private static final String hostSpecMembership = "membership";
-    private static final String hostSpecFlavor = "flavor";
-    private static final String hostSpecVespaVersion = "vespaVersion";
-
-    private final ImmutableSet<HostSpec> hosts;
 
     private ProvisionInfo(Set<HostSpec> hosts) {
-        this.hosts = ImmutableSet.copyOf(hosts);
+        super(hosts);
     }
 
     public static ProvisionInfo withHosts(Set<HostSpec> hosts) {
         return new ProvisionInfo(hosts);
     }
 
-    private void toSlime(Cursor cursor) {
-        Cursor array = cursor.setArray(mappingKey);
-        for (HostSpec host : hosts)
-            toSlime(host, array.addObject().setObject(hostSpecKey));
-    }
-
-    private void toSlime(HostSpec host, Cursor cursor) {
-        cursor.setString(hostSpecHostName, host.hostname());
-        if (host.membership().isPresent()) {
-            cursor.setString(hostSpecMembership, host.membership().get().stringValue());
-            cursor.setString(hostSpecVespaVersion, host.membership().get().cluster().vespaVersion().toString());
-        }
-        if (host.flavor().isPresent())
-            cursor.setString(hostSpecFlavor, host.flavor().get().name());
+    public static ProvisionInfo fromJson(byte[] json, Optional<NodeFlavors> nodeFlavors) {
+        return fromSlime(SlimeUtils.jsonToSlime(json).get(), nodeFlavors);
     }
 
-    /** Returns the hosts of this allocation */
-    public Set<HostSpec> getHosts() { return hosts; }
-
     private static ProvisionInfo fromSlime(Inspector inspector, Optional<NodeFlavors> nodeFlavors) {
         Inspector array = inspector.field(mappingKey);
         Set<HostSpec> hosts = new LinkedHashSet<>();
@@ -73,45 +44,4 @@ public class ProvisionInfo {
         return new ProvisionInfo(hosts);
     }
 
-    private static HostSpec hostsFromSlime(Inspector object, Optional<NodeFlavors> nodeFlavors) {
-        Optional<ClusterMembership> membership =
-                object.field(hostSpecMembership).valid() ? Optional.of(membershipFromSlime(object)) : Optional.empty();
-        Optional<Flavor> flavor =
-                object.field(hostSpecFlavor).valid() ? flavorFromSlime(object, nodeFlavors) : Optional.empty();
-
-        return new HostSpec(object.field(hostSpecHostName).asString(),Collections.emptyList(), flavor, membership);
-    }
-
-    private static ClusterMembership membershipFromSlime(Inspector object) {
-        return ClusterMembership.from(object.field(hostSpecMembership).asString(),
-                                      com.yahoo.component.Version.fromString(object.field(hostSpecVespaVersion).asString()));
-    }
-
-    private static Optional<Flavor> flavorFromSlime(Inspector object, Optional<NodeFlavors> nodeFlavors) {
-        return nodeFlavors.map(flavorMapper ->  flavorMapper.getFlavor(object.field(hostSpecFlavor).asString()))
-                .orElse(Optional.empty());
-    }
-
-    public byte[] toJson() throws IOException {
-        Slime slime = new Slime();
-        toSlime(slime.setObject());
-        return SlimeUtils.toJsonBytes(slime);
-    }
-
-    public static ProvisionInfo fromJson(byte[] json, Optional<NodeFlavors> nodeFlavors) {
-        return fromSlime(SlimeUtils.jsonToSlime(json).get(), nodeFlavors);
-    }
-    
-    @Override
-    public boolean equals(Object other) {
-        if (other == this) return true;
-        if ( ! (other instanceof ProvisionInfo)) return false;
-        return ((ProvisionInfo) other).hosts.equals(this.hosts);
-    }
-    
-    @Override
-    public int hashCode() {
-        return hosts.hashCode();
-    }
-
 }
diff --git a/config-provisioning/src/test/java/com/yahoo/config/provision/ProvisionInfoTest.java b/config-provisioning/src/test/java/com/yahoo/config/provision/AllocatedHostsTest.java
index 435b6e3a28a..54ce90d76fc 100644
--- a/config-provisioning/src/test/java/com/yahoo/config/provision/ProvisionInfoTest.java
+++ b/config-provisioning/src/test/java/com/yahoo/config/provision/AllocatedHostsTest.java
@@ -4,7 +4,6 @@ package com.yahoo.config.provision;
 import org.junit.Test;
 
 import java.io.IOException;
-import java.util.Collections;
 import java.util.LinkedHashSet;
 import java.util.Optional;
 import java.util.Set;
@@ -15,7 +14,7 @@ import static org.junit.Assert.assertTrue;
 /**
  * @author Ulf Lilleengen
  */
-public class ProvisionInfoTest {
+public class AllocatedHostsTest {
 
     private final HostSpec h1 = new HostSpec("host1", Optional.empty());
     private final HostSpec h2 = new HostSpec("host2", Optional.empty());
@@ -27,12 +26,12 @@ public class ProvisionInfoTest {
         hosts.add(h1);
         hosts.add(h2);
         hosts.add(h3);
-        ProvisionInfo info = ProvisionInfo.withHosts(hosts);
+        AllocatedHosts info = AllocatedHosts.withHosts(hosts);
         assertProvisionInfo(info);
     }
 
-    private void assertProvisionInfo(ProvisionInfo info) throws IOException {
-        ProvisionInfo serializedInfo = ProvisionInfo.fromJson(info.toJson(), Optional.empty());
+    private void assertProvisionInfo(AllocatedHosts info) throws IOException {
+        AllocatedHosts serializedInfo = AllocatedHosts.fromJson(info.toJson(), Optional.empty());
         assertEquals(info.getHosts().size(), serializedInfo.getHosts().size());
         assertTrue(serializedInfo.getHosts().contains(h1));
         assertTrue(serializedInfo.getHosts().contains(h2));