From e12d4f8538e4f9df7c07f3163a549646139b5d49 Mon Sep 17 00:00:00 2001 From: Jon Marius Venstad Date: Thu, 28 Mar 2019 09:49:23 +0100 Subject: Add some TODOs and fix a path group --- .../controller/restapi/application/JobControllerApiHandlerHelper.java | 2 +- .../src/main/java/com/yahoo/vespa/hosted/controller/role/PathGroup.java | 2 +- .../restapi/application/JobControllerApiHandlerHelperTest.java | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/restapi/application/JobControllerApiHandlerHelper.java b/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/restapi/application/JobControllerApiHandlerHelper.java index 2fb493cad42..73345923369 100644 --- a/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/restapi/application/JobControllerApiHandlerHelper.java +++ b/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/restapi/application/JobControllerApiHandlerHelper.java @@ -62,7 +62,7 @@ import static java.util.stream.Collectors.toMap; * @see JobController * @see ApplicationApiHandler */ -class JobControllerApiHandlerHelper { +class JobControllerApiHandlerHelper { // TODO jvenstad: Integrate into ApplicationApiHandler /** * @return Response with all job types that have recorded runs for the application _and_ the status for the last run of that type diff --git a/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/role/PathGroup.java b/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/role/PathGroup.java index ebfde10037b..8bfb60fd1d0 100644 --- a/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/role/PathGroup.java +++ b/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/role/PathGroup.java @@ -47,7 +47,7 @@ public enum PathGroup { "/application/v4/tenant/{tenant}/application/{application}", "/application/v4/tenant/{tenant}/application/{application}/deploying/{*}", "/application/v4/tenant/{tenant}/application/{application}/instance/{*}", - "/application/v4/tenant/{tenant}/application/{application}/environment/prod/region/{region}/instance/{instance}/global-rotation/override"), + "/application/v4/tenant/{tenant}/application/{application}/environment/prod/region/{region}/instance/{instance}/global-rotation/override"),// TODO add restart path? /** Paths used for direct deployment to development zones. */ development(Matcher.tenant, diff --git a/controller-server/src/test/java/com/yahoo/vespa/hosted/controller/restapi/application/JobControllerApiHandlerHelperTest.java b/controller-server/src/test/java/com/yahoo/vespa/hosted/controller/restapi/application/JobControllerApiHandlerHelperTest.java index df1f202a75c..96eecd199cf 100644 --- a/controller-server/src/test/java/com/yahoo/vespa/hosted/controller/restapi/application/JobControllerApiHandlerHelperTest.java +++ b/controller-server/src/test/java/com/yahoo/vespa/hosted/controller/restapi/application/JobControllerApiHandlerHelperTest.java @@ -39,7 +39,7 @@ import static org.junit.Assert.assertEquals; * @author jonmv * @author freva */ -public class JobControllerApiHandlerHelperTest { +public class JobControllerApiHandlerHelperTest { // TODO jvenstad: Integrate into ApplicationApiTest @Test public void testResponses() { -- cgit v1.2.3