diff options
16 files changed, 54 insertions, 27 deletions
diff --git a/chain/src/main/java/com/yahoo/component/chain/dependencies/ordering/ComponentNameProvider.java b/chain/src/main/java/com/yahoo/component/chain/dependencies/ordering/ComponentNameProvider.java index 77e492395ce..5ae2765c074 100644 --- a/chain/src/main/java/com/yahoo/component/chain/dependencies/ordering/ComponentNameProvider.java +++ b/chain/src/main/java/com/yahoo/component/chain/dependencies/ordering/ComponentNameProvider.java @@ -48,7 +48,8 @@ class ComponentNameProvider extends NameProvider { return 1; } - public @Override String toString() { + @Override + public String toString() { StringBuilder b=new StringBuilder("components ["); for (@SuppressWarnings("rawtypes") Iterator<ComponentNode> i=nodes.iterator(); i.hasNext(); ) { diff --git a/component/src/main/java/com/yahoo/component/ComponentId.java b/component/src/main/java/com/yahoo/component/ComponentId.java index 50417c15b5e..687d0da617a 100644 --- a/component/src/main/java/com/yahoo/component/ComponentId.java +++ b/component/src/main/java/com/yahoo/component/ComponentId.java @@ -111,7 +111,8 @@ public final class ComponentId implements Comparable<ComponentId> { */ public String stringValue() { return stringValue; } - public @Override String toString() { + @Override + public String toString() { return spec.toString(); } @@ -126,7 +127,8 @@ public final class ComponentId implements Comparable<ComponentId> { return c.stringValue().equals(stringValue); } - public @Override int hashCode() { + @Override + public int hashCode() { return stringValue.hashCode(); } diff --git a/component/src/main/java/com/yahoo/component/ComponentSpecification.java b/component/src/main/java/com/yahoo/component/ComponentSpecification.java index 9662eee0f66..af8fbdcdbe1 100644 --- a/component/src/main/java/com/yahoo/component/ComponentSpecification.java +++ b/component/src/main/java/com/yahoo/component/ComponentSpecification.java @@ -91,7 +91,8 @@ public final class ComponentSpecification { */ public String stringValue() { return stringValue; } - public @Override String toString() { + @Override + public String toString() { return toId().toString(); } @@ -102,7 +103,8 @@ public final class ComponentSpecification { return c.stringValue.equals(this.stringValue()); } - public @Override int hashCode() { + @Override + public int hashCode() { return stringValue.hashCode(); } diff --git a/component/src/main/java/com/yahoo/component/Spec.java b/component/src/main/java/com/yahoo/component/Spec.java index a3259484b4a..54cf52a3887 100644 --- a/component/src/main/java/com/yahoo/component/Spec.java +++ b/component/src/main/java/com/yahoo/component/Spec.java @@ -51,7 +51,8 @@ final class Spec<VERSION> { } } - public @Override String toString() { + @Override + public String toString() { if (isNonEmpty(version) || (namespace != null)) { StringBuilder builder = new StringBuilder(name); if (isNonEmpty(version)) { diff --git a/component/src/main/java/com/yahoo/component/provider/FreezableClass.java b/component/src/main/java/com/yahoo/component/provider/FreezableClass.java index c94c8a0bbac..895f642e315 100644 --- a/component/src/main/java/com/yahoo/component/provider/FreezableClass.java +++ b/component/src/main/java/com/yahoo/component/provider/FreezableClass.java @@ -30,7 +30,8 @@ public class FreezableClass implements Freezable { } /** Clones this. The clone is <i>not</i> frozen */ - public @Override FreezableClass clone() { + @Override + public FreezableClass clone() { try { FreezableClass clone=(FreezableClass)super.clone(); clone.frozen = false; diff --git a/component/src/main/java/com/yahoo/component/provider/FreezableComponent.java b/component/src/main/java/com/yahoo/component/provider/FreezableComponent.java index 9d51b0b5819..d2189c3a48b 100644 --- a/component/src/main/java/com/yahoo/component/provider/FreezableComponent.java +++ b/component/src/main/java/com/yahoo/component/provider/FreezableComponent.java @@ -38,7 +38,8 @@ public class FreezableComponent extends AbstractComponent implements Freezable { } /** Clones this. The clone will <i>not</i> be frozen */ - public @Override FreezableComponent clone() { + @Override + public FreezableComponent clone() { FreezableComponent clone=(FreezableComponent)super.clone(); clone.frozen = false; return clone; diff --git a/component/src/main/java/com/yahoo/component/provider/ListenableFreezableClass.java b/component/src/main/java/com/yahoo/component/provider/ListenableFreezableClass.java index d1d82b2de79..7bb2eae10a5 100644 --- a/component/src/main/java/com/yahoo/component/provider/ListenableFreezableClass.java +++ b/component/src/main/java/com/yahoo/component/provider/ListenableFreezableClass.java @@ -34,7 +34,8 @@ public class ListenableFreezableClass extends FreezableClass implements Listenab } /** Clones this. The clone is <i>not</i> frozen and has no listeners. */ - public @Override ListenableFreezableClass clone() { + @Override + public ListenableFreezableClass clone() { ListenableFreezableClass clone=(ListenableFreezableClass)super.clone(); clone.executionList = new ExecutionList(); return clone; diff --git a/config-model/src/main/java/com/yahoo/searchdefinition/document/Ranking.java b/config-model/src/main/java/com/yahoo/searchdefinition/document/Ranking.java index 442673e3a46..37f18e44b91 100644 --- a/config-model/src/main/java/com/yahoo/searchdefinition/document/Ranking.java +++ b/config-model/src/main/java/com/yahoo/searchdefinition/document/Ranking.java @@ -42,7 +42,8 @@ public class Ranking implements Cloneable, Serializable { public void setNormal(boolean n) { this.normal = n; } /** Returns true if the given rank settings are the same */ - public @Override boolean equals(Object o) { + @Override + public boolean equals(Object o) { if ( ! (o instanceof Ranking)) return false; Ranking other=(Ranking)o; @@ -52,15 +53,18 @@ public class Ranking implements Cloneable, Serializable { return true; } - public @Override int hashCode() { + @Override + public int hashCode() { return java.util.Objects.hash(filter, literal, normal); } - public @Override String toString() { + @Override + public String toString() { return "rank settings [filter: " + filter + ", literal: " + literal + ", normal: "+normal+"]"; } - public @Override Ranking clone() { + @Override + public Ranking clone() { try { return (Ranking)super.clone(); } diff --git a/config-model/src/main/java/com/yahoo/searchdefinition/document/Sorting.java b/config-model/src/main/java/com/yahoo/searchdefinition/document/Sorting.java index 8c238c104fe..34db554773c 100644 --- a/config-model/src/main/java/com/yahoo/searchdefinition/document/Sorting.java +++ b/config-model/src/main/java/com/yahoo/searchdefinition/document/Sorting.java @@ -48,7 +48,8 @@ public final class Sorting implements Cloneable, Serializable { (strength == other.strength); } - public @Override Sorting clone() { + @Override + public Sorting clone() { try { return (Sorting)super.clone(); } diff --git a/config-model/src/main/java/com/yahoo/vespa/documentmodel/SummaryField.java b/config-model/src/main/java/com/yahoo/vespa/documentmodel/SummaryField.java index 3eadd381508..b9d7a5953ab 100644 --- a/config-model/src/main/java/com/yahoo/vespa/documentmodel/SummaryField.java +++ b/config-model/src/main/java/com/yahoo/vespa/documentmodel/SummaryField.java @@ -74,10 +74,12 @@ public class SummaryField extends Field implements Cloneable, TypedKey { } public String getName() { return name; } public String getValue() { return value; } - public @Override int hashCode() { + @Override + public int hashCode() { return name.hashCode() + 17*value.hashCode(); } - public @Override boolean equals(Object obj) { + @Override + public boolean equals(Object obj) { if (!(obj instanceof Property)) { return false; } diff --git a/config-model/src/main/java/com/yahoo/vespa/model/search/Dispatch.java b/config-model/src/main/java/com/yahoo/vespa/model/search/Dispatch.java index 687531cbe11..2a1e5d70653 100644 --- a/config-model/src/main/java/com/yahoo/vespa/model/search/Dispatch.java +++ b/config-model/src/main/java/com/yahoo/vespa/model/search/Dispatch.java @@ -85,7 +85,8 @@ public class Dispatch extends AbstractService implements SearchInterface, public int getFrtPort() { return getRelativePort(0); } public int getDispatchPort() { return getRelativePort(1); } - public @Override int getHealthPort() { return getRelativePort(2); } + @Override + public int getHealthPort() { return getRelativePort(2); } /** * Twice the default of the number of threads in the container. diff --git a/searchlib/src/main/java/com/yahoo/searchlib/ranking/features/fieldmatch/QueryTerm.java b/searchlib/src/main/java/com/yahoo/searchlib/ranking/features/fieldmatch/QueryTerm.java index 47ffb276f70..be50b413eba 100644 --- a/searchlib/src/main/java/com/yahoo/searchlib/ranking/features/fieldmatch/QueryTerm.java +++ b/searchlib/src/main/java/com/yahoo/searchlib/ranking/features/fieldmatch/QueryTerm.java @@ -51,15 +51,18 @@ public final class QueryTerm { /** The degree to which this is exactly the term the user specified (1), or a stemmed form (closer to 0) */ public float getExactness() { return exactness; } - public @Override int hashCode() { return term.hashCode(); } + @Override + public int hashCode() { return term.hashCode(); } - public @Override boolean equals(Object object) { + @Override + public boolean equals(Object object) { if (! (object instanceof QueryTerm)) return false; return this.term.equals(((QueryTerm)object).term); } - public @Override String toString() { + @Override + public String toString() { if (connectedness==0.1f) return term; return connectedness + ":" + term; } diff --git a/searchlib/src/main/java/com/yahoo/searchlib/rankingexpression/evaluation/MapContext.java b/searchlib/src/main/java/com/yahoo/searchlib/rankingexpression/evaluation/MapContext.java index 2dffe2a1100..2862a4783a2 100644 --- a/searchlib/src/main/java/com/yahoo/searchlib/rankingexpression/evaluation/MapContext.java +++ b/searchlib/src/main/java/com/yahoo/searchlib/rankingexpression/evaluation/MapContext.java @@ -44,7 +44,8 @@ public class MapContext extends Context { /** * Returns the value of a key. 0 is returned if the given key is not bound in this. */ - public @Override Value get(String key) { + @Override + public Value get(String key) { Value value=bindings.get(key); if (value==null) return DoubleValue.zero; return value; @@ -56,7 +57,8 @@ public class MapContext extends Context { * * @since 5.1.5 */ - public @Override void put(String key,Value value) { + @Override + public void put(String key,Value value) { bindings.put(key,value.freeze()); } @@ -70,12 +72,14 @@ public class MapContext extends Context { public MapContext thawedCopy() { return new MapContext(new HashMap<>(bindings)); } /** Returns an unmodifiable map of the names of this */ - public @Override Set<String> names() { + @Override + public Set<String> names() { if (frozen) return bindings.keySet(); return Collections.unmodifiableMap(bindings).keySet(); } - public @Override String toString() { + @Override + public String toString() { return "a map context [" + bindings.size() + " bindings]"; } diff --git a/searchlib/src/main/java/com/yahoo/searchlib/rankingexpression/rule/TruthOperator.java b/searchlib/src/main/java/com/yahoo/searchlib/rankingexpression/rule/TruthOperator.java index 932975f3b63..234825eaa3d 100644 --- a/searchlib/src/main/java/com/yahoo/searchlib/rankingexpression/rule/TruthOperator.java +++ b/searchlib/src/main/java/com/yahoo/searchlib/rankingexpression/rule/TruthOperator.java @@ -27,7 +27,8 @@ public enum TruthOperator implements Serializable { /** Perform the truth operation on the input */ public abstract boolean evaluate(double x, double y); - public @Override String toString() { return operatorString; } + @Override + public String toString() { return operatorString; } public static TruthOperator fromString(String string) { for (TruthOperator operator : values()) diff --git a/searchlib/src/test/java/com/yahoo/searchlib/ranking/features/fieldmatch/SemanticDistanceTestCase.java b/searchlib/src/test/java/com/yahoo/searchlib/ranking/features/fieldmatch/SemanticDistanceTestCase.java index 14ea58961ba..2663fc26b1a 100644 --- a/searchlib/src/test/java/com/yahoo/searchlib/ranking/features/fieldmatch/SemanticDistanceTestCase.java +++ b/searchlib/src/test/java/com/yahoo/searchlib/ranking/features/fieldmatch/SemanticDistanceTestCase.java @@ -22,7 +22,8 @@ public class SemanticDistanceTestCase extends junit.framework.TestCase { super(name); } - public @Override void setUp() { + @Override + public void setUp() { c=new FieldMatchMetricsComputer(); StringBuilder field=new StringBuilder(); for (int i=0; i<150; i++) diff --git a/vespaclient-container-plugin/src/test/java/com/yahoo/storage/searcher/GetSearcherTestCase.java b/vespaclient-container-plugin/src/test/java/com/yahoo/storage/searcher/GetSearcherTestCase.java index bdd48949146..022360db54f 100755 --- a/vespaclient-container-plugin/src/test/java/com/yahoo/storage/searcher/GetSearcherTestCase.java +++ b/vespaclient-container-plugin/src/test/java/com/yahoo/storage/searcher/GetSearcherTestCase.java @@ -1022,7 +1022,8 @@ public class GetSearcherTestCase { this.hitToReturn = hitToReturn; } - public @Override Result search(Query query, Execution execution) { + @Override + public Result search(Query query, Execution execution) { Result result = new Result(query); result.hits().add(hitToReturn); return result; |