1 files changed, 33 insertions, 3 deletions
diff --git a/container-search/src/main/java/com/yahoo/search/query/profile/compiled/ValueWithSource.java b/container-search/src/main/java/com/yahoo/search/query/profile/compiled/ValueWithSource.java
index 925d20903c6..bc49e116c6e 100644
--- a/container-search/src/main/java/com/yahoo/search/query/profile/compiled/ValueWithSource.java
+++ b/container-search/src/main/java/com/yahoo/search/query/profile/compiled/ValueWithSource.java
@@ -2,6 +2,8 @@
 package com.yahoo.search.query.profile.compiled;
 
 import com.yahoo.search.query.profile.DimensionValues;
+import com.yahoo.search.query.profile.QueryProfile;
+import com.yahoo.search.query.profile.types.QueryProfileType;
 
 import java.util.Optional;
 
@@ -14,24 +16,52 @@ public class ValueWithSource {
 
     private final Object value;
 
-    /** The source of the query profile having a value */
     private final String source;
 
+    private final boolean isUnoverridable;
+
+    private final boolean isQueryProfile;
+
+    private final QueryProfileType type;
+
     /** The dimension values specifying a variant in that profile, or null if it is not in a variant */
     private final DimensionValues variant;
 
-    public ValueWithSource(Object value, String source, DimensionValues variant) {
+    public ValueWithSource(Object value,
+                           String source,
+                           boolean isUnoverridable, boolean isQueryProfile, QueryProfileType type,
+                           DimensionValues variant) {
         this.value = value;
         this.source = source;
+        this.isUnoverridable = isUnoverridable;
+        this.isQueryProfile = isQueryProfile;
+        this.type = type;
         this.variant = variant;
     }
 
+    /**
+     * Returns the value at this key, or null if none
+     * (in which case this is references a query profile which has no value set).
+     */
     public Object value() { return value; }
 
+    /** Returns the source of the query profile having a value */
     public String source() { return source; }
 
+    /** Returns true if this value cannot be overridden in queries */
+    public boolean isUnoverridable() { return isUnoverridable; }
+
+    /**
+     * Returns true if this key references a query profile (i.e a non-leaf).
+     * In this case the value may or may not be null, as non-leafs may have values.
+     */
+    public boolean isQueryProfile() { return isQueryProfile; }
+
+    /** Returns tye type of this if it refers to a query profile (not a leaf value), and it has a type */
+    public QueryProfileType queryProfileType() { return type; }
+
     public ValueWithSource withValue(Object value) {
-        return new ValueWithSource(value, source, variant);
+        return new ValueWithSource(value, source, isUnoverridable, isQueryProfile, type, variant);
     }
 
     /** Returns the variant having this value, or empty if it's not in a variant */