summaryrefslogtreecommitdiffstats
path: root/configserver
diff options
context:
space:
mode:
authorJon Bratseth <bratseth@yahoo-inc.com>2017-08-28 13:31:06 +0200
committerJon Bratseth <bratseth@yahoo-inc.com>2017-08-28 13:31:06 +0200
commit82049904c1ae9235eab7d11027dc85919819bee9 (patch)
treeb1128918748f435664d2e344d4d9787d573cb61a /configserver
parent37fc005dc97351dfdcec2dc283f128befe91e04a (diff)
Track API changes, remove warnings
Diffstat (limited to 'configserver')
-rw-r--r--configserver/src/main/java/com/yahoo/vespa/config/server/modelfactory/ModelsBuilder.java2
-rw-r--r--configserver/src/test/java/com/yahoo/vespa/config/server/ModelStub.java2
-rw-r--r--configserver/src/test/java/com/yahoo/vespa/config/server/application/MockModel.java2
3 files changed, 3 insertions, 3 deletions
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();
}
}