aboutsummaryrefslogtreecommitdiffstats
path: root/orchestrator
diff options
context:
space:
mode:
authorHåkon Hallingstad <hakon@yahoo-inc.com>2017-06-13 14:46:06 +0200
committerHåkon Hallingstad <hakon@yahoo-inc.com>2017-06-13 14:46:06 +0200
commite1b31539fb0705dcec76f448b6acfea8ac343026 (patch)
tree9cc6a16c8797973c7b87e2dca8e8c3ea1d9fdd97 /orchestrator
parentfacbedcd4b87053732bd1f7d696a176a1ac7a724 (diff)
Make patch work
Removes the PathParams annotation on the subclass, which caused Jersey to ignore the annotations on the superclass(!?). I have verified these changes work in CD.
Diffstat (limited to 'orchestrator')
-rw-r--r--orchestrator/src/main/java/com/yahoo/vespa/orchestrator/resources/HostResource.java3
1 files changed, 1 insertions, 2 deletions
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) {