summaryrefslogtreecommitdiffstats
path: root/configserver
diff options
context:
space:
mode:
authorBjørn Christian Seime <bjorncs@verizonmedia.com>2021-04-12 20:49:31 +0200
committerBjørn Christian Seime <bjorncs@verizonmedia.com>2021-04-12 20:57:24 +0200
commit97e6a063049a93d7a78301f29c27148f72dcef67 (patch)
treeb515dcb09a5b6e1380e16ca4aaafe373f45a9d18 /configserver
parent8cf392f9573d4061bef71e426c4940426dd121a7 (diff)
Convert remaining JAX-RS resources to request handlers
Diffstat (limited to 'configserver')
-rw-r--r--configserver/src/main/resources/configserver-app/services.xml28
1 files changed, 12 insertions, 16 deletions
diff --git a/configserver/src/main/resources/configserver-app/services.xml b/configserver/src/main/resources/configserver-app/services.xml
index 811edd05e94..47fc76af119 100644
--- a/configserver/src/main/resources/configserver-app/services.xml
+++ b/configserver/src/main/resources/configserver-app/services.xml
@@ -63,30 +63,26 @@
<component id="com.yahoo.vespa.orchestrator.controller.RetryingClusterControllerClientFactory" bundle="orchestrator" />
<component id="com.yahoo.vespa.orchestrator.OrchestratorImpl" bundle="orchestrator" />
- <rest-api path="orchestrator/v1/suspensions/applications" jersey2="true">
- <components bundle="orchestrator">
- <package>com.yahoo.vespa.orchestrator.resources.appsuspension</package>
- </components>
- </rest-api>
+ <handler id="com.yahoo.vespa.orchestrator.resources.ApplicationSuspensionRequestHandler" bundle="orchestrator">
+ <binding>http://*/orchestrator/v1/suspensions/applications</binding>
+ <binding>http://*/orchestrator/v1/suspensions/applications/*</binding>
+ </handler>
<handler id="com.yahoo.vespa.orchestrator.resources.HealthRequestHandler" bundle="orchestrator">
<binding>http://*/orchestrator/v1/health</binding>
<binding>http://*/orchestrator/v1/health/*</binding>
</handler>
- <rest-api path="orchestrator/v1/hosts" jersey2="true">
- <components bundle="orchestrator">
- <package>com.yahoo.vespa.orchestrator.resources.host</package>
- </components>
- </rest-api>
+ <handler id="com.yahoo.vespa.orchestrator.resources.HostRequestHandler" bundle="orchestrator">
+ <binding>http://*/orchestrator/v1/hosts</binding>
+ <binding>http://*/orchestrator/v1/hosts/*</binding>
+ </handler>
<handler id="com.yahoo.vespa.orchestrator.resources.HostSuspensionHandler" bundle="orchestrator">
<binding>http://*/orchestrator/v1/suspensions/hosts</binding>
<binding>http://*/orchestrator/v1/suspensions/hosts/*</binding>
</handler>
- <rest-api path="orchestrator/v1/instances" jersey2="true">
- <components bundle="orchestrator">
- <package>com.yahoo.vespa.orchestrator.resources.instance</package>
- </components>
- </rest-api>
-
+ <handler id="com.yahoo.vespa.orchestrator.resources.InstanceRequestHandler" bundle="orchestrator">
+ <binding>http://*/orchestrator/v1/instances</binding>
+ <binding>http://*/orchestrator/v1/instances/*</binding>
+ </handler>
<handler id="com.yahoo.vespa.serviceview.StateRequestHandler" bundle="configserver">
<binding>http://*/serviceview/v1</binding>
<binding>http://*/serviceview/v1/*</binding>