diff options
author | Jon Marius Venstad <venstad@gmail.com> | 2019-11-05 10:52:56 +0100 |
---|---|---|
committer | Jon Marius Venstad <venstad@gmail.com> | 2019-11-05 10:52:56 +0100 |
commit | 00deba72aae6c182ca41b1d22b290ca49c4963b2 (patch) | |
tree | eef0908bb1357666d252d2ee80f3172940401fec /controller-server | |
parent | 73cbfef0434123f59584f9ed5f5cceac6715adbd (diff) |
Update conflicting usage of DeploymentSpec#changeBlocker(), which was removed
Diffstat (limited to 'controller-server')
-rw-r--r-- | controller-server/src/main/java/com/yahoo/vespa/hosted/controller/restapi/application/ApplicationApiHandler.java | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/restapi/application/ApplicationApiHandler.java b/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/restapi/application/ApplicationApiHandler.java index 836115d900a..4537f480706 100644 --- a/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/restapi/application/ApplicationApiHandler.java +++ b/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/restapi/application/ApplicationApiHandler.java @@ -736,7 +736,7 @@ public class ApplicationApiHandler extends LoggingRequestHandler { // Change blockers Cursor changeBlockers = object.setArray("changeBlockers"); - deploymentSpec.requireInstance(instance.name()).changeBlocker().forEach(changeBlocker -> { + deploymentSpec.instance(instance.name()).ifPresent(spec -> spec.changeBlocker().forEach(changeBlocker -> { Cursor changeBlockerObject = changeBlockers.addObject(); changeBlockerObject.setBool("versions", changeBlocker.blocksVersions()); changeBlockerObject.setBool("revisions", changeBlocker.blocksRevisions()); @@ -745,7 +745,7 @@ public class ApplicationApiHandler extends LoggingRequestHandler { changeBlocker.window().days().stream().map(DayOfWeek::getValue).forEach(days::addLong); Cursor hours = changeBlockerObject.setArray("hours"); changeBlocker.window().hours().forEach(hours::addLong); - }); + })); // Rotation Cursor globalRotationsArray = object.setArray("globalRotations"); @@ -842,7 +842,7 @@ public class ApplicationApiHandler extends LoggingRequestHandler { // Change blockers Cursor changeBlockers = object.setArray("changeBlockers"); - application.deploymentSpec().requireInstance(instance.name()).changeBlocker().forEach(changeBlocker -> { + application.deploymentSpec().instance(instance.name()).ifPresent(spec -> spec.changeBlocker().forEach(changeBlocker -> { Cursor changeBlockerObject = changeBlockers.addObject(); changeBlockerObject.setBool("versions", changeBlocker.blocksVersions()); changeBlockerObject.setBool("revisions", changeBlocker.blocksRevisions()); @@ -851,7 +851,7 @@ public class ApplicationApiHandler extends LoggingRequestHandler { changeBlocker.window().days().stream().map(DayOfWeek::getValue).forEach(days::addLong); Cursor hours = changeBlockerObject.setArray("hours"); changeBlocker.window().hours().forEach(hours::addLong); - }); + })); // Compile version. The version that should be used when building an application object.setString("compileVersion", compileVersion(application.id()).toFullString()); |