diff options
| author | Valerij Fredriksen <freva@users.noreply.github.com> | 2021-03-02 20:52:48 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-03-02 20:52:48 +0100 |
| commit | c0c24529bb09e5bb2f129ac8e34451c0b2cc403f (patch) | |
| tree | 7b38986e73b404ca1b234f281f450cf4445ce856 /controller-api | |
| parent | 5ebf0c8733d462324649022757e108950ba6004e (diff) | |
| parent | 1d2b8fc5ce7a25db24ad4493259b123f35535e13 (diff) | |
Merge pull request #16750 from vespa-engine/freva/fix-patch
Patch archive URI fixes
Diffstat (limited to 'controller-api')
2 files changed, 30 insertions, 3 deletions
diff --git a/controller-api/src/main/java/com/yahoo/vespa/hosted/controller/api/integration/noderepository/ArchivePatch.java b/controller-api/src/main/java/com/yahoo/vespa/hosted/controller/api/integration/noderepository/ArchivePatch.java new file mode 100644 index 00000000000..b3ba4e1ba4f --- /dev/null +++ b/controller-api/src/main/java/com/yahoo/vespa/hosted/controller/api/integration/noderepository/ArchivePatch.java @@ -0,0 +1,28 @@ +package com.yahoo.vespa.hosted.controller.api.integration.noderepository; + +import com.fasterxml.jackson.annotation.JsonCreator; +import com.fasterxml.jackson.annotation.JsonIgnoreProperties; +import com.fasterxml.jackson.annotation.JsonInclude; +import com.fasterxml.jackson.annotation.JsonProperty; + +/** + * @author valerijf + */ +@JsonIgnoreProperties(ignoreUnknown = true) +@JsonInclude(JsonInclude.Include.NON_NULL) +public class ArchivePatch { + + @JsonProperty("uri") + private final String uri; + + @JsonCreator + public ArchivePatch(@JsonProperty("uri") String uri) { + this.uri = uri; + } + + @JsonInclude + public String uri() { + return uri; + } + +} diff --git a/controller-api/src/main/java/com/yahoo/vespa/hosted/controller/api/integration/noderepository/ProvisionResource.java b/controller-api/src/main/java/com/yahoo/vespa/hosted/controller/api/integration/noderepository/ProvisionResource.java index b5f86a46e87..d88c7146397 100644 --- a/controller-api/src/main/java/com/yahoo/vespa/hosted/controller/api/integration/noderepository/ProvisionResource.java +++ b/controller-api/src/main/java/com/yahoo/vespa/hosted/controller/api/integration/noderepository/ProvisionResource.java @@ -13,7 +13,6 @@ import javax.ws.rs.Path; import javax.ws.rs.PathParam; import javax.ws.rs.QueryParam; import javax.ws.rs.core.MediaType; -import java.net.URI; import java.util.Collection; /** @@ -116,8 +115,8 @@ public interface ProvisionResource { @POST @Path("/archive/{tenant}") - String patchArchiveUri(@PathParam("tenant") TenantName tenant, URI uri, - @HeaderParam("X-HTTP-Method-Override") String patchOverride); + String patchArchive(@PathParam("tenant") TenantName tenant, ArchivePatch archivePatch, + @HeaderParam("X-HTTP-Method-Override") String patchOverride); @DELETE @Path("/archive/{tenant}") |