diff options
| author | Martin Polden <mpolden@mpolden.no> | 2023-09-06 14:14:51 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2023-09-06 14:14:51 +0200 |
| commit | db8f9d346d37ec87833a87582ffb31cb0857f1eb (patch) | |
| tree | bed7ffd269c37062173439e97e3e46ed36181609 | |
| parent | 6f7bfba77282ab5ef814e4e29db9d06b535e92be (diff) | |
| parent | 75f524f48b55763ef0af7168314e1c9dbff62c62 (diff) | |
Merge pull request #28422 from vespa-engine/mpolden/hide-weighted
Filter generated endpoints before other filters MERGEOK
| -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 080ab46f0fa..30f3f74c400 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 @@ -2063,13 +2063,13 @@ public class ApplicationApiHandler extends AuditLoggingRequestHandler { 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); - // Hide non-generated if we have any + // If we have generated endpoints, hide non-generated if (!generatedEndpoints.isEmpty()) { - endpoints = generatedEndpoints; + endpoints = endpoints.generated(); } + // Hide legacy and weighted endpoints + endpoints = endpoints.not().legacy() + .not().scope(Endpoint.Scope.weighted); } return endpoints; } |