summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorBjørn Christian Seime <bjorncs@verizonmedia.com>2021-04-13 17:19:41 +0200
committerGitHub <noreply@github.com>2021-04-13 17:19:41 +0200
commit5d99eeefabb8ff58e0b6125cccb1430a521b5390 (patch)
tree29158fc46d0d5b8eb6acba71476d580f756b53b7
parent884a2695354fe6adb292b614c15ef0504568aea7 (diff)
parentf4e3f9dc32255dd09991e1b781acbd15f8b110e2 (diff)
Merge pull request #17412 from vespa-engine/bjorncs/fix
Use RestApiException instead of old JAX-RS equivalent
-rw-r--r--orchestrator/src/main/java/com/yahoo/vespa/orchestrator/resources/InstanceRequestHandler.java4
1 files changed, 1 insertions, 3 deletions
diff --git a/orchestrator/src/main/java/com/yahoo/vespa/orchestrator/resources/InstanceRequestHandler.java b/orchestrator/src/main/java/com/yahoo/vespa/orchestrator/resources/InstanceRequestHandler.java
index 5f0c7caf931..8642a51b804 100644
--- a/orchestrator/src/main/java/com/yahoo/vespa/orchestrator/resources/InstanceRequestHandler.java
+++ b/orchestrator/src/main/java/com/yahoo/vespa/orchestrator/resources/InstanceRequestHandler.java
@@ -30,8 +30,6 @@ import com.yahoo.vespa.service.manager.UnionMonitorManager;
import com.yahoo.vespa.service.monitor.ServiceMonitor;
import com.yahoo.vespa.service.monitor.SlobrokApi;
-import javax.ws.rs.WebApplicationException;
-import javax.ws.rs.core.Response;
import java.time.Instant;
import java.util.List;
import java.util.TreeMap;
@@ -101,7 +99,7 @@ public class InstanceRequestHandler extends RestApiRequestHandler<InstanceReques
ApplicationInstance applicationInstance
= serviceMonitor.getApplication(instanceId)
- .orElseThrow(() -> new WebApplicationException(Response.status(Response.Status.NOT_FOUND).build()));
+ .orElseThrow(RestApiException.NotFoundException::new);
HostInfos hostInfos = statusService.getHostInfosByApplicationResolver().apply(applicationInstance.reference());
TreeMap<HostName, WireHostInfo> hostStatusMap =