diff options
author | Harald Musum <musum@yahoo-inc.com> | 2016-07-05 08:17:12 +0200 |
---|---|---|
committer | Harald Musum <musum@yahoo-inc.com> | 2016-07-05 08:17:12 +0200 |
commit | ac0d36d85cec4f961d5b9008c2d7fc2e5e943160 (patch) | |
tree | 47278822d0ec5a42308c4315fbac7645d963c033 /orchestrator | |
parent | 7d3713b4b93449cb81ae5869184f7596f4631de1 (diff) |
Remove use of Optional
Diffstat (limited to 'orchestrator')
-rw-r--r-- | orchestrator/src/main/java/com/yahoo/vespa/orchestrator/resources/HostSuspensionResource.java | 14 |
1 files changed, 8 insertions, 6 deletions
diff --git a/orchestrator/src/main/java/com/yahoo/vespa/orchestrator/resources/HostSuspensionResource.java b/orchestrator/src/main/java/com/yahoo/vespa/orchestrator/resources/HostSuspensionResource.java index 855217c298a..9719c602a22 100644 --- a/orchestrator/src/main/java/com/yahoo/vespa/orchestrator/resources/HostSuspensionResource.java +++ b/orchestrator/src/main/java/com/yahoo/vespa/orchestrator/resources/HostSuspensionResource.java @@ -34,19 +34,21 @@ public class HostSuspensionResource implements HostSuspensionApi { @Override public BatchOperationResult suspendAll(BatchHostSuspendRequest request) throws WebApplicationException { - if (!request.getParentHostname().isPresent()) { - String message = "parentHostname missing in request: " + request; + final String ph = request.getParentHostname(); + if (ph == null || ph.isEmpty()) { + String message = "parentHostname missing or empty in request: " + request; log.log(LogLevel.DEBUG, message); throw createWebApplicationException(message, Response.Status.BAD_REQUEST); } - HostName parentHostname = new HostName(request.getParentHostname().get()); - - if (!request.getHostnames().isPresent()) { + final List<String> h = request.getHostnames(); + if (h == null || h.isEmpty()) { String message = "hostnames missing in request: " + request; log.log(LogLevel.DEBUG, message); throw createWebApplicationException(message, Response.Status.BAD_REQUEST); } - List<HostName> hostNames = request.getHostnames().get().stream().map(HostName::new).collect(Collectors.toList()); + + HostName parentHostname = new HostName(ph); + List<HostName> hostNames = request.getHostnames().stream().map(HostName::new).collect(Collectors.toList()); try { orchestrator.suspendAll(parentHostname, hostNames); |