summaryrefslogtreecommitdiffstats
path: root/flags
diff options
context:
space:
mode:
authorJon Bratseth <bratseth@gmail.com>2022-10-06 23:55:41 +0200
committerJon Bratseth <bratseth@gmail.com>2022-10-06 23:55:41 +0200
commit8fcec55c82a1035dd17a59eb7bd1b1b65fb16f17 (patch)
tree4ea47e490d61b657601e338d70dbeb8977c2cdb8 /flags
parent24c70d22397fad2c2d5d2e8b45d7da664283fd85 (diff)
Return X-Vespa-Ignored-Fields if fields were ignored
Diffstat (limited to 'flags')
-rw-r--r--flags/src/main/java/com/yahoo/vespa/flags/json/DimensionHelper.java7
-rw-r--r--flags/src/main/java/com/yahoo/vespa/flags/json/FetchVectorHelper.java2
2 files changed, 7 insertions, 2 deletions
diff --git a/flags/src/main/java/com/yahoo/vespa/flags/json/DimensionHelper.java b/flags/src/main/java/com/yahoo/vespa/flags/json/DimensionHelper.java
index c2a7ce56054..ad1242aa7e9 100644
--- a/flags/src/main/java/com/yahoo/vespa/flags/json/DimensionHelper.java
+++ b/flags/src/main/java/com/yahoo/vespa/flags/json/DimensionHelper.java
@@ -11,7 +11,9 @@ import java.util.stream.Collectors;
* @author hakonhall
*/
public class DimensionHelper {
- private static Map<FetchVector.Dimension, String> serializedDimensions = new HashMap<>();
+
+ private static final Map<FetchVector.Dimension, String> serializedDimensions = new HashMap<>();
+
static {
serializedDimensions.put(FetchVector.Dimension.ZONE_ID, "zone");
serializedDimensions.put(FetchVector.Dimension.HOSTNAME, "hostname");
@@ -29,7 +31,7 @@ public class DimensionHelper {
}
}
- private static Map<String, FetchVector.Dimension> deserializedDimensions = serializedDimensions.
+ private static final Map<String, FetchVector.Dimension> deserializedDimensions = serializedDimensions.
entrySet().stream().collect(Collectors.toMap(Map.Entry::getValue, Map.Entry::getKey));
public static String toWire(FetchVector.Dimension dimension) {
@@ -51,4 +53,5 @@ public class DimensionHelper {
}
private DimensionHelper() { }
+
}
diff --git a/flags/src/main/java/com/yahoo/vespa/flags/json/FetchVectorHelper.java b/flags/src/main/java/com/yahoo/vespa/flags/json/FetchVectorHelper.java
index 0b19be21b76..c0bb3128924 100644
--- a/flags/src/main/java/com/yahoo/vespa/flags/json/FetchVectorHelper.java
+++ b/flags/src/main/java/com/yahoo/vespa/flags/json/FetchVectorHelper.java
@@ -10,6 +10,7 @@ import java.util.stream.Collectors;
* @author hakonhall
*/
public class FetchVectorHelper {
+
public static Map<String, String> toWire(FetchVector vector) {
Map<FetchVector.Dimension, String> map = vector.toMap();
if (map.isEmpty()) return null;
@@ -24,4 +25,5 @@ public class FetchVectorHelper {
entry -> DimensionHelper.fromWire(entry.getKey()),
Map.Entry::getValue)));
}
+
}