diff options
Diffstat (limited to 'container-search/src/main/java/com/yahoo/search/query/profile')
8 files changed, 56 insertions, 28 deletions
diff --git a/container-search/src/main/java/com/yahoo/search/query/profile/AllValuesQueryProfileVisitor.java b/container-search/src/main/java/com/yahoo/search/query/profile/AllValuesQueryProfileVisitor.java index ab8cd49047d..cedbd45e831 100644 --- a/container-search/src/main/java/com/yahoo/search/query/profile/AllValuesQueryProfileVisitor.java +++ b/container-search/src/main/java/com/yahoo/search/query/profile/AllValuesQueryProfileVisitor.java @@ -19,11 +19,13 @@ final class AllValuesQueryProfileVisitor extends PrefixQueryProfileVisitor { super(prefix); } - public @Override void onValue(String localName, Object value, DimensionBinding binding, QueryProfile owner) { + @Override + public void onValue(String localName, Object value, DimensionBinding binding, QueryProfile owner) { putValue(localName, value, values); } - public @Override void onQueryProfileInsidePrefix(QueryProfile profile, DimensionBinding binding, QueryProfile owner) { + @Override + public void onQueryProfileInsidePrefix(QueryProfile profile, DimensionBinding binding, QueryProfile owner) { putValue("", profile.getValue(), values); } diff --git a/container-search/src/main/java/com/yahoo/search/query/profile/QueryProfileRegistry.java b/container-search/src/main/java/com/yahoo/search/query/profile/QueryProfileRegistry.java index a4bca752d18..54b702720b2 100644 --- a/container-search/src/main/java/com/yahoo/search/query/profile/QueryProfileRegistry.java +++ b/container-search/src/main/java/com/yahoo/search/query/profile/QueryProfileRegistry.java @@ -77,7 +77,8 @@ public class QueryProfileRegistry extends ComponentRegistry<QueryProfile> { } /** Freezes this, and all owned query profiles and query profile types */ - public @Override void freeze() { + @Override + public void freeze() { if (isFrozen()) return; queryProfileTypeRegistry.freeze(); for (QueryProfile queryProfile : allComponents()) diff --git a/container-search/src/main/java/com/yahoo/search/query/profile/QueryProfileVariant.java b/container-search/src/main/java/com/yahoo/search/query/profile/QueryProfileVariant.java index 05bf7055822..41b5331259d 100644 --- a/container-search/src/main/java/com/yahoo/search/query/profile/QueryProfileVariant.java +++ b/container-search/src/main/java/com/yahoo/search/query/profile/QueryProfileVariant.java @@ -88,7 +88,8 @@ public class QueryProfileVariant implements Cloneable, Comparable<QueryProfileVa * <b>Note:</b> This ordering is not consistent with equals - it returns 0 when the same dimensions * are <i>set</i>, regardless of what they are set <i>to</i>. */ - public @Override int compareTo(QueryProfileVariant other) { + @Override + public int compareTo(QueryProfileVariant other) { return this.dimensionValues.compareTo(other.dimensionValues); } @@ -150,7 +151,8 @@ public class QueryProfileVariant implements Cloneable, Comparable<QueryProfileVa } } - public @Override String toString() { + @Override + public String toString() { return "query profile variant for " + dimensionValues; } diff --git a/container-search/src/main/java/com/yahoo/search/query/profile/QueryProfileVariants.java b/container-search/src/main/java/com/yahoo/search/query/profile/QueryProfileVariants.java index 705ba7d3d29..4512168a046 100644 --- a/container-search/src/main/java/com/yahoo/search/query/profile/QueryProfileVariants.java +++ b/container-search/src/main/java/com/yahoo/search/query/profile/QueryProfileVariants.java @@ -390,7 +390,8 @@ public class QueryProfileVariants implements Freezable, Cloneable { } } - public @Override FieldValues clone() { + @Override + public FieldValues clone() { try { if (frozen) return this; FieldValues clone=(FieldValues)super.clone(); @@ -444,7 +445,8 @@ public class QueryProfileVariants implements Freezable, Cloneable { * <b>Note:</b> This ordering is not consistent with equals - it returns 0 when the same dimensions * are <i>set</i>, regardless of what they are set <i>to</i>. */ - public @Override int compareTo(FieldValue other) { + @Override + public int compareTo(FieldValue other) { return this.dimensionValues.compareTo(other.dimensionValues); } diff --git a/container-search/src/main/java/com/yahoo/search/query/profile/SingleValueQueryProfileVisitor.java b/container-search/src/main/java/com/yahoo/search/query/profile/SingleValueQueryProfileVisitor.java index c6af9e53494..c1bb6c8829e 100644 --- a/container-search/src/main/java/com/yahoo/search/query/profile/SingleValueQueryProfileVisitor.java +++ b/container-search/src/main/java/com/yahoo/search/query/profile/SingleValueQueryProfileVisitor.java @@ -30,11 +30,13 @@ final class SingleValueQueryProfileVisitor extends QueryProfileVisitor { this.allowQueryProfileResult=allowQueryProfileResult; } - public @Override String getLocalKey() { + @Override + public String getLocalKey() { return name.get(nameIndex); } - public @Override boolean enter(String name) { + @Override + public boolean enter(String name) { if (nameIndex+1<this.name.size()) { nameIndex++; enteringContent=true; @@ -45,16 +47,19 @@ final class SingleValueQueryProfileVisitor extends QueryProfileVisitor { return enteringContent; } - public @Override void leave(String name) { + @Override + public void leave(String name) { nameIndex--; } - public @Override void onValue(String key,Object value, DimensionBinding binding, QueryProfile owner) { + @Override + public void onValue(String key,Object value, DimensionBinding binding, QueryProfile owner) { if (nameIndex==name.size()-1) this.value=value; } - public @Override void onQueryProfile(QueryProfile profile,DimensionBinding binding, QueryProfile owner) { + @Override + public void onQueryProfile(QueryProfile profile,DimensionBinding binding, QueryProfile owner) { if (enteringContent) return; // still waiting for content if (allowQueryProfileResult) this.value = profile; @@ -62,14 +67,16 @@ final class SingleValueQueryProfileVisitor extends QueryProfileVisitor { this.value = profile.getValue(); } - public @Override boolean isDone() { + @Override + public boolean isDone() { return value!=null; } /** Returns the value found during visiting, or null if none */ public Object getResult() { return value; } - public @Override String toString() { + @Override + public String toString() { return "a single value visitor (hash " + hashCode() + ") with current value " + value; } diff --git a/container-search/src/main/java/com/yahoo/search/query/profile/SubstituteString.java b/container-search/src/main/java/com/yahoo/search/query/profile/SubstituteString.java index d0d18d7ba85..e73dbedaab3 100644 --- a/container-search/src/main/java/com/yahoo/search/query/profile/SubstituteString.java +++ b/container-search/src/main/java/com/yahoo/search/query/profile/SubstituteString.java @@ -76,7 +76,8 @@ public class SubstituteString { } /** Returns this string in original (unsubstituted) form */ - public @Override String toString() { + @Override + public String toString() { return stringValue; } @@ -94,11 +95,13 @@ public class SubstituteString { this.value=value; } - public @Override String getValue(Map<String,String> context,Properties substitution) { + @Override + public String getValue(Map<String,String> context,Properties substitution) { return value; } - public @Override String toString() { + @Override + public String toString() { return value; } @@ -112,13 +115,15 @@ public class SubstituteString { this.propertyName=propertyName; } - public @Override String getValue(Map<String,String> context,Properties substitution) { + @Override + public String getValue(Map<String,String> context,Properties substitution) { Object value=substitution.get(propertyName,context,substitution); if (value==null) return ""; return String.valueOf(value); } - public @Override String toString() { + @Override + public String toString() { return "%{" + propertyName + "}"; } diff --git a/container-search/src/main/java/com/yahoo/search/query/profile/types/PrimitiveFieldType.java b/container-search/src/main/java/com/yahoo/search/query/profile/types/PrimitiveFieldType.java index 76b3f78ac2f..887968dc64b 100644 --- a/container-search/src/main/java/com/yahoo/search/query/profile/types/PrimitiveFieldType.java +++ b/container-search/src/main/java/com/yahoo/search/query/profile/types/PrimitiveFieldType.java @@ -20,15 +20,19 @@ public class PrimitiveFieldType extends FieldType { this.primitiveClass=primitiveClass; } - public @Override Class getValueClass() { return primitiveClass; } + @Override + public Class getValueClass() { return primitiveClass; } - public @Override String stringValue() { + @Override + public String stringValue() { return toLowerCase(primitiveClass.getSimpleName()); } - public @Override String toString() { return "field type " + stringValue(); } + @Override + public String toString() { return "field type " + stringValue(); } - public @Override String toInstanceDescription() { + @Override + public String toInstanceDescription() { return toLowerCase(primitiveClass.getSimpleName()); } @@ -37,7 +41,8 @@ public class PrimitiveFieldType extends FieldType { return convertFrom(object, (QueryProfileRegistry)null); } - public @Override Object convertFrom(Object object, QueryProfileRegistry registry) { + @Override + public Object convertFrom(Object object, QueryProfileRegistry registry) { if (primitiveClass == object.getClass()) return object; if (object.getClass() == String.class) return convertFromString((String)object); diff --git a/container-search/src/main/java/com/yahoo/search/query/profile/types/QueryProfileFieldType.java b/container-search/src/main/java/com/yahoo/search/query/profile/types/QueryProfileFieldType.java index df52e78c6ef..724931b6c41 100644 --- a/container-search/src/main/java/com/yahoo/search/query/profile/types/QueryProfileFieldType.java +++ b/container-search/src/main/java/com/yahoo/search/query/profile/types/QueryProfileFieldType.java @@ -38,17 +38,21 @@ public class QueryProfileFieldType extends FieldType { /** Returns the query profile type of this, or null if any type works */ public QueryProfileType getQueryProfileType() { return type; } - public @Override Class<?> getValueClass() { return QueryProfile.class; } + @Override + public Class<?> getValueClass() { return QueryProfile.class; } - public @Override String stringValue() { + @Override + public String stringValue() { return "query-profile" + (type!=null ? ":" + type.getId().getName() : ""); } - public @Override String toString() { + @Override + public String toString() { return "field type " + stringValue(); } - public @Override String toInstanceDescription() { + @Override + public String toInstanceDescription() { return "reference to a query profile" + (type!=null ? " of type '" + type.getId().getName() + "'" : ""); } |