Remove optional /api prefix

8 files changed, 10 insertions, 22 deletions

diff --git a/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/restapi/application/ApplicationApiHandler.java b/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/restapi/application/ApplicationApiHandler.java
index 9bd3c3bb54c..ca080078328 100644
--- a/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/restapi/application/ApplicationApiHandler.java
+++ b/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/restapi/application/ApplicationApiHandler.java
@@ -154,8 +154,6 @@ public class ApplicationApiHandler extends LoggingRequestHandler {
 
     private static final ObjectMapper jsonMapper = new ObjectMapper();
 
-    private static final String OPTIONAL_PREFIX = "/api";
-
     private final Controller controller;
     private final AccessControlRequests accessControlRequests;
     private final TestConfigSerializer testConfigSerializer;
@@ -178,7 +176,7 @@ public class ApplicationApiHandler extends LoggingRequestHandler {
     @Override
     public HttpResponse handle(HttpRequest request) {
         try {
-            Path path = new Path(request.getUri(), OPTIONAL_PREFIX);
+            Path path = new Path(request.getUri());
             switch (request.getMethod()) {
                 case GET: return handleGET(path, request);
                 case PUT: return handlePUT(path, request);
diff --git a/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/restapi/athenz/AthenzApiHandler.java b/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/restapi/athenz/AthenzApiHandler.java
index d10a4879bf5..26c4bf6292a 100644
--- a/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/restapi/athenz/AthenzApiHandler.java
+++ b/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/restapi/athenz/AthenzApiHandler.java
@@ -37,7 +37,6 @@ import java.util.logging.Logger;
 public class AthenzApiHandler extends LoggingRequestHandler {
 
     private final static Logger log = Logger.getLogger(AthenzApiHandler.class.getName());
-    private static final String OPTIONAL_PREFIX = "/api";
 
     private final AthenzFacade athenz;
     private final AthenzDomain sandboxDomain;
@@ -70,7 +69,7 @@ public class AthenzApiHandler extends LoggingRequestHandler {
     }
 
     private HttpResponse get(HttpRequest request) {
-        Path path = new Path(request.getUri(), OPTIONAL_PREFIX);
+        Path path = new Path(request.getUri());
         if (path.matches("/athenz/v1")) return root(request);
         if (path.matches("/athenz/v1/domains")) return domainList(request);
         if (path.matches("/athenz/v1/properties")) return properties();
@@ -80,7 +79,7 @@ public class AthenzApiHandler extends LoggingRequestHandler {
     }
 
     private HttpResponse post(HttpRequest request) {
-        Path path = new Path(request.getUri(), OPTIONAL_PREFIX);
+        Path path = new Path(request.getUri());
         if (path.matches("/athenz/v1/user")) return signup(request);
         return ErrorResponse.notFoundError(String.format("No '%s' handler at '%s'", request.getMethod(),
                                                          request.getUri().getPath()));
diff --git a/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/restapi/billing/BillingApiHandler.java b/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/restapi/billing/BillingApiHandler.java
index 88191bc836b..c56c2e93f65 100644
--- a/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/restapi/billing/BillingApiHandler.java
+++ b/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/restapi/billing/BillingApiHandler.java
@@ -5,7 +5,6 @@ import com.yahoo.config.provision.TenantName;
 import com.yahoo.container.jdisc.HttpRequest;
 import com.yahoo.container.jdisc.HttpResponse;
 import com.yahoo.container.jdisc.LoggingRequestHandler;
-import com.yahoo.container.logging.AccessLog;
 import com.yahoo.restapi.ErrorResponse;
 import com.yahoo.restapi.JacksonJsonResponse;
 import com.yahoo.restapi.MessageResponse;
@@ -55,7 +54,6 @@ import java.util.stream.Collectors;
  */
 public class BillingApiHandler extends LoggingRequestHandler {
 
-    private static final String OPTIONAL_PREFIX = "/api";
     private static final DateTimeFormatter DATE_TIME_FORMATTER = DateTimeFormatter.ofPattern("yyyy-MM-dd");
 
     private final BillingController billingController;
@@ -73,7 +71,7 @@ public class BillingApiHandler extends LoggingRequestHandler {
     @Override
     public HttpResponse handle(HttpRequest request) {
         try {
-            Path path = new Path(request.getUri(), OPTIONAL_PREFIX);
+            Path path = new Path(request.getUri());
             String userId = userIdOrThrow(request);
             switch (request.getMethod()) {
                 case GET:
diff --git a/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/restapi/configserver/ConfigServerApiHandler.java b/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/restapi/configserver/ConfigServerApiHandler.java
index f65f7534476..1bb3b1c5de8 100644
--- a/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/restapi/configserver/ConfigServerApiHandler.java
+++ b/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/restapi/configserver/ConfigServerApiHandler.java
@@ -33,7 +33,6 @@ public class ConfigServerApiHandler extends AuditLoggingRequestHandler {
 
     private static final ZoneId CONTROLLER_ZONE = ZoneId.from("prod", "controller");
     private static final URI CONTROLLER_URI = URI.create("https://localhost:4443/");
-    private static final String OPTIONAL_PREFIX = "/api";
     private static final List<String> WHITELISTED_APIS = List.of("/flags/v1/", "/nodes/v2/", "/orchestrator/v1/");
 
     private final ZoneRegistry zoneRegistry;
@@ -70,7 +69,7 @@ public class ConfigServerApiHandler extends AuditLoggingRequestHandler {
     }
 
     private HttpResponse get(HttpRequest request) {
-        Path path = new Path(request.getUri(), OPTIONAL_PREFIX);
+        Path path = new Path(request.getUri());
         if (path.matches("/configserver/v1")) {
             return root(request);
         }
@@ -78,7 +77,7 @@ public class ConfigServerApiHandler extends AuditLoggingRequestHandler {
     }
 
     private HttpResponse proxy(HttpRequest request) {
-        Path path = new Path(request.getUri(), OPTIONAL_PREFIX);
+        Path path = new Path(request.getUri());
         if ( ! path.matches("/configserver/v1/{environment}/{region}/{*}")) {
             return ErrorResponse.notFoundError("Nothing at " + path);
         }
diff --git a/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/restapi/deployment/DeploymentApiHandler.java b/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/restapi/deployment/DeploymentApiHandler.java
index da13a84a3d4..552e22e9a2c 100644
--- a/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/restapi/deployment/DeploymentApiHandler.java
+++ b/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/restapi/deployment/DeploymentApiHandler.java
@@ -49,8 +49,6 @@ import static java.util.stream.Collectors.toUnmodifiableMap;
 @SuppressWarnings("unused") // Injected
 public class DeploymentApiHandler extends LoggingRequestHandler {
 
-    private static final String OPTIONAL_PREFIX = "/api";
-
     private final Controller controller;
 
     public DeploymentApiHandler(LoggingRequestHandler.Context parentCtx, Controller controller) {
@@ -77,7 +75,7 @@ public class DeploymentApiHandler extends LoggingRequestHandler {
     }
 
     private HttpResponse handleGET(HttpRequest request) {
-        Path path = new Path(request.getUri(), OPTIONAL_PREFIX);
+        Path path = new Path(request.getUri());
         if (path.matches("/deployment/v1/")) return root(request);
         return ErrorResponse.notFoundError("Nothing at " + path);
     }
diff --git a/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/restapi/routing/RoutingApiHandler.java b/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/restapi/routing/RoutingApiHandler.java
index f26477beb3b..828e7e63483 100644
--- a/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/restapi/routing/RoutingApiHandler.java
+++ b/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/restapi/routing/RoutingApiHandler.java
@@ -42,7 +42,6 @@ import java.util.stream.Collectors;
  */
 public class RoutingApiHandler extends AuditLoggingRequestHandler {
 
-    private static final String OPTIONAL_PREFIX = "/api";
     private final Controller controller;
 
     public RoutingApiHandler(Context ctx, Controller controller) {
@@ -53,7 +52,7 @@ public class RoutingApiHandler extends AuditLoggingRequestHandler {
     @Override
     public HttpResponse auditAndHandle(HttpRequest request) {
         try {
-            var path = new Path(request.getUri(), OPTIONAL_PREFIX);
+            var path = new Path(request.getUri());
             switch (request.getMethod()) {
                 case GET: return get(path, request);
                 case POST: return post(path);
diff --git a/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/restapi/user/UserApiHandler.java b/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/restapi/user/UserApiHandler.java
index e097b82b7d0..039e9b64df7 100644
--- a/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/restapi/user/UserApiHandler.java
+++ b/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/restapi/user/UserApiHandler.java
@@ -64,7 +64,6 @@ import java.util.stream.Collectors;
 public class UserApiHandler extends LoggingRequestHandler {
 
     private final static Logger log = Logger.getLogger(UserApiHandler.class.getName());
-    private static final String optionalPrefix = "/api";
 
     private final UserManagement users;
     private final Controller controller;
@@ -83,7 +82,7 @@ public class UserApiHandler extends LoggingRequestHandler {
     @Override
     public HttpResponse handle(HttpRequest request) {
         try {
-            Path path = new Path(request.getUri(), optionalPrefix);
+            Path path = new Path(request.getUri());
             switch (request.getMethod()) {
                 case GET: return handleGET(path, request);
                 case POST: return handlePOST(path, request);
diff --git a/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/restapi/zone/v1/ZoneApiHandler.java b/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/restapi/zone/v1/ZoneApiHandler.java
index abbbbef82c7..fd6dfa61180 100644
--- a/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/restapi/zone/v1/ZoneApiHandler.java
+++ b/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/restapi/zone/v1/ZoneApiHandler.java
@@ -29,8 +29,6 @@ import java.util.stream.Collectors;
 @SuppressWarnings("unused")
 public class ZoneApiHandler extends LoggingRequestHandler {
 
-    private static final String OPTIONAL_PREFIX = "/api";
-
     private final ZoneRegistry zoneRegistry;
 
     public ZoneApiHandler(LoggingRequestHandler.Context parentCtx, ServiceRegistry serviceRegistry) {
@@ -57,7 +55,7 @@ public class ZoneApiHandler extends LoggingRequestHandler {
     }
 
     private HttpResponse get(HttpRequest request) {
-        Path path = new Path(request.getUri(), OPTIONAL_PREFIX);
+        Path path = new Path(request.getUri());
         if (path.matches("/zone/v1")) {
             return root(request);
         }