summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMartin Polden <mpolden@mpolden.no>2023-10-02 14:45:21 +0200
committerMartin Polden <mpolden@mpolden.no>2023-10-02 14:45:21 +0200
commitc5d03b953cc914c2229ce3029f3ed5991367e4a2 (patch)
treeb4ad889cf169dc6cd5d2a7e973f9678d64f38e8b
parentb3c6333f70d857d00a1fb06f7218999e5f550372 (diff)
Expose legacy endpoints in API
-rw-r--r--controller-server/src/main/java/com/yahoo/vespa/hosted/controller/restapi/application/ApplicationApiHandler.java13
1 files changed, 3 insertions, 10 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 223fb45dd38..ec15eaf7d19 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
@@ -2061,19 +2061,12 @@ public class ApplicationApiHandler extends AuditLoggingRequestHandler {
metrics.instant().ifPresent(instant -> metricsObject.setLong("lastUpdated", instant.toEpochMilli()));
}
- private EndpointList endpointsOf(DeploymentId deploymentId, Application application, boolean includeHidden) {
+ private EndpointList endpointsOf(DeploymentId deploymentId, Application application, boolean includeWeighted) {
EndpointList zoneEndpoints = controller.routing().readEndpointsOf(deploymentId).direct();
EndpointList declaredEndpoints = controller.routing().readDeclaredEndpointsOf(application).targets(deploymentId);
EndpointList endpoints = zoneEndpoints.and(declaredEndpoints);
- EndpointList generatedEndpoints = endpoints.generated();
- if (!includeHidden) {
- // If we have generated endpoints, hide non-generated
- if (!generatedEndpoints.isEmpty()) {
- endpoints = endpoints.generated();
- }
- // Hide legacy and weighted endpoints
- endpoints = endpoints.not().legacy()
- .not().scope(Endpoint.Scope.weighted);
+ if (!includeWeighted) {
+ endpoints = endpoints.not().scope(Endpoint.Scope.weighted);
}
return endpoints;
}