diff options
author | Martin Polden <mpolden@mpolden.no> | 2023-09-05 15:37:36 +0200 |
---|---|---|
committer | Martin Polden <mpolden@mpolden.no> | 2023-09-05 15:37:36 +0200 |
commit | 772aa8fabea9cd469c204b7f7eb1f7204eb3d092 (patch) | |
tree | 40abaa440f81cfee8dbdae96b5f15ffb04940e4f /controller-server | |
parent | 27e59edc620c128707e528fe930bc4590a640a76 (diff) |
Do not hide non-generated when listing all endpoints
Diffstat (limited to 'controller-server')
-rw-r--r-- | controller-server/src/main/java/com/yahoo/vespa/hosted/controller/restapi/application/ApplicationApiHandler.java | 10 |
1 files changed, 5 insertions, 5 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 1e27627dc63..9b5e2596dd1 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,15 +2061,15 @@ public class ApplicationApiHandler extends AuditLoggingRequestHandler { 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) { // 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; + // Hide non-generated if we have any + if (!generatedEndpoints.isEmpty()) { + endpoints = generatedEndpoints; + } } return endpoints; } |