diff options
author | hakonhall <hakon@yahoo-inc.com> | 2017-06-13 15:18:01 +0200 |
---|---|---|
committer | GitHub <noreply@github.com> | 2017-06-13 15:18:01 +0200 |
commit | 906e8a650e14870b8169f694ba783ad564cf4c60 (patch) | |
tree | 45209f747c9afbd8bc24bac18830d3d55e3b1c80 | |
parent | a68fd0cac760b14d6c17f2c2b8abe7fbed66ff17 (diff) | |
parent | 76f75dbd07a3e89a4d325b23421682dea67594ac (diff) |
Merge pull request #2738 from yahoo/hakon/make-patch-work
Make patch work
-rw-r--r-- | orchestrator-restapi/src/main/java/com/yahoo/vespa/orchestrator/restapi/HostApi.java | 4 | ||||
-rw-r--r-- | orchestrator/src/main/java/com/yahoo/vespa/orchestrator/resources/HostResource.java | 3 |
2 files changed, 3 insertions, 4 deletions
diff --git a/orchestrator-restapi/src/main/java/com/yahoo/vespa/orchestrator/restapi/HostApi.java b/orchestrator-restapi/src/main/java/com/yahoo/vespa/orchestrator/restapi/HostApi.java index b389ac37aa3..e5ff92011da 100644 --- a/orchestrator-restapi/src/main/java/com/yahoo/vespa/orchestrator/restapi/HostApi.java +++ b/orchestrator-restapi/src/main/java/com/yahoo/vespa/orchestrator/restapi/HostApi.java @@ -1,6 +1,7 @@ // Copyright 2016 Yahoo Inc. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. package com.yahoo.vespa.orchestrator.restapi; +import com.yahoo.vespa.jaxrs.annotation.PATCH; import com.yahoo.vespa.orchestrator.restapi.wire.GetHostResponse; import com.yahoo.vespa.orchestrator.restapi.wire.PatchHostRequest; import com.yahoo.vespa.orchestrator.restapi.wire.PatchHostResponse; @@ -41,9 +42,8 @@ public interface HostApi { /** * Tweak internal Orchestrator state for host. - * Note: This should really be a patch method, but I was unable to get that working with PATCH from jaxrs_utils!? */ - @PUT + @PATCH @Path("/{hostname}") @Consumes(MediaType.APPLICATION_JSON) @Produces(MediaType.APPLICATION_JSON) diff --git a/orchestrator/src/main/java/com/yahoo/vespa/orchestrator/resources/HostResource.java b/orchestrator/src/main/java/com/yahoo/vespa/orchestrator/resources/HostResource.java index 54f1723c914..916ab9d3e5e 100644 --- a/orchestrator/src/main/java/com/yahoo/vespa/orchestrator/resources/HostResource.java +++ b/orchestrator/src/main/java/com/yahoo/vespa/orchestrator/resources/HostResource.java @@ -21,7 +21,6 @@ import javax.ws.rs.BadRequestException; import javax.ws.rs.InternalServerErrorException; import javax.ws.rs.NotFoundException; import javax.ws.rs.Path; -import javax.ws.rs.PathParam; import javax.ws.rs.WebApplicationException; import javax.ws.rs.core.MediaType; import javax.ws.rs.core.Response; @@ -54,7 +53,7 @@ public class HostResource implements HostApi { } @Override - public PatchHostResponse patch(@PathParam("hostname") String hostNameString, PatchHostRequest request) { + public PatchHostResponse patch(String hostNameString, PatchHostRequest request) { HostName hostName = new HostName(hostNameString); if (request.state != null) { |