Track API changes, remove warnings

5 files changed, 13 insertions, 18 deletions

diff --git a/config-model/src/test/java/com/yahoo/config/model/provision/HostSpecTest.java b/config-model/src/test/java/com/yahoo/config/model/provision/HostSpecTest.java
index 6a17f314d26..51b039a7532 100644
--- a/config-model/src/test/java/com/yahoo/config/model/provision/HostSpecTest.java
+++ b/config-model/src/test/java/com/yahoo/config/model/provision/HostSpecTest.java
@@ -11,10 +11,10 @@ import static org.junit.Assert.assertFalse;
 import static org.junit.Assert.assertTrue;
 
 /**
- * @author lulf
- * @since 5.11
+ * @author Ulf Lilleengen
  */
 public class HostSpecTest {
+
     @Test
     public void testEquals() {
         HostSpec h1 = new HostSpec("foo", Collections.<String>emptyList());
@@ -42,4 +42,5 @@ public class HostSpecTest {
         assertFalse(h4.equals(h3));
         assertTrue(h4.equals(h4));
     }
+
 }
diff --git a/config-provisioning/src/main/java/com/yahoo/config/provision/HostSpec.java b/config-provisioning/src/main/java/com/yahoo/config/provision/HostSpec.java
index a94660e142e..dd8bc311939 100644
--- a/config-provisioning/src/main/java/com/yahoo/config/provision/HostSpec.java
+++ b/config-provisioning/src/main/java/com/yahoo/config/provision/HostSpec.java
@@ -10,8 +10,7 @@ import java.util.Optional;
 
 /**
  * A specification of a host and its role.
- * This is a value object: Immutable and the identity is determined by all the content.
- * Host specs are ordered by host name.
+ * Equality and order is determined by the host name.
  *
  * @author hmusum
  */
@@ -71,21 +70,16 @@ public class HostSpec implements Comparable<HostSpec> {
     }
 
     @Override
-    public boolean equals(Object o) {
-        if (o == this) return true;
-        if ( ! (o instanceof HostSpec)) return false;
-
-        HostSpec other = (HostSpec) o;
-        if ( ! this.hostname.equals(other.hostname)) return false;
-        if ( ! this.aliases.equals(other.aliases)) return false;
-        if ( ! this.membership.equals(other.membership)) return false;
-        if ( ! this.flavor.equals(other.flavor)) return false;
-        return true;
+    public boolean equals(Object other) {
+        if (other == this) return true;
+        if ( ! (other instanceof HostSpec)) return false;
+
+        return ((HostSpec)other).hostname.equals(this.hostname);
     }
 
     @Override
     public int hashCode() {
-        return Objects.hash(hostname, aliases, membership, flavor); 
+        return hostname.hashCode();
     }
 
     @Override
diff --git a/configserver/src/main/java/com/yahoo/vespa/config/server/modelfactory/ModelsBuilder.java b/configserver/src/main/java/com/yahoo/vespa/config/server/modelfactory/ModelsBuilder.java
index 305f817f399..6d667947583 100644
--- a/configserver/src/main/java/com/yahoo/vespa/config/server/modelfactory/ModelsBuilder.java
+++ b/configserver/src/main/java/com/yahoo/vespa/config/server/modelfactory/ModelsBuilder.java
@@ -70,7 +70,7 @@ public abstract class ModelsBuilder<MODELRESULT extends ModelResult> {
                                               .collect(Collectors.toList());
 
         // The newest version (major and minor) (which is loaded first) decides the allocated hosts
-        SettableOptional<AllocatedHosts> allocatedHosts = new SettableOptional();
+        SettableOptional<AllocatedHosts> allocatedHosts = new SettableOptional<>();
         List<MODELRESULT> allApplicationModels = new ArrayList<>();
         for (int i = 0; i < majorVersions.size(); i++) {
             try {
diff --git a/configserver/src/test/java/com/yahoo/vespa/config/server/ModelStub.java b/configserver/src/test/java/com/yahoo/vespa/config/server/ModelStub.java
index ae65a3f01fe..2ccce9727a3 100644
--- a/configserver/src/test/java/com/yahoo/vespa/config/server/ModelStub.java
+++ b/configserver/src/test/java/com/yahoo/vespa/config/server/ModelStub.java
@@ -44,7 +44,7 @@ public class ModelStub implements Model {
     }
 
     @Override
-    public Optional<AllocatedHosts> getProvisionInfo() {
+    public AllocatedHosts allocatedHosts() {
         return null;
     }
 
diff --git a/configserver/src/test/java/com/yahoo/vespa/config/server/application/MockModel.java b/configserver/src/test/java/com/yahoo/vespa/config/server/application/MockModel.java
index ac2ca55313b..cf5463b7f4c 100644
--- a/configserver/src/test/java/com/yahoo/vespa/config/server/application/MockModel.java
+++ b/configserver/src/test/java/com/yahoo/vespa/config/server/application/MockModel.java
@@ -93,7 +93,7 @@ class MockModel implements Model {
     }
 
     @Override
-    public Optional<AllocatedHosts> getProvisionInfo() {
+    public AllocatedHosts allocatedHosts() {
         throw new UnsupportedOperationException();
     }
 }