diff options
author | Jon Bratseth <bratseth@yahoo-inc.com> | 2017-08-28 13:31:06 +0200 |
---|---|---|
committer | Jon Bratseth <bratseth@yahoo-inc.com> | 2017-08-28 13:31:06 +0200 |
commit | 82049904c1ae9235eab7d11027dc85919819bee9 (patch) | |
tree | b1128918748f435664d2e344d4d9787d573cb61a /configserver | |
parent | 37fc005dc97351dfdcec2dc283f128befe91e04a (diff) |
Track API changes, remove warnings
Diffstat (limited to 'configserver')
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(); } } |