Add parameter for listing all endpoints

1 files changed, 11 insertions, 11 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 a0e8b1c5610..1e27627dc63 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
@@ -1979,9 +1979,10 @@ public class ApplicationApiHandler extends AuditLoggingRequestHandler {
         response.setString("region", deploymentId.zoneId().region().value());
         addAvailabilityZone(response, deployment.zone());
         var application = controller.applications().requireApplication(TenantAndApplicationId.from(deploymentId.applicationId()));
-        boolean legacyEndpoints = request.getBooleanProperty("includeLegacyEndpoints");
+        boolean includeAllEndpoints = request.getBooleanProperty("includeAllEndpoints") ||
+                                      request.getBooleanProperty("includeLegacyEndpoints");
         var endpointArray = response.setArray("endpoints");
-        for (var endpoint : endpointsOf(deploymentId, application, legacyEndpoints)) {
+        for (var endpoint : endpointsOf(deploymentId, application, includeAllEndpoints)) {
             toSlime(endpoint, endpointArray.addObject());
         }
         response.setString("clusters", withPath(toPath(deploymentId) + "/clusters", request.getUri()).toString());
@@ -2056,19 +2057,18 @@ public class ApplicationApiHandler extends AuditLoggingRequestHandler {
         metrics.instant().ifPresent(instant -> metricsObject.setLong("lastUpdated", instant.toEpochMilli()));
     }
 
-    private EndpointList endpointsOf(DeploymentId deploymentId, Application application, boolean legacyEndpoints) {
-        EndpointList zoneEndpoints = controller.routing().readEndpointsOf(deploymentId).scope(Endpoint.Scope.zone);
-        if (!legacyEndpoints) {
-            zoneEndpoints = zoneEndpoints.not().legacy().direct();
-        }
+    private EndpointList endpointsOf(DeploymentId deploymentId, Application application, boolean includeHidden) {
+        EndpointList zoneEndpoints = controller.routing().readEndpointsOf(deploymentId).direct();
         EndpointList declaredEndpoints = controller.routing().readDeclaredEndpointsOf(application).targets(deploymentId);
-        if (!legacyEndpoints) {
-            declaredEndpoints = declaredEndpoints.not().legacy().direct();
-        }
         EndpointList endpoints = zoneEndpoints.and(declaredEndpoints);
-        // If the application has any generated endpoints, we show only those
+        if (!includeHidden) {
+            // Hide legacy and weighted endpoints by default
+            endpoints = endpoints.not().legacy()
+                                 .not().scope(Endpoint.Scope.weighted);
+        }
         EndpointList generatedEndpoints = endpoints.generated();
         if (!generatedEndpoints.isEmpty()) {
+            // If the application has any generated endpoints, we show only those
             endpoints = generatedEndpoints;
         }
         return endpoints;