Merge pull request #24344 from vespa-engine/bratseth/return-ignored-fields

Return X-Vespa-Ignored-Fields if fields were ignored

1 files changed, 5 insertions, 9 deletions

diff --git a/container-core/src/main/java/com/yahoo/container/jdisc/state/StateHandler.java b/container-core/src/main/java/com/yahoo/container/jdisc/state/StateHandler.java
index cfd2244bd70..7a64e14e65e 100644
--- a/container-core/src/main/java/com/yahoo/container/jdisc/state/StateHandler.java
+++ b/container-core/src/main/java/com/yahoo/container/jdisc/state/StateHandler.java
@@ -274,15 +274,11 @@ public class StateHandler extends AbstractRequestHandler {
     }
 
     private static List<Tuple> collapseMetrics(MetricSnapshot snapshot, String consumer) {
-        switch (consumer) {
-            case HEALTH_PATH:
-                return collapseHealthMetrics(snapshot);
-            case "all": // deprecated name
-            case METRICS_PATH:
-                return flattenAllMetrics(snapshot);
-            default:
-                throw new IllegalArgumentException("Unknown consumer '" + consumer + "'.");
-        }
+        return switch (consumer) {
+            case HEALTH_PATH -> collapseHealthMetrics(snapshot); // deprecated name
+            case "all", METRICS_PATH -> flattenAllMetrics(snapshot);
+            default -> throw new IllegalArgumentException("Unknown consumer '" + consumer + "'.");
+        };
     }
 
     private static List<Tuple> collapseHealthMetrics(MetricSnapshot snapshot) {